diff --git a/admin-web-master/src/components/add/addht.vue b/admin-web-master/src/components/add/addht.vue index bb098d2..5b4d27b 100644 --- a/admin-web-master/src/components/add/addht.vue +++ b/admin-web-master/src/components/add/addht.vue @@ -14,7 +14,7 @@ - +
取消 确定 @@ -125,6 +125,10 @@ import { type: Object, default: {} }, + isdel: { + type: String, + default:'' + }, contractChangeReason: { type: String, default: '' diff --git a/admin-web-master/src/components/change/mbadd.vue b/admin-web-master/src/components/change/mbadd.vue index c4f615e..c51b98f 100644 --- a/admin-web-master/src/components/change/mbadd.vue +++ b/admin-web-master/src/components/change/mbadd.vue @@ -132,7 +132,7 @@ - + @@ -171,6 +171,10 @@ zy }, props: { + isdel: { + type: String, + default:'' + }, list1: { type: Array, default: [] diff --git a/admin-web-master/src/components/merchantInformation/index.vue b/admin-web-master/src/components/merchantInformation/index.vue index fe49571..fecf1c4 100644 --- a/admin-web-master/src/components/merchantInformation/index.vue +++ b/admin-web-master/src/components/merchantInformation/index.vue @@ -177,7 +177,8 @@ }, methods: { minSev() { - + let that = this + console.error(this.info) // return cerePlatformMerchantedit({ ...this.info, @@ -190,6 +191,7 @@ message: '处理成功', type: 'success' }) + that.setmsg() this.info.checkState = this.radio this.$emit('removeonaction', '1') } else { @@ -200,6 +202,18 @@ } }) }, + async setmsg() { + let info = { + type:'通知消息', + phone:this.info.phone, + content:{ + type:'1', + title:this.radio=='2'?'商家审核已通过':this.radio=='3'?'商家审核已驳回':'商家', + content:this.checkOpinion + }, + } + await this.$setmsg(info); + }, changetype(){ this.xiangTab= 'first' this.$emit('removeonaction', '1') diff --git a/admin-web-master/src/components/resourceCommodity/index.vue b/admin-web-master/src/components/resourceCommodity/index.vue index d358e08..5600684 100644 --- a/admin-web-master/src/components/resourceCommodity/index.vue +++ b/admin-web-master/src/components/resourceCommodity/index.vue @@ -52,11 +52,11 @@
{{getLvdaoNameByCode(editbgid.belongingGreenwaySection) || '无'}}
- - -
{{getLvdaoNameByCode(editbgid.belongingParkTrail) || '无'}}
- - + + +
{{getLvdaoNameByCode(editbgid.belongingParkTrail) || '无'}}
+ +
{{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/admin-web-master/src/views/rent/audit/index.vue b/admin-web-master/src/views/rent/audit/index.vue index 613b745..208435c 100644 --- a/admin-web-master/src/views/rent/audit/index.vue +++ b/admin-web-master/src/views/rent/audit/index.vue @@ -123,7 +123,7 @@
- +
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/manifest.json b/lvdao-miniapp/manifest.json index ac3b56a..c759f17 100644 --- a/lvdao-miniapp/manifest.json +++ b/lvdao-miniapp/manifest.json @@ -1,6 +1,6 @@ { "name" : "绿道", - "appid" : "__UNI__F034047", + "appid" : "__UNI__189D96A", "description" : "", "versionName" : "1.0.2", "versionCode" : "100", diff --git a/lvdao-miniapp/pages/message/message.vue b/lvdao-miniapp/pages/message/message.vue index 23a82b6..4c99295 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,18 @@ this.zllist.push(obj[prop][0]) } } - console.error(this.zllist) + this.zllist.reverse() + }) + 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]) + } + } + this.tzlist.reverse() + console.error(this.tzlist) }) }, formatDateTime(dateTimeString) { diff --git a/lvdao-miniapp/pagesA/procedureList/procedureList.vue b/lvdao-miniapp/pagesA/procedureList/procedureList.vue index 21a091c..375072b 100644 --- a/lvdao-miniapp/pagesA/procedureList/procedureList.vue +++ b/lvdao-miniapp/pagesA/procedureList/procedureList.vue @@ -54,6 +54,7 @@ this.tableList.push(obj[prop][0]) } } + this.tableList.reverse() console.error(this.tableList) }) // this.tableList = JSON.parse(option.item) diff --git a/lvdao-miniapp/utils/request.js b/lvdao-miniapp/utils/request.js index a0c5326..06c97f6 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.41:9003'+ url; + // bases = 'http://128.10.249.41: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.41:9007' + url; - // bases = c1 + 'cdwlMall/meserver/api' + url; + // bases = 'http://128.10.249.41: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.41:9004' + url; + // bases = 'http://128.10.249.41:9004' + url; // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server' + url; bases = c1 + 'cdwlMall/business-server' + url;