webapp / GreenwayWeb

Commit f43899daa0cb99861d8e66ab1f1f2a80214fc622

Authored by wesley88
1 parent 229da850

1

Inline Side-by-side
Showing 3 changed files with 66 additions and 18 deletions
admin-web-master/src/views/detect/admap.vue
  View file @f43899d
... ... @@ -566,10 +566,10 @@
566 566 const budao = await gongyuan()
567 567 this.gongyuanList = budao.data.concat(gongyua.data)
568 568 this.getAll()
569   - this.changepublishStatus()
570   - this.changebelongingGreenwaySection()
571   - this.changebelongingParkTrail()
572   - this.changetype()
  569 + // this.changepublishStatus()
  570 + // this.changebelongingGreenwaySection()
  571 + // this.changebelongingParkTrail()
  572 + // this.changetype()
573 573 },
574 574 methods: {
575 575 gettypeShopList(code) {
... ...
lvdao-miniapp/pages/message/message.vue
  View file @f43899d
... ... @@ -58,7 +58,7 @@
58 58 </view>
59 59 </view>
60 60 <view class="more">
61   - <view class="more-num" v-if="tzlist.length>0">{{tzlist.length}}</view>
  61 + <view class="more-num" v-if="tzlist.length>0&&tzlist[0].isRead == '0'">{{tzlist.length}}</view>
62 62 <view class="icon-more" v-if="tzlist.length>0">{{formatDateTime(tzlist[0]?tzlist[0].createTime:'')}}</view>
63 63 </view>
64 64 </view>
... ... @@ -83,7 +83,7 @@
83 83 </view>
84 84 </view>
85 85 <view class="more">
86   - <view class="more-num" v-if="wylist.length>0">{{wylist.length}}</view>
  86 + <view class="more-num" v-if="wylist.length>0&&wylist[0].isRead == '0'">{{wylist.length}}</view>
87 87 <view class="icon-more" v-if="wylist.length>0">{{formatDateTime(wylist[0]?wylist[0].createTime:'')}}</view>
88 88 </view>
89 89 </view>
... ... @@ -108,7 +108,7 @@
108 108 </view>
109 109 </view>
110 110 <view class="more">
111   - <view class="more-num" v-if="zjlist.length>0">{{zjlist.length}}</view>
  111 + <view class="more-num" v-if="zjlist.length>0&&zjlist[0].isRead == '0'">{{zjlist.length}}</view>
112 112 <view class="icon-more" v-if="zjlist.length>0">{{formatDateTime(zjlist[0]?zjlist[0].createTime:'')}}</view>
113 113 </view>
114 114 </view>
... ... @@ -133,7 +133,7 @@
133 133 </view>
134 134 </view>
135 135 <view class="more">
136   - <view class="more-num" v-if="zllist.length>0">{{zllist.length}}</view>
  136 + <view class="more-num" v-if="zllist.length>0&&zllist[0].isRead == '0'">{{zllist.length}}</view>
137 137 <view class="icon-more" v-if="zllist.length>0">{{formatDateTime(zllist[0]?zllist[0].createTime:'')}}</view>
138 138 </view>
139 139 </view>
... ... @@ -210,7 +210,10 @@
210 210 // phone:'18121815598',
211 211 isRead:'0'
212 212 }
213   -
  213 + let info1 = {
  214 + phone:uni.getStorageSync('user').phone,
  215 + isRead:'1'
  216 + }
214 217 this.$http.sendRequest('/cereMessage/viewMessage', 'POST',{...info,messageType:'租赁提醒'},1).then(res => {
215 218 let obj = res.data.data
216 219 for(let prop in obj) {
... ... @@ -220,6 +223,18 @@
220 223 }
221 224 }
222 225 this.zllist.reverse()
  226 + if(this.zllist.length == 0){
  227 + this.$http.sendRequest('/cereMessage/viewMessage', 'POST',{...info1,messageType:'租赁提醒'},1).then(res => {
  228 + let obj = res.data.data
  229 + for(let prop in obj) {
  230 + if(obj.hasOwnProperty(prop)) { // 确保只访问实例上的属性，不包括继承的
  231 + obj[prop][0].content = JSON.parse(obj[prop][0].content)
  232 + this.zllist.push(obj[prop][0])
  233 + }
  234 + }
  235 + this.zllist.reverse()
  236 + })
  237 + }
223 238 })
224 239 this.$http.sendRequest('/cereMessage/viewMessage', 'POST',{...info,messageType:'通知消息'},1).then(res => {
225 240 let obj = res.data.data
... ... @@ -230,7 +245,18 @@
230 245 }
231 246 }
232 247 this.tzlist.reverse()
233   - console.error(this.tzlist)
  248 + if(this.tzlist.length == 0){
  249 + this.$http.sendRequest('/cereMessage/viewMessage', 'POST',{...info1,messageType:'通知消息'},1).then(res => {
  250 + let obj = res.data.data
  251 + for(let prop in obj) {
  252 + if(obj.hasOwnProperty(prop)) { // 确保只访问实例上的属性，不包括继承的
  253 + obj[prop][0].content = JSON.parse(obj[prop][0].content)
  254 + this.tzlist.push(obj[prop][0])
  255 + }
  256 + }
  257 + this.tzlist.reverse()
  258 + })
  259 + }
234 260 })
235 261 this.$http.sendRequest('/cereMessage/viewMessage', 'POST',{...info,messageType:'租金缴费通知'},1).then(res => {
236 262 let obj = res.data.data
... ... @@ -241,7 +267,18 @@
241 267 }
242 268 }
243 269 this.zjlist.reverse()
244   - console.error(this.zjlist)
  270 + if(this.zjlist.length == 0){
  271 + this.$http.sendRequest('/cereMessage/viewMessage', 'POST',{...info1,messageType:'租金缴费通知'},1).then(res => {
  272 + let obj = res.data.data
  273 + for(let prop in obj) {
  274 + if(obj.hasOwnProperty(prop)) { // 确保只访问实例上的属性，不包括继承的
  275 + obj[prop][0].content = JSON.parse(obj[prop][0].content)
  276 + this.zjlist.push(obj[prop][0])
  277 + }
  278 + }
  279 + this.zjlist.reverse()
  280 + })
  281 + }
245 282 })
246 283 this.$http.sendRequest('/cereMessage/viewMessage', 'POST',{...info,messageType:'物业缴费通知'},1).then(res => {
247 284 let obj = res.data.data
... ... @@ -252,7 +289,18 @@
252 289 }
253 290 }
254 291 this.wylist.reverse()
255   - console.error(this.wylist)
  292 + if(this.wylist.length == 0){
  293 + this.$http.sendRequest('/cereMessage/viewMessage', 'POST',{...info1,messageType:'物业缴费通知'},1).then(res => {
  294 + let obj = res.data.data
  295 + for(let prop in obj) {
  296 + if(obj.hasOwnProperty(prop)) { // 确保只访问实例上的属性，不包括继承的
  297 + obj[prop][0].content = JSON.parse(obj[prop][0].content)
  298 + this.wylist.push(obj[prop][0])
  299 + }
  300 + }
  301 + this.wylist.reverse()
  302 + })
  303 + }
256 304 })
257 305 },
258 306 formatDateTime(dateTimeString) {
... ...
lvdao-miniapp/utils/request.js
  View file @f43899d
... ... @@ -19,27 +19,27 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
19 19 // bases = 'http://128.10.249.22:9003' + url;
20 20 // bases = 'http://172.16.61.123/cdwlMall/admin-server' + url;
21 21 // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/admin-server' + url;
22   - // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url;
  22 + bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url;
23 23  
24   - bases = 'http://128.10.249.25:9003'+ url;
  24 + // bases = 'http://128.10.249.25:9003'+ url;
25 25 // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url;
26 26  
27 27 // bases = c1 + 'cdwlMall/meserver/admin-server' + url;
28 28  
29 29 }else if(baseUrl == 3){
30   - // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url;
  30 + bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url;
31 31 // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/api' + url;
32 32 // bases = 'http://128.10.249.22:9003:9007' + url;
33   - bases = 'http://128.10.249.25:9007' + url;
  33 + // bases = 'http://128.10.249.25:9007' + url;
34 34 // bases = c1 + 'cdwlMall/meserver/api' + url;
35 35  
36 36 }else{
37 37 // bases = 'http://128.10.249.22:9004' + url;
38 38 // bases = 'http://172.16.61.48/business-server' + url;
39 39 // bases = 'http://172.16.61.123/cdwlMall/business-server' + url;
40   - // bases = 'https://jy.scjysm.asia:18086/cdwlMall/business-server' + url;
  40 + bases = 'https://jy.scjysm.asia:18086/cdwlMall/business-server' + url;
41 41 // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/business-server' + url;
42   - bases = 'http://128.10.249.25:9004' + url;
  42 + // bases = 'http://128.10.249.25:9004' + url;
43 43 // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server' + url;
44 44 // bases = c1 + 'cdwlMall/business-server' + url;
45 45  
... ...