From a1829b3bc08e12eb7bc1c5872c0d35f1274d7882 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 3 Mar 2023 11:07:23 +0800
Subject: [PATCH] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E7=BB=99=E4=B8=AA0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppCooperationPropagandaBeta.vue                 |  2 +-
 .../huizhili/AppCooperationPropaganda/sendScoped.vue | 12 +++---------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/project/huizhili/AppCooperationPropaganda/AppCooperationPropagandaBeta.vue b/src/project/huizhili/AppCooperationPropaganda/AppCooperationPropagandaBeta.vue
index fe5b4b3e..2c28a02e 100644
--- a/src/project/huizhili/AppCooperationPropaganda/AppCooperationPropagandaBeta.vue
+++ b/src/project/huizhili/AppCooperationPropaganda/AppCooperationPropagandaBeta.vue
@@ -25,7 +25,7 @@
               <span v-if="tabIndex==0">{{ item.groupOwnerCount || 0 }}</span>
               <span v-else>{{ item.receiveExecutorCount || 0 }} </span>
             </span>名成员完成群发，目前已完成
-            <span class="num">{{ item.completionRate }}%</span>
+            <span class="num">{{ item.completionRate || 0}}%</span>
           </div>
           <div>
             创建部门：
diff --git a/src/project/huizhili/AppCooperationPropaganda/sendScoped.vue b/src/project/huizhili/AppCooperationPropaganda/sendScoped.vue
index 0065b012..14659872 100644
--- a/src/project/huizhili/AppCooperationPropaganda/sendScoped.vue
+++ b/src/project/huizhili/AppCooperationPropaganda/sendScoped.vue
@@ -32,7 +32,7 @@ export default {
         { name: '按网格选择', value: '2'}
       ],
       showContent: false,
-      sendType: '',
+      sendType: '', // Residents,CircleOfFriends,ResidentsGroup
       deptSelect: [],
       girdSelect: [],
       sendScope: 0,
@@ -95,7 +95,7 @@ export default {
           sendScope: this.sendScope,
           taskType: this.sendType == 'Residents'? 1:0,
         }
-      } else if(this.sendScope == 1 || this.sendScope == 2) {
+      } else {
         let resTags='', cirTags='', resRemove='', cirRemove=''
         if(this.ResidentTags.length) {
           resTags = this.ResidentTags?.map(e=> e.id).toString()
@@ -120,18 +120,12 @@ export default {
       }
       this.$http.post(`/app/whchatmomentstask/getSendScope`,{...formData}).then(res => {
         if (res.code === 0) {
-          if(this.sendType == 'Residents') {
-            this.wxGroups = res.data
-          } else if(this.sendType == 'CircleOfFriends') {
-            this.wxGroups = res.data
-          }
+          this.wxGroups = res.data
           uni.setStorageSync('wxGroupsUser', this.wxGroups)
         }
       }).then(()=> {
         uni.hideLoading()
         uni.navigateBack()
-      }).finally(()=> {
-        uni.hideLoading()
       })
     }
   },