webapp / GreenwayWeb

Commit 9f3b931f48d2936d0718c0beb7be5f133b9f33e1

Authored by 杨鑫
2 parents 57b010a3 06dc87e6

Merge branch 'master' of http://39.98.150.180/webapp/GreenwayWeb

Inline Side-by-side
Showing 5 changed files with 93 additions and 11 deletions
lvdao-miniapp/pages/login/login.vue
  View file @9f3b931
... ... @@ -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
  View file @9f3b931
... ... @@ -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,56 @@
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('/zjjf.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="wylist.length>0" >
  77 + <view v-if="wylist[0].content.type == '2'">{{wylist[0].content.title}}【图片】</view>
  78 + <view v-else >{{wylist[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="wylist.length>0">{{wylist.length}}</view>
  87 + <view class="icon-more" v-if="wylist.length>0">{{formatDateTime(wylist[0]?wylist[0].createTime:'')}}</view>
  88 + </view>
  89 + </view>
  90 + <view class="list" @click="gopath('/pagesA/procedureList/procedureList?type=租金缴费通知')">
  91 + <view class="icon-data">
  92 + <view class="icon">
  93 + <image :src="$imgUrl('/wyjf.png')" mode=""></image>
  94 + </view>
  95 + <view class="data">
  96 + <view class="title">
  97 + <text>租金缴费通知</text>
  98 + </view>
  99 +
  100 + <view class="describe">
  101 + <view v-if="zjlist.length>0" >
  102 + <view v-if="zjlist[0].content.type == '2'">{{zjlist[0].content.title}}【图片】</view>
  103 + <view v-else >{{zjlist[0].content.title}}</view>
  104 + </view>
  105 + <view v-else >暂无</view>
  106 + <!-- <text>{{?tableList[0].content:''}}</text> -->
  107 + </view>
  108 + </view>
  109 + </view>
  110 + <view class="more">
  111 + <view class="more-num" v-if="zjlist.length>0">{{zjlist.length}}</view>
  112 + <view class="icon-more" v-if="zjlist.length>0">{{formatDateTime(zjlist[0]?zjlist[0].createTime:'')}}</view>
  113 + </view>
  114 + </view>
66 115 <view class="list" @click="gopath('/pagesA/procedureList/procedureList?type=租赁提醒')">
67 116 <view class="icon-data">
68 117 <view class="icon">
... ... @@ -113,7 +162,9 @@
113 162 receiverMerchant:''
114 163 },
115 164 zllist:[],
116   - tzlist:[]
  165 + tzlist:[],
  166 + zjlist:[],
  167 + wylist:[]
117 168 }
118 169 },
119 170  
... ... @@ -152,6 +203,8 @@
152 203 getmsg() {
153 204 this.zllist = []
154 205 this.tzlist = []
  206 + this.zjlist = []
  207 + this.wylist = []
155 208 let info = {
156 209 // phone:uni.getStorageSync('user').phone,
157 210 phone:'18121815598',
... ... @@ -179,6 +232,28 @@
179 232 this.tzlist.reverse()
180 233 console.error(this.tzlist)
181 234 })
  235 + this.$http.sendRequest('/cereMessage/viewMessage', 'POST',{...info,messageType:'租金缴费通知'},1).then(res => {
  236 + let obj = res.data.data
  237 + for(let prop in obj) {
  238 + if(obj.hasOwnProperty(prop)) { // 确保只访问实例上的属性，不包括继承的
  239 + obj[prop][0].content = JSON.parse(obj[prop][0].content)
  240 + this.zjlist.push(obj[prop][0])
  241 + }
  242 + }
  243 + this.zjlist.reverse()
  244 + console.error(this.zjlist)
  245 + })
  246 + this.$http.sendRequest('/cereMessage/viewMessage', 'POST',{...info,messageType:'物业缴费通知'},1).then(res => {
  247 + let obj = res.data.data
  248 + for(let prop in obj) {
  249 + if(obj.hasOwnProperty(prop)) { // 确保只访问实例上的属性，不包括继承的
  250 + obj[prop][0].content = JSON.parse(obj[prop][0].content)
  251 + this.wylist.push(obj[prop][0])
  252 + }
  253 + }
  254 + this.wylist.reverse()
  255 + console.error(this.wylist)
  256 + })
182 257 },
183 258 formatDateTime(dateTimeString) {
184 259 // 将输入的日期时间字符串转换为Date对象
... ...
lvdao-miniapp/pages/my/my.vue
  View file @9f3b931
... ... @@ -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/pages/workbench/workbench.vue
  View file @9f3b931
... ... @@ -251,12 +251,12 @@
251 251 // { name: '活动申请', img: '/wyjf.png', path: '/pages/mycreated/mycreated' },
252 252 {
253 253 name: '租金缴费',
254   - img: '/zjjf.png',
  254 + img: '/wyjf.png',
255 255 path: '/pagesA/rentPay/rentPay'
256 256 },
257 257 {
258 258 name: '物业缴费',
259   - img: '/wyjf.png',
  259 + img: '/zjjf.png',
260 260 path: '/pages/propertyPay/propertyPayList/propertyPayList'
261 261 },
262 262 ]
... ...
lvdao-miniapp/pagesA/procedureList/procedureList.vue
  View file @9f3b931
1 1 <template>
2 2 <view class="pages">
  3 + <view v-if="tableList.length == 0" style="text-align: center;margin-top: 60rpx;color:#808080;">暂无数据</view>
3 4 <view class="contents">
4 5 <view class="box" v-for="(item,index) in tableList" @click="getDetail(item)">
5 6 <view style="width:70%">
... ...