diff --git a/common/js/golbalConfig.js b/common/js/golbalConfig.js index d93018c..a74d5ab 100644 --- a/common/js/golbalConfig.js +++ b/common/js/golbalConfig.js @@ -65,14 +65,10 @@ export default { }, tabBarPagePaddingStyle() { return this.$util.objToStyle({ - paddingBottom: this.shouldShowTabBar ? '112rpx' : '0' + height: `calc(100vh - ${this.tabBarHeight})`, + paddingBottom: this.tabBarHeight }); }, - tabBarPaddingStyleValue() { - return { - paddingBottom: this.shouldShowTabBar ? '112rpx' : '0' - }; - }, siteInfo() { return this.$store.state.siteInfo; }, @@ -132,7 +128,7 @@ export default { return this.$store.state.diySeckillInterval; }, tabBarHeight() { - return this.$store.state.tabBarHeight; + return this.shouldShowTabBar ? this.$store.state.tabBarHeight : '0rpx'; }, mapConfig() { return this.$store.state.mapConfig; diff --git a/pages_promotion/fenxiao/index.vue b/pages_promotion/fenxiao/index.vue index 5d895b7..8381b7f 100644 --- a/pages_promotion/fenxiao/index.vue +++ b/pages_promotion/fenxiao/index.vue @@ -581,7 +581,7 @@ export default { }, fenxiaoIndexPageStyle() { const style = { - ...this.tabBarPaddingStyleValue + ...this.tabBarPagePaddingStyle }; if (this.$util && this.$util.img) { style.background = 'url(' + this.$util.img('public/uniapp/fenxiao/index/commissionFission-background.png') + ')'; diff --git a/pages_promotion/merch/merchcategory.vue b/pages_promotion/merch/merchcategory.vue index 7fcad86..db0de4c 100644 --- a/pages_promotion/merch/merchcategory.vue +++ b/pages_promotion/merch/merchcategory.vue @@ -1,6 +1,6 @@