|
|
|
@ -64,7 +64,7 @@ |
|
|
|
</view> |
|
|
|
<view class="shop-list"> |
|
|
|
<view class="shop-member" v-for="(item,index) in shopList" :key="index" @tap="goDetail('shop',item)"> |
|
|
|
<view @tap.stop="buyingye" v-if="item.status != 1" |
|
|
|
<view @tap.stop="buyingye" v-if="item.shopTakeaway.status != 1" |
|
|
|
style="width: 100%;height:100%;position: absolute;top: 0;background: rgba(0, 0, 0, 0.1);z-index: 999;border-radius: 20rpx;"> |
|
|
|
</view> |
|
|
|
<view class="shop-top"> |
|
|
|
@ -128,7 +128,7 @@ |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<uni-load-more :status="loadStatus" @change="onChange" /> |
|
|
|
<uni-load-more :status="loadStatus" /> |
|
|
|
</view> |
|
|
|
<view class="zaixian"> |
|
|
|
<view class="zaixian-total">当前{{onlineWorkerTotal}}名配送员在线</view> |
|
|
|
@ -265,9 +265,11 @@ |
|
|
|
} |
|
|
|
}, |
|
|
|
onReachBottom() { |
|
|
|
|
|
|
|
if (this.searchForm.pageNumber >= this.totalPages) return; |
|
|
|
// this.status = 'loading'; |
|
|
|
this.searchForm.pageNumber++; |
|
|
|
this.searchForm.pageNumber+=1; |
|
|
|
console.log('1111') |
|
|
|
this.getShopList(); |
|
|
|
|
|
|
|
}, |
|
|
|
@ -376,6 +378,7 @@ |
|
|
|
}).catch(() => {}) |
|
|
|
}, |
|
|
|
getShopList() { |
|
|
|
console.log("3333") |
|
|
|
this.loadStatus = 'loading' |
|
|
|
if (this.searchSale) { |
|
|
|
this.searchForm.sortSale = 'saleCount' |
|
|
|
@ -391,6 +394,7 @@ |
|
|
|
} else { |
|
|
|
this.searchForm.sortScore = '' |
|
|
|
} |
|
|
|
console.log("2222") |
|
|
|
let that = this |
|
|
|
that.tui.request("/app/shop/getByCondition", "GET", this.searchForm, false, true).then((res) => { |
|
|
|
that.loadStatus = 'nomore'; |
|
|
|
@ -400,8 +404,8 @@ |
|
|
|
} else { |
|
|
|
that.shopList = [...that.shopList, ...res.result.content] |
|
|
|
} |
|
|
|
this.judgeBusinessStatus() |
|
|
|
that.totalPages = res.result.totalPages |
|
|
|
that.judgeBusinessStatus() |
|
|
|
that.isArea = false |
|
|
|
that.$forceUpdate() |
|
|
|
} else { |
|
|
|
@ -413,7 +417,7 @@ |
|
|
|
}, |
|
|
|
judgeBusinessStatus() { |
|
|
|
for (let i = 0; i < this.shopList.length; i++) { |
|
|
|
if (this.shopList[i].shopTakeaway != '') { |
|
|
|
if (this.shopList[i].shopTakeaway != '' && this.shopList[i].shopTakeaway != null) { |
|
|
|
if (this.shopList[i].shopTakeaway.status == 0) { |
|
|
|
let isEndTime = this.isWithinBusinessHours(this.shopList[i].shopTakeaway.businessHourBegin,this.shopList[i].shopTakeaway.businessHourEnd) |
|
|
|
this.shopList[i].shopTakeaway.status = isEndTime ? 0 : 1 |
|
|
|
|
