Merge branch 'master' of http://39.98.150.180/webapp/GreenwayWeb

wesley88
2 parents 8208ddf7 eaadab76
Showing 10 changed files with 101 additions and 42 deletions
admin-web-master/src/utils/request.js
admin-web-master/src/views/activity/activitySp.vue
admin-web-master/src/views/activity/index.vue
admin-web-master/src/views/atmosphere/atmosphereGl.vue
admin-web-master/src/views/atmosphere/atmosphereSp.vue
admin-web-master/src/views/media/mediaMana.vue
admin-web-master/src/views/promotion/account.vue
admin-web-master/src/views/promotion/audit.vue
lvdao-miniapp/main.js
lvdao-miniapp/manifest.json
@@ -16,8 +16,8 @@ let hostall = window.location.href;
 let baseURL =  ''
 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529'  ) {
-  baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
-  // baseURL = 'http://128.10.249.21:9003';
+  // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
+  baseURL = 'http://128.10.249.34:9003';
   // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
   // baseURL = 'http://192.168.2.225:9003';
@@ -1018,14 +1018,30 @@
 					</div>
 				</div>
-				<div v-if="actSpye" style="padding:20px;">
+				<!-- <div v-if="actSpye" style="padding:20px;">
 					<TitleWithCircle title="审核情况" style="margin-bottom:20px;" />
 					  <el-radio-group v-model="liuYe">
 					    <el-radio :label="1">通过</el-radio>
 					    <el-radio :label="2">不通过</el-radio>
 					  </el-radio-group>
-				</div>
-			</div>
+			 -->
+			 <div v-if="actSpye" style="padding:20px;">
+			 	<TitleWithCircle title="审核情况" style="margin-bottom:20px;"/>
+			 	<div style="padding: 20px;">
+			 	    <el-form  label-width="100px" class="demo-ruleForm">
+			 	      <el-form-item label="状态" >
+			 	<el-radio-group v-model="liuYe" style="margin-top: 14px;">
+			 	  <el-radio :label="1">通过</el-radio>
+			 	  <el-radio :label="2">不通过</el-radio>
+			 	</el-radio-group>
+			 	      </el-form-item>
+			 	      <el-form-item label="审核意见">
+			 	        <el-input maxlength="200" show-word-limit rows="4" v-model="secondData.auditOpinion" placeholder="请输入审核意见"
+			 	          type="textarea" />
+			 	      </el-form-item>
+			 	    </el-form>
+			 	  </div>
+			 	</div>
 			<div style="display: flex;justify-content: flex-end;padding:10px">
 				<el-button @click="refreshData" style="background-color: #3F9B6A;color: #fff">取消
 				</el-button>
@@ -1033,6 +1049,7 @@
 				</el-button>
 			</div>
 		</div>
+		</div>
 	</div>
 </template>
@@ -1434,7 +1451,8 @@
 				if (this.liuYe == 1) {
 					xiangedit({
 						id: this.secondData.id,
-						state: '5'
+						state: '5',
+						auditOpinion:this.secondData.auditOpinion
 					}).then(res => {
 						this.$message({
 						  message: '保存成功',
@@ -1445,7 +1463,8 @@
 				} else {
 					xiangedit({
 						id: this.secondData.id,
-						state: '6'
+						state: '6',
+						auditOpinion:this.secondData.auditOpinion
 					}).then(res => {
 						this.$message({
 						  message: '保存成功',
@@ -1713,9 +1732,7 @@
 		height: 50px;
 	}
-	/deep/ .el-form--label-top .el-form-item__label {
-		padding: 0;
-	}
+
 	.pagination {
 		text-align: right;
@@ -1829,11 +1846,6 @@
 		border-color: #3F9B6A
 	}
-	::v-deep .el-form-item__label {
-		font-weight: normal;
-		font-size: 12px;
-	}
-
 	.fenlan {
@@ -2066,12 +2066,14 @@
 				}
 				this.xinlei = true
 			},
-			xinFenlei(node,data){
-			        if(data){
-			          this.xinADD.parentId = data.id
-			        }
-			       this.xinlei = true
-			      },
+			editFenlei(node, data) {
+				this.editFen = 1
+				if (data) {
+					this.xinADD.parentId = data.id
+					this.xinADD.classificationName = data.classificationName
+				}
+				this.xinlei = true
+			},
 			 sevLei() {
 				this.$refs.fenFrom.validate((valid) => {
 				  if (valid) {
@@ -2086,6 +2088,11 @@
 							 	parentId: '',
 							 	classificationType: '0'
 							 }
+							 this.$message({
+							   message: '保存成功',
+							   type: 'success',
+							   offset: 100
+							 })
 							 this.getAll()
 						 })
 					  } else {
@@ -2100,6 +2107,11 @@
 							 	parentId: '',
 							 	classificationType: '0'
 							 }
+							 this.$message({
+							   message: '保存成功',
+							   type: 'success',
+							   offset: 100
+							 })
 							 this.getAll()
 						 })
 					  }
@@ -2024,6 +2024,11 @@
 							 	parentId: '',
 							 	classificationType: '1'
 							 }
+							 this.$message({
+							   message: '保存成功',
+							   type: 'success',
+							   offset: 100
+							 })
 							 this.getAll()
 						 })
 					  } else {
@@ -2038,6 +2043,11 @@
 							 	parentId: '',
 							 	classificationType: '1'
 							 }
+							 this.$message({
+							   message: '保存成功',
+							   type: 'success',
+							   offset: 100
+							 })
 							 this.getAll()
 						 })
 					  }
@@ -1123,12 +1123,24 @@
           </div>
         </div>
 		<div v-if="actSpye" style="padding:20px;">
-			<TitleWithCircle title="审核情况" style="margin-bottom:20px;" />
-							  <el-radio-group v-model="liuYe">
-							    <el-radio :label="1">通过</el-radio>
-							    <el-radio :label="2">不通过</el-radio>
-							  </el-radio-group>
-						</div>
+			<TitleWithCircle title="审核情况" style="margin-bottom:20px;"/>
+			<div style="padding: 20px;">
+			    <el-form  label-width="100px" class="demo-ruleForm">
+			      <el-form-item label="状态" >
+			<el-radio-group v-model="liuYe" style="margin-top: 14px;">
+			  <el-radio :label="1">通过</el-radio>
+			  <el-radio :label="2">不通过</el-radio>
+			</el-radio-group>
+			      </el-form-item>
+			      <el-form-item label="审核意见">
+			        <el-input maxlength="200" show-word-limit rows="4" v-model="secondData.auditOpinion" placeholder="请输入审核意见"
+			          type="textarea" />
+			      </el-form-item>
+			    </el-form>
+			  </div>
+			</div>
+						
+						
 					</div>
 					<div style="display: flex;justify-content: flex-end;padding:10px">
 						<el-button @click="refreshData" style="background-color: #3F9B6A;color: #fff">取消
@@ -1508,7 +1520,7 @@
            },
            OAshen(){
           if(this.liuYe == 1){
-            xiangedit({id:this.secondData.id,state:'5'}).then(res=>{
+            xiangedit({id:this.secondData.id,state:'5',auditOpinion:this.secondData.auditOpinion}).then(res=>{
 				this.$message({
 				  message: '保存成功',
 				  type: 'success'
@@ -1516,7 +1528,7 @@
               this.getAll()
             })
           }else{
-            xiangedit({id:this.secondData.id,state:'6'}).then(res=>{
+            xiangedit({id:this.secondData.id,state:'6',auditOpinion:this.secondData.auditOpinion}).then(res=>{
 				this.$message({
 				  message: '保存成功',
 				  type: 'success'
@@ -1766,9 +1778,6 @@
     height: 50px;
   }
-  /deep/ .el-form--label-top .el-form-item__label {
-    padding: 0;
-  }
   .pagination {
     text-align: right;
@@ -1877,10 +1886,6 @@
     border-color: #3F9B6A
   }
-  ::v-deep .el-form-item__label {
-    font-weight: normal;
-    font-size: 12px;
-  }
@@ -968,6 +968,11 @@ this.$refs.mulTable.clearSelection(); // 清除所有选项
 							 	parentId: '',
 							 	classificationType: '3'
 							 }
+							 this.$message({
+							   message: '保存成功',
+							   type: 'success',
+							   offset: 100
+							 })
 							 this.getAll()
 						 })
 					  } else {
@@ -982,6 +987,11 @@ this.$refs.mulTable.clearSelection(); // 清除所有选项
 							 	parentId: '',
 							 	classificationType: '3'
 							 }
+							 this.$message({
+							   message: '保存成功',
+							   type: 'success',
+							   offset: 100
+							 })
 							 this.getAll()
 						 })
 					  }
@@ -613,6 +613,11 @@ this.currentPage = val
 							 	parentId: '',
 							 	classificationType: '2'
 							 }
+							 this.$message({
+							   message: '保存成功',
+							   type: 'success',
+							   offset: 100
+							 })
 							 this.getAll()
 						 })
 					  } else {
@@ -627,6 +632,11 @@ this.currentPage = val
 							 	parentId: '',
 							 	classificationType: '2'
 							 }
+							 this.$message({
+							   message: '保存成功',
+							   type: 'success',
+							   offset: 100
+							 })
 							 this.getAll()
 						 })
 					  }
@@ -105,7 +105,7 @@
 						  </div>
 					 </el-form-item>
 					 <el-form-item label="审核意见" class="grid-content bg-purple" >
-						 <el-input type="textarea" v-model="secondData.auditOpinion" v-if='wangShow==false'></el-input>
+						 <el-input maxlength="200" show-word-limit rows="4"  placeholder="请输入审核意见" type="textarea" v-model="secondData.auditOpinion" v-if='wangShow==false'></el-input>
 						 <div style="padding:20px;" v-else>{{secondData.auditOpinion}}</div>    
 					 </el-form-item>
 	               </el-form>
@@ -8,13 +8,13 @@ import uView from &quot;uview-ui&quot;;
 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) => {
-  // return (c1 + "cdwlMall/questionnaire/file/static" + url);
-  return (c1 + "cdwlMall/zsfwzxt/test/file/static" + url);
+  return (c1 + "cdwlMall/questionnaire/file/static" + url);
+  // return (c1 + "cdwlMall/zsfwzxt/test/file/static" + url);
 }
 Vue.prototype.$img = c1+ 'cdwlMall'
 // Vue.prototype.$upload = "https://zhld.028wlkj.com:49008/cdwlMall/admin-server/miniio/upload"
 {
     "name" : "绿道",
-    "appid" : "__UNI__189D96A",
+    "appid" : "__UNI__F034047",
     "description" : "",
     "versionName" : "1.0.2",
     "versionCode" : "100",