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; }