From 9b58f12aa934620d15d9dd6ab47c3dc6b6a3b3f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=9F=E5=B7=9D=E4=B8=9C?= <wyemail666@163.com>
Date: Fri, 9 May 2025 16:55:23 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/config.js                 |  2 +-
 pages/order/order-info.vue    | 12 +++++++++---
 pages/workbench/workbench.vue |  4 ++--
 3 files changed, 12 insertions(+), 6 deletions(-)

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 @@
         <view class="value flex-l">{{helpers.removeCommas(data.order_info.area.merge_name)}}{{ data.order_info.address }}</view>
       </view>
       <view class="item-multi-line line-after">
-        <view class="title flex-l">详情</view>
+        <view class="title flex-l">订单详情</view>
         <view class="value flex-l">{{data.order_info.detail ? data.order_info.detail : '暂无详情'}}</view>
       </view>
       <view class="images line-after" v-if="data.order_info.images.length > 0">
@@ -78,7 +78,7 @@
         </view>
       </view>
       <view class="item-multi-line line-after">
-        <view class="title flex-l">客户备注</view>
+        <view class="title flex-l">平台备注</view>
         <view class="value flex-l">{{data.order_info.remark ? data.order_info.remark : '无备注信息'}}</view>
       </view>
       <view class="report-order-exception flex-c" v-if="canReportOrderException">
@@ -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 @@
             <view class="detail flex-l" v-if="item.order_info.address !== ''">{{item.order_info.address}}</view>
             <view class="area flex-l">{{helpers.removeCommas(item.order_info.area.merge_name)}}</view>
           </view>
-          <view class="right" @click.stop="helpers.openLocation(item.order_info.lat, item.order_info.lng)">
+          <view class="right" v-if="item.status !== enums.ORDER_DISPATCH_STATUS.STATUS_FINISH" @click.stop="helpers.openLocation(item.order_info.lat, item.order_info.lng)">
             <view class="icon-ctr flex-c">
               <me-icon type="icon-navigation" color="var(--descriptionColor)" size="60rpx"></me-icon>
             </view>
@@ -53,7 +53,7 @@
             <view class="name flex-l" v-if="item.order_info.receive_type === 1">上门报价</view>
             <view class="name flex-l" v-else>平台已收款</view>
           </view>
-          <view class="right flex-r" @click.stop="helpers.makePhoneCall(item.order_info.tel)">
+          <view v-if="item.status !== enums.ORDER_DISPATCH_STATUS.STATUS_FINISH" class="right flex-r" @click.stop="helpers.makePhoneCall(item.order_info.tel)">
             <me-icon type="icon-call" color="var(--themeColor)" size="44rpx"></me-icon>
             <view class="name flex-l">联系客户</view>
           </view>