LuChongMei 2 år sedan
förälder
incheckning
99da7ceaea

+ 16 - 12
src/views/activityMan/placeactivity/placeActivityInfo.vue

@@ -177,10 +177,6 @@
     >
   </div>
   <van-popup v-model:show="showReport">
-    <!-- <wang-editor
-      ref="subjectContentEditor"
-      v-model="placeActivity.subjectContent"
-    /> -->
     <div v-html="placeActivity.subjectContent" class="showhtml"></div>
   </van-popup>
 </template>
@@ -279,14 +275,22 @@ export default {
      * 下载文件 网页端可用
      */
     const downHandle = (fileObj) => {
-      // 声明a标签
-      const aEle = document.createElement("a");
-      // 设置下载文件名
-      aEle.download = fileObj.file.name;
-      // 下载地址
-      aEle.href = fileObj.content;
-      // 调用下载
-      aEle.click();
+      if (
+        !(
+          fileObj.file.name.includes(".jpg") ||
+          fileObj.file.name.includes(".jpeg") ||
+          fileObj.file.name.includes(".png")
+        )
+      ) {
+        // 声明a标签
+        const aEle = document.createElement("a");
+        // 设置下载文件名
+        aEle.download = fileObj.file.name;
+        // 下载地址
+        aEle.href = fileObj.url;
+        // 调用下载
+        aEle.click();
+      }
     };
     // 审核通过
     const update = () => {

+ 7 - 22
src/views/activityMan/placeactivity/placeActivityView.vue

@@ -208,7 +208,6 @@
               accept=""
               :preview-full-image="false"
               :before-delete="deleteRead"
-              @click-preview="downHandle"
             >
               <van-button>上传文件</van-button>
             </van-uploader>
@@ -290,12 +289,6 @@ export default {
     });
     // 富文本编辑器
     const subjectContentEditor = ref(null);
-    // 获取当前登录用户
-    const user = new placeActivityServer().queryListLonginId().then((data) => {
-      new tools().queryById(data.id).then((res) => {
-        placeActivity.value.reporter = res;
-      });
-    });
     // 根据路由初始化
     let route = useRoute();
     onMounted(() => {
@@ -330,11 +323,17 @@ export default {
             }
           });
           subjectContentEditor.value.init(placeActivity.value.subjectContent);
+          console.log("修改数据", placeActivity.value);
           isLoading.value = false;
         });
       } else {
         subjectContentEditor.value.init(placeActivity.value.subjectContent);
-        placeActivity.value.reporter = user;
+        // 获取当前登录用户
+        new placeActivityServer().queryListLonginId().then((data) => {
+          new tools().queryById(data.id).then((res) => {
+            placeActivity.value.reporter = res;
+          });
+        });
         isLoading.value = false;
       }
     });
@@ -436,19 +435,6 @@ export default {
         }
       }
     };
-    /**
-     * 下载文件 网页端可用
-     */
-    const downHandle = (fileObj) => {
-      // 声明a标签
-      const aEle = document.createElement("a");
-      // 设置下载文件名
-      aEle.download = fileObj.file.name;
-      // 下载地址
-      aEle.href = fileObj.content;
-      // 调用下载
-      aEle.click();
-    };
     // 提交数据
     const submit = () => {
       isLoading.value = true;
@@ -489,7 +475,6 @@ export default {
       // 文件上传
       afterRead,
       deleteRead,
-      downHandle,
       fileList,
       submit,
       subjectContentEditor,