|
|
@ -56,13 +56,10 @@ |
|
|
公告：{{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('')"> |
|
|
|
|
|
>>>>>>> 946d5f7b5bc979d55f8619021f5de61f9daefccb |
|
|
|
|
|
|
|
|
|
|
|
<swiper class="zaixian-swiper" vertical circular :autoplay="orderListWait.length > 1" |
|
|
<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 > 0" |
|
|
:interval="onlineWorkerInterval" :duration="onlineWorkerDuration"> |
|
|
:interval="onlineWorkerInterval" :duration="onlineWorkerDuration"> |
|
|
<swiper-item v-for="(item,index) in orderListWait" :key="index"> |
|
|
<swiper-item v-for="(item,index) in orderListWait" :key="index"> |
|
|
<view style="display: flex;"> |
|
|
<view style="display: flex;"> |
|
|
|
