最新

杨鑫
1 parent 521b3983
Showing 6 changed files with 65 additions and 24 deletions
admin-web-master/src/components/add/addmap.vue
admin-web-master/src/layout/index.vue
admin-web-master/src/utils/request.js
admin-web-master/src/views/detect/analyse.vue
lvdao-miniapp/pagesA/PunchInAct/PunchInSetting.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()
 				}
 		},
@@ -200,17 +200,17 @@
 				}
 			}
 			return {
-				msg: [],
-				list: [], 
+				// msg: [],
+				// list: [], 
 				// msg: ['招商服务系统'],
-				// msg: ['招商服务系统', '推广策划系统', '在线商城系统', '支付服务模块', '票务'],
-				// list: [
-				// 	['招商资源监测', '商家管理', '商铺租赁服务', '招商方案管理', '招商租赁管理', '广告服务', '轮播图设置', '商户意向管理', '问卷调查','客服服务管理', '系统设置'],
-				// 	['品牌策划', '活动策划', '氛围策划', '媒体推广'],
-				// 	['订单管理', '积分管理', '消息中心', '会员管理', '评论管理', '商品管理', '库存管理', '销售统计', '优惠券管理', '商城商家管理'],
-				// 	['联机交易', '对账处理', '日志管理', '商户服务'],
-				// 	['渠道售票统计分析', '销售额统计分析'],
-				// ],
+				msg: ['招商服务系统', '推广策划系统', '在线商城系统', '支付服务模块', '票务'],
+				list: [
+					['招商资源监测', '商家管理', '商铺租赁服务', '招商方案管理', '招商租赁管理', '广告服务', '轮播图设置', '商户意向管理', '问卷调查','客服服务管理', '系统设置'],
+					['品牌策划', '活动策划', '氛围策划', '媒体推广'],
+					['订单管理', '积分管理', '消息中心', '会员管理', '评论管理', '商品管理', '库存管理', '销售统计', '优惠券管理', '商城商家管理'],
+					['联机交易', '对账处理', '日志管理', '商户服务'],
+					['渠道售票统计分析', '销售额统计分析'],
+				],
 				listMune: [],
 				mumeList: [],
 				mumeChildren1: [],
@@ -299,10 +299,10 @@
 			this.userAvatar = getUserAvatar()
 		},
 		mounted() {
-			this.getMemu()
-			this.address()
-			this.waibu()
-			// this.neibu()
+			// this.getMemu()
+			// this.address()
+			// this.waibu()
+			this.neibu()
 		},
 		methods: {
@@ -786,12 +786,12 @@
 					['联机交易', '对账处理', '日志管理', '商户服务'],
 					['渠道售票统计分析', '销售额统计分析'],
 				]
-				// this.neibu()
+				this.neibu()
-				this.getMemu()
-				this.waibu()
-				this.list = this.mumeList
+				// this.getMemu()
+				// this.waibu()
+				// this.list = this.mumeList
 			},
@@ -17,12 +17,12 @@ let baseURL =  &#39;&#39;
 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 = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server';
+  // baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server';
   // 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>
@@ -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(){
@@ -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';