From 823df18a59d9299b3547158e0d088b43351315e3 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Sat, 15 Oct 2022 01:44:49 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/js/request.js                                | 4 ++--
 pages/order-manage/modal/agree-after-sale.vue       | 6 +++---
 pages/order-manage/modal/new-serv-price-offline.vue | 2 +-
 pages/order-manage/modal/new-serv-price-online.vue  | 2 +-
 pages/order-manage/order-manage.vue                 | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/common/js/request.js b/common/js/request.js
index 0351299..a8a9748 100644
--- a/common/js/request.js
+++ b/common/js/request.js
@@ -13,8 +13,8 @@ export default {
 				})
 				let userInfo = _this.getCurUserInfo();
 				// request 触发前拼接 url 
-				args.url = 'https://www.opsoul.com' + args.url;
-				// args.url = 'http://127.0.0.1:80' + args.url;
+				// args.url = 'https://www.opsoul.com' + args.url;
+				args.url = 'http://127.0.0.1:80' + args.url;
 				// args.url = 'http://192.168.2.20:80' + args.url;
 				
 				if (!args.data) {
diff --git a/pages/order-manage/modal/agree-after-sale.vue b/pages/order-manage/modal/agree-after-sale.vue
index 4ab2717..9e95a6c 100644
--- a/pages/order-manage/modal/agree-after-sale.vue
+++ b/pages/order-manage/modal/agree-after-sale.vue
@@ -90,7 +90,7 @@
 				let agreedRefund = this.agreedRefund;
 				if (!agreedRefund && this.data.afterServiceRecordList[0].refund != null) {
 					agreedRefund = this.data.afterServiceRecordList[0].refund;
-				} else {
+				} else if (!agreedRefund) {
 					agreedRefund = this.data.payMoney;
 				}
 				let res = await this.$request.editAfterServiceRecord({
@@ -102,13 +102,13 @@
 					updateBy: 2
 				});
 				if (res && res.code === 0) {
-					this.hideModal(e);
-					this.$emit('confirmFeedback');
 					uni.showToast({
 						icon: 'success',
 						title: '提交成功',
 						duration: 1000
 					})
+					this.hideModal(e);
+					this.$emit('confirmFeedback');
 					return;
 				}
 				uni.showToast({
diff --git a/pages/order-manage/modal/new-serv-price-offline.vue b/pages/order-manage/modal/new-serv-price-offline.vue
index 7b6e5e6..a425380 100644
--- a/pages/order-manage/modal/new-serv-price-offline.vue
+++ b/pages/order-manage/modal/new-serv-price-offline.vue
@@ -55,7 +55,7 @@
 			<view class="cu-bar bg-white solid-top">
 				<view class="action margin-0 flex-sub text-black" data-modal="showNewServPriceOfflineModal"
 					@click="hideModal">退出/再次上门</view>
-				<view class="action margin-0 flex-sub text-main-color solid-left" v-if="priceObj && priceObj.payStatus === 0"
+				<view class="action margin-0 flex-sub text-main-color solid-left" v-if="(priceObj && priceObj.payStatus === 0) || data.payStatus === 0"
 					data-modal="showPayQrcodeModal" @tap="makePayQrcode($event)">请客户支付</view>
 				<view class="action margin-0 flex-sub text-main-color solid-left"
 					data-modal="showNewServPriceOfflineModal" @tap="hideModal" @click="goFinishOrder" v-else>去完单</view>
diff --git a/pages/order-manage/modal/new-serv-price-online.vue b/pages/order-manage/modal/new-serv-price-online.vue
index cda464e..f4e47d4 100644
--- a/pages/order-manage/modal/new-serv-price-online.vue
+++ b/pages/order-manage/modal/new-serv-price-online.vue
@@ -55,7 +55,7 @@
 			<view class="cu-bar bg-white solid-top">
 				<view class="action margin-0 flex-sub text-black" data-modal="showNewServPriceOnlineModal"
 					@click="hideModal">退出/再次上门</view>
-				<view class="action margin-0 flex-sub text-main-color solid-left" v-if="priceObj && priceObj.payStatus === 0"
+				<view class="action margin-0 flex-sub text-main-color solid-left" v-if="(priceObj && priceObj.payStatus === 0) || data.payStatus === 0"
 					data-modal="showPayQrcodeModal" @tap="makePayQrcode($event)">请客户支付</view>
 				<view class="action margin-0 flex-sub text-main-color solid-left"
 					data-modal="showNewServPriceOnlineModal" @tap="hideModal" @click="goFinishOrder" v-else>去完单</view>
diff --git a/pages/order-manage/order-manage.vue b/pages/order-manage/order-manage.vue
index cbf5bea..632d1f0 100644
--- a/pages/order-manage/order-manage.vue
+++ b/pages/order-manage/order-manage.vue
@@ -185,8 +185,8 @@
 				<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @click = "changePrice($event, order)" data-ref="newServPriceOnline" data-modal="showNewServPriceOnlineModal" v-show="order.orderDetailId != null && order.payType === 0">报价/完单</button>
 				<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @tap="makePhoneCall(order.customerPhone)">联系客户</button>
 				<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" data-modal="showEditTimeArrangeModal" @tap="showModal($event, order)" v-show="order.orderDetailId != null">重新排期</button>
-				<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @tap="finishOrder(order)" v-if="order.payStatus === 1" v-show="order.orderDetailId != null">发起完单</button>
-				<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" data-modal="showPayQrcodeModal" v-if="order.payStatus === 0" @tap="makePayQrcode($event, order)" v-show="order.orderDetailId != null">生成收款码</button>
+				<!-- <button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @tap="finishOrder(order)" v-if="order.payStatus === 1" v-show="order.orderDetailId != null">发起完单</button> -->
+				<!-- <button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" data-modal="showPayQrcodeModal" v-if="order.payStatus === 0" @tap="makePayQrcode($event, order)" v-show="order.orderDetailId != null">生成收款码</button> -->
 			</view>
 			<view v-if="order.orderStatus === 4 || order.orderStatus === 5">
 				<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @click="showServOrderDetail(order)">查看</button>