Merge branch 'master' of http://8.140.253.224:3000/root/school_uni

components/tab-bar/delivery.vue

@@ -183,10 +183,11 @@
 						用户申请 退款中
 					</view>
 					<view v-else style="width: 100%;height: 100rpx;margin-top: 32rpx;">
-						<view style="width: 20%;" v-if="item.status == 1 && item.arriveTime == null" @tap="changeStatus(item,1)">已到店</view>
+						<img v-if="item.status == 1 && item.arriveTime == null" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/be29461437924dcfa4a7a6adfc771638.png"
+							alt="" style="width: 100%;height: 100rpx;background-size: 100%;" @tap="changeStatus(item,1)"/>
 						<!-- <view style="width: 20%;"  @tap="changeOthers(item,1)">转单</view> -->
 						<img v-if="item.status == 1 && item.arriveTime != null" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/c318cf292a4f40b296995c30e5e539ea.png"
-							alt="" style="width: 80%;height: 100rpx;background-size: 100%;" @tap="changeStatus(item,2)"/>
+							alt="" style="width: 100%;height: 100rpx;background-size: 100%;" @tap="changeStatus(item,2)"/>
 						<img v-if="item.status == 2 && item.arriveTime != null" src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/a8cdd6d86e9140df86d3c3c60356bd53.png"
 							alt="" style="width: 100%;height: 100rpx;background-size: 100%;" @tap="changeStatus(item,3)" />
 					</view>

components/tab-bar/tab-bar.vue

@@ -122,9 +122,7 @@
 				let that = this
 				let shopId = uni.getStorageSync('shopId')
 				let worker = uni.getStorageSync('worker')
-				if(!shopId && !worker){
+				if(shopId || worker){
-					return
-				}
 					this.tui.request("/mall/delivery/countOrderByStatus", "POST", {workerId:uni.getStorageSync('worker').workerId}, false, true).then((res) => {
 						if (res.code == 200) {
 							if(res.result != null){
@@ -148,6 +146,7 @@
 				}
 			}
 		}
+	}
 </script>
 
 <style>

package1/group/groupBuyList.vue

@@ -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

package1/order/orderDetail.vue

@@ -1254,6 +1254,8 @@
 	}
 	.btn-box{
 		height: auto;
+		display: flex;
+		margin-bottom: 10px;
 	}
 	.btn{
 		width: 90%;

pages/index/index.vue

@@ -1202,7 +1202,7 @@
 		width: 100%;
 		height: 160rpx;
 		display: flex;
-		margin-top: 80rpx;
+		margin-top: 40rpx;
 	}
 
 	.menu-list {
@@ -1471,6 +1471,7 @@
 	.qu-left {
 		width: 80%;
 		padding-left: 10rpx;
+		overflow: hidden;
 	}
 
 	.qu-right {