From 6364083316174c75fe4514e8799e3ff0e5491212 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 03 九月 2025 11:49:29 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/jinkuai
---
small-program/pages/order-details/order-details.vue | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/small-program/pages/order-details/order-details.vue b/small-program/pages/order-details/order-details.vue
index 01f642f..917b36c 100644
--- a/small-program/pages/order-details/order-details.vue
+++ b/small-program/pages/order-details/order-details.vue
@@ -89,6 +89,14 @@
</view>
</view>
<view class="order-info-price">
+ <view class="price-row" v-if="feeFrom.priceParam1.name">
+ <view class="price-row-label">{{feeFrom.priceParam1.name}}</view>
+ <view class="price-row-val" > {{(info.priceNum1||0) }}{{feeFrom.priceParam1.unit}} </view>
+ </view>
+ <view class="price-row" v-if="feeFrom.priceParam2.name">
+ <view class="price-row-label">{{feeFrom.priceParam2.name}}</view>
+ <view class="price-row-val" > {{(info.priceNum2||0) }}{{feeFrom.priceParam2.unit}} </view>
+ </view>
<view class="price-row">
<view class="price-row-label">璐圭敤鏍囧噯</view>
<view class="price-row-val" v-if="info.type !==2">{{((info.price||0)/100).toFixed(2) }}{{info.priceUnit || '' }}</view>
@@ -720,30 +728,30 @@
//鍖呰宸�
if(this.info.carType==0){
//鎸夊ぉ
- this.feeFrom.priceParam1.name ='鐢ㄥ伐澶╂暟锛�'
+ this.feeFrom.priceParam1.name ='鐢ㄥ伐澶╂暟'
this.feeFrom.priceParam1.unit ='澶�'
- this.feeFrom.priceParam2.name ='鐢ㄥ伐浜烘暟锛�'
+ this.feeFrom.priceParam2.name ='鐢ㄥ伐浜烘暟'
this.feeFrom.priceParam2.unit ='浜�'
}else if(this.info.carType==1){
//鎸夊皬鏃�
- this.feeFrom.priceParam1.name ='鐢ㄥ伐鏃堕棿锛�'
+ this.feeFrom.priceParam1.name ='鐢ㄥ伐鏃堕暱'
this.feeFrom.priceParam1.unit ='鏃�'
- this.feeFrom.priceParam2.name ='瀹為檯鐢ㄥ伐浜烘暟锛�'
+ this.feeFrom.priceParam2.name ='瀹為檯鐢ㄥ伐浜烘暟'
this.feeFrom.priceParam2.unit ='浜�'
}else if(this.info.carType==1){
//鎸夊皬鏃�
- this.feeFrom.priceParam1.name ='鍖呰閲嶉噺锛�'
+ this.feeFrom.priceParam1.name ='鍖呰閲嶉噺'
this.feeFrom.priceParam1.unit ='鏂�'
this.feeFrom.priceParam2.name =null
this.feeFrom.priceParam2.unit =null
}
}else if(this.info.type==1 && this.info.carType==0){
//杩愯揣鍗� 鎸夊ぉ鏁�
- this.feeFrom.priceParam1.name ='瀹為檯鐢ㄨ溅澶╂暟锛�'
+ this.feeFrom.priceParam1.name ='鐢ㄨ溅澶╂暟'
this.feeFrom.priceParam1.unit ='澶�'
}else if(this.info.type==1 && this.info.carType==1){
//杩愯揣鍗� 鎸夋鏁�
- this.feeFrom.priceParam1.name ='瀹為檯鐢ㄨ溅娆℃暟锛�'
+ this.feeFrom.priceParam1.name ='鐢ㄨ溅娆℃暟'
this.feeFrom.priceParam1.unit ='娆�'
}
}
--
Gitblit v1.9.3