fix(订单状态): 修正订单状态判断逻辑和显示时间

修复订单状态判断条件，增加状态为1时的判断
修改订单时间显示逻辑，优先显示物流轨迹创建时间
调整config.js的缩进格式

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'

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'

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>