frontend / freight-ma

Download as
Browse Code »

Commit e1a0031ffb03e613fd6cd890e51a0ab6baa3af46

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

fix: 支付运费

Showing 1 changed file with 8 additions and 8 deletions   Show diff stats
pages/order/card.vue
  Diff comments   View file @e1a0031
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
34 </view> 34 </view>
35 </view> 35 </view>
36 <view class="card-order__item"> 36 <view class="card-order__item">
37 - <image src="/static/driver.png" /> 37 + <image class="image" src="/static/driver.png" />
38 {{ item.driverName ? item.driverName.substring(0, 4) : '' }} {{ item.driverMobile ? item.driverMobile : '' }} | {{ item.vehicleLicenseNum ? item.vehicleLicenseNum : '' }} 38 {{ item.driverName ? item.driverName.substring(0, 4) : '' }} {{ item.driverMobile ? item.driverMobile : '' }} | {{ item.vehicleLicenseNum ? item.vehicleLicenseNum : '' }}
39 {{ item.trailerLicenseNum ? item.trailerLicenseNum : '' }} 39 {{ item.trailerLicenseNum ? item.trailerLicenseNum : '' }}
40 </view> 40 </view>
@@ -59,15 +59,15 @@ @@ -59,15 +59,15 @@
59 运费<text class="red">￥{{ item.freightAmount }}</text> 59 运费<text class="red">￥{{ item.freightAmount }}</text>
60 </view> 60 </view>
61 <view class="status" :style="{ color: payStatusColorMap[item.payStatus], background: bgPayStatusColorMap[item.payStatus] }"> 61 <view class="status" :style="{ color: payStatusColorMap[item.payStatus], background: bgPayStatusColorMap[item.payStatus] }">
62 - <render-dict dict="ONLINE_FREIGHT_ORDER_PAY_PROCESS" :value="item.payStatus"></render-dict> 62 + <render-dict v-if="item.payStatus" dict="ONLINE_FREIGHT_ORDER_PAY_PROCESS" :value="item.payStatus"></render-dict>
63 </view> 63 </view>
64 <view class="action"> 64 <view class="action">
65 <zb-tooltip placement="bottom" :visible="visible" @update:visible="e => (visible = e)"> 65 <zb-tooltip placement="bottom" :visible="visible" @update:visible="e => (visible = e)">
66 <template #content> 66 <template #content>
67 <view class="more-action"> 67 <view class="more-action">
68 - <view v-if="$permission('/freightOrder/add')" @tap="againOne"> 再来一单 </view>  
69 - <view v-if="$permission('/freightOrder/delete') && ['CANCEL'].includes(item.status)" @tap="deleteOrder"> 删除订单 </view>  
70 - <view v-if="$permission('/freightOrder/cancel') && ['WAIT_CONFIRM', 'WAIT_ACCEPT', 'WAIT_DEPART'].includes(item.status)" @tap="cancelOrder"> 取消订单 </view> 68 + <view class="view" v-if="$permission('/freightOrder/add')" @tap="againOne"> 再来一单 </view>
  69 + <view class="view" v-if="$permission('/freightOrder/delete') && ['CANCEL'].includes(item.status)" @tap="deleteOrder"> 删除订单 </view>
  70 + <view class="view" v-if="$permission('/freightOrder/cancel') && ['WAIT_CONFIRM', 'WAIT_ACCEPT', 'WAIT_DEPART'].includes(item.status)" @tap="cancelOrder"> 取消订单 </view>
71 </view> 71 </view>
72 </template> 72 </template>
73 <view class="button"> 73 <view class="button">
@@ -222,7 +222,7 @@ export default { @@ -222,7 +222,7 @@ export default {
222 font-size: 26upx; 222 font-size: 26upx;
223 color: #999999; 223 color: #999999;
224 align-items: baseline; 224 align-items: baseline;
225 - image { 225 + .image {
226 margin-right: $padding-xs; 226 margin-right: $padding-xs;
227 width: 24upx; 227 width: 24upx;
228 height: 24upx; 228 height: 24upx;
@@ -325,10 +325,10 @@ export default { @@ -325,10 +325,10 @@ export default {
325 text-align: center; 325 text-align: center;
326 color: #666666; 326 color: #666666;
327 box-shadow: 0px 2px 8px 2px rgba(0, 0, 0, 0.22); 327 box-shadow: 0px 2px 8px 2px rgba(0, 0, 0, 0.22);
328 - view { 328 + .view {
329 padding: $padding-sm; 329 padding: $padding-sm;
330 } 330 }
331 - view + view { 331 + .view + .view {
332 border-top: 1px solid #eaeaea; 332 border-top: 1px solid #eaeaea;
333 } 333 }
334 } 334 }