twt 1 yıl önce
ebeveyn
işleme
3fac329b00

+ 9 - 3
pages/activity/jkDetail.vue

@@ -13,7 +13,7 @@
 		<view class="ptBox" v-if="info.groupList&&info.groupList.length>0">
 			<view class="ptBoxtop">
 				<view class="ptNum">{{info.groupList.length}}人正在拼团,可直接参与</view>
-				<view class="ptMore">
+				<view class="ptMore" @click="ptMore">
 					<sapn>查看更多</sapn>
 					<img src="../../static/timg/jt2.png" alt="" class="shopjt">
 				</view>
@@ -283,8 +283,8 @@
 		<view class="baomingBox" v-if="djsMoreShow">
 			<view class="djsCont">
 				<view class="bmTop">
-					<view class="bmTitle">12人正在拼单,可直接参与</view>
-					<image src="../../static/timg/chahao.png" alt="" class="bmChimg" @click="noShowShop2"></image>
+					<view class="bmTitle">{{info.groupList.length}}人正在拼团,可直接参与</view>
+					<image src="../../static/timg/chahao.png" alt="" class="bmChimg" @click="ptMorehide"></image>
 				</view>
 				<view class="djsLineBox">
 					<view class="ptLine" v-for="(item,index) in info.groupList">
@@ -435,6 +435,12 @@
 		
 		
 		methods: {
+			ptMore(){
+				this.djsMoreShow=true;
+			},
+			ptMorehide(){
+				this.djsMoreShow=false;
+			},
 			beginTimer() { //这个计时器是每秒减去数组中指定字段的时间
 			 // console.log("??????????????????"+this.info.groupType)
 			  

+ 9 - 0
pages/subPack/jkDetail.vue

@@ -789,6 +789,15 @@
 				}
 			},
 			jionPt(){
+				if(this.info.state==3){
+					uni.showToast({
+						title: '活动已结束',
+						icon: 'none',
+						duration: 3000
+					});
+					return false;
+				}
+				
 				this.groupOwner=2;
 				this.cyptNum=1;
 				if(this.userInfo){	

+ 10 - 4
pages/user/myOrder/paintOrderDetail.vue

@@ -89,7 +89,7 @@
 					</view>
 					
 					<image src="../../../static/img/icon_erweima.png" mode="" style="width: 36rpx;height: 36rpx;"
-						v-if="v.writeoffState==1" @click="isShowMa=true"></image>
+						v-if="v.writeoffState==1" @click="isShowMaSHow"></image>
 				</view>
 			</view>
 
@@ -178,11 +178,11 @@
 
 
 		<!-- 券码 -->
-		<view class="maBox" v-if="isShowMa==true" @click="isShowMa=false">
+		<view class="maBox" v-if="isShowMa==true" @click="isShowMaHide">
 			<view class="querenMa">
 				<view class="maTop">
 					<view class="maTitle">请到店出示券码即可开始服务</view>
-					<image @click="isShowMa=false" src="../../../static/img/icon_delete.png" mode=""
+					<image @click="isShowMaHide" src="../../../static/img/icon_delete.png" mode=""
 						style="width: 26rpx;height: 26rpx;margin-left: 10rpx;"></image>
 
 				</view>
@@ -289,7 +289,13 @@
 		},
 		
 
-		methods: {
+		methods: {
+			isShowMaSHow(){
+				 this.isShowMa=true
+			},
+			isShowMaHide(){
+				this.isShowMa=false
+			},
 			decryptPhoneNumber: function(e) {
 			  console.log(e);
 			  this.code=e.detail.code