From 9f113f89bcd12465c655a2f74683e707c83e02e1 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Thu, 13 Jul 2023 18:29:18 +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 | 12 ++++++++----
 pages/home/home.js        | 30 ++++++++++++++++++++++++++++--
 2 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/assets/js/http/userApi.js b/assets/js/http/userApi.js
index 332bc6a..d9302b0 100644
--- a/assets/js/http/userApi.js
+++ b/assets/js/http/userApi.js
@@ -57,15 +57,19 @@ 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),
   // 分标委列表
   committeeList: (params) => http.get(`${URL_CONFIG}payCaseCommitteeSubitem/payCaseCommitteeSubitem/findTwo`, params),
   // 分标委详情
   committeeDetail: (params) => http.get(`${URL_CONFIG}payCaseCommittee/payCaseCommittee/detail`, params),
-  // 理事会列表 
+  // 理事会列表
   councilList:(params) => http.get(`${URL_CONFIG}payCaseCouncilSubitem/payCaseCouncilSubitem/findTwo`, params),
-  // 理事会详情 
+  // 理事会详情
   councilDetail: (params) => http.get(`${URL_CONFIG}payCaseCouncil/payCaseCouncil/detail`, params),
   // 资料网员分页接口
   queryDataMemberList: (params) => http.get(`${URL_CONFIG}jero/memberProjectSubitem/pageCompany`, params),
@@ -73,9 +77,9 @@ const UserApi = {
   getUserInfo: (params) => http.get(`${URL_CONFIG}sys/user/queryById`, params),
   // 注册
   registerUser: (params) => http.post(`${URL_CONFIG}home/registerSelf`, params),
-  // 手机号唯一校验 
+  // 手机号唯一校验
   checkPhoneOnly: (params) =>  http.get(`${URL_CONFIG}/sys/duplicate/check`, params),
-  // 企业端的会议文件的下载 
+  // 企业端的会议文件的下载
   downFileDownWeb: (fileId,meetingId, params) => http.get(`${URL_CONFIG}meeting/payMeeting/userDownload/${fileId}/${meetingId}`,params)
 }
 
diff --git a/pages/home/home.js b/pages/home/home.js
index 5d91d81..6150621 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -1,5 +1,6 @@
 import UserApi from '../../assets/js/http/userApi'
 import MeetingApi from '../../assets/js/http/meetingApi'
+
 import {
   isLogin
 } from '../../assets/js/common'
@@ -173,7 +174,7 @@ Page({
     }
 
   },
-  // 去报名 
+  // 去报名
   goSignUpPage() {
     const templateCode = this.data.clickItem.currentTarget.dataset.message.templateCode
     const meetingId = JSON.parse(this.data.clickItem.currentTarget.dataset.message.busId).id
@@ -378,6 +379,31 @@ 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('\r\n'),
+            showCancel: false,
+            confirmText: '知道了',
+            success: () => {
+              // 点击知道了把这些超时未读消息变成已读
+              UserApi.messageOverTimeToRead({anntIds: anntIds}).then(res => {
+                if (res.success) {
+                  this.messageDetail({currentTarget: {dataset: {message: {readFlag: 0, anntId: ''}}}})
+                  this.loadData()
+                }
+              })
+            }
+          })
+        }
+      }
+    })
   },
   /**
    * 页面上拉触底事件的处理函数
@@ -386,4 +412,4 @@ Page({
     this.data.searchParams.pageNo++
     this.loadData()
   }
-})
\ No newline at end of file
+})