1

wesley88
1 parent 1e0e118d
Showing 8 changed files with 20 additions and 9 deletions
admin-web-master/src/components/add/addht.vue
admin-web-master/src/components/change/mbadd.vue
admin-web-master/src/components/merchantInformation/index.vue
admin-web-master/src/views/rent/audit/index.vue
lvdao-miniapp/manifest.json
lvdao-miniapp/pages/message/message.vue
lvdao-miniapp/pagesA/procedureList/procedureList.vue
lvdao-miniapp/utils/request.js
@@ -14,7 +14,7 @@
         </el-row>
       </el-form>
       <TitleWithCircle title="合同信息" style="margin-bottom: 20px;" />
-      <mbadd v-if="isshow" ref="rulesallForm" :list1="list1" />
+      <mbadd v-if="isshow" ref="rulesallForm" :list1="list1" :isdel="isdel" />
       <div style="margin-top: 20px;margin-left: 65px;">
         <el-button @click="close()" class="buttonHover" style="color: #606266;border: 1px solid #DBDBDB;background-color: #fff;">取消</el-button>
         <el-button @click="add()" style="background-color: #3F9B6A;color: #fff;">确定</el-button>
@@ -125,6 +125,10 @@ import {
         type: Object,
         default: {}
       },
+      isdel: {
+        type: String,
+        default:''
+      },
       contractChangeReason: {
         type: String,
         default: ''
@@ -132,7 +132,7 @@
 										</el-table-column>
-										<el-table-column label="操作" v-if="!iscopy">
+										<el-table-column label="操作" v-if="!iscopy && isdel == ''">
 											<template slot-scope="scope">
 												<div @click="MingDelete(scope.$index)" class="tableBtn greens">删除</div>
 											</template>
@@ -171,6 +171,10 @@
 			zy
 		},
 		props: {
+			isdel: {
+				type: String,
+				default:''
+			},
 			list1: {
 				type: Array,
 				default: []
@@ -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
           },
         }
@@ -123,7 +123,7 @@
       </div>
       <div style="padding: 20px 20px 20px 0;">
-        <add :info="formInline" @removeonaction="removeonaction"></add>
+        <add :info="formInline" @removeonaction="removeonaction" :isdel="'1'"></add>
       </div>
     </div>
     <div class="zhuti" v-if="onaction == '3'">
 {
     "name" : "绿道",
-    "appid" : "__UNI__F034047",
+    "appid" : "__UNI__189D96A",
     "description" : "",
     "versionName" : "1.0.2",
     "versionCode" : "100",
@@ -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)
 				})
 			},
@@ -54,6 +54,7 @@
 						this.tableList.push(obj[prop][0])
 				    }
 				}
+				this.tableList.reverse()
 				console.error(this.tableList)
 			})
 			// this.tableList = JSON.parse(option.item)
@@ -21,7 +21,7 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
 		// 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 = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
 		// 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 = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
 		// 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;