From 6b576fbdfc7389279fdab17302184b807cc2dc30 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Wed, 1 Mar 2023 09:29:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppCooperationPropagandaBeta.vue           |  2 ++
 .../AppCooperationPropaganda/addPropaganda.vue |  2 ++
 .../AppCooperationPropaganda/circleDetail.vue  |  2 +-
 .../AppCooperationPropaganda/sendScoped.vue    | 18 ++++++++++--------
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/project/huizhili/AppCooperationPropaganda/AppCooperationPropagandaBeta.vue b/src/project/huizhili/AppCooperationPropaganda/AppCooperationPropagandaBeta.vue
index 0afd0519..e25f45eb 100644
--- a/src/project/huizhili/AppCooperationPropaganda/AppCooperationPropagandaBeta.vue
+++ b/src/project/huizhili/AppCooperationPropaganda/AppCooperationPropagandaBeta.vue
@@ -146,6 +146,8 @@ export default {
       uni.removeStorageSync('ResidentTagsRemove')
       uni.removeStorageSync('circleTags')
       uni.removeStorageSync('circleTagsRemove')
+      uni.removeStorageSync('startTime')
+      uni.removeStorageSync('endTime')
       this.$dict.load('mstStatus').then(() => {
         this.getList()
       })
diff --git a/src/project/huizhili/AppCooperationPropaganda/addPropaganda.vue b/src/project/huizhili/AppCooperationPropaganda/addPropaganda.vue
index 0d1bfb27..e41facd1 100644
--- a/src/project/huizhili/AppCooperationPropaganda/addPropaganda.vue
+++ b/src/project/huizhili/AppCooperationPropaganda/addPropaganda.vue
@@ -550,6 +550,8 @@ export default {
       uni.removeStorageSync('ResidentTagsRemove')
       uni.removeStorageSync('circleTags')
       uni.removeStorageSync('circleTagsRemove')
+      uni.removeStorageSync('startTime')
+      uni.removeStorageSync('endTime')
     },
 
     getDeptUser() {
diff --git a/src/project/huizhili/AppCooperationPropaganda/circleDetail.vue b/src/project/huizhili/AppCooperationPropaganda/circleDetail.vue
index 043dacde..2dd39c45 100644
--- a/src/project/huizhili/AppCooperationPropaganda/circleDetail.vue
+++ b/src/project/huizhili/AppCooperationPropaganda/circleDetail.vue
@@ -121,7 +121,7 @@ export default {
       uni.getSystemInfo({
         success: (res)=>{
           if(res.platform == "ios") {
-            this.firstClickTime = new Date(this.detail.remindTime.replace(/-/g, "/")).getTime() || 0
+            this.firstClickTime = new Date(this.detail.remindTime?.replace(/-/g, "/")).getTime() || 0
           } else {
             this.firstClickTime = new Date(this.detail.remindTime).getTime() || 0
           }
diff --git a/src/project/huizhili/AppCooperationPropaganda/sendScoped.vue b/src/project/huizhili/AppCooperationPropaganda/sendScoped.vue
index 1dc47fe1..78f6d8ad 100644
--- a/src/project/huizhili/AppCooperationPropaganda/sendScoped.vue
+++ b/src/project/huizhili/AppCooperationPropaganda/sendScoped.vue
@@ -40,8 +40,10 @@ export default {
       deptListIds: [],
       wxGroups: [],  // 居民群,居民,朋友圈
       sex: '',
-      ResidentTags: [],
-      ResidentTagsRemove: [],
+      circleTags: '',
+      ResidentTags: '',
+      ResidentTagsRemove: '',
+      circleTagsRemove: '',
       startTime: '',
       endTime: '',
     }
@@ -96,8 +98,8 @@ export default {
         formData = {
           filterCriteria: this.girdListIds.toString() || this.deptListIds.toString() || '',
           sendScope: this.sendScope,
-          tags: this.ResidentTags.toString() || this.circleTags.toString() || '',
-          excludeTags: this.ResidentTagsRemove.toString() || this.circleTagsRemove.toString() || '',
+          tags: this.ResidentTags || this.circleTags || '',
+          excludeTags: this.ResidentTagsRemov || this.circleTagsRemove || '',
           addFromTime: this.startTime,
           addEndTime: this.endTime,
           gender: this.sex,
@@ -140,11 +142,11 @@ export default {
     this.sex = uni.getStorageSync('gender')
     // 标签
     if(this.sendType == 'Residents') { 
-      this.ResidentTags = uni.getStorageSync('ResidentTags') // 居民包含
-      this.ResidentTagsRemove = uni.getStorageSync('ResidentTagsRemove') // 居民剔除
+      this.ResidentTags = uni.getStorageSync('ResidentTags').toString() // 居民包含
+      this.ResidentTagsRemove = uni.getStorageSync('ResidentTagsRemove').toString() // 居民剔除
     } else if(this.sendType == 'CircleOfFriends') {
-      this.circleTags = uni.getStorageSync('circleTags') // 朋友圈包含
-      this.circleTagsRemove = uni.getStorageSync('circleTagsRemove') // 朋友圈剔除
+      this.circleTags = uni.getStorageSync('circleTags').toString() // 朋友圈包含
+      this.circleTagsRemove = uni.getStorageSync('circleTagsRemove').toString() // 朋友圈剔除
     }
     // 时间
     this.startTime = uni.getStorageSync('startTime')