新增到店堂食

pages/order/index.vue

@@ -46,13 +46,13 @@
 							<view class="cont">
 								<view class="order_title" v-if="item.expectDeliveryTime">预约订单：{{item.expectDeliveryTime}}送达</view>
 								<view class="flex justify-between padding align-center">
-		<view class="text-green text-lg" v-if="item.status == 3 && item.indentState == 2">待骑手接单</view>
+		<view class="text-green text-lg" v-if="item.status == 3 && item.indentState == 2&&item.orderTypeExtra == 2">待骑手接单</view>
 		
 		<view class="text-red text-lg" v-if="item.status == 6 && item.indentState == 2">制作中</view>
 		
-		<view class="text-green text-lg" v-if="(item.status == 3 || item.status == 6) && item.indentState == 3">骑手已接单</view>
+		<view class="text-green text-lg" v-if="(item.status == 3 || item.status == 6) && item.indentState == 3&&item.orderTypeExtra == 2">骑手已接单</view>
 		
-		<view class="text-green text-lg" v-if="(item.status == 3 || item.status == 6) && item.indentState == 4">骑手配送中</view>							
+		<view class="text-green text-lg" v-if="(item.status == 3 || item.status == 6) && item.indentState == 4&&item.orderTypeExtra == 2">骑手配送中</view>							
 									
 									<view class="text-red text-lg" v-if="item.status == 7">待接单</view>
 									<view class="text-green text-lg" v-if="item.status == 3&&item.orderType==1">待取餐
@@ -68,7 +68,10 @@
 
 								</view>
 								<u-line color="#f2f2f2" />
-								<view style="padding:0 30rpx;font-size: 20px;" v-if="item.orderSequence">#{{item.orderSequence}}</view>
+								<view style="padding:0 30rpx;font-size: 20px;" v-if="item.orderSequence">
+									{{ item.orderTypeExtra == 0 ? '上门堂食' :item.orderTypeExtra == 1 ? '上门取餐' : item.orderTypeExtra == 2 ? '骑手配送' : item.orderTypeExtra == 3 ? '商家配送' : '' }}
+									<view v-if="item.orderSequence">#{{ item.orderSequence }}</view>
+								</view>
 								<view class="text-red text-xl padding-lr padding-top" v-if="item.orderType==1"><text
 										style="font-size: 30upx;">取餐号：</text>{{item.orderCode}}</view>
 

pages/order/orderDet.vue

@@ -2,13 +2,13 @@
 	<view class="pages">
 		<!-- 余额 -->
 		<view class="tosend">
-			<view class="tosend_text" v-if="dataDet.status == 3 && dataDet.indentState == 2">待骑手接单</view>
+			<view class="tosend_text" v-if="dataDet.status == 3 && dataDet.indentState == 2&&dataDet.orderTypeExtra == 2">待骑手接单</view>
 
 			<view class="tosend_text" v-if="dataDet.status == 6 && dataDet.indentState == 2">制作中...</view>
 
-			<view class="tosend_text" v-if="(dataDet.status == 3 || dataDet.status == 6) && dataDet.indentState == 3">骑手已接单</view>
+			<view class="tosend_text" v-if="(dataDet.status == 3 || dataDet.status == 6) && dataDet.indentState == 3&&dataDet.orderTypeExtra == 2">骑手已接单</view>
 
-			<view class="tosend_text" v-if="(dataDet.status == 3 || dataDet.status == 6) && dataDet.indentState == 4">骑手配送中</view>
+			<view class="tosend_text" v-if="(dataDet.status == 3 || dataDet.status == 6) && dataDet.indentState == 4&&dataDet.orderTypeExtra == 2">骑手配送中</view>
 
 			<view class="tosend_text" v-if="dataDet.status == 3 && dataDet.orderType == 1">待取餐</view>
 			<view class="tosend_text" v-if="dataDet.status == 3 && dataDet.orderType == 2 && dataDet.riderUserId">配送中</view>
@@ -19,7 +19,10 @@
 			<view class="tosend_text" v-if="dataDet.status == 7">待接单</view>
 			<!-- <view class="btnCm" v-if="item.riderUserId">配送中</view>
 									<view class="btnCm" v-else>待派送</view> -->
-			<view style="padding: 0 30rpx; font-size: 20px" v-if="dataDet.orderSequence">#{{ dataDet.orderSequence }}</view>
+			<view style="padding: 0 30rpx; font-size: 20px" v-if="dataDet.orderSequence">
+				{{ dataDet.orderTypeExtra == 0 ? '上门堂食' :dataDet.orderTypeExtra == 1 ? '上门取餐' : dataDet.orderTypeExtra == 2 ? '骑手配送' : dataDet.orderTypeExtra == 3 ? '商家配送' : '' }}
+				<view v-if="dataDet.orderSequence">#{{ dataDet.orderSequence }}</view>
+			</view>
 			<view class="tosend_cont" style="position: relative; margin-top: 20upx" v-if="dataDet.orderType == 2">
 				<image src="../../static/images/order/dizhi.png" style="position: absolute; width: 32rpx; height: 40rpx; top: 50rpx; left: 32rpx"></image>
 				<view class="tosend_header_text" style="margin-left: 64rpx" @tap="bindGps(dataDet.address.lat, dataDet.address.lng, dataDet.address.addressDetail)">