Merge remote-tracking branch 'origin/dev' into dev

src/project/saas/AppCooperationPropaganda/cooperationDetail.vue

@@ -31,8 +31,8 @@
             数据更新于<span>{{ info.remindTime }}</span>
           </div>
           <div class="pie_card">
-            <div v-if="info.executedCount != null" id="pieEcharts"></div>
+            <div v-show="info.executedCount != null" id="pieEcharts"></div>
-            <AiEmpty description="暂无数据" v-else />
+            <AiEmpty description="暂无数据" v-show="info.executedCount == null" />
             <div class="pie_right">
               <div>
                 计划送达居民群: <span>{{ info.planCount || 0 }}</span>
@@ -48,8 +48,7 @@
               </div>
             </div>
           </div>
-          <!-- v-if="info.status == 4" -->
+          <div v-if="info.status == 4" class="btn" @click="remindSend">提醒成员发送</div>
-          <div class="btn" @click="remindSend">提醒成员发送</div>
         </div>
       </div>
 
@@ -187,6 +186,7 @@ export default {
           if (res?.data) {
             this.tableData = res.data.executedList;
           }
+          this.getPieEcharts()
         });
     },
 

src/project/saas/AppCooperationPropaganda/detail.vue

@@ -20,6 +20,10 @@
           <span>{{ data.choiceTime }}</span>
         </div>
       </div>
+      <div class="task_results">
+        <img v-if="data.status == 1" src="./images/refuse.png" alt="">
+        <img v-if="data.status == 2" src="./images/pass.png" alt="">
+      </div>
     </div>
     <div class="info">
       <div class="scope">
@@ -31,7 +35,7 @@
         <div>
           <div class="textarea" v-if="content.length">{{ content[0].content }}</div>
           <div class="pictures">
-            <!-- <image v-for="(item, index) in picList" :key="index" :src="item."/> -->
+            <!-- <image v-for="(item, index) in picList" :key="index" :src="item.url" @click.stop="previewImages(picList, item.url)/> -->
           </div>
           <div></div>
           <div></div>
@@ -68,6 +72,12 @@ export default {
         }
       })
     },
+    previewImage(images, img) {
+      uni.previewImage({
+        urls: images.map(v => v.url),
+        current: img
+      })
+    },
     // 拒绝
     refuseBtn() {
       this.pass = 0
@@ -110,6 +120,7 @@ export default {
   padding: 32px 32px 120px 32px;
   box-sizing: border-box;
   .task {
+    position: relative;
     margin-bottom: 24px;
     background: #FFF;
     border-radius: 8px;
@@ -135,6 +146,15 @@ export default {
         }
       }
     }
+    .task_results {
+      position: absolute;
+      right: 30px;
+      top: 30px;
+      img {
+        width: 160px;
+        height: 130px;
+      }
+    }
   }
 
   .info {