diff --git a/admin-web-master/src/views/detect/admap.vue b/admin-web-master/src/views/detect/admap.vue
index 23a1d42..51a3db8 100644
--- a/admin-web-master/src/views/detect/admap.vue
+++ b/admin-web-master/src/views/detect/admap.vue
@@ -566,10 +566,10 @@
const budao = await gongyuan()
this.gongyuanList = budao.data.concat(gongyua.data)
this.getAll()
- this.changepublishStatus()
- this.changebelongingGreenwaySection()
- this.changebelongingParkTrail()
- this.changetype()
+ // this.changepublishStatus()
+ // this.changebelongingGreenwaySection()
+ // this.changebelongingParkTrail()
+ // this.changetype()
},
methods: {
gettypeShopList(code) {
diff --git a/lvdao-miniapp/pages/message/message.vue b/lvdao-miniapp/pages/message/message.vue
index b1dd3af..856c7ad 100644
--- a/lvdao-miniapp/pages/message/message.vue
+++ b/lvdao-miniapp/pages/message/message.vue
@@ -58,7 +58,7 @@
- {{tzlist.length}}
+ {{tzlist.length}}
{{formatDateTime(tzlist[0]?tzlist[0].createTime:'')}}
@@ -83,7 +83,7 @@
- {{wylist.length}}
+ {{wylist.length}}
{{formatDateTime(wylist[0]?wylist[0].createTime:'')}}
@@ -108,7 +108,7 @@
- {{zjlist.length}}
+ {{zjlist.length}}
{{formatDateTime(zjlist[0]?zjlist[0].createTime:'')}}
@@ -133,7 +133,7 @@
- {{zllist.length}}
+ {{zllist.length}}
{{formatDateTime(zllist[0]?zllist[0].createTime:'')}}
@@ -210,7 +210,10 @@
// phone:'18121815598',
isRead:'0'
}
-
+ let info1 = {
+ phone:uni.getStorageSync('user').phone,
+ isRead:'1'
+ }
this.$http.sendRequest('/cereMessage/viewMessage', 'POST',{...info,messageType:'租赁提醒'},1).then(res => {
let obj = res.data.data
for(let prop in obj) {
@@ -220,6 +223,18 @@
}
}
this.zllist.reverse()
+ if(this.zllist.length == 0){
+ this.$http.sendRequest('/cereMessage/viewMessage', 'POST',{...info1,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.zllist.push(obj[prop][0])
+ }
+ }
+ this.zllist.reverse()
+ })
+ }
})
this.$http.sendRequest('/cereMessage/viewMessage', 'POST',{...info,messageType:'通知消息'},1).then(res => {
let obj = res.data.data
@@ -230,7 +245,18 @@
}
}
this.tzlist.reverse()
- console.error(this.tzlist)
+ if(this.tzlist.length == 0){
+ this.$http.sendRequest('/cereMessage/viewMessage', 'POST',{...info1,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.tzlist.push(obj[prop][0])
+ }
+ }
+ this.tzlist.reverse()
+ })
+ }
})
this.$http.sendRequest('/cereMessage/viewMessage', 'POST',{...info,messageType:'租金缴费通知'},1).then(res => {
let obj = res.data.data
@@ -241,7 +267,18 @@
}
}
this.zjlist.reverse()
- console.error(this.zjlist)
+ if(this.zjlist.length == 0){
+ this.$http.sendRequest('/cereMessage/viewMessage', 'POST',{...info1,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()
+ })
+ }
})
this.$http.sendRequest('/cereMessage/viewMessage', 'POST',{...info,messageType:'物业缴费通知'},1).then(res => {
let obj = res.data.data
@@ -252,7 +289,18 @@
}
}
this.wylist.reverse()
- console.error(this.wylist)
+ if(this.wylist.length == 0){
+ this.$http.sendRequest('/cereMessage/viewMessage', 'POST',{...info1,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()
+ })
+ }
})
},
formatDateTime(dateTimeString) {
diff --git a/lvdao-miniapp/utils/request.js b/lvdao-miniapp/utils/request.js
index 44b321f..7e55a91 100644
--- a/lvdao-miniapp/utils/request.js
+++ b/lvdao-miniapp/utils/request.js
@@ -19,27 +19,27 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => {
// bases = 'http://128.10.249.22:9003' + url;
// bases = 'http://172.16.61.123/cdwlMall/admin-server' + url;
// bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/admin-server' + url;
- // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url;
+ bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url;
- bases = 'http://128.10.249.25:9003'+ url;
+ // bases = 'http://128.10.249.25:9003'+ url;
// bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url;
// bases = c1 + 'cdwlMall/meserver/admin-server' + url;
}else if(baseUrl == 3){
- // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url;
+ bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url;
// bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/api' + url;
// bases = 'http://128.10.249.22:9003:9007' + url;
- bases = 'http://128.10.249.25:9007' + url;
+ // bases = 'http://128.10.249.25:9007' + url;
// bases = c1 + 'cdwlMall/meserver/api' + url;
}else{
// bases = 'http://128.10.249.22:9004' + url;
// bases = 'http://172.16.61.48/business-server' + url;
// bases = 'http://172.16.61.123/cdwlMall/business-server' + url;
- // bases = 'https://jy.scjysm.asia:18086/cdwlMall/business-server' + url;
+ bases = 'https://jy.scjysm.asia:18086/cdwlMall/business-server' + url;
// bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/business-server' + url;
- bases = 'http://128.10.249.25:9004' + url;
+ // bases = 'http://128.10.249.25:9004' + url;
// bases = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server' + url;
// bases = c1 + 'cdwlMall/business-server' + url;