Merge branch 'iteration-IM' into jenkins

src/views/massMessage/index.vue

@@ -12,20 +12,8 @@
         <van-tab :name="1" title="已发送"></van-tab>
       </van-tabs>
     </van-sticky>
-    <van-list
-      v-model="loading"
-      v-if="dataShow"
-      :finished="finished"
-      finished-text="- 没有更多了 -"
-      :immediate-check="false"
-      @load="getList"
-    >
-      <Item
-        v-for="(item, index) in list"
-        :key="index"
-        :item="item"
-        @onDetail="onDetail"
-      />
+    <van-list v-model="loading" v-if="dataShow" :finished="finished" finished-text="- 没有更多了 -" :immediate-check="false" @load="getList">
+      <Item v-for="(item, index) in list" :key="index" :item="item" @onDetail="onDetail" />
     </van-list>
     <m-empty v-else msg="暂无数据" />
   </div>
@@ -65,7 +53,6 @@ export default {
       });
     },
     onDetail(item) {
-      console.log("onDetail", item);
       // 未发送的可以编辑
       if (!item.sendFlag) {
         this.$router.push({
@@ -76,6 +63,7 @@ export default {
             messageContent: item.messageContent,
             messageType: item.messageType,
             fileName: item.fileName,
+            fileSize: item.fileSize,
             fileUrl: item.fileUrl,
             sendTime: item.sendTime,
             sendType: item.sendType,

src/views/massMessage/operation.vue

@@ -101,6 +101,7 @@ export default {
       id: query.id,
       form: {
         fileName: query.fileName || "",
+        fileSize: query.fileSize || 0,
         fileUrl: query.fileUrl || "",
         messageContent: query.messageContent || "",
         messageType: query.messageType || "",
@@ -141,6 +142,7 @@ export default {
     },
     beforDelete() {
       this.form.fileName = "";
+      this.form.fileSize = 0;
       this.form.fileUrl = "";
       return true;
     },
@@ -198,6 +200,7 @@ export default {
         // const uploadUrl = this.ossUploadUrl + "/" + key;
         file.status = "done";
         form.fileName = file.file.name;
+        form.fileSize = file.file.size;
         form.fileUrl = uploadUrl;
         form.messageType = this.onCheckFileType(file.file.type);
 
@@ -208,6 +211,7 @@ export default {
         file.message = "上传失败";
         form.fileName = "";
         form.fileUrl = "";
+        form.fileSize = 0;
         return false;
       }
       // this.$toast.loading({