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 054fd70..fecf1c4 100644
--- a/admin-web-master/src/components/merchantInformation/index.vue
+++ b/admin-web-master/src/components/merchantInformation/index.vue
@@ -208,7 +208,7 @@
phone:this.info.phone,
content:{
type:'1',
- title:this.radio=='2'?'商家同意':this.radio=='3'?'商家驳回':'商家',
+ title:this.radio=='2'?'商家审核已通过':this.radio=='3'?'商家审核已驳回':'商家',
content:this.checkOpinion
},
}
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/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 7c4c6b9..4c99295 100644
--- a/lvdao-miniapp/pages/message/message.vue
+++ b/lvdao-miniapp/pages/message/message.vue
@@ -166,6 +166,7 @@
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
@@ -175,6 +176,7 @@
this.tzlist.push(obj[prop][0])
}
}
+ this.tzlist.reverse()
console.error(this.tzlist)
})
},
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;