diff --git a/package1/group/groupBuySingle.vue b/package1/group/groupBuySingle.vue
index dfb0199..1c52f23 100644
--- a/package1/group/groupBuySingle.vue
+++ b/package1/group/groupBuySingle.vue
@@ -56,13 +56,10 @@
 					公告：{{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
+
+			<view class="pintuan" style="padding: 0;margin-top:20rpx;display: flex;"  v-if="orderListWait.length > 0" @tap="openOrderWait('')">
 				
-				<swiper class="zaixian-swiper" vertical circular :autoplay="orderListWait.length > 1"
+				<swiper class="zaixian-swiper" vertical circular :autoplay="orderListWait.length > 0"
 					:interval="onlineWorkerInterval" :duration="onlineWorkerDuration">
 					<swiper-item v-for="(item,index) in orderListWait" :key="index">
 						<view style="display: flex;">