no message

common/config.js

@@ -1,12 +1,12 @@
-// const ROOTPATH = "https://mxys.chuanghai-tech.com/sqx_fast";
-// const ROOTPATH1 = "https://mxys.chuanghai-tech.com/sqx_fast";
-// const ROOTPATH2 = "wss://mxys.chuanghai-tech.com/wss/websocket/"
-// const ROOTPATH3 = "wss://mxys.chuanghai-tech.com/wss/ordersChat/"
+const ROOTPATH = "https://mxys.chuanghai-tech.com/sqx_fast";
+const ROOTPATH1 = "https://mxys.chuanghai-tech.com/sqx_fast";
+const ROOTPATH2 = "wss://mxys.chuanghai-tech.com/wss/websocket/"
+const ROOTPATH3 = "wss://mxys.chuanghai-tech.com/wss/ordersChat/"
 
-const ROOTPATH = "https://mxys.chuanghai-tech.com/wm-test/wm-api/sqx_fast";
-const ROOTPATH1 = "https://mxys.chuanghai-tech.com/wm-test/wm-api/sqx_fast";
-const ROOTPATH2 = "wss://mxys.chuanghai-tech.com/wss-test/websocket/"
-const ROOTPATH3 = "wss://mxys.chuanghai-tech.com/wss-test/ordersChat/"
+// const ROOTPATH = "https://mxys.chuanghai-tech.com/wm-test/wm-api/sqx_fast";
+// const ROOTPATH1 = "https://mxys.chuanghai-tech.com/wm-test/wm-api/sqx_fast";
+// const ROOTPATH2 = "wss://mxys.chuanghai-tech.com/wss-test/websocket/"
+// const ROOTPATH3 = "wss://mxys.chuanghai-tech.com/wss-test/ordersChat/"
 
 // const ROOTPATH = "http://192.168.161.190:8171/sqx_fast";
 // const ROOTPATH1 = "http://192.168.161.190:8171/sqx_fast";

pages/order/index.vue

@@ -29,7 +29,7 @@
 				<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 == 3">待取餐</view>
+						<view class="order_name" v-if="item.status == 3 && item.indentState != 3 && item.indentState != 4">待取餐</view>
 
 						<view class="order_name" v-if="item.status == 3 && item.indentState == 2">待骑手接单</view>
 
@@ -91,7 +91,7 @@
 				<view class="cont" v-if="item.orderType == 2">
 					<view class="order_title" v-if="item.expectDeliveryTime">预约订单：{{ item.expectDeliveryTime }}送达</view>
 					<view class="order_success">
-						<view class="order_name" v-if="item.status == 3">
+						<view class="order_name" v-if="item.status == 3 && item.indentState != 3 && item.indentState != 4">
 							配送中
 							<text style="color: #666666; margin-left: 10upx">{{ item.autoSendOrder == 1 ? '商家配送' : '平台配送' }}</text>
 						</view>