From 1222799fcf186f8461a4b14ffbc8f0334009e0f5 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Thu, 13 Jul 2023 18:39:40 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E5=8F=98=E6=9B=B4=EF=BC=9A=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E6=B6=88=E6=81=AF=E6=9C=89=E8=B6=85=E6=97=B6=E6=9C=AA?=
 =?UTF-8?q?=E8=AF=BB=E7=9A=84=E5=BC=B9=E6=A1=86=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/js/http/userApi.js |  4 ++++
 pages/home/home.js        | 40 +++++++++++++++++++++++++++++++--------
 2 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/assets/js/http/userApi.js b/assets/js/http/userApi.js
index 588f089..d9302b0 100644
--- a/assets/js/http/userApi.js
+++ b/assets/js/http/userApi.js
@@ -57,6 +57,10 @@ const UserApi = {
   messageList: (params) => http.get(`${URL_CONFIG}sys/sysAnnouncementSend/getCompanyMyAnnouncementSend`, params),
   // 消息提醒已读状态
   messageStatus: (params) => http.post(`${URL_CONFIG}sys/sysAnnouncementSend/editCompanyByAnntIdAndUserId`, params),
+  // 消息超时未读列表
+  messageOverTimeUnreadList: (params) => http.get(`${URL_CONFIG}sys/sysAnnouncementSend/getDeadlineUnreadSend`, params),
+  // 将超时未读消息全部变已读
+  messageOverTimeToRead: (params) => http.get(`${URL_CONFIG}sys/sysAnnouncementSend/allReadDeadlineUnreadSend`, params),
   // 工作组分页
   workList: (params) => http.get(`${URL_CONFIG}project/payWorkingGroupSubitem/queryCompanyPageList`, params),
   // 分标委列表
diff --git a/pages/home/home.js b/pages/home/home.js
index 88c0c7e..0a87d78 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -274,10 +274,10 @@ Page({
   onShow: function () {
     const that = this
     let menuArrStand = [{
-        path: '../../assets/images/gongzuozu-new.png',
-        text: '工作组',
-        val: '1',
-      },
+      path: '../../assets/images/gongzuozu-new.png',
+      text: '工作组',
+      val: '1',
+    },
       {
         path: '../../assets/images/fenbiaowei-new.png',
         text: '分标委',
@@ -311,10 +311,10 @@ Page({
     ]
 
     let menuArr = [{
-        path: '../../assets/images/gongzuozu-new.png',
-        text: '工作组',
-        val: '1',
-      },
+      path: '../../assets/images/gongzuozu-new.png',
+      text: '工作组',
+      val: '1',
+    },
       {
         path: '../../assets/images/fenbiaowei-new.png',
         text: '分标委',
@@ -380,6 +380,30 @@ Page({
       }
     })
 
+    // 2023-07变更：调接口看有没有超出消息提醒截止时间未读的，如果有则弹框提示
+    UserApi.messageOverTimeUnreadList().then(res => {
+      if (res.success) {
+        if (res.result && res.result.length > 0) {
+          const messageArr = res.result.map(item => item.msgContent)
+          const anntIds = res.result.map(item => item.anntId).join(',')
+          wx.showModal({
+            title: '超时未读提醒',
+            content: messageArr.join('\n'),
+            showCancel: false,
+            confirmText: '知道了',
+            success: () => {
+              // 点击知道了把这些超时未读消息变成已读
+              UserApi.messageOverTimeToRead({anntIds: anntIds}).then(res => {
+                if (res.success) {
+                  this.messageDetail({currentTarget: {dataset: {message: {readFlag: 0, anntId: ''}}}})
+                  this.loadData()
+                }
+              })
+            }
+          })
+        }
+      }
+    })
   },
   /**
    * 页面上拉触底事件的处理函数