From 4e7cbe6fe9cac81058977eb664e66208abdd55de Mon Sep 17 00:00:00 2001 From: binbin_pan Date: Mon, 2 Sep 2024 16:53:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 9 +- pages/YNEduApp/index/index.vue | 17 ++-- pages/YNEduApp/index/notices.vue | 72 ++++++++++++++++ pages/YNEduApp/user/myMsg.vue | 139 +++++++++++++++++++++++++------ pages/gzt/index.vue | 25 +++--- 5 files changed, 211 insertions(+), 51 deletions(-) create mode 100644 pages/YNEduApp/index/notices.vue diff --git a/pages.json b/pages.json index 27d7821..2fd41dd 100644 --- a/pages.json +++ b/pages.json @@ -189,7 +189,7 @@ { "path": "pages/YNEduApp/user/myMsg", "style": { - "navigationBarTitleText": "消息通知" + "navigationStyle": "custom" } }, { @@ -227,6 +227,13 @@ "style": { "navigationBarTitleText": "职业预约" } + }, + { + "path" : "pages/YNEduApp/index/notices", + "style" : + { + "navigationBarTitleText" : "公告通知" + } } ], "globalStyle": { diff --git a/pages/YNEduApp/index/index.vue b/pages/YNEduApp/index/index.vue index b60ecde..1cdaded 100644 --- a/pages/YNEduApp/index/index.vue +++ b/pages/YNEduApp/index/index.vue @@ -28,7 +28,7 @@ scrollable color="#808080" background-color="transparent" - :text="msgList.length > 0 ? msgList[0].noticeName : '暂无消息'" + :text="text" @click="handleMsg" /> @@ -48,7 +48,7 @@
{{ item.trainPercentage }}%
- + 可联系管理员发布 @@ -92,7 +92,7 @@ export default { } ], taskList: [], - msgList: [] + text: '暂无公告' } }, onLoad() { @@ -153,7 +153,7 @@ export default { }) }, // 获取消息列表 - async getMsgList() { + getMsgList() { uni.request({ url: config.bmwUrl + '/studentUsers/getNoticeList', method: 'post', @@ -162,16 +162,17 @@ export default { Authorization: uni.getStorageSync('access_token') }, success: res => { - console.log('🚀 ~ getMsgList ~ res:', res) - this.msgList = res.data - console.log('🚀 ~ getMsgList ~ this.msgList:', this.msgList) + console.log('🚀 ~ getMsgList ~ res:', res.data[0].noticeName) + this.text = res.data[0].noticeName + console.log('🚀 ~ getMsgList ~ this.text:', this.text) } }) }, // 点击消息 handleMsg() { + console.log('🚀 ~ handleMsg ~ handleMsg:') uni.navigateTo({ - url: '/pages/YNEduApp/user/myMsg' + url: '/pages/YNEduApp/index/notices' }) }, toggleScan() { diff --git a/pages/YNEduApp/index/notices.vue b/pages/YNEduApp/index/notices.vue new file mode 100644 index 0000000..662254d --- /dev/null +++ b/pages/YNEduApp/index/notices.vue @@ -0,0 +1,72 @@ + + + + + diff --git a/pages/YNEduApp/user/myMsg.vue b/pages/YNEduApp/user/myMsg.vue index 1780c85..e915402 100644 --- a/pages/YNEduApp/user/myMsg.vue +++ b/pages/YNEduApp/user/myMsg.vue @@ -1,9 +1,24 @@ @@ -15,6 +30,14 @@ export default { return { userId: uni.getStorageSync('userId'), token: uni.getStorageSync('access_token'), + options: [ + { + text: '删除', + style: { + backgroundColor: '#f56c6c' + } + } + ], // 消息列表 msgList: [] } @@ -24,29 +47,81 @@ export default { }, methods: { // 获取消息列表 - async getMsgList() { + getMsgList() { uni.request({ - url: config.bmwUrl + '/studentUsers/getNoticeList', - method: 'post', - data: {}, + url: config.bmwUrl + '/users/getMsgInform', + method: 'get', + data: { + page: 1, + limit: 999 + }, header: { Authorization: this.token }, success: res => { + res = res.data console.log('🚀 ~ getMsgList ~ res:', res) this.msgList = res.data console.log('🚀 ~ getMsgList ~ this.msgList:', this.msgList) } }) }, - // 跳转消息详情 - handleDetail(item) { - const params = { - noticeName: item.noticeName, - noticeContent: item.noticeContent, + // 操作-删除 + handleOption(item) { + console.log('🚀 ~ handleOption ~ item:', item) + if (item.isRead == '0') { + this.markRead(item) } - uni.navigateTo({ - url: `/pages/YNEduApp/user/msgDetail?params=${JSON.stringify(params)}` + this.deleteMsg(item) + }, + // 点击消息 + handleItem(item) { + console.log('🚀 ~ handleItem ~ item:', item) + if (item.isRead == '0') { + this.markRead(item) + } + }, + // 标记已读 + markRead(item) { + const ids = [item.id] + console.log('🚀 ~ markRead ~ ids:', ids) + uni.request({ + url: config.bmwUrl + '/users/markAsRead', + method: 'post', + data: { ids }, + header: { + Authorization: this.token + }, + success: res => { + console.log('🚀 ~ markRead ~ res:', res) + this.getMsgList() + } + }) + }, + // 删除消息 + deleteMsg(item) { + const ids = [item.id] + console.log('🚀 ~ deleteMsg ~ ids:', ids) + uni.request({ + url: config.bmwUrl + '/users/batchDelete', + method: 'post', + data: { ids }, + header: { + Authorization: this.token + }, + success: res => { + console.log('🚀 ~ deleteMsg ~ res:', res) + // 刷新页面 + uni.reLaunch({ + url: '/pages/YNEduApp/user/myMsg' + }) + } + }) + }, + // 返回 + leftClick() { + uni.reLaunch({ + url: '/pages/YNEduApp/user/user' }) } } @@ -54,19 +129,29 @@ export default { diff --git a/pages/gzt/index.vue b/pages/gzt/index.vue index 844c802..f97353e 100644 --- a/pages/gzt/index.vue +++ b/pages/gzt/index.vue @@ -197,7 +197,7 @@ jwtToken: uni.getStorageSync('App-Token') } const tjparams = { - username: '14755181965', + username: '13908860263', password: 'YNsbd@123456' } console.log('🚀 ~ gotoYy ~ tjparams:', tjparams) @@ -248,15 +248,15 @@ 'Content-Type': 'application/x-www-form-urlencoded' }, success: res => { - console.log(res) - let req = res.data - console.log('🚀 ~ getUserInfo ~ req:', req) - if (req.code == 200) { - // setTimeout(() => { - // uni.reLaunch({ - // url: '/pages/HealthExaminationApp/index/index' - // }) - // }, 500) + console.log('🚀 ~ gotoYy ~ res:', res,) + console.log('🚀 ~ gotoYy ~ res:', res.data.token) + if (res.statusCode == 200) { + uni.setStorageSync('tjToken', res.data.token) + setTimeout(() => { + uni.reLaunch({ + url: '/pages/HealthExaminationApp/index/index' + }) + }, 500) } else { uni.showToast({ title: req.message, @@ -272,11 +272,6 @@ }) } }) - setTimeout(() => { - uni.reLaunch({ - url: '/pages/HealthExaminationApp/index/index' - }) - }, 500) } },