From 5d461484dd567ed7733dac361b6d212bd4a2b4c2 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 03 九月 2025 17:21:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
small-program/pages/order-details/order-details.vue | 47 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 42 insertions(+), 5 deletions(-)
diff --git a/small-program/pages/order-details/order-details.vue b/small-program/pages/order-details/order-details.vue
index fd1e830..93e9dea 100644
--- a/small-program/pages/order-details/order-details.vue
+++ b/small-program/pages/order-details/order-details.vue
@@ -302,28 +302,28 @@
<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" placeholder-style="color: #999999; font-size: 56rpx; font-weight: 500;" 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-input">
- <input type="number" v-model="feeForm.priceNum2" placeholder-style="color: #999999; font-size: 56rpx; font-weight: 500;" 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-style="color: #999999; font-size: 56rpx; font-weight: 500;" 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" 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">
@@ -474,8 +474,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
--
Gitblit v1.9.3