From b74a5f420630f01b0479e1f32b8c92e1e12d2fd5 Mon Sep 17 00:00:00 2001
From: lxf <xunfeng1122@163.com>
Date: Tue, 18 Mar 2025 09:56:32 +0800
Subject: [PATCH] fix: 安全服务费->运营服务费，下单司机优化，修改货物小数优化

---
 pages/order/add.vue          | 17 +++++++++++++----
 pages/order/change-fee.vue   |  2 +-
 pages/order/change-goods.vue |  6 +++---
 pages/order/detail.vue       |  6 +++---
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/pages/order/add.vue b/pages/order/add.vue
index 23403d1..17391e9 100644
--- a/pages/order/add.vue
+++ b/pages/order/add.vue
@@ -49,8 +49,9 @@
               </template>
             </u-input>
           </u-form-item>
-          <u-form-item label="司机姓名" required>
-            <u-input v-model="form.driverName" border="none" placeholder="请输入" :disabled="!!form.driverId" />
+          <u-form-item label="司机姓名" :required="!driverIsAuditPass">
+            <span v-if="driverIsAuditPass">{{ form.driverName }}</span>
+            <u-input v-else v-model="form.driverName" border="none" placeholder="请输入" />
           </u-form-item>
           <view class="payee">
             <payee ref="payee" v-model="payeeModel" :have-action="isCollect" />
@@ -83,7 +84,7 @@
               @change="computedService"
             >
               <template #suffix>
-                <span v-if="autoComputedArrival && form.driverSecurityServiceAmount" class="color-red">已扣安全服务费{{ form.driverSecurityServiceAmount }}</span>
+                <span v-if="autoComputedArrival && form.driverSecurityServiceAmount" class="color-red">已扣运营服务费{{ form.driverSecurityServiceAmount }}</span>
               </template>
             </u-input>
           </u-form-item>
@@ -98,7 +99,7 @@
               :placeholder="!autoComputedArrival ? '自动计算' : '请输入'"
             >
               <template #suffix>
-                <span v-if="!autoComputedArrival && form.driverSecurityServiceAmount" class="color-red">已扣安全服务费{{ form.driverSecurityServiceAmount }}</span>
+                <span v-if="!autoComputedArrival && form.driverSecurityServiceAmount" class="color-red">已扣运营服务费{{ form.driverSecurityServiceAmount }}</span>
               </template>
             </u-input>
           </u-form-item>
@@ -193,6 +194,7 @@ export default {
         waypoints: [{}, {}],
       },
       payeeModel: {},
+      driverObj: {}, //司机信息
       currentFreight: {},
     };
   },
@@ -200,6 +202,11 @@ export default {
     isCollect() {
       return this.currentFreight.collectByOtherFlag || false;
     },
+    // 司机是否已认证
+    driverIsAuditPass() {
+      const { idCardImageAuditStatus = '' } = this.driverObj;
+      return idCardImageAuditStatus === 'PASS';
+    },
     autoComputedArrival() {
       // 自动计算货到
       return 'OUT_INVITE_ARRIVAL' === this.currentFreight?.autoComputeFeeType;
@@ -395,12 +402,14 @@ export default {
             this.form.driverMobile = res.result[0].mobile;
             this.payeeModel = res.result[0];
             this.$refs.payee.setItem(this.payeeModel);
+            this.driverObj = res.result[0];
           } else {
             this.form.driverId = '';
             this.form.driverName = '';
             this.form.driverMobile = this.form.mobile;
             this.payeeModel = {};
             this.$refs.payee.setItem(this.payeeModel);
+            this.driverObj = {};
           }
         });
       }
diff --git a/pages/order/change-fee.vue b/pages/order/change-fee.vue
index 4f70393..b44a153 100644
--- a/pages/order/change-fee.vue
+++ b/pages/order/change-fee.vue
@@ -18,7 +18,7 @@
           </view>
         </view>
         <view class="item">
-          <view class="td">安全服务费</view>
+          <view class="td">运营服务费</view>
           <view class="amount">￥{{ item.securityServiceAmount ? item.securityServiceAmount : '0' }}</view>
           <view class="amount">
             <text>￥</text>
diff --git a/pages/order/change-goods.vue b/pages/order/change-goods.vue
index 7c215f7..2468a06 100644
--- a/pages/order/change-goods.vue
+++ b/pages/order/change-goods.vue
@@ -7,7 +7,7 @@
             <u-input v-model="form.goodsName" border="none" suffix-icon="arrow-right" placeholder="请选择" disabledColor="#ffffff" disabled />
           </u-form-item>
           <u-form-item v-if="showGoodsValue" label="货物价值" required>
-            <u-input v-model="form.goodsValue" border="none" type="number" placeholder="请输入">
+            <u-input v-model="form.goodsValue" border="none" type="digit" placeholder="请输入">
               <template slot="suffix">元</template>
             </u-input>
           </u-form-item>
@@ -15,10 +15,10 @@
             <u-input v-model="form.goodsPiece" border="none" type="number" placeholder="请输入，选填" />
           </u-form-item>
           <u-form-item label="货物吨数" required>
-            <u-input v-model="form.goodsWeight" border="none" type="number" placeholder="请输入" />
+            <u-input v-model="form.goodsWeight" border="none" type="digit" placeholder="请输入" />
           </u-form-item>
           <u-form-item label="货物方数">
-            <u-input v-model="form.goodsVolume" border="none" type="number" placeholder="请输入，选填" />
+            <u-input v-model="form.goodsVolume" border="none" type="digit" placeholder="请输入，选填" />
           </u-form-item>
         </view>
       </u-form>
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index 1175ea1..c72b0be 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -200,7 +200,7 @@
           <view class="card__item_content">￥{{ item.paidAmount }}</view>
         </view>
         <view class="card__item" v-if="!!item.securityServiceAmount">
-          <view class="card__item_field">安全服务费</view>
+          <view class="card__item_field">运营服务费</view>
           <view class="card__item_content">￥{{ item.securityServiceAmount }}</view>
         </view>
         <view class="card__item">
@@ -223,8 +223,8 @@
           <view class="card__item_content">
             ￥{{ it.amount || 0 }}
             <span class="fee-service" v-if="item.driverSecurityServiceAmount">
-              <span v-if="autoComputedArrival && it.type === 'OUT_INVITE_ARRIVAL'" class="color-red">已扣安全服务费{{ item.driverSecurityServiceAmount }}</span>
-              <span v-if="!autoComputedArrival && it.type === 'OUT_INVITE_FINAL'" class="color-red">已扣安全服务费{{ item.driverSecurityServiceAmount }}</span>
+              <span v-if="autoComputedArrival && it.type === 'OUT_INVITE_ARRIVAL'" class="color-red">已扣运营服务费{{ item.driverSecurityServiceAmount }}</span>
+              <span v-if="!autoComputedArrival && it.type === 'OUT_INVITE_FINAL'" class="color-red">已扣运营服务费{{ item.driverSecurityServiceAmount }}</span>
             </span>
           </view>
           <view v-if="it.payStatus === 'PAY_FAILED'" class="card__item--warning">支付失败:{{ it.remark }}</view>
--
libgit2 0.21.0