no message

pages/order/index.vue

@@ -29,10 +29,11 @@
 				<view class="cont" v-if="item.orderType == 1">
 					<view class="order_title" v-if="item.expectDeliveryTime">预约订单：{{ item.expectDeliveryTime }}送达</view>
 					<view class="order_success">
-						<view class="order_name" v-if="item.status == 6">制作中</view>
 						<view class="order_name" v-if="item.status == 3">待取餐</view>
 
-						<view class="order_name" v-if="(item.status == 3 || item.status == 6) && item.indentState == 2">待骑手接单</view>
+						<view class="order_name" v-if="item.status == 3 && item.indentState == 2">待骑手接单</view>
+
+						<view class="order_name" v-if="item.status == 6 && item.indentState == 2">制作中</view>
 
 						<view class="order_name" v-if="(item.status == 3 || item.status == 6) && item.indentState == 3">骑手已接单</view>
 
@@ -97,13 +98,14 @@
 						<view class="order_name" v-if="item.status == 4">已完成</view>
 						<view class="order_name" v-if="item.status == 5">已取消</view>
 
-						<view class="order_name" v-if="(item.status == 3 || item.status == 6) && item.indentState == 2">待骑手接单</view>
+						<view class="order_name" v-if="item.status == 3 && item.indentState == 2">待骑手接单</view>
+
+						<view class="order_name" v-if="item.status == 6 && item.indentState == 2">制作中</view>
 
 						<view class="order_name" v-if="(item.status == 3 || item.status == 6) && item.indentState == 3">骑手已接单</view>
 
 						<view class="order_name" v-if="(item.status == 3 || item.status == 6) && item.indentState == 4">骑手配送中</view>
 
-						<view class="order_name" v-if="item.status == 6">制作中</view>
 						<view class="order_name" v-if="item.status == 7">待接单</view>
 						<view class="order_name" v-if="item.status == 8">已退款</view>
 						<view class="order_name" v-if="item.status == 13">待骑手接单</view>

pages/order/takefood.vue

@@ -4,9 +4,12 @@
 		<view class="tosend" v-if="dataDet">
 			<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">配送中</view>
+			<view class="order_name" v-if="dataDet.status == 3 && dataDet.indentState == 2">待骑手接单</view>
+			<view class="order_name" v-if="dataDet.status == 6 && dataDet.indentState == 2">制作中</view>
+			<view class="order_name" v-if="(dataDet.status == 3 || dataDet.status == 6) && dataDet.indentState == 3">骑手已接单</view>
+			<view class="order_name" v-if="(dataDet.status == 3 || dataDet.status == 6) && dataDet.indentState == 4">骑手配送中</view>
 			<view class="tosend_text" v-if="dataDet.status == 4">已完成</view>
 			<view class="tosend_text" v-if="dataDet.status == 5">已取消</view>
-			<view class="tosend_text" v-if="dataDet.status == 6">制作中</view>
 			<view class="tosend_text" v-if="dataDet.status == 7">待接单</view>
 			<view class="tosend_text" v-if="dataDet.status == 8">已退款</view>
 			<view class="tosend_text" v-if="dataDet.status == 13">待骑手接单</view>
@@ -23,7 +26,11 @@
 			<view class="flex justify-center" v-if="dataDet.orderType == 1" style="width: 100%; height: 140rpx; margin-bottom: 30rpx">
 				<view class="flex justify-center" style="width: 94%; height: 100%; border-radius: 18rpx; background-color: #ffffff; padding: 3%">
 					<view class="flex justify-between align-center" style="width: 100%; height: 100%">
-						<image :src="shopInfo.shopCover ? shopInfo.shopCover : 'https://mxys.chuanghai-tech.com/wmfile/20250814/fff4dc5d02ea4af881db9685f2e1e61d.png'" style="width: 110rpx; height: 110rpx; border-radius: 8rpx" mode=""></image>
+						<image
+							:src="shopInfo.shopCover ? shopInfo.shopCover : 'https://mxys.chuanghai-tech.com/wmfile/20250814/fff4dc5d02ea4af881db9685f2e1e61d.png'"
+							style="width: 110rpx; height: 110rpx; border-radius: 8rpx"
+							mode=""
+						></image>
 						<view class="flex flex-wrap align-center" style="width: 80%; height: 100%">
 							<view class="" style="width: 100%; font-size: 30rpx" @click="call">
 								<text style="font-weight: bold">{{ shopInfo.shopName ? shopInfo.shopName : '' }}</text>