diff --git a/pages.json b/pages.json index 2bebce3..08295bb 100644 --- a/pages.json +++ b/pages.json @@ -431,9 +431,9 @@ "borderStyle": "black", "backgroundColor": "#ffffff", "height": "50px", - "fontSize": "8px", - "iconWidth": "16px", - "spacing": "-3px", + "fontSize": "10px", + "iconWidth": "24px", + "spacing": "3px", "list": [{ "pagePath": "pages/home/index", "iconPath": "static/icon-home.png", diff --git a/pages/activity/DargainDetails/index.vue b/pages/activity/DargainDetails/index.vue index 533b9ed..20604d9 100644 --- a/pages/activity/DargainDetails/index.vue +++ b/pages/activity/DargainDetails/index.vue @@ -276,7 +276,9 @@ }, mountedStart: function () { var that = this; + console.log(this) let url = handleQrCode(); + console.log(url) if (url) { that.bargainId = url.bargainId; that.partake = url.uid; @@ -376,7 +378,9 @@ ' { uni.showToast({ @@ -451,12 +455,15 @@ //获取砍掉的金额 getBargainHelpPrice: function () { var that = this; + that.helpListLoading = true; + getBargainHelpPrice({ bargainId: that.bargainId, bargainUserUid: that.bargainPartake }) .then(res => { that.bargainHelpPrice = res.data.price; + that.helpListLoading = false; that.getBargainHelpCount(); that.getBargainHelpList(); switch (that.activeMsg) { diff --git a/pages/activity/Poster/index.vue b/pages/activity/Poster/index.vue index a199a70..88874cb 100644 --- a/pages/activity/Poster/index.vue +++ b/pages/activity/Poster/index.vue @@ -37,11 +37,16 @@ } }, methods: { + // 砍价海报 getBargainPoster: function () { var that = this; + let from = this.$deviceType + if (from == 'weixin' || this.$deviceType == 'weixinh5') { + from = 'uniappH5' + } getBargainPoster({ bargainId: that.id, - from: "wechat" + from }) .then(res => { that.image = res.data.url; @@ -58,9 +63,15 @@ // 拼团海报 getCombinationPoster: function () { var that = this; + console.log(this.$deviceType) + let from = this.$deviceType + if (from == 'weixin' || this.$deviceType == 'weixinh5') { + from = 'uniappH5' + } + console.log(from) getCombinationPoster({ id: that.id, - from: this.$deviceType == 'weixin' || this.$deviceType == 'weixinh5' ? 'uniappH5' : this.$deviceType + from }) .then(res => { that.image = res.data.url; diff --git a/utils/store/cookie.js b/utils/store/cookie.js index 0e048e4..eeb6714 100644 --- a/utils/store/cookie.js +++ b/utils/store/cookie.js @@ -37,7 +37,6 @@ function _has(key) { return } let value = uni.getStorageSync(key) - console.log(key) if (value) { return true }