From 634e27bb3b7834bf22dd8976c718fad9df1a88c2 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Wed, 1 Jun 2022 00:36:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=8E=A5=E5=8F=A3=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/js/request.js             | 6 +++---
 pages/product/product-detail.vue | 5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/common/js/request.js b/common/js/request.js
index ee157b5..9532344 100644
--- a/common/js/request.js
+++ b/common/js/request.js
@@ -6,9 +6,9 @@ export default {
 		uni.addInterceptor('request', {
 			invoke(args) {
 				// request 触发前拼接 url 
-				// args.url = 'https://www.opsoul.com' + args.url;
-				// args.url = 'http://10.45.110.67:80' + args.url;
-				args.url = 'http://127.0.0.1:80' + args.url;
+				args.url = 'https://www.opsoul.com' + args.url;
+				// args.url = 'http://10.45.111.215:80' + args.url;
+				// args.url = 'http://127.0.0.1:80' + args.url;
 				if (args.data) {
 					args.data.deptId = globalData.deptId;
 					args.data.from = globalData.from;
diff --git a/pages/product/product-detail.vue b/pages/product/product-detail.vue
index 6460068..36e33c8 100644
--- a/pages/product/product-detail.vue
+++ b/pages/product/product-detail.vue
@@ -28,11 +28,14 @@
 		<!-- 价格及活动栏 -->
 		<view class="bg-gradual-color padding-sm margin-bottom-xs shadow-blur">
 			<view class="flex justify-between align-center">
-				<view>
+				<view v-if="curProductSpecs.discountPrice">
 					<text class="text-sl text-price">{{curProductSpecs.discountPrice}}</text>
 					<text class="text-del">
 						<text class="text-xxl">¥{{curProductSpecs.goodsPrice}}</text>
 					</text>
+				</view>
+				<view v-else>
+					<text class="text-sl text-price">{{curProductSpecs.goodsPrice}}</text>
 				</view>
 				<view>
 					<text class="text-df">已售：{{curProductSpecs.saledCount}}</text>