twt 2 years ago
parent
commit
ffb10db222
2 changed files with 19 additions and 6 deletions
  1. 4 4
      pages/addjk/activity.vue
  2. 15 2
      pages/addjk/eadit.vue

+ 4 - 4
pages/addjk/activity.vue

@@ -37,7 +37,7 @@
 				<view class="name">{{item.ActivityName}}</view>
 
 				<view class="btnBox">
-					<view class="btn" style="width: 120rpx;" @click="goEdit(item.id)">编辑</view>
+					<view class="btn" style="width: 120rpx;" @click="goEdit(item.ID)">编辑</view>
 					<view class="btn" @click="">报名详情</view>
 					<view class="btn" @click="">数据统计</view>
 					<view class="btn" style="width: 120rpx;" @click="">分享</view>
@@ -92,9 +92,9 @@
 				// })
 			},
 			goEdit(id) {
-				// uni.navigateTo({
-				// 	url: 'jkDetail?id=' + id
-				// })
+				uni.navigateTo({
+					url: 'eadit?id=' + id
+				 })
 			},
 			myOrderCoupon() {
 				uni.showLoading({

+ 15 - 2
pages/addjk/eadit.vue

@@ -219,17 +219,30 @@
 					this.activityContent=jkdata.activityContent;
 					this.money=jkdata.money;
 					this.number=jkdata.number;
-					this.music=jkdata.music;
+					
 					this.clWhereString=jkdata.clWhere;
 					this.clWhereList=this.clWhereString.slice(',');
 					this.startTime=jkdata.startTime.slice(0,10);
 					this.endTime=jkdata.endTime.slice(0,10);
-					this.payType=jkdata.payType
+					this.payType=jkdata.payType;
+					this.img=res.data.img.img;
 					if(res.data.imgList){
 						res.data.imgList.forEach(item=>{
 							this.imgListArr.push(item.img)
 						})
 					}
+					var shopNames=[];
+					var shopList=[];
+					if(res.data.shopList){
+						res.data.shopList.forEach(item=>{
+							shopNames.push(item.shopName)
+							shopList.push(item.shopId)
+						})
+						this.shopNames=shopNames.join(',')
+						this.shopList=shopList.join(',')
+					}
+					this.ckMusic=res.data.selectedMusic
+					this.music=ckMusic.id;
 					console.log(this.imgListArr)
 					
 			  		//this.list=res.data