Commit e2119c7086285834d0267b30cf1181f33c86df17

Authored by wesley88
1 parent 84cb5fa7

1

lvdao-miniapp/pages/login/login.vue
@@ -115,9 +115,15 @@ @@ -115,9 +115,15 @@
115 uni.setStorageSync('token', res.data.data.token); 115 uni.setStorageSync('token', res.data.data.token);
116 uni.setStorageSync('user', res.data.data); 116 uni.setStorageSync('user', res.data.data);
117 // uni.setStorageSync('shopId', res.data.data.shopId); 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 } else { 127 } else {
122 uni.showToast({ 128 uni.showToast({
123 icon: 'none', 129 icon: 'none',
lvdao-miniapp/pages/message/message.vue
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 </view> 15 </view>
16 <view class="main"> 16 <view class="main">
17 <view class="message-list"> 17 <view class="message-list">
18 - <view class="list" @click="toMsgList"> 18 +<!-- <view class="list" @click="toMsgList">
19 <view class="icon-data"> 19 <view class="icon-data">
20 <view class="icon"> 20 <view class="icon">
21 <image :src="$imgUrl('/msg1.png')" mode=""></image> 21 <image :src="$imgUrl('/msg1.png')" mode=""></image>
@@ -30,14 +30,13 @@ @@ -30,14 +30,13 @@
30 <view v-html="tableList[0].content"></view> 30 <view v-html="tableList[0].content"></view>
31 </view> 31 </view>
32 <view v-else >暂无</view> 32 <view v-else >暂无</view>
33 - <!-- <text>{{?tableList[0].content:''}}</text> -->  
34 </view> 33 </view>
35 </view> 34 </view>
36 </view> 35 </view>
37 <view class="more" v-if="tableList.length>0"> 36 <view class="more" v-if="tableList.length>0">
38 <view class="icon-more">{{formatDateTime(tableList[0]?tableList[0].createdAt:'')}}</view> 37 <view class="icon-more">{{formatDateTime(tableList[0]?tableList[0].createdAt:'')}}</view>
39 </view> 38 </view>
40 - </view> 39 + </view> -->
41 <view class="list" @click="gopath('/pagesA/procedureList/procedureList?type=通知消息')"> 40 <view class="list" @click="gopath('/pagesA/procedureList/procedureList?type=通知消息')">
42 <view class="icon-data"> 41 <view class="icon-data">
43 <view class="icon"> 42 <view class="icon">
@@ -63,6 +62,31 @@ @@ -63,6 +62,31 @@
63 <view class="icon-more" v-if="tzlist.length>0">{{formatDateTime(tzlist[0]?tzlist[0].createTime:'')}}</view> 62 <view class="icon-more" v-if="tzlist.length>0">{{formatDateTime(tzlist[0]?tzlist[0].createTime:'')}}</view>
64 </view> 63 </view>
65 </view> 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 <view class="list" @click="gopath('/pagesA/procedureList/procedureList?type=租赁提醒')"> 90 <view class="list" @click="gopath('/pagesA/procedureList/procedureList?type=租赁提醒')">
67 <view class="icon-data"> 91 <view class="icon-data">
68 <view class="icon"> 92 <view class="icon">
@@ -113,7 +137,8 @@ @@ -113,7 +137,8 @@
113 receiverMerchant:'' 137 receiverMerchant:''
114 }, 138 },
115 zllist:[], 139 zllist:[],
116 - tzlist:[] 140 + tzlist:[],
  141 + zjlist:[]
117 } 142 }
118 }, 143 },
119 144
@@ -152,6 +177,7 @@ @@ -152,6 +177,7 @@
152 getmsg() { 177 getmsg() {
153 this.zllist = [] 178 this.zllist = []
154 this.tzlist = [] 179 this.tzlist = []
  180 + this.zjlist = []
155 let info = { 181 let info = {
156 // phone:uni.getStorageSync('user').phone, 182 // phone:uni.getStorageSync('user').phone,
157 phone:'18121815598', 183 phone:'18121815598',
@@ -179,6 +205,17 @@ @@ -179,6 +205,17 @@
179 this.tzlist.reverse() 205 this.tzlist.reverse()
180 console.error(this.tzlist) 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 formatDateTime(dateTimeString) { 220 formatDateTime(dateTimeString) {
184 // 将输入的日期时间字符串转换为Date对象 221 // 将输入的日期时间字符串转换为Date对象
lvdao-miniapp/pages/my/my.vue
@@ -58,8 +58,7 @@ @@ -58,8 +58,7 @@
58 </view> --> 58 </view> -->
59 <view class="service-list-list" @click="myativity"> 59 <view class="service-list-list" @click="myativity">
60 <view class="thumb"> 60 <view class="thumb">
61 - <text v-if="Islogin">0</text>  
62 - <text v-else>{{activityNum}}</text> 61 + <text>{{activityNum || 0}}</text>
63 </view> 62 </view>
64 <view class="name" > 63 <view class="name" >
65 <text>我的活动</text> 64 <text>我的活动</text>
@@ -310,6 +309,7 @@ @@ -310,6 +309,7 @@
310 } 309 }
311 } 310 }
312 }) 311 })
  312 + this.getALL()
313 } 313 }
314 314
315 }, 315 },
@@ -320,7 +320,7 @@ @@ -320,7 +320,7 @@
320 this.scrollTop = e.scrollTop; 320 this.scrollTop = e.scrollTop;
321 }, 321 },
322 mounted() { 322 mounted() {
323 - this.getALL() 323 +
324 }, 324 },
325 methods: { 325 methods: {
326 out() { 326 out() {
lvdao-miniapp/pagesA/procedureList/procedureList.vue
1 <template> 1 <template>
2 <view class="pages"> 2 <view class="pages">
  3 + <view v-if="tableList.length == 0" style="text-align: center;margin-top: 60rpx;color:#808080;">暂无数据</view>
3 <view class="contents"> 4 <view class="contents">
4 <view class="box" v-for="(item,index) in tableList" @click="getDetail(item)"> 5 <view class="box" v-for="(item,index) in tableList" @click="getDetail(item)">
5 <view style="width:70%"> 6 <view style="width:70%">