From f4197ec3b01c3de55e2860fd005fd064fb36aa73 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Wed, 19 Oct 2022 00:51:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E4=BB=98?=
 =?UTF-8?q?=E6=AC=BE=E5=88=A4=E6=96=AD=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=BB=98=E6=AC=BE=E6=A6=82=E5=86=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/my/my-order.vue    | 14 +++++++-------
 pages/my/serv-detail.vue |  9 ++++++---
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/pages/my/my-order.vue b/pages/my/my-order.vue
index c8bf061..2e7c083 100644
--- a/pages/my/my-order.vue
+++ b/pages/my/my-order.vue
@@ -39,19 +39,19 @@
 						</view>
 						<view class="margin-right-sm"><text>优惠</text><text class="text-price text-red">{{shopOrder.discountMoney}}</text>
 						</view>
-						<view class="margin-right-sm" v-if="shopOrder.payStatus == 4"><text>已付款</text><text class="text-price text-red">{{shopOrder.paidMoney}}</text>
-						</view>
-						<view class="text-lg" v-if="shopOrder.payStatus == 1"><text>实付款</text><text
+						<view class="margin-right-sm" v-if="shopOrder.payStatus == 1 && shopOrder.changeMoney"><text>已付款</text><text class="text-price text-red">{{shopOrder.payMoney}}</text>
+						</view>
+						<view class="text-lg" v-if="shopOrder.payStatus == 1 && shopOrder.changeMoney"><text>需付款</text><text
+								class="text-price text-red text-lg text-bold">{{shopOrder.changeMoney}}</text></view>
+						<view class="text-lg" v-else-if="shopOrder.payStatus == 1"><text>实付款</text><text
 								class="text-price text-red text-lg text-bold">{{shopOrder.payMoney}}</text></view>
 						<view class="text-lg" v-else-if="shopOrder.payStatus == 0"><text>需付款</text><text
-								class="text-price text-red text-lg text-bold">{{shopOrder.payMoney}}</text></view>
-						<view class="text-lg" v-else-if="shopOrder.payStatus == 4"><text>需付款</text><text
-								class="text-price text-red text-lg text-bold">{{shopOrder.changeMoney}}</text></view>
+								class="text-price text-red text-lg text-bold">{{shopOrder.payMoney + shopOrder.changeMoney}}</text></view>
 					</view>
 					<view v-if="orderType === 0" class="padding-tb-sm">
 						<view class="flex justify-end">
 							<button v-if="[0,1].indexOf(shopOrder.orderStatus) >= 0" class="cu-btn bg-gray margin-right-sm shadow-blur" @click="showModalByRef('confirmModal', shopOrder)">取消订单</button>
-							<button v-if="shopOrder.payStatus != 1" class="cu-btn bg-main-color shadow-blur margin-right-sm" @click="wxpay(shopOrder)">付款</button>
+							<button v-if="shopOrder.payStatus != 1 || shopOrder.changeMoney" class="cu-btn bg-main-color shadow-blur margin-right-sm" @click="wxpay(shopOrder)">付款</button>
 							<button class="cu-btn bg-main-color shadow-blur" @click="showServDetail(shopOrder)">查看</button>
 						</view>
 					</view>
diff --git a/pages/my/serv-detail.vue b/pages/my/serv-detail.vue
index cb52a88..42fa65e 100644
--- a/pages/my/serv-detail.vue
+++ b/pages/my/serv-detail.vue
@@ -272,9 +272,12 @@
 						<view class="text-red" v-if="afterServiceRecord.customerFinalCheck === 0">订单已申请平台介入</view>
 						<view v-else-if="afterServiceRecord.customerFinalCheck === 1">
 							<view v-if="afterServiceRecord.originalRefund > 0">
-								<text>本单退款，系统已发起原路退回</text>
-								<text class="text-red">{{afterServiceRecord.originalRefund}}</text>
-								<text>元，发起时间：{{afterServiceRecord.refundApplyTime}}，有其余部分的以双方沟通操作为准（注：银行按工作日到帐，节假日顺延到账）。</text>
+								<view>
+									<text>本单退款，系统已发起原路退回</text>
+									<text class="text-red">{{afterServiceRecord.originalRefund}}</text>
+									<text>元，有其余部分的以双方沟通操作为准（注：银行按工作日到帐，节假日顺延到账）。</text>
+								</view>
+								<view>支付时间：{{afterServiceRecord.refundApplyTime}}</view>
 							</view>
 							<view v-else-if="afterServiceRecord.originalRefund == 0 && servDetail.payStatus == 0">
 								<text>本单未支付，实际退回0.00元</text>