更改功德箱未显示完

src/App.vue

@@ -78,16 +78,14 @@ export default {
             set(){ }
         },
         showTabbar() {
-            const path = tabbar.map(tab => tab.path);
+            const path = tabbar.map(tab => tab.name);
-            const { name, query: { temple_id, hideTab } } = this.$route;
+            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.name);
-            return path.includes(this.$route.path);
         },
         paddingBottom() {
             return this.showTabbar ? this.$refs.tabbar ? this.$refs.tabbar.$el.offsetHeight : 0 : 0;

src/components/Thanksgiving/index.vue

@@ -7,7 +7,7 @@
             </div>
         </div>
         <div class="body">
-            <div :options="swiperOptions">
+            <div>
                 <div v-for="slide in type_nav"  :key="slide.id" class="1231">
                     <div v-if="type_id === slide.id" class="123">
                         <user-merit v-for="dynamic in slide.list" :key="dynamic.id" :data="dynamic" ></user-merit>
@@ -46,13 +46,7 @@ export default {
                 { id: 2, title: "月榜", list: [] },
                 { id: 3, title: "总榜", list: [] },
             ],
-            swiperOptions: {
+            page: 1,
-
-                // onSlideChangeEnd: ({realIndex}) => {
-                //     this.type_id = this.type_nav[realIndex].id;
-                //     this.getOrderCompare();
-                // }
-            }
         }
     },
     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)
             }

src/components/user-merit/index.vue

@@ -7,7 +7,7 @@
 		<div class="profile">
 			<div>
 				<div class="name">
-					<span>{{data.nickname || data.user_info.nickname}}</span>
+					<span>{{data.merit_name || data.nickname || data.user_info.nickname}}</span>
 <!--					<span>{{data.user_info.region}}</span>-->
 				</div>
 				<p class="goods_name">{{data.goods_name}}</p>

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() {