From 771b9a8521b159e93f152232e73a6a9368c7c3e5 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Wed, 1 Mar 2023 16:54:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cooperationDetail.vue                     |  1 -
 .../addPropaganda.vue                         | 30 ++++++++++++-------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/apps/AppCooperationPropaganda/cooperationDetail.vue b/src/apps/AppCooperationPropaganda/cooperationDetail.vue
index 1740467e..3b39279c 100644
--- a/src/apps/AppCooperationPropaganda/cooperationDetail.vue
+++ b/src/apps/AppCooperationPropaganda/cooperationDetail.vue
@@ -522,7 +522,6 @@ export default {
       color: #3aa0ff;
       text-align: center;
       border-radius: 16px;
-      
     }
     .bgactive {
       background: #fff;
diff --git a/src/project/huizhili/AppCooperationPropaganda/addPropaganda.vue b/src/project/huizhili/AppCooperationPropaganda/addPropaganda.vue
index 21a60486..d1a4af64 100644
--- a/src/project/huizhili/AppCooperationPropaganda/addPropaganda.vue
+++ b/src/project/huizhili/AppCooperationPropaganda/addPropaganda.vue
@@ -124,7 +124,7 @@
 
     <u-popup v-model="showUpload" mode="bottom" border-radius="24">
 			<div class="uploadPopup">
-        <div class="upload_card" v-for="(item,index) in upload" :key="index">
+        <div class="upload_card" v-for="(item,index) in uploadList" :key="index">
           <div class="upload_item">{{ item.title }}</div>
           <div class="upload_list">
             <div class="list_item" v-for="(e, i) in item.list" :key="i" @click="uploadBtn(e.msgType)">
@@ -251,7 +251,7 @@ export default {
           ]
         }
       ],
-      upload: [],
+      // upload: [],
       midiaIds: [],
       sum: '',
       // 筛选条件
@@ -545,14 +545,26 @@ export default {
       })
     }
   },
+  watch: {
+    type: {
+      handler(v) {
+        if(v) {
+          if(v=='Residents') {
+            this.forms.taskType = 1
+            this.uploadList = this.uploadList
+          } else if(v=='CircleOfFriends') {
+            this.forms.taskType = 0
+            this.uploadList = this.uploadCircle
+          } else if(v=='ResidentsGroup') {
+            this.uploadList = this.uploadList
+          }
+        }
+      }
+    }
+  },
   onLoad(o) {
     this.type = o.type;
     document.title = this.type=='ResidentsGroup'? "群发居民群": this.type=='Residents'? "群发居民": "群发朋友圈"
-    if(this.type=='Residents') {
-      this.forms.taskType = 1
-    } else if(this.type=='CircleOfFriends') {
-      this.forms.taskType = 0
-    }
   },
   onShow() {
     this.form.wxGroups = uni.getStorageSync('wxGroupsUser') || []
@@ -562,15 +574,13 @@ export default {
       this.forms.sendScope = this.form.sendScope
       this.forms.groupList = this.form.wxGroups
       this.sum = this.form.wxGroups.reduce((pre, cur) => pre + cur.customerCount, 0)
-      this.upload = this.uploadList
     } else if(this.type=='CircleOfFriends') {
       this.forms.taskType = 0
       this.forms.sendScope = this.form.sendScope
       this.forms.executorList = this.form.wxGroups
       this.sum = this.form.wxGroups.reduce((pre, cur) => pre + cur.customerCount, 0)
-      this.upload = this.uploadCircle
     } else if(this.type == 'ResidentsGroup') {
-      this.upload = this.uploadList
+      
     }
     this.forms.taskTitle = this.form.taskTitle
     const girdArr = uni.getStorageSync('girdSelect')