{{editbgid.houseNumber || '无'}}
@@ -258,20 +258,45 @@
-
+
+
+
+
+
+
+
+
+ {{dpinfo.shopName}}
+
+
+
+
+ {{dpinfo.businessHours}}
+
+
+
+
+ {{dpinfo.contactNumber}}
+
+
+
+
+ {{dpinfo.locationDescription}}
+
+
+
+
+ {{dpinfo.shopDescription}}
+
+
+
+
+
+
+
@@ -324,7 +349,8 @@
cereBusinessPlan,
cereBusinessOperationqueryByPage,
cereContractInformation,
- resourcesFindPlan
+ resourcesFindPlan,
+ cereAssetShopInformationqueryByPage
} from '@/api/newly';
import newmap from "@/components/newmap/index";
import {
@@ -334,6 +360,9 @@
lvdaoduan,
} from '@/api/information.js';
import allimg from '@/components/chakan/allimg.vue';
+ import {
+ contractGetAllnew
+ } from '@/api/manage.js'
export default {
components: {
TitleWithCircle,
@@ -380,10 +409,11 @@
datalist: [],
datalist1:[],
datalistxsj:[],
- lvdaoList:[]
+ lvdaoList:[],
+ dpinfo:null
}
},
- created() {
+ async created() {
console.error(this.editbgid)
if (this.editbgid.id) {
@@ -416,11 +446,18 @@
this.getAllxsj()
this.getAllzl()
}
- this.getAll()
+ const res = await contractGetAllnew({pageNumber: 0, pageSize:1,shopNumber:'sp' + this.editbgid.id,dataStatus:'1'})
+ if(res.data.content.length>0) {
+ const res1 = await cereAssetShopInformationqueryByPage({"pageNumber":0,"pageSize":10,"contractId":res.data.content[0].id})
+ if(res1.data.content.length>0){
+ this.dpinfo = res1.data.content[0]
+ }
+ console.log('=============1234567')
+ console.log(this.dpinfo)
+ }
+ this.getAll()
},
-
computed: {
-
},
methods: {
async getAll(){
diff --git a/lvdao-miniapp/App.vue b/lvdao-miniapp/App.vue
index 189f66b..0c68058 100644
--- a/lvdao-miniapp/App.vue
+++ b/lvdao-miniapp/App.vue
@@ -6,12 +6,27 @@ export default {
// const host = 'https://zhld.028wlkj.com:49008/cdwlMall'
// let c1 = host.split('cdwlMall')[0];
// console.error(c1);
+ let info = {
+ // phone:uni.getStorageSync('user').phone,
+ phone:'18121815598',
+ }
+ let that = this
+ // setInterval(() => {
+ // that.$http.sendRequest('/cereMessage/getMessageNum', 'GET',{...info},1).then(res => {
+ // console.error(res)
+ // getApp().globalData.MessageNum = res.data
+ // that.$forceUpdate()
+ // })
+ // }, 6000)
},
onShow: function() {
},
onHide: function() {
console.log('App Hide');
+ },
+ globalData: {
+ MessageNum:0
}
};
diff --git a/lvdao-miniapp/components/tabbar/tabbar.vue b/lvdao-miniapp/components/tabbar/tabbar.vue
index 1d626b7..8b999dc 100644
--- a/lvdao-miniapp/components/tabbar/tabbar.vue
+++ b/lvdao-miniapp/components/tabbar/tabbar.vue
@@ -45,6 +45,7 @@
codeheight: 0,
isOverall: 0,
phoneModel: '',
+ nums:getApp().globalData.MessageNum
};
},
props:{
diff --git a/lvdao-miniapp/main.js b/lvdao-miniapp/main.js
index f0b29d2..05955c5 100644
--- a/lvdao-miniapp/main.js
+++ b/lvdao-miniapp/main.js
@@ -8,8 +8,8 @@ import uView from "uview-ui";
import DialogBox from './components/DialogBox/DialogBox';
// let hostall = window.location.href;
// let c1 = hostall.split('cdwlMall')[0];
-let c1 = 'https://jy.scjysm.asia:18086/'
-// let c1 = 'https://zhgw-uat.028wlkj.com/'
+// let c1 = 'https://jy.scjysm.asia:18086/'
+let c1 = 'https://zhgw-uat.028wlkj.com/'
Vue.config.productionTip = false
Vue.prototype.$http = http
Vue.prototype.$imgUrl = (url) => {
diff --git a/lvdao-miniapp/pages/message/message.vue b/lvdao-miniapp/pages/message/message.vue
index 23a82b6..7c4c6b9 100644
--- a/lvdao-miniapp/pages/message/message.vue
+++ b/lvdao-miniapp/pages/message/message.vue
@@ -38,6 +38,31 @@
{{formatDateTime(tableList[0]?tableList[0].createdAt:'')}}
+
+
+
+
+
+
+
+ 通知消息
+
+
+
+
+ {{tzlist[0].content.title}}【图片】
+ {{tzlist[0].content.title}}
+
+ 暂无
+
+
+
+
+
+ {{tzlist.length}}
+ {{formatDateTime(tzlist[0]?tzlist[0].createTime:'')}}
+
+
@@ -87,7 +112,8 @@
pageSize: 2,
receiverMerchant:''
},
- zllist:[]
+ zllist:[],
+ tzlist:[]
}
},
@@ -125,14 +151,13 @@
methods:{
getmsg() {
this.zllist = []
+ this.tzlist = []
let info = {
// phone:uni.getStorageSync('user').phone,
phone:'18121815598',
isRead:'0'
}
- this.$http.sendRequest('/cereMessage/getMessageNum', 'GET',{...info},1).then(res => {
- // console.error(res)
- })
+
this.$http.sendRequest('/cereMessage/viewMessage', 'POST',{...info,messageType:'租赁提醒'},1).then(res => {
let obj = res.data.data
for(let prop in obj) {
@@ -141,7 +166,16 @@
this.zllist.push(obj[prop][0])
}
}
- console.error(this.zllist)
+ })
+ this.$http.sendRequest('/cereMessage/viewMessage', 'POST',{...info,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])
+ }
+ }
+ console.error(this.tzlist)
})
},
formatDateTime(dateTimeString) {
diff --git a/lvdao-miniapp/utils/request.js b/lvdao-miniapp/utils/request.js
index 07e3ddb..2583b43 100644
--- a/lvdao-miniapp/utils/request.js
+++ b/lvdao-miniapp/utils/request.js
@@ -21,7 +21,7 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => {
// bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/admin-server' + url;
// bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url;
- bases = 'http://128.10.249.42:9003'+ url;
+ // bases = 'http://128.10.249.42:9003'+ url;
// bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url;
bases = c1 + 'cdwlMall/meserver/admin-server' + url;
@@ -30,8 +30,8 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => {
// 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.42:9007' + url;
- // bases = c1 + 'cdwlMall/meserver/api' + url;
+ // bases = 'http://128.10.249.42:9007' + url;
+ bases = c1 + 'cdwlMall/meserver/api' + url;
}else{
// bases = 'http://128.10.249.22:9004' + url;
@@ -39,7 +39,7 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => {
// bases = 'http://172.16.61.123/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.42:9004' + url;
+ // bases = 'http://128.10.249.42:9004' + url;
// bases = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server' + url;
bases = c1 + 'cdwlMall/business-server' + url;
--
libgit2 0.21.4