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

# Conflicts:
#	pages/index/index.vue

package1/buyFood/buyFood.vue

@@ -1078,6 +1078,9 @@
 				if(this.nowMake && deliveryType == 2 && !this.isStoreGroupOrder){
 					payload.userRequireMake = 1
 				}
+				if(this.isStoreGroupOrder){
+					payload.otherOrder = 2
+				}
 				payload.regionId = JSON.parse(uni.getStorageSync('area')).id
 				this.tui.request("/mall/order/create", "POST", payload, false, false).then(res => {
 					uni.hideLoading();

package1/order/orderDetail.vue

@@ -190,12 +190,17 @@
 				</view>
 				<view class="btn-box">
 					<view class="btn"
-						v-if="orderDetail.status == 3 && orderDetail.deliveryType == 2 &&orderDetail.userRequireMake == null"
+						v-if="orderDetail.status == 3 && orderDetail.deliveryType == 2 && orderDetail.userRequireMake == null && orderDetail.otherOrder == null"
 						@tap="openCode">
 						核销取餐码
 					</view>
 					<view class="btn"
-						v-if="orderDetail.status == 3 && orderDetail.deliveryType == 2 &&orderDetail.userRequireMake == null"
+						v-if="orderDetail.status == 3 && orderDetail.deliveryType == 2 &&orderDetail.userRequireMake == null &&orderDetail.otherOrder == 2"
+						@tap="openCode">
+						核销二维码
+					</view>
+					<view class="btn"
+						v-if="orderDetail.status == 3 && orderDetail.deliveryType == 2 && orderDetail.userRequireMake == null && orderDetail.otherOrder == null"
 						@tap="makeMeal" style="background: rgba(0, 35, 28, 1);color:rgba(166, 255, 234, 1);">
 						立即备餐
 					</view>

package1/order/orderList.vue

@@ -41,9 +41,16 @@
 						src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/4bb5fc7725cb4a7a84d1d3a15f05b39c.png" alt=""
 						style="width: 180rpx;height: 14rpx;position: absolute;bottom: 12rpx;left: 32rpx;" />
 				</view>
+				<view class="tabs1" @tap="checkTab1('tuangou')"
+					:style="{'color':tab1Checked == 'tuangou'?'#000':'#777','font-size':tab1Checked== 'tuangou'?'36rpx':'30rpx'}">
+					团购
+					<img v-if="tab1Checked == 'tuangou'"
+						src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/4bb5fc7725cb4a7a84d1d3a15f05b39c.png" alt=""
+						style="width: 80rpx;height: 14rpx;position: absolute;bottom: 8rpx;left: 32rpx;" />
+				</view>
 				<view class="tabs1" @tap="checkTab1('ershou')"
 					:style="{'color':tab1Checked == 'ershou'?'#000':'#777','font-size':tab1Checked== 'ershou'?'36rpx':'30rpx'}">
-					二手
+					咸鱼
 					<img v-if="tab1Checked == 'ershou'"
 						src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/4bb5fc7725cb4a7a84d1d3a15f05b39c.png" alt=""
 						style="width: 80rpx;height: 14rpx;position: absolute;bottom: 8rpx;left: 32rpx;" />
@@ -136,11 +143,11 @@
 				</view>
 				<view style="width: 100%;line-height: 70rpx;font-size: 28rpx;font-weight: 700;display: flex;">
 					<view style="height: 40rpx;line-height: 40rpx;background: linear-gradient(90deg, rgba(255, 77, 0, 1), rgba(255, 184, 84, 1));padding: 0 16rpx;border-radius: 40rpx;color: #fff;margin: 14rpx 20rpx 0 0;">
-						{{item.otherOrder == 1 ? '快递/跑腿' : item.otherOrder == 2 ? '二手' :"饭团"}}
+						{{item.otherOrder == 1 ? '快递/跑腿' : item.otherOrder == 2 ? '团购' : item.otherOrder == 3 ? '咸鱼' :"饭团"}}
 					</view>
-					{{item.otherOrder == 1 ? '快递/跑腿' : item.otherOrder == 2 ? '二手物品': item.shopName}}
+					{{item.otherOrder == 1 ? '快递/跑腿' : item.otherOrder == 2 ? '团购订单' : item.otherOrder == 3 ? '咸鱼订单' : item.shopName}}
 				</view>
-				<view v-if="item.otherOrder == 1 || item.otherOrder == 2" style="display: flex;padding: 20rpx;background: rgba(247, 248, 248, 0.6);border-radius: 20rpx;">
+				<view v-if="item.otherOrder == 1" style="display: flex;padding: 20rpx;background: rgba(247, 248, 248, 0.6);border-radius: 20rpx;">
 					<view class="goods-img">
 						<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/4130b6a412584c71949b3a03e5834453.png" alt="">
 						<!-- <view class="jiaobiao">
@@ -386,8 +393,10 @@
 					this.searchForm.searchType = 1
 				}else if(type == 'paotui'){
 					this.searchForm.searchType = 2
-				}else if(type == 'ershou'){
+				}else if(type == 'tuangou'){
 					this.searchForm.searchType = 3
+				}else if(type == 'ershou'){
+					this.searchForm.searchType = 4
 				}
 				this.searchForm.pageNum = 1
 				this.getOrderList()

pages/index/index.vue

@@ -178,7 +178,7 @@
 									<view class="content-list" v-if="item.position == 'home_center_left_top' "
 										v-for="(item,index) in mallAds" :key="index" @tap="goAdPage(item)">
 										<view class="list-img">
-											<img :src="item.adImage" alt="">
+											<image :src="item.adImage" alt="">
 											<view class="list-type">正在拼</view>
 										</view>
 										<view class="list-product">
@@ -197,7 +197,7 @@
 									<view class="content-list" v-if="item.position == 'home_center_left_bottom' "
 										v-for="(item,index) in mallAds" :key="index" @tap="goAdPage(item)">
 										<view class="list-img">
-											<img :src="item.adImage" alt="">
+											<image :src="item.adImage" alt="">
 											<view class="list-type">正在拼</view>
 										</view>
 										<view class="list-product">
@@ -227,7 +227,7 @@
 									<view class="content-list" v-if="item.position == 'home_center_right_top' "
 										v-for="(item,index) in mallAds" :key="index" @tap="goAdPage(item)">
 										<view class="list-img">
-											<img :src="item.adImage" alt="">
+											<image :src="item.adImage" alt="">
 											<view class="list-type">正在拼</view>
 										</view>
 										<view class="list-product">
@@ -246,7 +246,7 @@
 									<view class="content-list" v-if="item.position == 'home_center_right_bottom' "
 										v-for="(item,index) in mallAds" :key="index" @tap="goAdPage(item)">
 										<view class="list-img">
-											<img :src="item.adImage" alt="">
+											<image :src="item.adImage" alt="">
 											<view class="list-type">正在拼</view>
 										</view>
 										<view class="list-product">