|
|
@ -56,7 +56,11 @@ |
|
|
公告：{{shopItem.remark}} |
|
|
公告：{{shopItem.remark}} |
|
|
</view> |
|
|
</view> |
|
|
</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('')"> |
|
|
|
|
|
======= |
|
|
|
|
|
<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" |
|
|
<swiper class="zaixian-swiper" vertical circular :autoplay="orderListWait.length > 1" |
|
|
:interval="onlineWorkerInterval" :duration="onlineWorkerDuration"> |
|
|
:interval="onlineWorkerInterval" :duration="onlineWorkerDuration"> |
|
|
@ -90,11 +94,18 @@ |
|
|
</swiper> |
|
|
</swiper> |
|
|
</view> |
|
|
</view> |
|
|
<!-- 分类栏：移到goods-list外层，position:sticky才能生效 --> |
|
|
<!-- 分类栏：移到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%;"> |
|
|
<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;"> |
|
|
<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" |
|
|
<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':''}"> |
|
|
: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 style="width: 160rpx;">{{item.categoryName}}</view> |
|
|
</view> |
|
|
</view> |
|
|
</scroll-view> |
|
|
</scroll-view> |
|
|
@ -1008,7 +1019,11 @@ |
|
|
if (this.groupId && this.isFaceToFaceGroup) { |
|
|
if (this.groupId && this.isFaceToFaceGroup) { |
|
|
// Direct face-to-face pay path |
|
|
// Direct face-to-face pay path |
|
|
this.submitFTFJoinPay(specChoices); |
|
|
this.submitFTFJoinPay(specChoices); |
|
|
|
|
|
<<<<<<< HEAD |
|
|
return; |
|
|
return; |
|
|
|
|
|
======= |
|
|
|
|
|
return |
|
|
|
|
|
>>>>>>> 946d5f7b5bc979d55f8619021f5de61f9daefccb |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// Pack data for checkout |
|
|
// Pack data for checkout |
|
|
|
