|
|
@ -330,8 +330,8 @@ |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
|
|
|
|
|
|
<scroll-view @scrolltolower="onReachPage" :upper-threshold="30" @scrolltoupper="gundongTop" :scroll-y="lastScrollTop>583" 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> |
|
|
<view class="empty-delivery-title">暂时没有可抢订单</view> |
|
|
<view class="empty-delivery-title">暂时没有可抢订单</view> |
|
|
@ -339,7 +339,6 @@ |
|
|
</view> |
|
|
</view> |
|
|
<view class="list-1" v-for="(item,index) in deliveryItem" :key="index" |
|
|
<view class="list-1" v-for="(item,index) in deliveryItem" :key="index" |
|
|
@tap="productDetail(item)"> |
|
|
@tap="productDetail(item)"> |
|
|
<view style="width:100%;height:70rpx;" v-if="lastScrollTop>560 && index == 0"></view> |
|
|
|
|
|
<view class="daoda-time"> |
|
|
<view class="daoda-time"> |
|
|
送达时间:{{item.mustFinishTime != null ? item.mustFinishTime : '' | formatHourMinute }} |
|
|
送达时间:{{item.mustFinishTime != null ? item.mustFinishTime : '' | formatHourMinute }} |
|
|
</view> |
|
|
</view> |
|
|
@ -445,7 +444,7 @@ |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
</scroll-view> |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
|
|
|
|
|
|
@ -789,11 +788,10 @@ |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
onReachBottom() { |
|
|
onReachBottom() { |
|
|
if (this.searchForm.pageNum < this.total) { |
|
|
// 接管原 delivery-list scroll-view 的 scrolltolower 分页 |
|
|
this.searchForm.pageNum++; |
|
|
if (this.searchForm.pageNum >= this.totalPages) return; |
|
|
this.getProduct(this.searchForm.categoryId); |
|
|
this.searchForm.pageNum++; |
|
|
return; |
|
|
this.getDelivery(); |
|
|
} |
|
|
|
|
|
}, |
|
|
}, |
|
|
onLoad() { |
|
|
onLoad() { |
|
|
|
|
|
|
|
|
@ -1215,15 +1213,6 @@ |
|
|
} |
|
|
} |
|
|
}).catch((res) => {}) |
|
|
}).catch((res) => {}) |
|
|
}, |
|
|
}, |
|
|
onReachPage() { |
|
|
|
|
|
console.log("11111") |
|
|
|
|
|
if (this.searchForm.pageNum >= this.totalPages) return; |
|
|
|
|
|
this.searchForm.pageNum++; |
|
|
|
|
|
this.getDelivery(); |
|
|
|
|
|
}, |
|
|
|
|
|
gundongTop(){ |
|
|
|
|
|
console.log("00000000000000000000000") |
|
|
|
|
|
}, |
|
|
|
|
|
searchOrder(type, value) { |
|
|
searchOrder(type, value) { |
|
|
if (type == 'getarea') { |
|
|
if (type == 'getarea') { |
|
|
if (this.searchForm.getAreaId == value.id) { |
|
|
if (this.searchForm.getAreaId == value.id) { |
|
|
@ -2512,10 +2501,8 @@ |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
.delivery-list-wrap { |
|
|
.delivery-list-wrap { |
|
|
height: 1200rpx; |
|
|
/* 改为单一 page-scroll:内容跟随页面滚动,不再是独立 scroll-view */ |
|
|
contain: layout paint; |
|
|
width: 100%; |
|
|
will-change: transform; |
|
|
|
|
|
-webkit-overflow-scrolling: touch; |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
.empty-delivery { |
|
|
.empty-delivery { |
|
|
|