From a377521310f5f9a39b71e7c7ce4623d5a13ea185 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 03 九月 2025 17:18:18 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/jinkuai
---
small-program/pages/packaging-worker/packaging-worker.vue | 6 +++---
small-program/pages/order-details/order-details.vue | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/small-program/pages/order-details/order-details.vue b/small-program/pages/order-details/order-details.vue
index 0646f09..eafc8a4 100644
--- a/small-program/pages/order-details/order-details.vue
+++ b/small-program/pages/order-details/order-details.vue
@@ -771,9 +771,9 @@
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){
//鎸夊皬鏃�
diff --git a/small-program/pages/packaging-worker/packaging-worker.vue b/small-program/pages/packaging-worker/packaging-worker.vue
index 77a6182..f790397 100644
--- a/small-program/pages/packaging-worker/packaging-worker.vue
+++ b/small-program/pages/packaging-worker/packaging-worker.vue
@@ -84,9 +84,9 @@
<view :class="form.carType === item.id ? 'list-item-cate-item active' : 'list-item-cate-item'" v-for="(item, index) in settlementType" :key="index" @click="clickType(item.id)">{{item.name}}</view>
</view>
<view class="list-item-row">
- <view class="list-item-row-label" v-if="form.carType === 0">澶╂暟</view>
- <view class="list-item-row-label" v-if="form.carType === 1">灏忔椂鏁�</view>
- <view class="list-item-row-label" v-if="form.carType === 2">閲嶉噺</view>
+ <view class="list-item-row-label" v-if="form.carType === 0">鐢ㄥ伐澶╂暟</view>
+ <view class="list-item-row-label" v-if="form.carType === 1">宸ヤ綔鏃堕暱</view>
+ <view class="list-item-row-label" v-if="form.carType === 2">鍖呰閲嶉噺</view>
<view class="list-item-row-val">
<input v-model="form.priceNum1" :disabled="form.carType === 0" @blur="getPrice" type="number" placeholder="璇疯緭鍏�" />
<text v-if="form.carType === 0">澶�</text>
--
Gitblit v1.9.3