From 2aab583a99f72e380e150af9eec7d8c49a7ee17b Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 02 Jul 2021 10:48:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pages/article/article.vue | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/pages/article/article.vue b/pages/article/article.vue
index 32cd362..a865b2d 100644
--- a/pages/article/article.vue
+++ b/pages/article/article.vue
@@ -37,6 +37,9 @@
</view>
</view>
</view>
+
+ <!-- 底部导航条 -->
+ <u-tabbar :list="tabbar" :mid-button="false"></u-tabbar>
</view>
</template>
@@ -60,7 +63,8 @@
titleNum: 0,
articleTabArr: ['全部', '视频', '社会', '经济', '热点'],
articleTabNum: 0,
- navbarTopHeight: "10px"
+ navbarTopHeight: "10px",
+ tabbar:this.$store.state.tabbar
}
},
mounted() {
--
Gitblit v1.9.3