11

package1/buyFood/buyFood.vue

@@ -340,19 +340,16 @@
 								alt=""
 								style="width: 90rpx;height: 90rpx;border-radius: 90rpx;margin: 0 auto;display: block;" />
 						</view>
-						<view class="kaituan22">
-							<view class="weipincheng">
-								+
-							</view>
-						</view>
-						<view class="kaituan22">
+						<view class="kaituan22" v-for="n in groupItem.groupRule.groupCount - 1">
 							<view class="weipincheng">
 								+
 							</view>
 						</view>
 					</view>
-					<view class="kaituan3">
-						剩余<text style="font-size: 32rpx;font-weight: 700;padding: 0 20rpx;color: red;">23:59:23</text>结束
+					<view class="kaituan3" style="display: flex;margin-left: auto;margin-right: auto;width: 50%;">
+						剩余
+						<uni-countdown :show-day="false" :hour="23" :minute="59" :second="59" :font-size="16" color="red" />
+						结束
 					</view>
 					<view class="kaituan4">
 						<button open-type="share" style="background:transparent;border:none;color:inherit;font-size:inherit;display:inline-flex;align-items:center;">
@@ -1304,4 +1301,7 @@
 		line-height: 80rpx;
 		margin: 0 auto;
 	}
+	button::after{
+		border: 0;
+	}
 </style>

package1/group/groupBuyList.vue

@@ -333,8 +333,6 @@
 									that.shopArea.push(res.result[m])
 								}
 							}
-							console.log(that.shopArea)
-							console.log(that.shopArea)
 						}
 					} else {
 						that.tui.toast(res.message)
@@ -397,7 +395,6 @@
 					})
 				}else if(type == 'search'){
 					if(item){
-						console.log("11111",item)
 						uni.navigateTo({
 							url:'/package1/group/searchGroup?shopType=' + (item.value || '')
 						})

package1/group/groupBuySingle.vue

@@ -91,7 +91,7 @@
 				</swiper>
 			</view>
 			<!-- 分类栏：移到goods-list外层，position:sticky才能生效 -->
-			<view class="container" style="display: flex;height: 72%;">
+			<view class="container" style="display: flex;height: 72%;margin-top: 20rpx;">
 				<scroll-view scroll-y id="menuList" style="border-right: 1px solid #eee;font-weight: 700;font-size: 28rpx;height: 100%;width: 160rpx;">
 					<view class="menu1" @tap="checkTab(index)" v-for="(item,index) in menuList" :key="index"
 						:style="{'border-top-right-radius':item.checked?'20rpx':'','border-bottom-right-radius':item.checked?'20rpx':'','color':item.checked?'rgba(0, 35, 28, 1)':'#777','background':item.checked?'#fff':''}">
@@ -143,6 +143,7 @@
 						</view>
 					</view>
 					<uni-load-more :status="loadStatus" @change="onChange" />
+					<view style="width: 100%;height: 160rpx;"></view>
 				</scroll-view>
 				
 			</view>
@@ -285,7 +286,25 @@
 							</view>
 						</view>
 					</view>
-					
+					<template
+						v-if="(groupId == null || groupId == '') && isPintuan && currentItem.productGroupBuyPrices && currentItem.productGroupBuyPrices.length > 0">
+						<view class="spec11">
+							成团选择
+						</view>
+						<view class="goods-team">
+							<view
+								:class="selectedGroupRule && selectedGroupRule.groupCount === rule.groupCount ? 'team-check' : 'team1'"
+								v-for="(rule, rIndex) in currentItem.productGroupBuyPrices" :key="rIndex"
+								@tap="selectGroupRule(rule)">
+								<view class="team11">
+									￥{{parseFloat(rule.groupPrice).toFixed(2)}}
+								</view>
+								<view class="team11">
+									{{rule.groupCount}}人团
+								</view>
+							</view>
+						</view>
+					</template>
 					<view class="spec11"  v-if="moreBuyList.length > 0 && isPintuan" style="display: flex;">
 						<view style="flex: 1;">
 							搭配小食
@@ -321,27 +340,6 @@
 							</view>
 						</view>
 					</view>
-					
-
-					<template
-						v-if="groupId == '' && isPintuan && currentItem.productGroupBuyPrices && currentItem.productGroupBuyPrices.length > 0">
-						<view class="spec11" style="margin-top: -30rpx;">
-							成团选择
-						</view>
-						<view class="goods-team">
-							<view
-								:class="selectedGroupRule && selectedGroupRule.groupCount === rule.groupCount ? 'team-check' : 'team1'"
-								v-for="(rule, rIndex) in currentItem.productGroupBuyPrices" :key="rIndex"
-								@tap="selectGroupRule(rule)">
-								<view class="team11">
-									￥{{parseFloat(rule.groupPrice).toFixed(2)}}
-								</view>
-								<view class="team11">
-									{{rule.groupCount}}人团
-								</view>
-							</view>
-						</view>
-					</template>
 					<view style="width: 100%;height: 160rpx;"></view>
 				</scroll-view>
 				<view class="bottom" style="padding-bottom: 40rpx;height: 160rpx;z-index: 10;">
@@ -377,11 +375,8 @@
 				<view class="car-close" @tap="$refs.pintuanGroupPopup.close()">
 					<uni-icons type="close" size="30" color="#fff"></uni-icons>
 				</view>
-				<view class="goods-top">
-					快来加入一起成团吧！
-				</view>
-				<view class="goods-top">
-					可以选取任意拼团商品下单！
+				<view class="goods-top" style="font-size: 14px;font-weight: 700;">
+					快来加入拼团吧！可以选取任意拼团商品下单！
 				</view>
 				<scroll-view scroll-y style="max-height: 50vh;">
 					<template>
@@ -1898,7 +1893,7 @@
 
 	.goods-team {
 		width: 100%;
-		min-height: 180rpx;
+		min-height: 130rpx;
 	}
 
 	.list-right {