From 04986cb28a011fac5a62c0b82e9ff0d4ee46cf22 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Tue, 25 Oct 2022 00:36:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AF=B7=E6=B1=82=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B0=E7=9A=84=E5=9C=B0=E5=9D=80=EF=BC=9B=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=8A=A0=E4=BB=B7=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/js/request.js  | 2 +-
 pages/my/my-order.vue | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/common/js/request.js b/common/js/request.js
index c87f6ca..4a52628 100644
--- a/common/js/request.js
+++ b/common/js/request.js
@@ -11,7 +11,7 @@ export default {
 					title: '加载中'
 				})
 				// request 触发前拼接 url 
-				args.url = 'https://www.opsoul.com' + args.url;
+				args.url = 'https://www.opsoul.com:8881' + args.url;
 				// args.url = 'http://192.168.2.42:80' + args.url;
 				// args.url = 'http://127.0.0.1:80' + args.url;
 				if (args.data && Object.prototype && Object.prototype.toString.call(args.data) === '[object Object]') {
diff --git a/pages/my/my-order.vue b/pages/my/my-order.vue
index 2e7c083..f8d7ff6 100644
--- a/pages/my/my-order.vue
+++ b/pages/my/my-order.vue
@@ -34,7 +34,7 @@
 					<view class="margin-top-sm" @click="showServDetail(shopOrder)">
 						<product-picked :product="shopOrder" :pickedList="shopOrder.standardList"></product-picked>
 					</view>
-					<view class="flex justify-end align-end padding-bottom-sm" @click="showServDetail(shopOrder)">
+					<view class="flex justify-end align-end padding-bottom-xs" @click="showServDetail(shopOrder)">
 						<view class="margin-right-sm"><text>总价</text><text class="text-price text-red">{{shopOrder.totalMoney}}</text>
 						</view>
 						<view class="margin-right-sm"><text>优惠</text><text class="text-price text-red">{{shopOrder.discountMoney}}</text>
@@ -47,7 +47,8 @@
 								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 + shopOrder.changeMoney}}</text></view>
-					</view>
+					</view>
+					<view class="padding-bottom-sm flex justify-end align-end text-red text-lg" v-if="shopOrder.payStatus == 1 && shopOrder.changeMoney">您有报价/加价申请待付款中......</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>