diff --git a/lvdao-miniapp/pages/login/login.vue b/lvdao-miniapp/pages/login/login.vue index 7bc216f..c427a98 100644 --- a/lvdao-miniapp/pages/login/login.vue +++ b/lvdao-miniapp/pages/login/login.vue @@ -115,9 +115,15 @@ uni.setStorageSync('token', res.data.data.token); uni.setStorageSync('user', res.data.data); // uni.setStorageSync('shopId', res.data.data.shopId); - uni.switchTab({ - url: '/pages/home/home' + uni.showToast({ + icon:'none', + title:'登录成功' }) + setTimeout(() => { + uni.switchTab({ + url: '/pages/home/home' + }) + }, 1000) } else { uni.showToast({ icon: 'none', diff --git a/lvdao-miniapp/pages/message/message.vue b/lvdao-miniapp/pages/message/message.vue index fbc6db9..78d484b 100644 --- a/lvdao-miniapp/pages/message/message.vue +++ b/lvdao-miniapp/pages/message/message.vue @@ -15,7 +15,7 @@ - + {{formatDateTime(tableList[0]?tableList[0].createdAt:'')}} - + --> @@ -63,6 +62,56 @@ {{formatDateTime(tzlist[0]?tzlist[0].createTime:'')}} + + + + + + + + 物业缴费通知 + + + + + {{wylist[0].content.title}}【图片】 + {{wylist[0].content.title}} + + 暂无 + + + + + + {{wylist.length}} + {{formatDateTime(wylist[0]?wylist[0].createTime:'')}} + + + + + + + + + + 租金缴费通知 + + + + + {{zjlist[0].content.title}}【图片】 + {{zjlist[0].content.title}} + + 暂无 + + + + + + {{zjlist.length}} + {{formatDateTime(zjlist[0]?zjlist[0].createTime:'')}} + + @@ -113,7 +162,9 @@ receiverMerchant:'' }, zllist:[], - tzlist:[] + tzlist:[], + zjlist:[], + wylist:[] } }, @@ -152,6 +203,8 @@ getmsg() { this.zllist = [] this.tzlist = [] + this.zjlist = [] + this.wylist = [] let info = { // phone:uni.getStorageSync('user').phone, phone:'18121815598', @@ -179,6 +232,28 @@ this.tzlist.reverse() console.error(this.tzlist) }) + this.$http.sendRequest('/cereMessage/viewMessage', 'POST',{...info,messageType:'租金缴费通知'},1).then(res => { + let obj = res.data.data + for(let prop in obj) { + if(obj.hasOwnProperty(prop)) { // 确保只访问实例上的属性，不包括继承的 + obj[prop][0].content = JSON.parse(obj[prop][0].content) + this.zjlist.push(obj[prop][0]) + } + } + this.zjlist.reverse() + console.error(this.zjlist) + }) + this.$http.sendRequest('/cereMessage/viewMessage', 'POST',{...info,messageType:'物业缴费通知'},1).then(res => { + let obj = res.data.data + for(let prop in obj) { + if(obj.hasOwnProperty(prop)) { // 确保只访问实例上的属性，不包括继承的 + obj[prop][0].content = JSON.parse(obj[prop][0].content) + this.wylist.push(obj[prop][0]) + } + } + this.wylist.reverse() + console.error(this.wylist) + }) }, formatDateTime(dateTimeString) { // 将输入的日期时间字符串转换为Date对象 diff --git a/lvdao-miniapp/pages/my/my.vue b/lvdao-miniapp/pages/my/my.vue index abf6797..43e6ca3 100644 --- a/lvdao-miniapp/pages/my/my.vue +++ b/lvdao-miniapp/pages/my/my.vue @@ -58,8 +58,7 @@ --> - 0 - {{activityNum}} + {{activityNum || 0}} 我的活动 @@ -310,6 +309,7 @@ } } }) + this.getALL() } }, @@ -320,7 +320,7 @@ this.scrollTop = e.scrollTop; }, mounted() { - this.getALL() + }, methods: { out() { diff --git a/lvdao-miniapp/pages/workbench/workbench.vue b/lvdao-miniapp/pages/workbench/workbench.vue index 4707686..997d49e 100644 --- a/lvdao-miniapp/pages/workbench/workbench.vue +++ b/lvdao-miniapp/pages/workbench/workbench.vue @@ -251,12 +251,12 @@ // { name: '活动申请', img: '/wyjf.png', path: '/pages/mycreated/mycreated' }, { name: '租金缴费', - img: '/zjjf.png', + img: '/wyjf.png', path: '/pagesA/rentPay/rentPay' }, { name: '物业缴费', - img: '/wyjf.png', + img: '/zjjf.png', path: '/pages/propertyPay/propertyPayList/propertyPayList' }, ] diff --git a/lvdao-miniapp/pagesA/procedureList/procedureList.vue b/lvdao-miniapp/pagesA/procedureList/procedureList.vue index 375072b..e57a67b 100644 --- a/lvdao-miniapp/pagesA/procedureList/procedureList.vue +++ b/lvdao-miniapp/pagesA/procedureList/procedureList.vue @@ -1,5 +1,6 @@