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 @@
-
-
+
+ {{ form.driverName }}
+
@@ -83,7 +84,7 @@
@change="computedService"
>
- 已扣安全服务费{{ form.driverSecurityServiceAmount }}
+ 已扣运营服务费{{ form.driverSecurityServiceAmount }}
@@ -98,7 +99,7 @@
:placeholder="!autoComputedArrival ? '自动计算' : '请输入'"
>
- 已扣安全服务费{{ form.driverSecurityServiceAmount }}
+ 已扣运营服务费{{ form.driverSecurityServiceAmount }}
@@ -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 @@
- 安全服务费
+ 运营服务费
¥{{ item.securityServiceAmount ? item.securityServiceAmount : '0' }}
¥
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 @@
-
+
元
@@ -15,10 +15,10 @@
-
+
-
+
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 @@
¥{{ item.paidAmount }}
- 安全服务费
+ 运营服务费
¥{{ item.securityServiceAmount }}
@@ -223,8 +223,8 @@
¥{{ it.amount || 0 }}
- 已扣安全服务费{{ item.driverSecurityServiceAmount }}
- 已扣安全服务费{{ item.driverSecurityServiceAmount }}
+ 已扣运营服务费{{ item.driverSecurityServiceAmount }}
+ 已扣运营服务费{{ item.driverSecurityServiceAmount }}
支付失败:{{ it.remark }}
--
libgit2 0.21.0