Merge branch 'zcwy_0723_hotforum' into dev0515

src/components/FileUpload/index.vue

@@ -217,13 +217,16 @@ export default {
         if(delIdx>-1){
           fileList.splice(delIdx,1);
         }
+        this.$emit("success", res);
       } else {
         this.isLoading = false;
-        //this.fileList = [];
+        if(this.limit == 1){
+          this.fileList = [];
+        }
         this.$message({message:"上传失败",type:'error',offset:100});
       }
 
-      this.$emit("success", res);
+      // this.$emit("success", res);
     },
     // 删除文件
     handleDelete(index) {

src/views/hotforum/Index.vue

@@ -21,7 +21,7 @@
         imgData:[
           {img:'01',url:'1265897142383042560'},
           {img:'02',url:'1265697724606210048'},
-          {img:'03',url:''},
+          {img:'003',url:'1280185851054231552'},
           {img:'4',url:''},
         ],
       }

src/views/portal/course/rePreview.vue

@@ -360,17 +360,25 @@ export default {
             }
       } else if(r.contentType == 40) {
          //let url = this.fileBaseUrl + r.content;
-         if(r.content!='' && r.content.indexOf('.pdf')==-1){
-             apiCourseFile.detail(r.contentRefId).then(cfrs=>{
-               if(cfrs.status==200){
-                  r.content=cfrs.result.previewFilePath;
-                  //console.log(r.content);
-               }else{
-                  $this.$message.error('加载pdf课件文件失败');
-               }
-             });
-         }
-
+        if(r.content!='' && r.content.indexOf('.pdf')==-1){
+          apiCourseFile.detail(r.contentRefId).then(cfrs=>{
+            if(cfrs.status==200){
+              r.content=cfrs.result.previewFilePath;
+              //console.log(r.content);
+            }else{
+              $this.$message.error('加载pdf课件文件失败');
+            }
+          });
+        }
+        if(r.content==''){
+          apiCourseFile.detail(r.contentRefId).then(cfrs=>{
+            if(cfrs.status==200){
+              r.content=cfrs.result.previewFilePath;
+            }else{
+              $this.$message.error('加载pdf课件文件失败');
+            }
+          });
+        }
       }
       this.contentData = r;
     },