diff --git a/src/App.vue b/src/App.vue index fb7854c..8d84793 100644 --- a/src/App.vue +++ b/src/App.vue @@ -78,16 +78,14 @@ export default { set(){ } }, showTabbar() { - const path = tabbar.map(tab => tab.path); - const { name, query: { temple_id, hideTab } } = this.$route; + const path = tabbar.map(tab => tab.name); + const { name, query: { hideTab } } = this.$route; // 等于寺庙功德箱时隐藏底部导航 - console.log(name, temple_id !== '1') if(name === 'merit-box' || (name === 'temple-list' && hideTab === '1')){ return false } - - return path.includes(this.$route.path); + return path.includes(this.$route.name); }, paddingBottom() { return this.showTabbar ? this.$refs.tabbar ? this.$refs.tabbar.$el.offsetHeight : 0 : 0; diff --git a/src/components/Thanksgiving/index.vue b/src/components/Thanksgiving/index.vue index edef3ef..284e208 100644 --- a/src/components/Thanksgiving/index.vue +++ b/src/components/Thanksgiving/index.vue @@ -7,7 +7,7 @@
-
+
@@ -46,13 +46,7 @@ export default { { id: 2, title: "月榜", list: [] }, { id: 3, title: "总榜", list: [] }, ], - swiperOptions: { - - // onSlideChangeEnd: ({realIndex}) => { - // this.type_id = this.type_nav[realIndex].id; - // this.getOrderCompare(); - // } - } + page: 1, } }, mounted(){ @@ -66,7 +60,7 @@ export default { async getOrderCompare(){ let res; if(this.templeId){ - res = await getOrderCompare(this.templeId || '1', this.type_id, this.goodsId, this.goodsType) + res = await getOrderCompare(this.templeId || '1', this.page, this.type_id, this.goodsId, this.goodsType) } else { res = await getOrderCompareByAgentId(this.agentId, this.type_id, this.goodsId, this.goodsType) } diff --git a/src/components/user-merit/index.vue b/src/components/user-merit/index.vue index 5d17be4..4c54deb 100644 --- a/src/components/user-merit/index.vue +++ b/src/components/user-merit/index.vue @@ -7,7 +7,7 @@
- {{data.nickname || data.user_info.nickname}} + {{data.merit_name || data.nickname || data.user_info.nickname}}

{{data.goods_name}}

diff --git a/src/pages/home.vue b/src/pages/home.vue index c320c5f..86b8e3f 100644 --- a/src/pages/home.vue +++ b/src/pages/home.vue @@ -165,7 +165,6 @@ export default { console.log(res.temple_data.unit_name) setTimeout(() => { document.title = res.temple_data.unit_name; - console.log(document.title) }, 10) }, onMoreProcess() { diff --git a/wap/index.html b/wap/index.html index 98903e1..2b5f022 100644 --- a/wap/index.html +++ b/wap/index.html @@ -1 +1 @@ -
\ No newline at end of file +
\ No newline at end of file