Commit e2119c7086285834d0267b30cf1181f33c86df17
1 parent
84cb5fa7
1
Showing
4 changed files
with
53 additions
and
9 deletions
lvdao-miniapp/pages/login/login.vue
| ... | ... | @@ -115,9 +115,15 @@ |
| 115 | 115 | uni.setStorageSync('token', res.data.data.token); |
| 116 | 116 | uni.setStorageSync('user', res.data.data); |
| 117 | 117 | // uni.setStorageSync('shopId', res.data.data.shopId); |
| 118 | - uni.switchTab({ | |
| 119 | - url: '/pages/home/home' | |
| 118 | + uni.showToast({ | |
| 119 | + icon:'none', | |
| 120 | + title:'登录成功' | |
| 120 | 121 | }) |
| 122 | + setTimeout(() => { | |
| 123 | + uni.switchTab({ | |
| 124 | + url: '/pages/home/home' | |
| 125 | + }) | |
| 126 | + }, 1000) | |
| 121 | 127 | } else { |
| 122 | 128 | uni.showToast({ |
| 123 | 129 | icon: 'none', | ... | ... |
lvdao-miniapp/pages/message/message.vue
| ... | ... | @@ -15,7 +15,7 @@ |
| 15 | 15 | </view> |
| 16 | 16 | <view class="main"> |
| 17 | 17 | <view class="message-list"> |
| 18 | - <view class="list" @click="toMsgList"> | |
| 18 | +<!-- <view class="list" @click="toMsgList"> | |
| 19 | 19 | <view class="icon-data"> |
| 20 | 20 | <view class="icon"> |
| 21 | 21 | <image :src="$imgUrl('/msg1.png')" mode=""></image> |
| ... | ... | @@ -30,14 +30,13 @@ |
| 30 | 30 | <view v-html="tableList[0].content"></view> |
| 31 | 31 | </view> |
| 32 | 32 | <view v-else >暂无</view> |
| 33 | - <!-- <text>{{?tableList[0].content:''}}</text> --> | |
| 34 | 33 | </view> |
| 35 | 34 | </view> |
| 36 | 35 | </view> |
| 37 | 36 | <view class="more" v-if="tableList.length>0"> |
| 38 | 37 | <view class="icon-more">{{formatDateTime(tableList[0]?tableList[0].createdAt:'')}}</view> |
| 39 | 38 | </view> |
| 40 | - </view> | |
| 39 | + </view> --> | |
| 41 | 40 | <view class="list" @click="gopath('/pagesA/procedureList/procedureList?type=通知消息')"> |
| 42 | 41 | <view class="icon-data"> |
| 43 | 42 | <view class="icon"> |
| ... | ... | @@ -63,6 +62,31 @@ |
| 63 | 62 | <view class="icon-more" v-if="tzlist.length>0">{{formatDateTime(tzlist[0]?tzlist[0].createTime:'')}}</view> |
| 64 | 63 | </view> |
| 65 | 64 | </view> |
| 65 | + <view class="list" @click="gopath('/pagesA/procedureList/procedureList?type=租金缴费通知')"> | |
| 66 | + <view class="icon-data"> | |
| 67 | + <view class="icon"> | |
| 68 | + <image :src="$imgUrl('/wyjf.png')" mode=""></image> | |
| 69 | + </view> | |
| 70 | + <view class="data"> | |
| 71 | + <view class="title"> | |
| 72 | + <text>租金缴费通知</text> | |
| 73 | + </view> | |
| 74 | + | |
| 75 | + <view class="describe"> | |
| 76 | + <view v-if="zjlist.length>0" > | |
| 77 | + <view v-if="zjlist[0].content.type == '2'">{{zjlist[0].content.title}}【图片】</view> | |
| 78 | + <view v-else >{{zjlist[0].content.title}}</view> | |
| 79 | + </view> | |
| 80 | + <view v-else >暂无</view> | |
| 81 | + <!-- <text>{{?tableList[0].content:''}}</text> --> | |
| 82 | + </view> | |
| 83 | + </view> | |
| 84 | + </view> | |
| 85 | + <view class="more"> | |
| 86 | + <view class="more-num" v-if="zjlist.length>0">{{zjlist.length}}</view> | |
| 87 | + <view class="icon-more" v-if="zjlist.length>0">{{formatDateTime(zjlist[0]?zjlist[0].createTime:'')}}</view> | |
| 88 | + </view> | |
| 89 | + </view> | |
| 66 | 90 | <view class="list" @click="gopath('/pagesA/procedureList/procedureList?type=租赁提醒')"> |
| 67 | 91 | <view class="icon-data"> |
| 68 | 92 | <view class="icon"> |
| ... | ... | @@ -113,7 +137,8 @@ |
| 113 | 137 | receiverMerchant:'' |
| 114 | 138 | }, |
| 115 | 139 | zllist:[], |
| 116 | - tzlist:[] | |
| 140 | + tzlist:[], | |
| 141 | + zjlist:[] | |
| 117 | 142 | } |
| 118 | 143 | }, |
| 119 | 144 | |
| ... | ... | @@ -152,6 +177,7 @@ |
| 152 | 177 | getmsg() { |
| 153 | 178 | this.zllist = [] |
| 154 | 179 | this.tzlist = [] |
| 180 | + this.zjlist = [] | |
| 155 | 181 | let info = { |
| 156 | 182 | // phone:uni.getStorageSync('user').phone, |
| 157 | 183 | phone:'18121815598', |
| ... | ... | @@ -179,6 +205,17 @@ |
| 179 | 205 | this.tzlist.reverse() |
| 180 | 206 | console.error(this.tzlist) |
| 181 | 207 | }) |
| 208 | + this.$http.sendRequest('/cereMessage/viewMessage', 'POST',{...info,messageType:'租金缴费通知'},1).then(res => { | |
| 209 | + let obj = res.data.data | |
| 210 | + for(let prop in obj) { | |
| 211 | + if(obj.hasOwnProperty(prop)) { // 确保只访问实例上的属性，不包括继承的 | |
| 212 | + obj[prop][0].content = JSON.parse(obj[prop][0].content) | |
| 213 | + this.zjlist.push(obj[prop][0]) | |
| 214 | + } | |
| 215 | + } | |
| 216 | + this.zjlist.reverse() | |
| 217 | + console.error(this.zjlist) | |
| 218 | + }) | |
| 182 | 219 | }, |
| 183 | 220 | formatDateTime(dateTimeString) { |
| 184 | 221 | // 将输入的日期时间字符串转换为Date对象 | ... | ... |
lvdao-miniapp/pages/my/my.vue
| ... | ... | @@ -58,8 +58,7 @@ |
| 58 | 58 | </view> --> |
| 59 | 59 | <view class="service-list-list" @click="myativity"> |
| 60 | 60 | <view class="thumb"> |
| 61 | - <text v-if="Islogin">0</text> | |
| 62 | - <text v-else>{{activityNum}}</text> | |
| 61 | + <text>{{activityNum || 0}}</text> | |
| 63 | 62 | </view> |
| 64 | 63 | <view class="name" > |
| 65 | 64 | <text>我的活动</text> |
| ... | ... | @@ -310,6 +309,7 @@ |
| 310 | 309 | } |
| 311 | 310 | } |
| 312 | 311 | }) |
| 312 | + this.getALL() | |
| 313 | 313 | } |
| 314 | 314 | |
| 315 | 315 | }, |
| ... | ... | @@ -320,7 +320,7 @@ |
| 320 | 320 | this.scrollTop = e.scrollTop; |
| 321 | 321 | }, |
| 322 | 322 | mounted() { |
| 323 | - this.getALL() | |
| 323 | + | |
| 324 | 324 | }, |
| 325 | 325 | methods: { |
| 326 | 326 | out() { | ... | ... |
lvdao-miniapp/pagesA/procedureList/procedureList.vue