diff --git a/api/config.js b/api/config.js
index d54f263..3dde5dc 100644
--- a/api/config.js
+++ b/api/config.js
@@ -3,7 +3,7 @@ let accountInfo = wx.getAccountInfoSync();
let envVersion = accountInfo.miniProgram.envVersion
//手动指定版本
-// envVersion = 'trial'
+envVersion = 'trial'
let hosts = {
"develop": 'http://wanyu.test',
diff --git a/pages/order/order-info.vue b/pages/order/order-info.vue
index 1c9f2ac..9303191 100644
--- a/pages/order/order-info.vue
+++ b/pages/order/order-info.vue
@@ -66,7 +66,7 @@
{{helpers.removeCommas(data.order_info.area.merge_name)}}{{ data.order_info.address }}
- 详情
+ 订单详情
{{data.order_info.detail ? data.order_info.detail : '暂无详情'}}
@@ -78,7 +78,7 @@
- 客户备注
+ 平台备注
{{data.order_info.remark ? data.order_info.remark : '无备注信息'}}
@@ -200,7 +200,13 @@ import enums from "../../utils/enums";
//是否可上报异常,未接单和已拒接的无法上报
const canReportOrderException = computed(() => {
- return data.value.status !== enums.ORDER_DISPATCH_STATUS.STATUS_TOGET && data.value.status !== enums.ORDER_DISPATCH_STATUS.STATUS_REFUSED
+ const excludedStatuses = [
+ enums.ORDER_DISPATCH_STATUS.STATUS_TOGET,
+ enums.ORDER_DISPATCH_STATUS.STATUS_REFUSED,
+ enums.ORDER_DISPATCH_STATUS.STATUS_FINISH
+ ];
+
+ return !excludedStatuses.includes(data.value.status);
})
const changePlanTime = (time) => {
diff --git a/pages/workbench/workbench.vue b/pages/workbench/workbench.vue
index fbec36b..6d03e6f 100644
--- a/pages/workbench/workbench.vue
+++ b/pages/workbench/workbench.vue
@@ -32,7 +32,7 @@
{{item.order_info.address}}
{{helpers.removeCommas(item.order_info.area.merge_name)}}
-
+
@@ -53,7 +53,7 @@
上门报价
平台已收款
-
+
联系客户