From 4bbc66248f03f900ffe9c2cf1c0741b2b2a4bac7 Mon Sep 17 00:00:00 2001
From: 15093570141 <141405260+17521612761@users.noreply.github.com>
Date: Fri, 1 Nov 2024 09:35:22 +0800
Subject: [PATCH] =?UTF-8?q?uniapp=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91:=20?=
 =?UTF-8?q?=E5=94=AE=E5=90=8E=E9=87=91=E9=A2=9D=E4=B8=BA0=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/subpackage/member/afterSales/apply/apply.vue       | 5 ++++-
 .../CoreShop/pages/subpackage/member/order/detail/detail.vue | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/afterSales/apply/apply.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/afterSales/apply/apply.vue
index da3f5458..257e0bd6 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/afterSales/apply/apply.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/afterSales/apply/apply.vue
@@ -128,6 +128,7 @@
 		images : Array<any>;
 		reason : string;
 		refundPrice : number;  /** 退款金额 */
+		payedAmount : number;   /** 订单金额 */
 	}>({
 		orderId: "",
 		goodsList: [],
@@ -139,6 +140,7 @@
 		images: [],
 		reason: "",
 		refundPrice: 0,
+		payedAmount: 0,
 	});
 
 	const loading = ref(false);
@@ -185,6 +187,7 @@
 					}
 					return item;
 				})
+				state.payedAmount = orderDetail.data.payedAmount;
 				state.maxRefund = (orderDetail.data.orderAmount * 10000 - orderDetail.data.refunded * 10000) / 10000;
 				state.costFreight = orderDetail.data.costFreight;
 				state.refundShow = (orderDetail.data.payedAmount * 10000 - orderDetail.data.refunded * 10000) / 10000;
@@ -292,7 +295,7 @@
 
 	/** 提交 */
 	async function onSubmit() {
-		if (!amount(state.refundPrice)) {
+		if (state.payedAmount != 0 && !amount(state.refundPrice)) {
 			handleShowToast('请输入正确金额'); return;
 		}
 		if (state.refundPrice > state.refundShow) {
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/order/detail/detail.vue b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/order/detail/detail.vue
index 704c432f..f6bc3b76 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/order/detail/detail.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/order/detail/detail.vue
@@ -223,7 +223,7 @@
 					</view>
 					<view class="msg-box">
 						<view class="lab">{{ shopConfigStore?.config?.pointShowName }}优惠</view>
-						<view class="val">{{ state.orderDetail?.pointMoney }}</view>
+						<view class="val">-￥{{ state.orderDetail?.pointMoney }}</view>
 					</view>
 					<view class="msg-box" v-if="state.orderDetail?.orderDiscountAmount > 0">
 						<view class="lab">订单优惠</view>