frontend / freight-ma

Download as
Browse Code »

Commit 548dbbf4a1a53e6e28a372e76ec635e56cbc3d39

Authored by lxf
2 parents 637bbf9c a9707d2d
Exists in master and in 1 other branch 宁夏邮政-定制

Merge branch 'master' into 货源管理

Showing 3 changed files with 6 additions and 6 deletions   Show diff stats
pages/order/add.vue
  Diff comments   View file @548dbbf
@@ -115,7 +115,7 @@ @@ -115,7 +115,7 @@
115 @change="computedService" 115 @change="computedService"
116 > 116 >
117 <template #suffix> 117 <template #suffix>
118 - <span v-if="autoComputedArrival && form.driverSecurityServiceAmount" class="color-red">已扣运营服务费{{ form.driverSecurityServiceAmount }}</span> 118 + <span v-if="autoComputedArrival && form.driverSecurityServiceAmount" class="color-red">已扣安全服务费{{ form.driverSecurityServiceAmount }}</span>
119 </template> 119 </template>
120 </u-input> 120 </u-input>
121 </u-form-item> 121 </u-form-item>
@@ -130,7 +130,7 @@ @@ -130,7 +130,7 @@
130 :placeholder="!autoComputedArrival ? '自动计算' : '请输入'" 130 :placeholder="!autoComputedArrival ? '自动计算' : '请输入'"
131 > 131 >
132 <template #suffix> 132 <template #suffix>
133 - <span v-if="!autoComputedArrival && form.driverSecurityServiceAmount" class="color-red">已扣运营服务费{{ form.driverSecurityServiceAmount }}</span> 133 + <span v-if="!autoComputedArrival && form.driverSecurityServiceAmount" class="color-red">已扣安全服务费{{ form.driverSecurityServiceAmount }}</span>
134 </template> 134 </template>
135 </u-input> 135 </u-input>
136 </u-form-item> 136 </u-form-item>
pages/order/change-fee.vue
  Diff comments   View file @548dbbf
@@ -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
  Diff comments   View file @548dbbf
@@ -243,7 +243,7 @@ @@ -243,7 +243,7 @@
243 <view class="card__item_content">￥{{ item.paidAmount }}</view> 243 <view class="card__item_content">￥{{ item.paidAmount }}</view>
244 </view> 244 </view>
245 <view class="card__item" v-if="!!item.securityServiceAmount"> 245 <view class="card__item" v-if="!!item.securityServiceAmount">
246 - <view class="card__item_field">运营服务费</view> 246 + <view class="card__item_field">安全服务费</view>
247 <view class="card__item_content">￥{{ item.securityServiceAmount }}</view> 247 <view class="card__item_content">￥{{ item.securityServiceAmount }}</view>
248 </view> 248 </view>
249 <view class="card__item"> 249 <view class="card__item">
@@ -266,8 +266,8 @@ @@ -266,8 +266,8 @@
266 <view class="card__item_content"> 266 <view class="card__item_content">
267 ￥{{ it.amount || 0 }} 267 ￥{{ it.amount || 0 }}
268 <span class="fee-service" v-if="item.driverSecurityServiceAmount"> 268 <span class="fee-service" v-if="item.driverSecurityServiceAmount">
269 - <span v-if="autoComputedArrival && it.type === 'OUT_INVITE_ARRIVAL'" class="color-red">已扣运营服务费{{ item.driverSecurityServiceAmount }}</span>  
270 - <span v-if="!autoComputedArrival && it.type === 'OUT_INVITE_FINAL'" class="color-red">已扣运营服务费{{ item.driverSecurityServiceAmount }}</span> 269 + <span v-if="autoComputedArrival && it.type === 'OUT_INVITE_ARRIVAL'" class="color-red">已扣安全服务费{{ item.driverSecurityServiceAmount }}</span>
  270 + <span v-if="!autoComputedArrival && it.type === 'OUT_INVITE_FINAL'" class="color-red">已扣安全服务费{{ item.driverSecurityServiceAmount }}</span>
271 </span> 271 </span>
272 </view> 272 </view>
273 <view v-if="it.payStatus === 'PAY_FAILED'" class="card__item--warning">支付失败:{{ it.remark }}</view> 273 <view v-if="it.payStatus === 'PAY_FAILED'" class="card__item--warning">支付失败:{{ it.remark }}</view>