From 6a159e76d79f92a4b12095b38d01687ff4ec9346 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 03 九月 2025 13:43:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
small-program/pages/order-details/order-details.vue | 55 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 33 insertions(+), 22 deletions(-)
diff --git a/small-program/pages/order-details/order-details.vue b/small-program/pages/order-details/order-details.vue
index 74e42ef..fcce88d 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>
@@ -291,38 +299,41 @@
<view class="querenfee-c" >
<view class="querenfee-c-info1"><text style="color: red;">*</text>瀹為檯{{feeFrom.priceParam1.name}}</view>
<view class="querenfee-c-input">
- <input type="number" v-model="feeForm.priceNum1" placeholder="璇疯緭鍏�" />
+ <input type="number" placeholder-style="color: #999999; font-size: 56rpx; font-weight: 500;" v-model="feeForm.priceNum1" placeholder="璇疯緭鍏�" />
</view>
<text class="querenfee-c-danw">{{feeFrom.priceParam1.unit}}</text>
</view>
<view class="querenfee-c" v-if="feeFrom.priceParam2.name !=null">
<view class="querenfee-c-info1"><text style="color: red;">*</text>瀹為檯{{feeFrom.priceParam2.name}}锛�</view>
<view class="querenfee-c-input">
- <input type="number" v-model="feeForm.priceNum2" placeholder="璇疯緭鍏�" />
+ <input type="number" v-model="feeForm.priceNum2" placeholder-style="color: #999999; font-size: 56rpx; font-weight: 500;" placeholder="璇疯緭鍏�" />
</view>
<text class="querenfee-c-info1" >{{feeFrom.priceParam2.unit}}</text>
</view>
<view class="querenfee-c">
<view class="querenfee-c-info1">鍏朵粬璐圭敤锛�</view>
<view class="querenfee-c-input">
- <input type="number" v-model="feeForm.confirmOtherFee" placeholder="璇疯緭鍏�" />
+ <input type="number" v-model="feeForm.confirmOtherFee" placeholder-style="color: #999999; font-size: 56rpx; font-weight: 500;" placeholder="璇疯緭鍏�" />
</view>
<text class="querenfee-c-danw">鍏�</text>
</view>
<view class="querenfee-c" style="flex-direction: column;">
- <view class="querenfee-c-info1">澶囨敞淇℃伅锛�</view>
+ <view class="querenfee-c-info1" style="margin-bottom: 30rpx;">澶囨敞淇℃伅锛�</view>
<view class="querenfee-c-input" style="width: 100%; height: 200rpx; padding: 30rpx; box-sizing: border-box;">
<u--textarea placeholder="濡傞渶澶囨敞锛岃杈撳叆" border="none" v-model="feeForm.confirmFeeRemark" ></u--textarea>
</view>
</view>
<view class="querenfee-c">
<view class="querenfee-c-info1">瀹為檯鎬昏垂鐢細</view>
- <view class="querenfee-c-input">
+ <view class="querenfee-c-price">
+ 锟{confirmPayFee}}
+ </view>
+ <!-- <view class="querenfee-c-input">
<image src="/static/icon/ic_money@2x.png" mode="widthFix"></image>
<text class="querenfee-c-input money">{{confirmPayFee}}</text>
- </view>
+ </view> -->
</view>
- <view class="querenfee-c">
+ <view class="querenfee-c" style="margin-top: 12rpx;">
<view class="querenfee-tips">鏈�缁堣垂鐢ㄧ敱鍙戝崟鏂规敮浠橈紝鎺ュ崟鏂规敹鍒扮殑閲戦灏嗘墸闄ゅ钩鍙版墜缁垂鐢�</view>
</view>
<view class="querenfee-botton" @click="confirmFee">纭璐圭敤</view>
@@ -717,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 ='娆�'
}
}
@@ -834,6 +845,11 @@
color: #333333;
margin-left: 10rpx;
}
+ .querenfee-c-price {
+ font-weight: 600;
+ font-size: 44rpx;
+ color: #FF0000;
+ }
.querenfee-c-info1 {
width: 50%;
display: flex;
@@ -841,7 +857,6 @@
font-weight: 600;
font-size: 32rpx;
color: #222222;
- margin-bottom: 20rpx;
}
.querenfee-tips{
width: 100%;
@@ -858,13 +873,6 @@
color: #FF0000 !important;
}
.querenfee-c-input {
- // width: 100%;
- // padding: 0 30rpx;
- // box-sizing: border-box;
- // height: 60rpx;
- // background: #F7F7F7;
- // border-radius: 10rpx;
- // border: 1rpx solid #EEEEEE;
width: 260rpx;
height: 100rpx;
padding: 10rpx 30rpx;
@@ -887,6 +895,9 @@
font-size: 56rpx;
color: #222222;
text-align: right;
+ .querenfee-c-input-placeholder {
+ font-size: 32rpx !important;
+ }
}
}
}
--
Gitblit v1.9.3