From 5524650a8e46e6bd0d82c537a447f45a205eb1e7 Mon Sep 17 00:00:00 2001
From: "@AliceXiaoZhan" <1936165216@qq.com>
Date: Thu, 8 Jun 2023 09:26:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/components/xuqiu.vue       | 1 +
 components/tabs/tabs.vue              | 5 ++++-
 pages.json                            | 2 +-
 pages/resource_list/resource_list.vue | 1 +
 pages/shop_street/shop_street.vue     | 2 +-
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/components/components/xuqiu.vue b/components/components/xuqiu.vue
index 28daf1c..d4ed5a9 100644
--- a/components/components/xuqiu.vue
+++ b/components/components/xuqiu.vue
@@ -69,6 +69,7 @@
             },
             // 切换标签导航
             changeTabs(event) {
+
                 this.current = event;
             },
             // 初始化获取话题
diff --git a/components/tabs/tabs.vue b/components/tabs/tabs.vue
index 35d8601..6431fa3 100644
--- a/components/tabs/tabs.vue
+++ b/components/tabs/tabs.vue
@@ -314,6 +314,7 @@
                 query.exec(
                     function(res) {
                         this.tabQueryInfo = res;
+						//console.log(res)
                         // 初始化滚动条和移动bar的位置
                         this.scrollByIndex();
                     }.bind(this)
@@ -322,9 +323,11 @@
             // 滚动scroll-view，让活动的tab处于屏幕的中间位置
             scrollByIndex() {
                 // 当前活动tab的布局信息，有tab菜单的width和left(为元素左边界到父元素左边界的距离)等信息
-                let tabInfo = this.tabQueryInfo[this.currentIndex];
 				console.log('tabInfo')
+				console.log(this.currentIndex)
 				console.log(this.tabQueryInfo)
+                let tabInfo = this.tabQueryInfo[this.currentIndex];
+				
                 if (!tabInfo) return;
                 // 活动tab的宽度
                 let tabWidth = tabInfo.width;
diff --git a/pages.json b/pages.json
index f481f22..5f736f6 100644
--- a/pages.json
+++ b/pages.json
@@ -939,7 +939,7 @@
 				"pagePath": "pages/community/community",
 				"iconPath": "/static/images/tab-community.png",
 				"selectedIconPath": "/static/images/tab-community_s.png",
-				"text": "任务中心"
+				"text": "服务大厅"
 			},
 			{
 				"pagePath": "pages/resource_list/resource_list",
diff --git a/pages/resource_list/resource_list.vue b/pages/resource_list/resource_list.vue
index 345ffee..5ce66e3 100644
--- a/pages/resource_list/resource_list.vue
+++ b/pages/resource_list/resource_list.vue
@@ -50,6 +50,7 @@
 			</view>
 
 		</mescroll-body>
+		<tabbar></tabbar>
 	</view>
 </template>
 
diff --git a/pages/shop_street/shop_street.vue b/pages/shop_street/shop_street.vue
index ccb638b..2e9ed1b 100644
--- a/pages/shop_street/shop_street.vue
+++ b/pages/shop_street/shop_street.vue
@@ -41,7 +41,7 @@
 				</view>
 			</view> -->
 		</view>
-	
+	<tabbar></tabbar>
 	</view>
 
 </template>