diff --git a/teamwork/App.vue b/teamwork/App.vue
index a4d18a1900b364914a0c1cbdcc0db6f315b6f71b..be44f843a571630ff597e801c03dced4cccad8c9 100644
--- a/teamwork/App.vue
+++ b/teamwork/App.vue
@@ -2,7 +2,6 @@
 	export default {
 		onLaunch: function() {
 			console.log('App Launch')
-			uni.hideTabBar();
 		},
 		onShow: function() {
 			console.log('App Show')
diff --git a/teamwork/pages.json b/teamwork/pages.json
index 77791336e509d4ede74763660bd8d698d197b757..714ddc446b183935b219d547fb98d93b250a4150 100644
--- a/teamwork/pages.json
+++ b/teamwork/pages.json
@@ -4,17 +4,17 @@
 		"^u-(.*)": "@/uni_modules/uview-ui/components/u-$1/u-$1.vue"
 	},
 	"pages": [
-		// {
-		// 	"path": "pages/login/login",
-		// 	"style": {
-		// 		"navigationStyle": "custom"
-		// 	}
-		// }, {
-		// 	"path": "pages/login/register",
-		// 	"style": {
-		// 		"navigationStyle": "custom"
-		// 	}
-		// }, 
+		{
+			"path": "pages/login/login",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		}, {
+			"path": "pages/login/register",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		}, 
 		{
 			"path": "pages/sport/main",
 			"style": {
@@ -53,20 +53,40 @@
 		"backgroundColor": "#F8F8F8"
 	},
 	"tabBar": {
+		"selectedColor":"#F1992D", 
 		"list": [{
-				"pagePath": "pages/sport/main"
+			
+				"pagePath": "pages/sport/main",
+				"text": "运动",
+				"iconPath": "static/tabbar/运动.png",
+				"selectedIconPath": "static/tabbar/运动2.png"
+					
+				
+				
 			},
 			{
-				"pagePath": "pages/discover/main"
+				"pagePath": "pages/discover/main",
+				"text": "发现",
+				"iconPath": "static/tabbar/发现.png",
+				"selectedIconPath": "static/tabbar/发现2.png"
 			},
 			{
-				"pagePath": "pages/post/post"
+				"pagePath": "pages/post/post",
+				"text": "高校圈",
+				"iconPath": "static/tabbar/圈子.png",
+				"selectedIconPath": "static/tabbar/圈子2.png"
 			},
 			{
-				"pagePath": "pages/team/main"
+				"pagePath": "pages/team/main",
+				"text": "小队",
+				"iconPath": "static/tabbar/队伍.png",
+				"selectedIconPath": "static/tabbar/队伍2.png"
 			},
 			{
-				"pagePath": "pages/my/main"
+				"pagePath": "pages/my/main",
+				"text": "我的",
+				"iconPath": "static/tabbar/我的.png",
+				"selectedIconPath": "static/tabbar/我的2.png"
 			}
 
 		]
diff --git a/teamwork/pages/discover/main.vue b/teamwork/pages/discover/main.vue
index 60f525a3b0746586ccc7a1deaa5175234055a880..8ea85cf5adfd7e20806cec0a78d1e41b50425e5c 100644
--- a/teamwork/pages/discover/main.vue
+++ b/teamwork/pages/discover/main.vue
@@ -1,15 +1,15 @@
 <template>
 	<view>
 		<text>发现</text>
-		<tabbar :current="1" />
+		<!-- <tabbar :current="1" /> -->
 	</view>
 </template>
 
 <script>
 	export default {
-		onLoad() {
-			uni.hideTabBar();
-		},
+		// onLoad() {
+		// 	uni.hideTabBar();
+		// },
 	}
 </script>
 
diff --git a/teamwork/pages/my/main.vue b/teamwork/pages/my/main.vue
index ca09f8351ca3653ea8f47fa1b6ba23f0082acf58..8a2d4f2a3750bcd988c569a9c94cf90e10d12396 100644
--- a/teamwork/pages/my/main.vue
+++ b/teamwork/pages/my/main.vue
@@ -1,15 +1,12 @@
 <template>
 	<view>
 		<text>我的</text>
-		<tabbar :current="4" />
 	</view>
 </template>
 
 <script>
 	export default {
-		onLoad() {
-			uni.hideTabBar();
-		},
+		
 	}
 </script>
 
diff --git a/teamwork/pages/post/post.vue b/teamwork/pages/post/post.vue
index 01a66c85a25f8d38f3f408a4573b1ca9c9106527..b03cb2c5969b0f2faefedb51b0082769fa7ae505 100644
--- a/teamwork/pages/post/post.vue
+++ b/teamwork/pages/post/post.vue
@@ -1,6 +1,5 @@
 <template>
 	<view>
-		<tabbar :current="2" />
 
 		<u-tabs :list="list" lineWidth="30" lineColor="#F1992D" :activeStyle="{
 		            color: '#F1992D',
@@ -29,9 +28,9 @@
 
 <script>
 	export default {
-		onLoad() {
-			uni.hideTabBar();
-		},
+		// onLoad() {
+		// 	uni.hideTabBar();
+		// },
 
 		data() {
 			return {
diff --git a/teamwork/pages/sport/main.vue b/teamwork/pages/sport/main.vue
index 854bca4e6a5e1122e87837708922beca11142653..305dad7fd4ea510d0d73d0cd95fefeffd9b73321 100644
--- a/teamwork/pages/sport/main.vue
+++ b/teamwork/pages/sport/main.vue
@@ -1,15 +1,14 @@
 <template>
 	<view>
 		<text>运动</text>
-		<tabbar :current="0" />
 	</view>
 </template>
 
 <script>
 	export default {
-		onLoad() {
-			uni.hideTabBar();
-		},
+		// onLoad() {
+		// 	uni.hideTabBar();
+		// },
 	}
 </script>
 
diff --git a/teamwork/pages/team/main.vue b/teamwork/pages/team/main.vue
index 30bce172a6c540aec59b3593bfd2aa4b6304b9f3..ee559b676778ee9daca4323597b9192e2fff3b79 100644
--- a/teamwork/pages/team/main.vue
+++ b/teamwork/pages/team/main.vue
@@ -1,15 +1,14 @@
 <template>
 	<view>
 		<text>小队</text>
-		<tabbar :current="3" />
 	</view>
 </template>
 
 <script>
 	export default {
-		onLoad() {
-			uni.hideTabBar();
-		},
+		// onLoad() {
+		// 	uni.hideTabBar();
+		// },
 	}
 </script>
 
diff --git "a/teamwork/static/tabbar/\345\217\221\347\216\2602.png" "b/teamwork/static/tabbar/\345\217\221\347\216\2602.png"
new file mode 100644
index 0000000000000000000000000000000000000000..028c6bea8aa1000978be06d0e833935c65bc35ee
Binary files /dev/null and "b/teamwork/static/tabbar/\345\217\221\347\216\2602.png" differ
diff --git "a/teamwork/static/tabbar/\345\234\210\345\255\2202.png" "b/teamwork/static/tabbar/\345\234\210\345\255\2202.png"
new file mode 100644
index 0000000000000000000000000000000000000000..3d21932f2a3f64e43cc1d0a29361548d58bc494d
Binary files /dev/null and "b/teamwork/static/tabbar/\345\234\210\345\255\2202.png" differ
diff --git "a/teamwork/static/tabbar/\346\210\221\347\232\2042.png" "b/teamwork/static/tabbar/\346\210\221\347\232\2042.png"
new file mode 100644
index 0000000000000000000000000000000000000000..6f2add2ff69599b2f5e3b289b9d67a1e594f4b98
Binary files /dev/null and "b/teamwork/static/tabbar/\346\210\221\347\232\2042.png" differ
diff --git "a/teamwork/static/tabbar/\350\277\220\345\212\2502.png" "b/teamwork/static/tabbar/\350\277\220\345\212\2502.png"
new file mode 100644
index 0000000000000000000000000000000000000000..72b4e4ff768b9b4caeb726d26e9da46dbb468d65
Binary files /dev/null and "b/teamwork/static/tabbar/\350\277\220\345\212\2502.png" differ
diff --git "a/teamwork/static/tabbar/\351\230\237\344\274\2152.png" "b/teamwork/static/tabbar/\351\230\237\344\274\2152.png"
new file mode 100644
index 0000000000000000000000000000000000000000..ba73b7e33f149993082664b34ed11b88cc48a7fb
Binary files /dev/null and "b/teamwork/static/tabbar/\351\230\237\344\274\2152.png" differ