Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_wxcp_app into dev

src/project/saas/AppCooperationPropaganda/cooperationDetail.vue

@@ -68,7 +68,7 @@
         <div class="list_card">
           <div class="tab">
             <u-subsection
-              :list="tabIndex == 0 ? subsection_0 : subsection_1"
+              :list="subsection"
               :current="subIndex"
               @change="changeSub"
             ></u-subsection>
@@ -112,6 +112,11 @@ export default {
       currentClickTime: "",
       flag: true,
       detail: {},
+      subsection: [
+        { name: "未执行" },
+        { name: "已执行" },
+        { name: "无法执行" },
+      ],
     };
   },
   computed: {
@@ -122,13 +127,13 @@ export default {
         { name: "无法执行" },
       ]
     },
-    subsection_1() { 
+    // subsection_1() { 
-      return [
+    //   return [
-        { name: "未送达" },
+    //     { name: "未送达" },
-        { name: "已送达" },
+    //     { name: "已送达" },
-        { name: "无法送达" },
+    //     { name: "无法送达" },
-      ]
+    //   ]
-    },
+    // },
     colConfigs0() {
       return [
         { slot: "groupOwnerId", label: "成员" },
@@ -143,6 +148,25 @@ export default {
       ];
     },
   },
+  // watch: {
+  //   subsection: {
+  //     handler: (newVal, oldVal) => {
+  //       if(newVal == 0) {
+  //         this.subsection = [
+  //           { name: "未执行" },
+  //           { name: "已执行" },
+  //           { name: "无法执行" },
+  //         ]
+  //       } else {
+  //         this.subsection = [
+  //           { name: "未送达" },
+  //           { name: "已送达" },
+  //           { name: "无法送达" },
+  //         ]
+  //       }
+  //     }
+  //   }
+  // },
   onLoad(o) {
     this.id = o.id;
     this.createTime = o.time;
@@ -226,8 +250,8 @@ export default {
           if (res?.data) {
             this.info = res.data;
             this.tableData = res.data.executedList.records;
+            this.getPieEcharts();
           }
-          this.getPieEcharts();
         });
     },
 

src/project/saas/AppCooperationPropaganda/detail.vue

@@ -45,7 +45,7 @@
         <p>群发内容</p>
         <div>
           <!-- 文本 -->
-          <div class="textarea" v-show="content && content.length>0">{{ content[0].content }}</div>
+          <div class="textarea" v-show="content.length">{{ content }}</div>
           <!-- 图片 -->
           <div class="pictures" v-show="picList.length">
             <image v-for="(item, index) in picList" :key="index" :src="item.imgPicUrl" @click.stop="previewImages(picList, item.imgPicUrl)"/>
@@ -91,7 +91,7 @@ export default {
     return {
       id: "",
       data: {},
-      content: [],
+      content: '',
       picList: [],
       videoList: [],
       fileList: [],
@@ -113,16 +113,16 @@ export default {
       this.$http.post(`/app/appmasssendingtask/queryDetailById?id=${this.id}`).then(res=> {
         if (res?.data) {
           this.data = res.data
-          this.content = res.data.contents.filter(v=> v.msgType == 0)
+          this.content = res.data.contents.filter(v=> v.msgType == 0)?.[0].content
           this.picList = res.data.contents.filter(v=> v.msgType == 1)
           this.videoList = res.data.contents.filter(v=> v.msgType == 2)
           this.fileList = res.data.contents.filter(v=> v.msgType == 3)
           this.webpage = res.data.contents.filter(v=> v.msgType == 4)
           this.miniapp = res.data.contents.filter(v=> v.msgType == 5)
           if(res.data.status==1) {  // 拒绝
-            this.approver = data.examines.filter(e=> e.examineUserId == user.openId)
+            this.approver = res.data.examines.filter(e=> e.examineUserId == user.openId)
           } else {  // 通过
-            this.approver = data.examines
+            this.approver = res.data.examines
           }
         }
       })