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/order-details/order-details.vue | 110 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 79 insertions(+), 31 deletions(-)
diff --git a/small-program/pages/order-details/order-details.vue b/small-program/pages/order-details/order-details.vue
index 6353f91..eafc8a4 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>
@@ -289,40 +297,43 @@
<viem class="money">{{((info.price||0)/100).toFixed(2) }}{{info.priceUnit || '' }}</viem>
</view>
<view class="querenfee-c" >
- <view class="querenfee-c-info1"><text style="color: red;">*</text>{{feeFrom.priceParam1.name}}</view>
+ <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;" @input="getTotal" v-model="feeFrom.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-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="feeFrom.priceNum2" placeholder-style="color: #999999; font-size: 56rpx; font-weight: 500;" @input="getTotal" 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="feeFrom.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>
+ <u--textarea placeholder="濡傞渶澶囨敞锛岃杈撳叆" border="none" v-model="feeFrom.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>
@@ -361,8 +372,8 @@
},
data() {
return {
- isPushlishor:false,
- isAcceptor:false,
+ isPushlishor:false,//鏄惁鍙戝崟鏂�
+ isAcceptor:false,//鏄惁鎺ュ崟鏂�
show: false,
show1: false,
show2: false,
@@ -457,8 +468,45 @@
}
})
},
+ getTotal() {
+ this.$u.api.getTotal({
+ price: this.info.price,
+ priceUnit: this.feeFrom.priceParam1.unit,
+ priceNum1: this.feeFrom.priceNum1 || 0,
+ priceNum2: this.feeFrom.priceNum2 || 0,
+ type: this.info.type
+ }).then(res => {
+ if (res.code === 200) {
+ this.confirmPayFee = (res.data / 100) || '0'
+ }
+ })
+ },
confirmFee(){
- console.log("confirmFee")
+ if (!this.feeFrom.priceNum1) {
+ return uni.showToast({
+ title: '瀹為檯' + this.feeFrom.priceParam1.name + '涓嶈兘涓虹┖',
+ icon: 'none'
+ })
+ }
+ if (this.feeFrom.priceParam2.name && !this.feeFrom.priceNum2) {
+ return uni.showToast({
+ title: '瀹為檯' + this.feeFrom.priceParam2.name + '涓嶈兘涓虹┖',
+ icon: 'none'
+ })
+ }
+ this.$u.api.confirmFee({
+ confirmFeeRemark: this.feeFrom.confirmFeeRemark,
+ confirmOtherFee: this.feeFrom.confirmOtherFee,
+ orderId: this.info.id,
+ priceNum1: this.feeFrom.priceNum1,
+ priceNum2: this.feeFrom.priceNum2
+ }).then(res => {
+ if (res.code === 200) {
+ this.show7 = false
+ uni.showToast({ title: '鎿嶄綔鎴愬姛', icon: 'success', duration: 2000 });
+ this.getOrderData()
+ }
+ })
},
payment() {
var that = this
@@ -703,13 +751,13 @@
this.feeFrom.priceParam2.unit =null
if(this.info.type==0 && this.info.workType==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.type==0 && this.info.workType==0){
//閲囨憳宸�
- this.feeFrom.priceParam1.name ='瀹為檯閲囨憳閲嶉噺锛�'
+ this.feeFrom.priceParam1.name ='閲囨憳閲嶉噺锛�'
this.feeFrom.priceParam1.unit ='鏂�'
this.feeFrom.priceParam2.name =null
this.feeFrom.priceParam2.unit =null
@@ -717,30 +765,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 +882,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 +894,6 @@
font-weight: 600;
font-size: 32rpx;
color: #222222;
- margin-bottom: 20rpx;
}
.querenfee-tips{
width: 100%;
@@ -858,13 +910,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 +932,9 @@
font-size: 56rpx;
color: #222222;
text-align: right;
+ .querenfee-c-input-placeholder {
+ font-size: 32rpx !important;
+ }
}
}
}
--
Gitblit v1.9.3