From aa13588e1b32616b48d1f6f980a380fa59bcee99 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Wed, 30 Jul 2025 10:38:47 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81):=20?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E9=80=BB=E8=BE=91=E5=92=8C=E6=98=BE=E7=A4=BA=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复订单状态判断条件，增加状态为1时的判断
修改订单时间显示逻辑，优先显示物流轨迹创建时间
调整config.js的缩进格式
---
 config.js                    | 42 +++++++++++++++++++++---------------------
 pages/manager/order.vue      |  2 +-
 pages/subcomponent/order.vue |  2 +-
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/config.js b/config.js
index d166eb8..61604a8 100644
--- a/config.js
+++ b/config.js
@@ -2,30 +2,30 @@
 const type = 'prod'
 
 const config = {
-  local: {
-    baseUrl: 'http://127.0.0.1:8002',
-  },
-  dev: {
-    baseUrl: 'http://h5.xzaiyp.top',
-  },
-  prod: {
-    baseUrl: 'https://www.ddmhs.top',
-  }
+	local: {
+		baseUrl: 'http://127.0.0.1:8002',
+	},
+	dev: {
+		baseUrl: 'http://h5.xzaiyp.top',
+	},
+	prod: {
+		baseUrl: 'https://www.ddmhs.top',
+	}
 }
 
 const defaultConfig = {
-  mapKey: 'XMBBZ-BCPCV-SXPPQ-5Y7MY-PHZXK-YFFVU',
-  aliOss: {
-    url: 'https://oss.ddmhs.top/',
-    config: {
-      region: 'oss-cn-hangzhou',
-      accessKeyId: 'LTAI5tDXgH5a42GbUZroVvio',
-      accessKeySecret: 'TK7jQ0KeXnFBHNxpEHzT83Spp81tl5',
-      bucket: 'ossddmhs',
-      endpoint: 'oss-cn-hangzhou.aliyuncs.com',
-    }
-  },
-  mchId: '1701841654',
+	mapKey: 'XMBBZ-BCPCV-SXPPQ-5Y7MY-PHZXK-YFFVU',
+	aliOss: {
+		url: 'https://oss.ddmhs.top/',
+		config: {
+			region: 'oss-cn-hangzhou',
+			accessKeyId: 'LTAI5tDXgH5a42GbUZroVvio',
+			accessKeySecret: 'TK7jQ0KeXnFBHNxpEHzT83Spp81tl5',
+			bucket: 'ossddmhs',
+			endpoint: 'oss-cn-hangzhou.aliyuncs.com',
+		}
+	},
+	mchId: '1701841654',
 }
 
 import utils from './utils/utils.js'
diff --git a/pages/manager/order.vue b/pages/manager/order.vue
index c389827..359fbd1 100644
--- a/pages/manager/order.vue
+++ b/pages/manager/order.vue
@@ -346,7 +346,7 @@
 				// if (state === 3) {
 				//   return { label: '已取消', class: 'gray' }
 				// }
-				if ((status === 1 && state === 0) && state != 3 && state != 4) {
+				if ((status == 1 && state == 0) || (status == 1 && state == 1)) {
 					return {
 						label: '已预约',
 						class: 'green'
diff --git a/pages/subcomponent/order.vue b/pages/subcomponent/order.vue
index 24eec02..2ee9d40 100644
--- a/pages/subcomponent/order.vue
+++ b/pages/subcomponent/order.vue
@@ -73,7 +73,7 @@
             <image class="status-icon" :src="order.statusIcon || '/static/my/【待取件】快递员正在赶来.png'" mode="aspectFill"></image>
             <view class="status-info">
               <text class="status-text">{{ getOrderStatusText(order) }}</text>
-              <text class="status-time">{{ order.goTime || order.statusTime }}</text>
+              <text class="status-time">{{ order.logisticsTrajectory ? order.logisticsTrajectory.createTime : order.goTime }}</text>
             </view>
           </view>
         </view>