|
|
@ -222,107 +222,109 @@ |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
<view class="daimai-box" style="padding-bottom:180rpx;"> |
|
|
<view class="daimai-box" style="padding-bottom:180rpx;"> |
|
|
<view class="daimai-tab" id="menuList" :class="{'daimai-tab--sticky': lastScrollTop>583}" |
|
|
|
|
|
:style="{'top': (navBarHeight+46) + 'px'}"> |
|
|
<view class="daimai-tab" id="menuList" :class="{'daimai-tab--sticky': lastScrollTop>583}" |
|
|
<view class="daimai-tab-item" :class="{'active': checked == 'waimai'}" |
|
|
:style="{'top': (navBarHeight+46) + 'px'}"> |
|
|
@tap="checkTab1('waimai')"> |
|
|
<view class="daimai-tab-item" :class="{'active': checked == 'waimai'}" |
|
|
<view class="daimai-tab-glow"></view> |
|
|
@tap="checkTab1('waimai')"> |
|
|
<view class="daimai-tab-icon">饭</view> |
|
|
<view class="daimai-tab-glow"></view> |
|
|
<view class="daimai-tab-info"> |
|
|
<view class="daimai-tab-icon">饭</view> |
|
|
<text class="daimai-tab-label">外卖</text> |
|
|
<view class="daimai-tab-info"> |
|
|
<text class="daimai-tab-count">{{waimaiCount}}</text> |
|
|
<text class="daimai-tab-label">外卖</text> |
|
|
</view> |
|
|
<text class="daimai-tab-count">{{waimaiCount}}</text> |
|
|
</view> |
|
|
</view> |
|
|
<view class="daimai-tab-item" :class="{'active': checked == 'kuaidi'}" |
|
|
|
|
|
@tap="checkTab1('kuaidi')"> |
|
|
|
|
|
<view class="daimai-tab-glow"></view> |
|
|
|
|
|
<view class="daimai-tab-icon">递</view> |
|
|
|
|
|
<view class="daimai-tab-info"> |
|
|
|
|
|
<text class="daimai-tab-label">快递</text> |
|
|
|
|
|
<text class="daimai-tab-count">{{kuaidiCount}}</text> |
|
|
|
|
|
</view> |
|
|
|
|
|
</view> |
|
|
|
|
|
<view class="daimai-tab-item" :class="{'active': checked == 'paotui'}" |
|
|
|
|
|
@tap="checkTab1('paotui')"> |
|
|
|
|
|
<view class="daimai-tab-glow"></view> |
|
|
|
|
|
<view class="daimai-tab-icon">跑</view> |
|
|
|
|
|
<view class="daimai-tab-info"> |
|
|
|
|
|
<text class="daimai-tab-label">跑腿</text> |
|
|
|
|
|
<text class="daimai-tab-count">{{paotuiCount}}</text> |
|
|
|
|
|
</view> |
|
|
|
|
|
</view> |
|
|
|
|
|
<view class="daimai-tab-item" :class="{'active': checked == 'zhipai'}" |
|
|
|
|
|
@tap="checkTab1('zhipai')" v-if="worker != null"> |
|
|
|
|
|
<view class="daimai-tab-glow"></view> |
|
|
|
|
|
<view class="daimai-tab-icon">派</view> |
|
|
|
|
|
<view class="daimai-tab-info"> |
|
|
|
|
|
<text class="daimai-tab-label">指派单</text> |
|
|
|
|
|
<text class="daimai-tab-count">{{zhipaiCount}}</text> |
|
|
|
|
|
</view> |
|
|
|
|
|
</view> |
|
|
|
|
|
</view> |
|
|
|
|
|
<view class="title-sort" v-if="lastScrollTop>583" :class="{'title-sort--sticky': lastScrollTop>583}" |
|
|
|
|
|
:style="{'top': (navBarHeight+90) + 'px'}"> |
|
|
|
|
|
<view class="sort-member" style="position: relative;"> |
|
|
|
|
|
<view @tap="checkAdd"> |
|
|
|
|
|
取餐地址 <text style="font-size: 20rpx;">▼</text> |
|
|
|
|
|
</view> |
|
|
</view> |
|
|
<view class="sort-value" v-if="isgetArea"> |
|
|
<view class="daimai-tab-item" :class="{'active': checked == 'kuaidi'}" |
|
|
<view class="sort-value1" v-for="(item,index) in getshopArea" :key="index" |
|
|
@tap="checkTab1('kuaidi')"> |
|
|
@tap="searchOrder('getarea',item)">{{item.title}}</view> |
|
|
<view class="daimai-tab-glow"></view> |
|
|
|
|
|
<view class="daimai-tab-icon">递</view> |
|
|
|
|
|
<view class="daimai-tab-info"> |
|
|
|
|
|
<text class="daimai-tab-label">快递</text> |
|
|
|
|
|
<text class="daimai-tab-count">{{kuaidiCount}}</text> |
|
|
|
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
<view class="daimai-tab-item" :class="{'active': checked == 'paotui'}" |
|
|
<view class="sort-member" style="position: relative;"> |
|
|
@tap="checkTab1('paotui')"> |
|
|
<view @tap="checkAdd1"> |
|
|
<view class="daimai-tab-glow"></view> |
|
|
送餐地址 <text style="font-size: 20rpx;">▼</text> |
|
|
<view class="daimai-tab-icon">跑</view> |
|
|
|
|
|
<view class="daimai-tab-info"> |
|
|
|
|
|
<text class="daimai-tab-label">跑腿</text> |
|
|
|
|
|
<text class="daimai-tab-count">{{paotuiCount}}</text> |
|
|
|
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
<view class="sort-value" v-if="isputArea"> |
|
|
<view class="daimai-tab-item" :class="{'active': checked == 'zhipai'}" |
|
|
<view class="sort-value1" v-for="(item,index) in putshopArea" :key="index" |
|
|
@tap="checkTab1('zhipai')" v-if="worker != null"> |
|
|
@tap="searchOrder('putarea',item)">{{item.title}}</view> |
|
|
<view class="daimai-tab-glow"></view> |
|
|
|
|
|
<view class="daimai-tab-icon">派</view> |
|
|
|
|
|
<view class="daimai-tab-info"> |
|
|
|
|
|
<text class="daimai-tab-label">指派单</text> |
|
|
|
|
|
<text class="daimai-tab-count">{{zhipaiCount}}</text> |
|
|
|
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
<view @tap="searchOrder('yongjin')" class="sort-member" style="border-radius: 60rpx" |
|
|
<view class="title-sort" v-if="lastScrollTop>583" :class="{'title-sort--sticky': lastScrollTop>583}" |
|
|
:style="{'background':checkYongjin==true?'linear-gradient(135deg, rgba(255, 247, 215, 0.95), rgba(166, 255, 234, 0.72))':'rgba(248, 255, 250, 0.86)','border':checkYongjin==true?'1px solid rgba(255, 188, 119, 0.72)':'1px solid rgba(166, 255, 234, 0.46)'}"> |
|
|
:style="{'top': (navBarHeight+90) + 'px'}"> |
|
|
佣金 |
|
|
<view class="sort-member" style="position: relative;"> |
|
|
</view> |
|
|
<view @tap="checkAdd"> |
|
|
</view> |
|
|
取餐地址 <text style="font-size: 20rpx;">▼</text> |
|
|
<view class="sort-text" |
|
|
|
|
|
v-if="getAreaData.id != undefined || putAreaData.id != undefined || checkYongjin" |
|
|
|
|
|
:style="{'top': (navBarHeight+146) + 'px'}"> |
|
|
|
|
|
<view class="sort-text-inner"> |
|
|
|
|
|
<view @tap="searchOrder('delgetarea')" class="guize1-qusong" |
|
|
|
|
|
v-if="getAreaData.id != undefined"> |
|
|
|
|
|
<view class="qusong1"> |
|
|
|
|
|
取 |
|
|
|
|
|
</view> |
|
|
</view> |
|
|
<view class="qusong2"> |
|
|
<view class="sort-value" v-if="isgetArea"> |
|
|
{{getAreaData.title}} |
|
|
<view class="sort-value1" v-for="(item,index) in getshopArea" :key="index" |
|
|
|
|
|
@tap="searchOrder('getarea',item)">{{item.title}}</view> |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
<view @tap="searchOrder('delputarea')" class="guize1-qusong" |
|
|
<view class="sort-member" style="position: relative;"> |
|
|
v-if="putAreaData.id != undefined"> |
|
|
<view @tap="checkAdd1"> |
|
|
<view class="qusong1"> |
|
|
送餐地址 <text style="font-size: 20rpx;">▼</text> |
|
|
送 |
|
|
|
|
|
</view> |
|
|
</view> |
|
|
<view class="qusong2" style="background: rgba(209, 206, 255, 1);"> |
|
|
<view class="sort-value" v-if="isputArea"> |
|
|
{{putAreaData.title}} |
|
|
<view class="sort-value1" v-for="(item,index) in putshopArea" :key="index" |
|
|
|
|
|
@tap="searchOrder('putarea',item)">{{item.title}}</view> |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
<view @tap="searchOrder('delyongjin')" class="guize1-qusong" v-if="checkYongjin"> |
|
|
<view @tap="searchOrder('yongjin')" class="sort-member" style="border-radius: 60rpx" |
|
|
<view class="qusong1"> |
|
|
:style="{'background':checkYongjin==true?'linear-gradient(135deg, rgba(255, 247, 215, 0.95), rgba(166, 255, 234, 0.72))':'rgba(248, 255, 250, 0.86)','border':checkYongjin==true?'1px solid rgba(255, 188, 119, 0.72)':'1px solid rgba(166, 255, 234, 0.46)'}"> |
|
|
佣 |
|
|
佣金 |
|
|
|
|
|
</view> |
|
|
|
|
|
</view> |
|
|
|
|
|
<view class="sort-text" |
|
|
|
|
|
v-if="getAreaData.id != undefined || putAreaData.id != undefined || checkYongjin" |
|
|
|
|
|
:style="{'top': (navBarHeight+140) + 'px'}"> |
|
|
|
|
|
<view class="sort-text-inner"> |
|
|
|
|
|
<view @tap="searchOrder('delgetarea')" class="guize1-qusong" |
|
|
|
|
|
v-if="getAreaData.id != undefined"> |
|
|
|
|
|
<view class="qusong1"> |
|
|
|
|
|
取 |
|
|
|
|
|
</view> |
|
|
|
|
|
<view class="qusong2"> |
|
|
|
|
|
{{getAreaData.title}} |
|
|
|
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
<view class="qusong2 commission-chip"> |
|
|
<view @tap="searchOrder('delputarea')" class="guize1-qusong" |
|
|
佣金优先 |
|
|
v-if="putAreaData.id != undefined"> |
|
|
|
|
|
<view class="qusong1"> |
|
|
|
|
|
送 |
|
|
|
|
|
</view> |
|
|
|
|
|
<view class="qusong2" style="background: rgba(209, 206, 255, 1);"> |
|
|
|
|
|
{{putAreaData.title}} |
|
|
|
|
|
</view> |
|
|
|
|
|
</view> |
|
|
|
|
|
<view @tap="searchOrder('delyongjin')" class="guize1-qusong" v-if="checkYongjin"> |
|
|
|
|
|
<view class="qusong1"> |
|
|
|
|
|
佣 |
|
|
|
|
|
</view> |
|
|
|
|
|
<view class="qusong2 commission-chip"> |
|
|
|
|
|
佣金优先 |
|
|
|
|
|
</view> |
|
|
|
|
|
</view> |
|
|
|
|
|
<view @tap="clearCheck" |
|
|
|
|
|
v-if="getAreaData.id != undefined || putAreaData.id != undefined || checkYongjin" |
|
|
|
|
|
class="clear-filter"> |
|
|
|
|
|
清空 |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
|
|
|
<view @tap="clearCheck" |
|
|
|
|
|
v-if="getAreaData.id != undefined || putAreaData.id != undefined || checkYongjin" |
|
|
|
|
|
class="clear-filter"> |
|
|
|
|
|
清空 |
|
|
|
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
|
|
|
<view class="delivery-list-wrap"> |
|
|
<view class="delivery-list-wrap"> |
|
|
<view class="empty-delivery" v-if="deliveryItem.length <= 0"> |
|
|
<view class="empty-delivery" v-if="deliveryItem.length <= 0"> |
|
|
<view class="empty-delivery-icon">校园</view> |
|
|
<view class="empty-delivery-icon">校园</view> |
|
|
@ -1634,7 +1636,7 @@ |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
.daimai-tab--sticky { |
|
|
.daimai-tab--sticky { |
|
|
background: rgba(255, 255, 255, 0.96); |
|
|
background: rgba(255, 255, 255, 1); |
|
|
box-shadow: 0 16rpx 36rpx rgba(130, 84, 43, 0.08); |
|
|
box-shadow: 0 16rpx 36rpx rgba(130, 84, 43, 0.08); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@ -2323,8 +2325,6 @@ |
|
|
padding: 20rpx 10rpx 0; |
|
|
padding: 20rpx 10rpx 0; |
|
|
box-sizing: border-box; |
|
|
box-sizing: border-box; |
|
|
box-shadow: 0 12rpx 26rpx rgba(0, 35, 28, 0.05); |
|
|
box-shadow: 0 12rpx 26rpx rgba(0, 35, 28, 0.05); |
|
|
border-bottom-left-radius: 26rpx; |
|
|
|
|
|
border-bottom-right-radius: 26rpx; |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
.title-sort--sticky { |
|
|
.title-sort--sticky { |
|
|
@ -2338,10 +2338,12 @@ |
|
|
top: 0; |
|
|
top: 0; |
|
|
z-index: 94; |
|
|
z-index: 94; |
|
|
background: rgba(255, 255, 255, 0.96); |
|
|
background: rgba(255, 255, 255, 0.96); |
|
|
padding: 0 10rpx 8rpx; |
|
|
padding: 20rpx 10rpx 10rpx; |
|
|
box-sizing: border-box; |
|
|
box-sizing: border-box; |
|
|
box-shadow: 0 12rpx 22rpx rgba(0, 35, 28, 0.04); |
|
|
box-shadow: 0 12rpx 22rpx rgba(0, 35, 28, 0.04); |
|
|
animation: filterChipIn 0.22s ease; |
|
|
animation: filterChipIn 0.22s ease; |
|
|
|
|
|
border-bottom-left-radius: 26rpx; |
|
|
|
|
|
border-bottom-right-radius: 26rpx; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
.sort-text-inner { |
|
|
.sort-text-inner { |
|
|
@ -2443,7 +2445,7 @@ |
|
|
|
|
|
|
|
|
.empty-delivery { |
|
|
.empty-delivery { |
|
|
width: 98%; |
|
|
width: 98%; |
|
|
min-height: 360rpx; |
|
|
min-height: 1120rpx; |
|
|
margin: 24rpx auto 0; |
|
|
margin: 24rpx auto 0; |
|
|
padding: 54rpx 36rpx; |
|
|
padding: 54rpx 36rpx; |
|
|
box-sizing: border-box; |
|
|
box-sizing: border-box; |
|
|
|