diff --git a/package1/group/groupBuySingle.vue b/package1/group/groupBuySingle.vue
index 1d558ff..dfb0199 100644
--- a/package1/group/groupBuySingle.vue
+++ b/package1/group/groupBuySingle.vue
@@ -56,7 +56,11 @@
 					公告：{{shopItem.remark}}
 				</view>
 			</view>
+<<<<<<< HEAD
 			<view class="pintuan" style="padding: 0;margin-top:20rpx;display: flex;" v-if="orderListWait.length > 1" @tap="openOrderWait('')">
+=======
+			<view class="pintuan" style="padding: 0;margin-top:20rpx;display: flex;"  v-if="orderListWait.length > 1" @tap="openOrderWait('')">
+>>>>>>> 946d5f7b5bc979d55f8619021f5de61f9daefccb
 				
 				<swiper class="zaixian-swiper" vertical circular :autoplay="orderListWait.length > 1"
 					:interval="onlineWorkerInterval" :duration="onlineWorkerDuration">
@@ -90,11 +94,18 @@
 				</swiper>
 			</view>
 			<!-- 分类栏：移到goods-list外层，position:sticky才能生效 -->
+<<<<<<< HEAD
 
 			<view class="container" :class="{'container-sticky': isContainerSticky}" :style="{'margin-top': isContainerSticky ? '0' : '10px', 'top': isContainerSticky ? navBarHeight + 'px' : 'auto'}" style="display: flex;height: 72%;">
 				<scroll-view scroll-y id="menuList" style="border-right: 1px solid #eee;font-weight: 700;font-size: 14px;height: 100%;width: 160rpx;">
 					<view class="menu1" @tap="checkTab(index)" v-for="(item,index) in menuList" :key="index"
 						:style="{'border-radius':item.checked?'10px':'','color':item.checked?'rgba(0, 35, 28, 1)':'#777','background':item.checked?'#fff':''}">
+=======
+			<view class="container" :class="{'container-sticky': isContainerSticky}" :style="{'margin-top': isContainerSticky ? '0' : '10px', 'top': isContainerSticky ? navBarHeight + 'px' : 'auto'}" style="display: flex;height: 72%;">
+				<scroll-view scroll-y id="menuList" style="border-right: 1px solid #eee;font-weight: 700;font-size: 14px;height: 100%;width: 160rpx;">
+					<view class="menu1" @tap="checkTab(index)" v-for="(item,index) in menuList" :key="index"
+						:style="{'border-radius':item.checked?'10px':'','color':item.checked?'rgba(0, 35, 28, 1)':'#777','background':item.checked?'#fff':'','border-right':item.checked?'5px solid #48D1CC;':''}">
+>>>>>>> 946d5f7b5bc979d55f8619021f5de61f9daefccb
 						<view style="width: 160rpx;">{{item.categoryName}}</view>
 					</view>
 				</scroll-view>
@@ -786,7 +797,7 @@
 					});
 					return;
 				}
-				setTimeout(() => {
+				setTimeout(() => { 
 					this.isSwitching = false;
 				}, 300);
 				this.$forceUpdate();
@@ -1008,7 +1019,11 @@
 				if (this.groupId && this.isFaceToFaceGroup) {
 					// Direct face-to-face pay path
 					this.submitFTFJoinPay(specChoices);
+<<<<<<< HEAD
 					return;
+=======
+					return
+>>>>>>> 946d5f7b5bc979d55f8619021f5de61f9daefccb
 				}
 
 				// Pack data for checkout