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

wesley88
2 parents c7b1294b 3bfff9e5
Showing 8 changed files with 41 additions and 9 deletions
admin-web-master/src/components/add/addht.vue
admin-web-master/src/components/add/addmap.vue
admin-web-master/src/utils/request.js
admin-web-master/src/utils/request2.js
admin-web-master/src/views/serve/salesReport.vue
ceres-uniapp-master/components/canvasShow/basics/banner.vue
lvdao-miniapp/pages/home/home.vue
lvdao-miniapp/pages/propertyPay/payRecord/payRecord.vue
@@ -196,7 +196,7 @@ import {
         this.redirectUrl =  this.info.redirectUrl
       }
       if(this.info.coverImage){
-        this.coverImage =  this.info.coverImage
+        this.coverImage = this.info.coverImage
       }
     },
     methods: {
@@ -271,6 +271,7 @@ import {
           }
         }
         this.formInline.templateInformation = JSON.stringify(this.list1)
+		
         let from = {
           ...this.formInline,
           contractChangeReason: this.contractChangeReason,
@@ -289,6 +290,8 @@ import {
           createDate:this.updateCurrentTime(),
           createUser: localStorage.getItem('roleName'),
         }
+		// console.log(from)
+		// return
         console.error(from)
         let info = await this.culfj()
         console.error(info)
@@ -340,6 +343,7 @@ import {
       },
       async add() {
+		
         let ismb = false
         await this.$refs.rulesmbinfoForm.validate((valid) => {
           if (valid) {
@@ -398,11 +402,18 @@ import {
           documentAddress:  this.templateAttachment,
           insertData: JSON.stringify(info)
         }
+
+		if(this.formInline.coverImage){
+			this.formInline.coverImage = this.$baseURL+this.formInline.coverImage
+		}
+		console.log(this.formInline.coverImage,'this.formInline.coverImagethis.formInline.coverImagethis.formInline.coverImage')
+		return
         dataInprotDocument(c1).then(res => {
           console.error(res)
           if(res.code == 200 && res.data) {
             this.formInline.appendicesContract = res.data
+			
             contractinsertAdd({
               ...this.formInline,
               templateInformationUrl:this.templateAttachment,
@@ -26,7 +26,7 @@
       </el-form-item>
       <el-form-item label="轮播图" prop="carouselId" >
         <el-select v-model="formInline.carouselId" placeholder="请选择" style="width: 100%;">
-          <el-option v-for="(item,index) in tableData" :key="index" :label="'第'+(index+1)+'张'" :value="item.id"></el-option>
+          <el-option v-for="(item,index) in tableData" :key="index" :label="'第'+(index+1)+'张'+`${item.type==1?'商城端':'商家端'}`" :value="item.id"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="广告尺寸" prop="dimensions" >
@@ -45,6 +45,7 @@
         <upimg :cmpOption="{disabled:false,isSetCover:false}" filePath="gg" inputtype="locationDiagram" :value="formInline.locationDiagram"
           @changimg="e=>changimg(e,'locationDiagram')"></upimg>
       </el-form-item>
+
       <el-form-item label="介绍" prop="memo">
         <wangEditor v-model="formInline.memo" ref="editor" :height="200"></wangEditor>
         <!-- <el-input maxlength="200" show-word-limit rows="4" v-model="formInline.memo" placeholder="请输入"
@@ -121,6 +122,7 @@
         <upimg :cmpOption="{disabled:false,isSetCover:false}" filePath="gg" inputtype="locationDiagram" :value="formInline.locationDiagram"
           @changimg="e=>changimg(e,'locationDiagram')"></upimg>
       </el-form-item>
+	  
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item>
@@ -212,9 +214,9 @@
           onlineType: '' ,// 线上类型
           belongingGreenwaySection: '', // 所属绿道段
           belongingParkTrail: '', // 所属公园/步道
+		  // carouselId:'',//选择租赁广告位置
         },
         rules: {
-          
           advertisingType: [{
             required: true,
             message: '请选择广告类型',
@@ -245,6 +247,7 @@
             message: '请上传位置示意图',
             trigger: ['change']
           }],
+		  
         },
         rulesSt: {
           belongingGreenwaySection: [{
@@ -354,6 +357,11 @@
       const lvdao = await lvdaoduan()
 	const gongyua  = await parkTrails() 
 	  this.lvdaoList = lvdao.data.concat(gongyua.data)
+	  let obj = {
+		  pageNumber: 1,
+		  pageSize: 10
+	  }
+
     },
     methods: {
       validateNumber(field, value) {
@@ -22,7 +22,7 @@ if(host === &#39;localhost:8080&#39; || host === &#39;localhost:8081&#39; || host === &#39;localhost
   // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
-  // baseURL = 'http://128.10.249.39:9003';
+  baseURL = 'http://128.10.249.37:9003';
 } else {
@@ -20,7 +20,7 @@ if(host === &#39;localhost:8080&#39; || host === &#39;localhost:8081&#39; || host === &#39;localhost
   baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/business-server';
   // baseURL = 'http://172.16.61.125:9004';
   // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/business-server';
-    // baseURL = 'http://128.10.249.44:9004';
+    baseURL = 'http://128.10.249.37:9004';
 } else {
   console.error('---------------------')
   console.error(hostall)
@@ -93,7 +93,7 @@
       </div>
     </div>
-<iframe src="http://localhost:9528/investigation/wenjuanList?token=eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX25hbWUiOiIxODEwODE0Mzk0NSIsImp0aSI6Imt3Z1c4aU96NkVtTFZsNWg0UWdORF9aUFBRRSIsImNsaWVudF9pZCI6ImNiOGYxNDE2M2QxYzExZWM5NmU4MDBlMDRjMzEwMjUzIiwic2NvcGUiOlsiZ2V0X3VzZXJfaW5mbyJdfQ.T1zOJ9N78NJ01yW0C7Kv7QdgqDoLGt4EC4XoZ76jnocIGAgH30gFqI6o-dbQuSYeXGmgTfGfbqSINUksP91GEsEHpJK_knLrmpfHTMf7gtfzx8nIsRQLtf_GPZbUn3hoWnHpEuhH5c__3KEdVaruOZDxrevHqO7IfFRjp3giw19n0ymmDDmvtCidtrVM4XvyQEHTQ9iikWaAqW3W582MEh1GsIBh5S2fqBU_h6vc5q4OIFyQeNb-tEhcMb0gEY3rxbukdCKP3pgAZeZtFYpWn4MY8W4CZeRU9A6JcU8pFNj0Ar8zrveLrx0Oh3FRcNADsx0nUA4dXPvERnEMAZpDOQ" ref="iframe" frameborder="0" width="100%" height="700px" />
+<!-- <iframe src="http://localhost:9528/investigation/wenjuanList?token=eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX25hbWUiOiIxODEwODE0Mzk0NSIsImp0aSI6Imt3Z1c4aU96NkVtTFZsNWg0UWdORF9aUFBRRSIsImNsaWVudF9pZCI6ImNiOGYxNDE2M2QxYzExZWM5NmU4MDBlMDRjMzEwMjUzIiwic2NvcGUiOlsiZ2V0X3VzZXJfaW5mbyJdfQ.T1zOJ9N78NJ01yW0C7Kv7QdgqDoLGt4EC4XoZ76jnocIGAgH30gFqI6o-dbQuSYeXGmgTfGfbqSINUksP91GEsEHpJK_knLrmpfHTMf7gtfzx8nIsRQLtf_GPZbUn3hoWnHpEuhH5c__3KEdVaruOZDxrevHqO7IfFRjp3giw19n0ymmDDmvtCidtrVM4XvyQEHTQ9iikWaAqW3W582MEh1GsIBh5S2fqBU_h6vc5q4OIFyQeNb-tEhcMb0gEY3rxbukdCKP3pgAZeZtFYpWn4MY8W4CZeRU9A6JcU8pFNj0Ar8zrveLrx0Oh3FRcNADsx0nUA4dXPvERnEMAZpDOQ" ref="iframe" frameborder="0" width="100%" height="700px" /> -->
 <!-- <iframe v-if="show" src="https://zhgw-uat.028wlkj.com/cdwlMall/investigation/wenjuanList?token=eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX25hbWUiOiIxODEwODE0Mzk0NSIsImp0aSI6Imt3Z1c4aU96NkVtTFZsNWg0UWdORF9aUFBRRSIsImNsaWVudF9pZCI6ImNiOGYxNDE2M2QxYzExZWM5NmU4MDBlMDRjMzEwMjUzIiwic2NvcGUiOlsiZ2V0X3VzZXJfaW5mbyJdfQ.T1zOJ9N78NJ01yW0C7Kv7QdgqDoLGt4EC4XoZ76jnocIGAgH30gFqI6o-dbQuSYeXGmgTfGfbqSINUksP91GEsEHpJK_knLrmpfHTMf7gtfzx8nIsRQLtf_GPZbUn3hoWnHpEuhH5c__3KEdVaruOZDxrevHqO7IfFRjp3giw19n0ymmDDmvtCidtrVM4XvyQEHTQ9iikWaAqW3W582MEh1GsIBh5S2fqBU_h6vc5q4OIFyQeNb-tEhcMb0gEY3rxbukdCKP3pgAZeZtFYpWn4MY8W4CZeRU9A6JcU8pFNj0Ar8zrveLrx0Oh3FRcNADsx0nUA4dXPvERnEMAZpDOQ" ref="iframe" frameborder="0" width="100%" height="700px" /> -->
   </div>
 </template>
@@ -42,8 +42,14 @@
 			type:1
 			}
 		NET.request2(API.cereCarouselImage, pagesize, 'POST').then(res => {
-			
-			this.bannerList  = res.data.content
+			res.data.content.map(item=>{
+				 if(item.state ==1){
+					 item.imageUrl ='https://zhgw-uat.028wlkj.com/cdwlMall/zsfwzxt/lb/f96559b3-949e-49f3-9db0-72dc59795b0f-0c5150bb-7419-43e2-a8b0-e57c305eb99b-%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20250110172248.jpg'
+					 item.jumpUrl = ''
+				 } 
+				 
+			})
+			this.bannerList = res.data.content
 		})
 		// uni.request({
@@ -541,6 +541,13 @@
 				})
 				// 轮播图
 				this.$http.sendRequest('/cereCarouselImage/queryByPage', 'POST', this.pageindex, 1).then(res => {
+					res.data.data.content.map(item=>{
+						 if(item.state ==1){
+							 item.imageUrl ='https://zhgw-uat.028wlkj.com/cdwlMall/zsfwzxt/lb/f96559b3-949e-49f3-9db0-72dc59795b0f-0c5150bb-7419-43e2-a8b0-e57c305eb99b-%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20250110172248.jpg'
+							 item.jumpUrl = ''
+						 } 
+						 
+					})
 					this.swiperList = res.data.data.content
 				})
 				// 营销推广活动
@@ -3,7 +3,7 @@
 		<view class="title-top">
 			<div class="left" @click="show = true">
 				<text>{{year}}年<u-icon name="arrow-down"></u-icon></text>
-				<u-icon name="arrow-down" style="font-size: 24rpx;margin-left: 10rpx;" />
+				<!-- <u-icon name="arrow-down" style="font-size: 24rpx;margin-left: 10rpx;" /> -->
 				<u-picker v-model="show" mode="time" :params="{year: true}" @confirm ="change"></u-picker>
 			</div>
 			<div class="right"><u-icon name="rmb"  class="price" /><text class="price">{{allnum}}</text></div>