Commit 2969e9077048964e11b728f729348b5053b79296
1 parent
e1a0031f
Exists in
master
and in
1 other branch
fix: 运营服务费名称改为安全服务费
Showing
3 changed files
with
6 additions
and
6 deletions
Show diff stats
pages/order/add.vue
| @@ -104,7 +104,7 @@ | @@ -104,7 +104,7 @@ | ||
| 104 | @change="computedService" | 104 | @change="computedService" |
| 105 | > | 105 | > |
| 106 | <template #suffix> | 106 | <template #suffix> |
| 107 | - <span v-if="autoComputedArrival && form.driverSecurityServiceAmount" class="color-red">已扣运营服务费{{ form.driverSecurityServiceAmount }}</span> | 107 | + <span v-if="autoComputedArrival && form.driverSecurityServiceAmount" class="color-red">已扣安全服务费{{ form.driverSecurityServiceAmount }}</span> |
| 108 | </template> | 108 | </template> |
| 109 | </u-input> | 109 | </u-input> |
| 110 | </u-form-item> | 110 | </u-form-item> |
| @@ -119,7 +119,7 @@ | @@ -119,7 +119,7 @@ | ||
| 119 | :placeholder="!autoComputedArrival ? '自动计算' : '请输入'" | 119 | :placeholder="!autoComputedArrival ? '自动计算' : '请输入'" |
| 120 | > | 120 | > |
| 121 | <template #suffix> | 121 | <template #suffix> |
| 122 | - <span v-if="!autoComputedArrival && form.driverSecurityServiceAmount" class="color-red">已扣运营服务费{{ form.driverSecurityServiceAmount }}</span> | 122 | + <span v-if="!autoComputedArrival && form.driverSecurityServiceAmount" class="color-red">已扣安全服务费{{ form.driverSecurityServiceAmount }}</span> |
| 123 | </template> | 123 | </template> |
| 124 | </u-input> | 124 | </u-input> |
| 125 | </u-form-item> | 125 | </u-form-item> |
pages/order/change-fee.vue
| @@ -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/detail.vue
| @@ -216,7 +216,7 @@ | @@ -216,7 +216,7 @@ | ||
| 216 | <view class="card__item_content">￥{{ item.paidAmount }}</view> | 216 | <view class="card__item_content">￥{{ item.paidAmount }}</view> |
| 217 | </view> | 217 | </view> |
| 218 | <view class="card__item" v-if="!!item.securityServiceAmount"> | 218 | <view class="card__item" v-if="!!item.securityServiceAmount"> |
| 219 | - <view class="card__item_field">运营服务费</view> | 219 | + <view class="card__item_field">安全服务费</view> |
| 220 | <view class="card__item_content">￥{{ item.securityServiceAmount }}</view> | 220 | <view class="card__item_content">￥{{ item.securityServiceAmount }}</view> |
| 221 | </view> | 221 | </view> |
| 222 | <view class="card__item"> | 222 | <view class="card__item"> |
| @@ -239,8 +239,8 @@ | @@ -239,8 +239,8 @@ | ||
| 239 | <view class="card__item_content"> | 239 | <view class="card__item_content"> |
| 240 | ￥{{ it.amount || 0 }} | 240 | ￥{{ it.amount || 0 }} |
| 241 | <span class="fee-service" v-if="item.driverSecurityServiceAmount"> | 241 | <span class="fee-service" v-if="item.driverSecurityServiceAmount"> |
| 242 | - <span v-if="autoComputedArrival && it.type === 'OUT_INVITE_ARRIVAL'" class="color-red">已扣运营服务费{{ item.driverSecurityServiceAmount }}</span> | ||
| 243 | - <span v-if="!autoComputedArrival && it.type === 'OUT_INVITE_FINAL'" class="color-red">已扣运营服务费{{ item.driverSecurityServiceAmount }}</span> | 242 | + <span v-if="autoComputedArrival && it.type === 'OUT_INVITE_ARRIVAL'" class="color-red">已扣安全服务费{{ item.driverSecurityServiceAmount }}</span> |
| 243 | + <span v-if="!autoComputedArrival && it.type === 'OUT_INVITE_FINAL'" class="color-red">已扣安全服务费{{ item.driverSecurityServiceAmount }}</span> | ||
| 244 | </span> | 244 | </span> |
| 245 | </view> | 245 | </view> |
| 246 | <view v-if="it.payStatus === 'PAY_FAILED'" class="card__item--warning">支付失败:{{ it.remark }}</view> | 246 | <view v-if="it.payStatus === 'PAY_FAILED'" class="card__item--warning">支付失败:{{ it.remark }}</view> |