From 6bf70059042c10b6fa0d17cae6710d42a6c39716 Mon Sep 17 00:00:00 2001
From: Gaoxs <704041637@qq.com>
Date: Mon, 28 Sep 2020 17:53:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A0=8D=E4=BB=B7=E9=A6=96?=
 =?UTF-8?q?=E6=AC=A1=E8=BF=9B=E5=85=A5=E6=97=A0=E6=B3=95=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/index.js                         | 1 -
 pages.json                              | 8 ++------
 pages/activity/DargainDetails/index.vue | 5 ++---
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/config/index.js b/config/index.js
index c54667e..47f84b0 100644
--- a/config/index.js
+++ b/config/index.js
@@ -5,4 +5,3 @@ export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api';
 // export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api';
 // export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api';
 export const VUE_APP_RESOURCES_URL = 'https://wx.yixiang.co/static';
-
diff --git a/pages.json b/pages.json
index 766b550..b87a7e3 100644
--- a/pages.json
+++ b/pages.json
@@ -423,12 +423,8 @@
 		"navigationBarTitleText": "Yshop",
 		"navigationBarBackgroundColor": "#F8F8F8",
 		"backgroundColor": "#F8F8F8",
-		// #ifndef H5 
-		"navigationStyle": "default",
-		// #endif 
-		// #ifdef H5 
-		"navigationStyle": "custom"
-		// #endif 
+		"navigationStyle": "default"
+		
 	},
 	"tabBar": {
 		"color": "#282828",
diff --git a/pages/activity/DargainDetails/index.vue b/pages/activity/DargainDetails/index.vue
index dc16e6b..e574c50 100644
--- a/pages/activity/DargainDetails/index.vue
+++ b/pages/activity/DargainDetails/index.vue
@@ -236,10 +236,9 @@
         } else {
           // 正常途径进来
           that.bargainId = that.$yroute.query.id;
-          that.bargainUid = that.$yroute.query.partake || 0
+          that.bargainUid = that.$yroute.query.partake
         }
-
-        if (!this.bargainUid) {
+        if (this.bargainUid == 0 || !this.bargainUid) {
           // url未携带用户uid，填上登录用户uid，跳转
           that.bargainUid = that.userInfo.uid;
         }