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

wesley88
2 parents 84290017 49206db5
Showing 8 changed files with 57 additions and 10 deletions
admin-web-master/src/components/add/addmap.vue
admin-web-master/src/utils/request.js
admin-web-master/src/views/detect/analyse.vue
lvdao-miniapp/pages/details/details.vue
lvdao-miniapp/pagesA/PunchInAct/PunchInSetting.vue
lvdao-miniapp/pagesA/moreZu/moreZu.vue
merchant-web-master/src/App.vue
merchant-web-master/src/utils/request.js
@@ -214,7 +214,7 @@
           onlineType: '' ,// 线上类型
           belongingGreenwaySection: '', // 所属绿道段
           belongingParkTrail: '', // 所属公园/步道
-		  // carouselId:'',//选择租赁广告位置
+		  carouselId:'',//选择租赁广告位置
         },
         rules: {
           advertisingType: [{
@@ -332,7 +332,32 @@
         if (this.formInline.mapPunctuation) {
           this.lat = Number(this.formInline.mapPunctuation.split(',')[0])
           this.lng = Number(this.formInline.mapPunctuation.split(',')[1])
+		  
         }
+		if(this.info.affiliation){
+			console.log('this.info.affiliation',this.info.affiliation)
+			console.log('this.info.carouselId',this.info.carouselId)
+			let arList = []
+			let res= await bannerGet({pageNumber: 1,pageSize: 20})
+			arList = res.data.content
+				if(this.info.affiliation == '在线商城'){
+					 this.tableData =  arList.filter(item => item.type === 1);
+					 this.$forceUpdate()
+				}else{
+					  this.tableData = arList.filter(item => item.type === 2);
+					  this.$forceUpdate()
+				}
+				console.log('111111111111111111',this.tableData)
+				 this.tableData.map((item,index)=>{
+					 if(item.id == this.info.carouselId){
+						 this.handleSelectChange(index)
+						 this.formInline.carouselId = this.info.carouselId
+						 this.$forceUpdate()
+					 }
+				 })
+				
+				console.log('222222222222222',this.tableData)
+		}
         this.ontype = this.formInline.advertisingType
         if (this.ontype == '线上广告位') {
           this.typelist = [{
@@ -372,6 +397,7 @@
 			      }
 		},
 		async affiliationChange(value){
+			this.formInline.carouselId = ''
 				let arList = []
 			let res= await bannerGet({pageNumber: 1,pageSize: 20})
 			arList = res.data.content
@@ -380,6 +406,7 @@
 					 this.$forceUpdate()
 				}else{
 					  this.tableData = arList.filter(item => item.type === 2);
+					  this.$forceUpdate()
 				}
 		},
@@ -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://192.168.8.103:9003';
+  // baseURL = 'http://128.10.249.43:9003';
 } else {
@@ -12,7 +12,7 @@
 							range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
 							style="width: 300px;margin-right: 10px;" prefix-icon="none">
 						</el-date-picker>
-						<el-select v-model="msgList.belongingGreenwaySection" placeholder="请选择"
+						<el-select v-model="msgList.belongingGreenwaySection" placeholder="请选择所属绿道段"
 						  style="width: 168px;margin-right: 10px;">
 						  <el-option :label="item.name" :value="item.code" v-for="(item,index) in lvdaoList"
 						    :key="index"></el-option>
@@ -20,8 +20,8 @@
 				</view>
 				<!-- <view class="info-text">{{tableData.shopDescription}}</view> -->
 				<view class="info-racord" style="margin: 20rpx 0;" v-if="moban.length !=0">
-					<view class="info-price" v-if="tableData.actualUsableArea"><span>{{moban[0].rentalPrice*tableData.actualUsableArea || ''}}</span>元/{{moban[0].leaseTerm || ''}}</view>
-					<view class="info-price" v-else-if="moban[0].rentalPrice"><span>{{moban[0].rentalPrice*tableData.actualArea || ''}}</span>元/{{moban[0].leaseTerm || ''}}</view>
+					<view class="info-price" v-if="tableData.actualUsableArea"><span>{{math(moban[0].rentalPrice*tableData.actualUsableArea) || ''}}</span>元/{{moban[0].leaseTerm || ''}}</view>
+					<view class="info-price" v-else-if="moban[0].rentalPrice"><span>{{math(moban[0].rentalPrice*tableData.actualArea) || ''}}</span>元/{{moban[0].leaseTerm || ''}}</view>
 					<view class="info-price" v-else>自营</view>
 				</view>
 				<view class="" v-if="moban.length !=0" @click="moreZu">
@@ -199,7 +199,7 @@
 						<view class="position-info"  @click.stop="gomapApp(latitude,longitude)">
 							<u-image :showLoading="true" :src="$imgUrl('/location-icon.png')" width="20rpx"
 								height="20rpx"></u-image>
-							<view @click.stop="gomapApp(latitude,longitude)">
+							<view>
 								<text v-if="tableData.shopName">{{tableData.detailedLocation}}</text>
 								<u-parse :html="tableData.description" v-else></u-parse>
 							</view>
@@ -351,6 +351,9 @@
 		},
 		methods: {
+			math(val){
+				return val.toFixed(4);
+			},
 			openimg1(urls,index) {
 				let list = urls.map(item=>{
 					return this.imgUrl + item
@@ -127,7 +127,7 @@
 							</u-radio-group>
 						</view>
 						<view style="display: flex;justify-content: space-between;margin-top: 10px;">
-							<u-button type="" style="width: 45%;" @click="submit">取消</u-button>
+							<u-button type="" style="width: 45%;" @click="close">取消</u-button>
 							<u-button type="success" style="width: 45%;" @click="submit">提交</u-button>
 						</view>
 					</view>
@@ -233,6 +233,10 @@
 					url: `/pagesA/PunchInAct/PunchInSetting?ids=${this.tableData.id}`
 				})
 			},
+			close(){
+				this.addjiangliShow = false
+			
+			},
 			submit() {
 				if (!this.form.userName) {
 					uni.showToast({
@@ -301,6 +305,16 @@
 				return `${year}-${month}-${day}`;
 			},
 			addjiangli(){
+				
+				this.form = {
+					activityId: '',
+					userId: '',
+					createTime: '',
+					createUser: '',
+					userName: '',
+					userPhone: '',
+					canyutiem:''
+				}
 				this.addjiangliShow = true
 			},
 			dakaSet(){
@@ -4,7 +4,7 @@
 			<view class="zuTitle">{{item.policyName}}</view>
 			<view class="">
 				<view v-if="item.rentalPrice" style="padding: 10rpx; color: #3f9b6a;font-size: 16px;padding: 15px 0;">
-					{{item.rentalPrice*moprice}}元/{{item.leaseTerm}}
+					{{math(item.rentalPrice*moprice)}}元/{{item.leaseTerm}}
 				</view>
 				<view style="padding: 10rpx; color: #3f9b6a;font-size: 16px;padding: 15px 0;" v-else>自营</view>
 				<view class="youTitle">
@@ -67,6 +67,9 @@
 		},
 		methods: {
+			math(val){
+				return val.toFixed(4);
+			},
 			getAll(){
 				this.$http.sendRequest('/cereResourceStrategy/queryByResources', 'POST', this.paesize,1).then(res => {
 					this.moban = res.data.data
@@ -321,7 +321,7 @@ export default {
        border-bottom: 1px solid #EFEFEF;
      }
-     .el-dialog__title {
+     .el-dialog__title { 
        font-size: 14px;
        color: #000000e6;
      }
@@ -21,7 +21,7 @@ let PREFIX;
   // PREFIX = 'http://8.130.38.56:8027/business-server';
   // PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/business-server';
   // PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/business-server';
-  PREFIX = 'http://128.10.249.9:9004';
+  PREFIX = 'http://128.10.249.43:9004';
 }else{
   // PREFIX = '/merchant-business';
   // PREFIX = 'http://8.130.38.56:9004';