From bf514012240ebdf902fc8623835f9ba34210d50d Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Wed, 27 Jul 2022 15:39:14 +0800
Subject: [PATCH] 30620

---
 .../AppCooperationPropaganda.vue                     | 12 ++++++------
 .../AppCooperationPropaganda/cooperationDetail.vue   | 10 +++++-----
 .../AppPropagandaStatistics.vue                      |  6 +++---
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/project/saas/AppCooperationPropaganda/AppCooperationPropaganda.vue b/src/project/saas/AppCooperationPropaganda/AppCooperationPropaganda.vue
index 6468dc70..826cd0fe 100644
--- a/src/project/saas/AppCooperationPropaganda/AppCooperationPropaganda.vue
+++ b/src/project/saas/AppCooperationPropaganda/AppCooperationPropaganda.vue
@@ -227,25 +227,25 @@ export default {
           }
 
           .status0 {
-            background: #3399FF;
+            background: #FFA938;
           }
           .status1 {
-            background: #FFA938;
+            background: #FF6758;
           }
           .status2 {
             background: #3399FF;
           }
           .status3 {
-            background: #1CCEB0;
+            background: #FF6758;
           }
           .status4 {
-            background: #FF6758;
+            background: #3399FF;
           }
           .status5 {
-            background: #FF6758;
+            background: #1CCEB0;
           }
           .status6 {
-            background: #999999;
+            background: #666666;
           }
         }
       }
diff --git a/src/project/saas/AppCooperationPropaganda/cooperationDetail.vue b/src/project/saas/AppCooperationPropaganda/cooperationDetail.vue
index 42acb857..09190467 100644
--- a/src/project/saas/AppCooperationPropaganda/cooperationDetail.vue
+++ b/src/project/saas/AppCooperationPropaganda/cooperationDetail.vue
@@ -51,7 +51,8 @@
               </div>
             </div>
           </div>
-          <div v-if="detail.status == 4" class="btn" @click="remindSend">提醒成员发送</div>
+          <!-- v-if="detail.status == 4" -->
+          <div  class="btn" @click="remindSend">提醒成员发送</div>
         </div>
       </div>
 
@@ -119,7 +120,6 @@ export default {
   onLoad(o) {
     this.id = o.id;
     this.createTime = o.time;
-    this.firstClickTime = uni.getStorageSync('firstClick')
   },
   methods: {
     tabClick(index) {
@@ -140,11 +140,10 @@ export default {
     },
     // 提醒发送
     remindSend() {
-      this.firstClickTime = this.firstClickTime || +new Date()
-      uni.setStorageSync('firstClick',this.firstClickTime)
+      this.firstClickTime = +new Date(this.detail.remindTime).getTime();
       this.currentClickTime = +new Date();
       let time = this.currentClickTime - this.firstClickTime;
-      if (time >= 60 * 60 * 1000 && this.flag) {
+      if (time >= 60 * 60 * 1000 || this.flag) {
         this.$http
           .post("/app/appmasssendingtask/remindSend", null, {
             params: {
@@ -160,6 +159,7 @@ export default {
           .catch(() => {
           });
       } else {
+        console.log(111);
         time = 60 * 60 * 1000 - time;
         const min = Math.floor(time / 1000 / 60); // 分钟
         let second = Math.floor(time / 1000);  // 秒
diff --git a/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue b/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue
index b71c8bb4..088b6928 100644
--- a/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue
+++ b/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue
@@ -19,7 +19,7 @@
             <div v-for="(item,index) in calendarList[nowDate - 1].taskList.slice(2, calendarList[nowDate - 1].taskList.length)" :key="index">{{item.taskTitle}}</div>
           </div>
         </div>
-        <div v-if="!(calendarList && calendarList[nowDate - 1] && calendarList[nowDate - 1].taskList.length)">今日暂无宣发任务</div>
+        <div v-if="!(calendarList && calendarList[nowDate - 1] && calendarList[nowDate - 1].taskList.length)">暂无宣发任务</div>
         <div class="isShow" v-if="calendarList && calendarList[nowDate - 1] && calendarList[nowDate - 1].taskList.length && calendarList[nowDate - 1].taskList.length > 2" @click="showYes = !showYes">{{ showYes ? "收起" : "展开" }}</div>
       </div>
 
@@ -33,7 +33,7 @@
             <div v-for="(item,index) in calendarList[nowDate].taskList.slice(2, calendarList[nowDate].taskList.length)" :key="index">{{item.taskTitle}}</div>
           </div>
         </div>
-        <div v-if="!(calendarList && calendarList[nowDate] && calendarList[nowDate].taskList.length>0)">今日暂无宣发任务</div>
+        <div v-if="!(calendarList && calendarList[nowDate] && calendarList[nowDate].taskList.length>0)">暂无宣发任务</div>
         <div class="isShow" v-if="calendarList && calendarList[nowDate] && calendarList[nowDate].taskList.length && calendarList[nowDate].taskList.length > 2" @click="showTo=!showTo">{{ showTo ? "收起" : "展开" }}</div>
       </div>
 
@@ -47,7 +47,7 @@
             <div v-for="(item,index) in calendarList[nowDate + 1].taskList.slice(2, calendarList[nowDate + 1].taskList.length)" :key="index">{{item.taskTitle}}</div>
           </div>
         </div>
-        <div v-if="!(calendarList && calendarList[nowDate + 1] && calendarList[nowDate + 1].taskList.length)">今日暂无宣发任务</div>
+        <div v-if="!(calendarList && calendarList[nowDate + 1] && calendarList[nowDate + 1].taskList.length)">暂无宣发任务</div>
         <div class="isShow" v-if="calendarList && calendarList[nowDate + 1] && calendarList[nowDate + 1].taskList.length && calendarList[nowDate + 1].taskList.length > 2" @click="showTom=!showTom">{{ showTom ? "收起" : "展开" }}</div>
       </div>
     </div>