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