frontend / freight-ma

Download as
Browse Code »

Commit b74a5f420630f01b0479e1f32b8c92e1e12d2fd5

Authored by lxf
1 parent 295d451a
Exists in master and in 1 other branch 宁夏邮政-定制

fix: 安全服务费->运营服务费，下单司机优化，修改货物小数优化

Showing 4 changed files with 20 additions and 11 deletions   Show diff stats
pages/order/add.vue
  Diff comments   View file @b74a5f4
@@ -49,8 +49,9 @@ @@ -49,8 +49,9 @@
49 </template> 49 </template>
50 </u-input> 50 </u-input>
51 </u-form-item> 51 </u-form-item>
52 - <u-form-item label="司机姓名" required>  
53 - <u-input v-model="form.driverName" border="none" placeholder="请输入" :disabled="!!form.driverId" /> 52 + <u-form-item label="司机姓名" :required="!driverIsAuditPass">
  53 + <span v-if="driverIsAuditPass">{{ form.driverName }}</span>
  54 + <u-input v-else v-model="form.driverName" border="none" placeholder="请输入" />
54 </u-form-item> 55 </u-form-item>
55 <view class="payee"> 56 <view class="payee">
56 <payee ref="payee" v-model="payeeModel" :have-action="isCollect" /> 57 <payee ref="payee" v-model="payeeModel" :have-action="isCollect" />
@@ -83,7 +84,7 @@ @@ -83,7 +84,7 @@
83 @change="computedService" 84 @change="computedService"
84 > 85 >
85 <template #suffix> 86 <template #suffix>
86 - <span v-if="autoComputedArrival && form.driverSecurityServiceAmount" class="color-red">已扣安全服务费{{ form.driverSecurityServiceAmount }}</span> 87 + <span v-if="autoComputedArrival && form.driverSecurityServiceAmount" class="color-red">已扣运营服务费{{ form.driverSecurityServiceAmount }}</span>
87 </template> 88 </template>
88 </u-input> 89 </u-input>
89 </u-form-item> 90 </u-form-item>
@@ -98,7 +99,7 @@ @@ -98,7 +99,7 @@
98 :placeholder="!autoComputedArrival ? '自动计算' : '请输入'" 99 :placeholder="!autoComputedArrival ? '自动计算' : '请输入'"
99 > 100 >
100 <template #suffix> 101 <template #suffix>
101 - <span v-if="!autoComputedArrival && form.driverSecurityServiceAmount" class="color-red">已扣安全服务费{{ form.driverSecurityServiceAmount }}</span> 102 + <span v-if="!autoComputedArrival && form.driverSecurityServiceAmount" class="color-red">已扣运营服务费{{ form.driverSecurityServiceAmount }}</span>
102 </template> 103 </template>
103 </u-input> 104 </u-input>
104 </u-form-item> 105 </u-form-item>
@@ -193,6 +194,7 @@ export default { @@ -193,6 +194,7 @@ export default {
193 waypoints: [{}, {}], 194 waypoints: [{}, {}],
194 }, 195 },
195 payeeModel: {}, 196 payeeModel: {},
  197 + driverObj: {}, //司机信息
196 currentFreight: {}, 198 currentFreight: {},
197 }; 199 };
198 }, 200 },
@@ -200,6 +202,11 @@ export default { @@ -200,6 +202,11 @@ export default {
200 isCollect() { 202 isCollect() {
201 return this.currentFreight.collectByOtherFlag || false; 203 return this.currentFreight.collectByOtherFlag || false;
202 }, 204 },
  205 + // 司机是否已认证
  206 + driverIsAuditPass() {
  207 + const { idCardImageAuditStatus = '' } = this.driverObj;
  208 + return idCardImageAuditStatus === 'PASS';
  209 + },
203 autoComputedArrival() { 210 autoComputedArrival() {
204 // 自动计算货到 211 // 自动计算货到
205 return 'OUT_INVITE_ARRIVAL' === this.currentFreight?.autoComputeFeeType; 212 return 'OUT_INVITE_ARRIVAL' === this.currentFreight?.autoComputeFeeType;
@@ -395,12 +402,14 @@ export default { @@ -395,12 +402,14 @@ export default {
395 this.form.driverMobile = res.result[0].mobile; 402 this.form.driverMobile = res.result[0].mobile;
396 this.payeeModel = res.result[0]; 403 this.payeeModel = res.result[0];
397 this.$refs.payee.setItem(this.payeeModel); 404 this.$refs.payee.setItem(this.payeeModel);
  405 + this.driverObj = res.result[0];
398 } else { 406 } else {
399 this.form.driverId = ''; 407 this.form.driverId = '';
400 this.form.driverName = ''; 408 this.form.driverName = '';
401 this.form.driverMobile = this.form.mobile; 409 this.form.driverMobile = this.form.mobile;
402 this.payeeModel = {}; 410 this.payeeModel = {};
403 this.$refs.payee.setItem(this.payeeModel); 411 this.$refs.payee.setItem(this.payeeModel);
  412 + this.driverObj = {};
404 } 413 }
405 }); 414 });
406 } 415 }
pages/order/change-fee.vue
  Diff comments   View file @b74a5f4
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
18 </view> 18 </view>
19 </view> 19 </view>
20 <view class="item"> 20 <view class="item">
21 - <view class="td">安全服务费</view> 21 + <view class="td">运营服务费</view>
22 <view class="amount">￥{{ item.securityServiceAmount ? item.securityServiceAmount : '0' }}</view> 22 <view class="amount">￥{{ item.securityServiceAmount ? item.securityServiceAmount : '0' }}</view>
23 <view class="amount"> 23 <view class="amount">
24 <text>￥</text> 24 <text>￥</text>
pages/order/change-goods.vue
  Diff comments   View file @b74a5f4
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 <u-input v-model="form.goodsName" border="none" suffix-icon="arrow-right" placeholder="请选择" disabledColor="#ffffff" disabled /> 7 <u-input v-model="form.goodsName" border="none" suffix-icon="arrow-right" placeholder="请选择" disabledColor="#ffffff" disabled />
8 </u-form-item> 8 </u-form-item>
9 <u-form-item v-if="showGoodsValue" label="货物价值" required> 9 <u-form-item v-if="showGoodsValue" label="货物价值" required>
10 - <u-input v-model="form.goodsValue" border="none" type="number" placeholder="请输入"> 10 + <u-input v-model="form.goodsValue" border="none" type="digit" placeholder="请输入">
11 <template slot="suffix">元</template> 11 <template slot="suffix">元</template>
12 </u-input> 12 </u-input>
13 </u-form-item> 13 </u-form-item>
@@ -15,10 +15,10 @@ @@ -15,10 +15,10 @@
15 <u-input v-model="form.goodsPiece" border="none" type="number" placeholder="请输入，选填" /> 15 <u-input v-model="form.goodsPiece" border="none" type="number" placeholder="请输入，选填" />
16 </u-form-item> 16 </u-form-item>
17 <u-form-item label="货物吨数" required> 17 <u-form-item label="货物吨数" required>
18 - <u-input v-model="form.goodsWeight" border="none" type="number" placeholder="请输入" /> 18 + <u-input v-model="form.goodsWeight" border="none" type="digit" placeholder="请输入" />
19 </u-form-item> 19 </u-form-item>
20 <u-form-item label="货物方数"> 20 <u-form-item label="货物方数">
21 - <u-input v-model="form.goodsVolume" border="none" type="number" placeholder="请输入，选填" /> 21 + <u-input v-model="form.goodsVolume" border="none" type="digit" placeholder="请输入，选填" />
22 </u-form-item> 22 </u-form-item>
23 </view> 23 </view>
24 </u-form> 24 </u-form>
pages/order/detail.vue
  Diff comments   View file @b74a5f4
@@ -200,7 +200,7 @@ @@ -200,7 +200,7 @@
200 <view class="card__item_content">￥{{ item.paidAmount }}</view> 200 <view class="card__item_content">￥{{ item.paidAmount }}</view>
201 </view> 201 </view>
202 <view class="card__item" v-if="!!item.securityServiceAmount"> 202 <view class="card__item" v-if="!!item.securityServiceAmount">
203 - <view class="card__item_field">安全服务费</view> 203 + <view class="card__item_field">运营服务费</view>
204 <view class="card__item_content">￥{{ item.securityServiceAmount }}</view> 204 <view class="card__item_content">￥{{ item.securityServiceAmount }}</view>
205 </view> 205 </view>
206 <view class="card__item"> 206 <view class="card__item">
@@ -223,8 +223,8 @@ @@ -223,8 +223,8 @@
223 <view class="card__item_content"> 223 <view class="card__item_content">
224 ￥{{ it.amount || 0 }} 224 ￥{{ it.amount || 0 }}
225 <span class="fee-service" v-if="item.driverSecurityServiceAmount"> 225 <span class="fee-service" v-if="item.driverSecurityServiceAmount">
226 - <span v-if="autoComputedArrival && it.type === 'OUT_INVITE_ARRIVAL'" class="color-red">已扣安全服务费{{ item.driverSecurityServiceAmount }}</span>  
227 - <span v-if="!autoComputedArrival && it.type === 'OUT_INVITE_FINAL'" class="color-red">已扣安全服务费{{ item.driverSecurityServiceAmount }}</span> 226 + <span v-if="autoComputedArrival && it.type === 'OUT_INVITE_ARRIVAL'" class="color-red">已扣运营服务费{{ item.driverSecurityServiceAmount }}</span>
  227 + <span v-if="!autoComputedArrival && it.type === 'OUT_INVITE_FINAL'" class="color-red">已扣运营服务费{{ item.driverSecurityServiceAmount }}</span>
228 </span> 228 </span>
229 </view> 229 </view>
230 <view v-if="it.payStatus === 'PAY_FAILED'" class="card__item--warning">支付失败:{{ it.remark }}</view> 230 <view v-if="it.payStatus === 'PAY_FAILED'" class="card__item--warning">支付失败:{{ it.remark }}</view>