优化订单状态

pages/order/index.vue

@@ -46,7 +46,14 @@
 							<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-red text-lg" v-if="item.status == 6">制作中</view>
+		<view class="text-green text-lg" v-if="item.status == 3 && item.indentState == 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 == 4">骑手配送中</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">待取餐
 									</view>
@@ -1324,7 +1331,7 @@
 						} else {
 							this.orderList = [...this.orderList, ...res.data.list]
 						}
-						// console.log(this.orderList,'kk')
+						console.log(this.orderList,'kk')
 						this.totalCount = res.data.totalCount
 						this.show1 = true
 					}

pages/order/orderDet.vue

@@ -2,7 +2,14 @@
 	<view class="pages">
 		<!-- 余额 -->
 		<view class="tosend">
-			<view class="tosend_text" v-if="dataDet.status == 6">制作中...</view>
+			<view class="tosend_text" v-if="dataDet.status == 3 && dataDet.indentState == 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 == 4">骑手配送中</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>
 			<view class="tosend_text" v-if="dataDet.status == 3 && dataDet.orderType == 2 && dataDet.riderUserId == null">待配送</view>