bug修改

pages/activity/jkDetail.vue

@@ -79,7 +79,7 @@
 						<view class="signupLineLName" v-else>微信用户</view>
 					</view>
 					<view class="signupLineM">{{item.plateNumber?item.plateNumber:''}}</view>
-					<view class="signupLineR">{{item.createTime}}</view>
+					<view class="signupLineR">{{item.signTime}}</view>
 				</view>
 			</view>
 		</view>
@@ -806,7 +806,8 @@
 					//uni.hideLoading();
 					this.info = res.data;
 					console.log(this.info)
-					this.getInfo()
+					this.getInfo();
+					this.dimgList=[]
 					if(this.info.imgList){
 						this.info.imgList.forEach(item=>{
 							if(item.imgType==1){
@@ -1041,9 +1042,10 @@
 			/* if(this.info.ImgList.length>0){
 				img=this.info.ImgList[0].url
 			} */
+			console.log(this.info.groupType)
 			if(this.info.groupType){
-				console.log(res.target.dataset.obj.ID)
-				var url= 'pages/subPack/jkDetail?id=' + this.collectingID+'&shareId='+this.userInfo.openId+'&groupID='+res.target.dataset.obj.ID+'&shareName='+this.userInfo.nickName
+				//console.log(res.target.dataset.obj.ID)
+				var url= 'pages/subPack/jkDetail?id=' + this.collectingID+'&shareId='+this.userInfo.openId+'&shareName='+this.userInfo.nickName+'&groupID='+res.target.dataset.obj.ID
 			}else{
 				var url= 'pages/activity/jkDetail?id=' + this.collectingID+'&shareId='+this.userInfo.openId
 			}

pages/shop/wp.vue

@@ -278,7 +278,7 @@
 				}
                
 				var timeX=hp;
-				var timeY=vp+30
+				var timeY=vp+20
 				
 				const fz26 = uni.upx2px(26)
 				ctx.setFillStyle('#3C3C3C')

pages/subPack/jkDetail.vue

@@ -111,7 +111,7 @@
 			  <view class="timeK">{{shengyuM}}</view>
 			  <view class="timeviewTxt" > 分</view>
 			</view>
-			<view class="bottomBtnBox">
+			<view class="bottomBtnBox" v-if="info.clState!=1">
 				<view class="bottomBtnBoxLeft" @click="shareShowzs">
 					<img src="../../static/timg/share.png" alt="" class="shareIcon">
 					<view class="shareTxt">分享</view>
@@ -138,6 +138,13 @@
 				<view class="bottomBtn2" v-if="info.state==1">报名未开始</view>
 				<view class="bottomBtn2" v-if="info.state==3">报名已结束</view>
 			</view>
+			<view class="bottomBtnBox" v-if="info.clState==1">
+				<view class="bottomBtnBoxLeft" @click="shareShowzs">
+					<img src="../../static/timg/share.png" alt="" class="shareIcon">
+					<view class="shareTxt">分享</view>
+				</view>
+				<view class="bottomBtn2" >该活动已停用，暂无法参与拼团</view>
+			</view>
 		</view>
 		<!-- 报名弹框 -->
 		<view class="baomingBox" v-if="bmShow" @click="nobmshow">
@@ -856,7 +863,8 @@
 					//uni.hideLoading();
 					this.info = res.data;
 					console.log(this.info)
-					this.getInfo()
+					this.getInfo();
+					this.dimgList=[]
 					if(this.info.imgList){
 						this.info.imgList.forEach(item=>{
 							if(item.imgType==1){

pages/user/myOrder/activityOrderDetail.vue

@@ -132,7 +132,7 @@
                    	
                    	</view>
 					<image src="../../../static/img/icon_erweima.png" mode="" style="width: 36rpx;height: 36rpx;"
-						v-if="v.writeoffState==1" @click="isShowMaSHow"></image>
+						v-if="v.writeoffState==1" @click="isShowMaSHow(index)"></image>
                    </view>
 					
 					<view class="writeoffLineBox" v-if="v.writeoffState==3">
@@ -253,7 +253,7 @@
 						style="width: 26rpx;height: 26rpx;margin-left: 10rpx;"></image>
 
 				</view>
-				<swiper class="swiper" circular  :autoplay="false" :indicator-dots="true" indicator-color="#CCCCCC" indicator-active-color="#D53533">
+				<swiper class="swiper" circular :current='swiperIndex'  :autoplay="false" :indicator-dots="true" indicator-color="#CCCCCC" indicator-active-color="#D53533">
 					<swiper-item v-for="(item,index) in quanMaList">
 						<view class="swiper-item">
 							<view class="maCode">{{item}}</view>
@@ -414,6 +414,7 @@
 				index:0,
 				tuicauseList: [],
 				tuikuanContent: '',
+				swiperIndex:0,
 			}
 		},
 		//0拼团取消1拼团失败 2拼团中3拼团成功4自动成团 groupState
@@ -525,7 +526,8 @@
 						}	
 					  })
 			},
-			isShowMaSHow(){
+			isShowMaSHow(index){
+				this.swiperIndex=index
 				 this.isShowMa=true
 			},
 			isShowMaHide(){

pages/user/myOrder/mallOrderDetail.vue

@@ -91,7 +91,7 @@
                    	
                    	</view>
 					<image src="../../../static/img/icon_erweima.png" mode="" style="width: 36rpx;height: 36rpx;"
-						v-if="v.writeoffState==1" @click="isShowMaSHow"></image>
+						v-if="v.writeoffState==1" @click="isShowMaSHow(index)"></image>
                    </view>
 					
 					<view class="writeoffLineBox" v-if="v.writeoffState==3">
@@ -242,7 +242,7 @@
 						style="width: 26rpx;height: 26rpx;margin-left: 10rpx;"></image>
 
 				</view>
-				<swiper class="swiper" circular  :autoplay="false" :indicator-dots="true" indicator-color="#CCCCCC" indicator-active-color="#D53533">
+				<swiper class="swiper" circular :current='swiperIndex' :autoplay="false" :indicator-dots="true" indicator-color="#CCCCCC" indicator-active-color="#D53533">
 					<swiper-item v-for="(item,index) in quanMaList">
 						<view class="swiper-item">
 							<view class="maCode">{{item}}</view>
@@ -374,6 +374,7 @@
 				index:0,
 				tuicauseList: [],
 				tuikuanContent: '',
+				swiperIndex:0,
 			}
 		},
 		onLoad(opt) {
@@ -455,7 +456,8 @@
 			
 				})
 			},
-			isShowMaSHow(){
+			isShowMaSHow(index){
+				this.swiperIndex=index
 				 this.isShowMa=true
 			},
 			isShowMaHide(){

pages/user/myOrder/paintOrderDetail.vue

@@ -88,8 +88,8 @@
 							<view class="quanState2">已使用</view>
 						
 						</view>
-										<image src="../../../static/img/icon_erweima.png" mode="" style="width: 36rpx;height: 36rpx;"
-											v-if="v.writeoffState==1" @click="isShowMaSHow"></image>
+							<image src="../../../static/img/icon_erweima.png" mode="" style="width: 36rpx;height: 36rpx;"
+								v-if="v.writeoffState==1" @click="isShowMaSHow(index)"></image>
 					</view>
 										
 										<view class="writeoffLineBox" v-if="v.writeoffState==3">
@@ -221,7 +221,7 @@
 						style="width: 26rpx;height: 26rpx;margin-left: 10rpx;"></image>
 
 				</view>
-				<swiper class="swiper" circular  :autoplay="false" :indicator-dots="true" indicator-color="#CCCCCC" indicator-active-color="#D53533">
+				<swiper class="swiper" circular :current='swiperIndex' :autoplay="false" :indicator-dots="true" indicator-color="#CCCCCC" indicator-active-color="#D53533">
 					<swiper-item v-for="(item,index) in quanMaList">
 						<view class="swiper-item">
 							<view class="maCode">{{item}}</view>
@@ -354,6 +354,7 @@
 				index:0,
 				tuicauseList: [],
 				tuikuanContent: '',
+				swiperIndex:0,
 			}
 		},
 		onLoad(opt) {
@@ -434,7 +435,8 @@
 			
 				})
 			},
-			isShowMaSHow(){
+			isShowMaSHow(index){
+				this.swiperIndex=index
 				 this.isShowMa=true
 			},
 			isShowMaHide(){