diff --git a/teamwork/App.vue b/teamwork/App.vue
index be44f843a571630ff597e801c03dced4cccad8c9..a4d18a1900b364914a0c1cbdcc0db6f315b6f71b 100644
--- a/teamwork/App.vue
+++ b/teamwork/App.vue
@@ -2,6 +2,7 @@
 	export default {
 		onLaunch: function() {
 			console.log('App Launch')
+			uni.hideTabBar();
 		},
 		onShow: function() {
 			console.log('App Show')
diff --git a/teamwork/components/tabbar/tabbar.vue b/teamwork/components/tabbar/tabbar.vue
index 35edbc0418a91e9408fd0c1cfc1068933da82203..1a70c31e83c624f8a96620d377e481e8aa0056ee 100644
--- a/teamwork/components/tabbar/tabbar.vue
+++ b/teamwork/components/tabbar/tabbar.vue
@@ -1,11 +1,12 @@
 <template>
 	<view>
 		<u-tabbar :value="current?current:0" @change="tabbarChange" :fixed="true" :placeholder="false"
-			:safeAreaInsetBottom="true" activeColor="#dd524d">
-			<u-tabbar-item text="运动" icon="../../static/tabbar/运动.svg"></u-tabbar-item>
-			<u-tabbar-item text="发现" icon="../../static/tabbar/发现.svg"></u-tabbar-item>
-			<!-- <u-tabbar-item text="鱼塘" icon="../../static/pool.svg"  ></u-tabbar-item>
-			<u-tabbar-item text="我的" icon="../../static/mine.svg" ></u-tabbar-item> -->
+			:safeAreaInsetBottom="true" activeColor="#F1992D">
+			<u-tabbar-item text="运动" icon="../../static/tabbar/运动.png"></u-tabbar-item>
+			<u-tabbar-item text="发现" icon="../../static/tabbar/发现.png"></u-tabbar-item>
+			<u-tabbar-item text="高校圈" icon="../../static/tabbar/圈子.png"></u-tabbar-item>
+			<u-tabbar-item text="小队" icon="../../static/tabbar/队伍.png"></u-tabbar-item>
+			<u-tabbar-item text="我的" icon="../../static/tabbar/我的.png"></u-tabbar-item>
 		</u-tabbar>
 	</view>
 </template>
@@ -17,8 +18,22 @@
 		},
 		data() {
 			return {
-				list: [{ path: "pages/login/login" },
-				{ path: "pages/login/register" },
+				list: [{
+						path: "pages/sport/main"
+					},
+					{
+						path: "pages/discover/main"
+					},
+					{
+						path: "pages/post/post"
+					},
+					{
+						path: "pages/team/main"
+					},
+					{
+						path: "pages/my/main"
+					}
+
 				]
 			};
 		},
diff --git a/teamwork/main.js b/teamwork/main.js
index c1141161c93b89aa3f6b03e6a80d5101aa9a0dba..c78495aa7b8da6fd013496a718fa4ccf49d04d86 100644
--- a/teamwork/main.js
+++ b/teamwork/main.js
@@ -1,6 +1,8 @@
 import App from './App'
 import Vue from 'vue'
 import './uni.promisify.adaptor'
+import uView from '@/uni_modules/uview-ui'
+Vue.use(uView)
 Vue.config.productionTip = false
 App.mpType = 'app'
 const app = new Vue({
diff --git a/teamwork/pages.json b/teamwork/pages.json
index 83a64a512f24d00ad1cd990ef940fd98e20b20cb..77791336e509d4ede74763660bd8d698d197b757 100644
--- a/teamwork/pages.json
+++ b/teamwork/pages.json
@@ -1,49 +1,75 @@
 {
-    
+
 	"easycom": {
 		"^u-(.*)": "@/uni_modules/uview-ui/components/u-$1/u-$1.vue"
 	},
-	"pages": [ 
+	"pages": [
+		// {
+		// 	"path": "pages/login/login",
+		// 	"style": {
+		// 		"navigationStyle": "custom"
+		// 	}
+		// }, {
+		// 	"path": "pages/login/register",
+		// 	"style": {
+		// 		"navigationStyle": "custom"
+		// 	}
+		// }, 
 		{
-			"path": "pages/login/login",
+			"path": "pages/sport/main",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/discover/main",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/post/post",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/team/main",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/my/main",
 			"style": {
 				"navigationStyle": "custom"
 			}
 		}
-	    ,{
-            "path" : "pages/login/register",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-        },{
-            "path" : "pages/helang-tabBar/helang-tabBar",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            } 
-        },{
-            "path" : "pages/sport/main",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            } 
-        }
-    ],
+	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",
 		"navigationBarBackgroundColor": "#F8F8F8",
 		"backgroundColor": "#F8F8F8"
 	},
-    "tabBar": {
+	"tabBar": {
 		"list": [{
-				"pagePath": "pages/login/login"
+				"pagePath": "pages/sport/main"
+			},
+			{
+				"pagePath": "pages/discover/main"
+			},
+			{
+				"pagePath": "pages/post/post"
+			},
+			{
+				"pagePath": "pages/team/main"
 			},
 			{
-				"pagePath": "pages/login/register"
+				"pagePath": "pages/my/main"
 			}
+
 		]
 	},
 	"uniIdRouter": {}
-}
+}
\ No newline at end of file
diff --git a/teamwork/pages/discover/main.vue b/teamwork/pages/discover/main.vue
new file mode 100644
index 0000000000000000000000000000000000000000..60f525a3b0746586ccc7a1deaa5175234055a880
--- /dev/null
+++ b/teamwork/pages/discover/main.vue
@@ -0,0 +1,17 @@
+<template>
+	<view>
+		<text>发现</text>
+		<tabbar :current="1" />
+	</view>
+</template>
+
+<script>
+	export default {
+		onLoad() {
+			uni.hideTabBar();
+		},
+	}
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/teamwork/pages/helang-tabBar/helang-tabBar.vue b/teamwork/pages/helang-tabBar/helang-tabBar.vue
deleted file mode 100644
index 5f67c62a17031615ec24777c6547546d3e1a2693..0000000000000000000000000000000000000000
--- a/teamwork/pages/helang-tabBar/helang-tabBar.vue
+++ /dev/null
@@ -1,68 +0,0 @@
-<template>
-	<view>
-		<view class="preview" style="background-color: #82a9f2;">
-			<view class="title">翻滚效果</view>
-			<helang-tab-bar-roll :fixed-bottom="false"></helang-tab-bar-roll>
-		</view>
-		
-		<view class="preview" style="background-color: #313131;">
-			<view class="title" style="margin-bottom: 30px;">冒泡效果</view>
-			<helang-tab-bar-bubble :fixed-bottom="false"></helang-tab-bar-bubble>
-		</view>
-		
-		<view class="preview" style="background-color: #b49df9;">
-			<view class="title">翻转效果</view>
-			<helang-tab-bar-overturn :fixed-bottom="false"></helang-tab-bar-overturn>
-		</view>
-		
-		<view class="preview" style="background-color: #efedee;">
-			<view class="title" style="margin-bottom: 30px;color: #333;">凸起舵式切换效果</view>
-			<helang-tab-bar-bulge :fixed-bottom="false"></helang-tab-bar-bulge>
-		</view>
-		
-		<view class="preview" style="background-color: #f4614e;">
-			<view class="title" style="margin-bottom: 30px;">窗帘下拉效果</view>
-			<helang-tab-bar-curtain :fixed-bottom="false"></helang-tab-bar-curtain>
-		</view>
-	</view>
-</template>
-
-<script>
-	import tabBarRoll from "@/components/helang-tabBar/tab-bar-roll";
-	import tabBarBubble from "@/components/helang-tabBar/tab-bar-bubble";
-	import tabBarOverturn from "@/components/helang-tabBar/tab-bar-overturn";
-	import tabBarBulge from "@/components/helang-tabBar/tab-bar-bulge";
-	import tabBarCurtain from "@/components/helang-tabBar/tab-bar-curtain";
-	
-	export default {
-		components: {
-			"helang-tab-bar-roll": tabBarRoll,
-			"helang-tab-bar-bubble": tabBarBubble,
-			"helang-tab-bar-overturn": tabBarOverturn,
-			"helang-tab-bar-bulge": tabBarBulge,
-			"helang-tab-bar-curtain": tabBarCurtain
-		},
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			
-		}
-	}
-</script>
-
-<style lang="scss">
-.preview{
-	margin-bottom: 24px;
-	padding: 32px 8px;
-	
-	.title{
-		font-weight: 32rpx;
-		margin-bottom: 20rpx;
-		padding-left: 10px;
-		color: #fff;
-	}
-}
-</style>
diff --git a/teamwork/pages/login/login.vue b/teamwork/pages/login/login.vue
index 0f710e34c014cf3b45e7ff8a37c91a44c93092da..0f321b03d28722a46e081b1740ad335038bad18a 100644
--- a/teamwork/pages/login/login.vue
+++ b/teamwork/pages/login/login.vue
@@ -15,6 +15,7 @@
 				</uni-forms-item>
 			</uni-forms>
 		</view>
+	
 	</view>
 </template>
 
@@ -30,6 +31,9 @@
 	export default {
 		name: 'login',
 		components: {},
+		onLoad() {
+			uni.hideTabBar();
+		},
 		data() {
 			return {
 				formData: {
diff --git a/teamwork/pages/my/main.vue b/teamwork/pages/my/main.vue
new file mode 100644
index 0000000000000000000000000000000000000000..ca09f8351ca3653ea8f47fa1b6ba23f0082acf58
--- /dev/null
+++ b/teamwork/pages/my/main.vue
@@ -0,0 +1,17 @@
+<template>
+	<view>
+		<text>我的</text>
+		<tabbar :current="4" />
+	</view>
+</template>
+
+<script>
+	export default {
+		onLoad() {
+			uni.hideTabBar();
+		},
+	}
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/teamwork/pages/post/post.vue b/teamwork/pages/post/post.vue
new file mode 100644
index 0000000000000000000000000000000000000000..01a66c85a25f8d38f3f408a4573b1ca9c9106527
--- /dev/null
+++ b/teamwork/pages/post/post.vue
@@ -0,0 +1,72 @@
+<template>
+	<view>
+		<tabbar :current="2" />
+
+		<u-tabs :list="list" lineWidth="30" lineColor="#F1992D" :activeStyle="{
+		            color: '#F1992D',
+		            fontWeight: 'bold',
+		            transform: 'scale(1.05)'
+		        }" :inactiveStyle="{
+		            color: '#606266',
+		            transform: 'scale(1)'
+		        }" itemStyle="padding-left: 15px; padding-right: 15px; height: 34px;"
+				@click="tabChange"
+				:current="current">
+		</u-tabs>
+
+
+		<view v-if="current == 1">
+			<text>所有帖子</text>
+		</view>
+
+		<!-- 我的帖子 -->
+		<view v-if="current == 0">
+			<text>我的帖子</text>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		onLoad() {
+			uni.hideTabBar();
+		},
+
+		data() {
+			return {
+				current:1,
+				list: [{
+					name: '我的帖子'
+				}, {
+					name: '高校圈',
+
+				}, ]
+
+			};
+		},
+
+		methods: {
+			tabChange(index) {
+				this.current = index.index;
+				//console.log(this.current)
+				// this.followUserPost = [];
+				// this.lastPost = [];
+
+				// if (index === 0) {
+				// 	this.page1 = 1;
+				// 	this.getFollowUserPost();
+
+				// }
+				// if (index === 1) {
+				// 	this.page2 = 1;
+				// 	this.getLastPost();
+				// }
+			},
+
+		}
+	}
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/teamwork/pages/sport/main.vue b/teamwork/pages/sport/main.vue
index 11efff500ba244e7c1d3c9eb3dba97141aa7a8e8..854bca4e6a5e1122e87837708922beca11142653 100644
--- a/teamwork/pages/sport/main.vue
+++ b/teamwork/pages/sport/main.vue
@@ -1,8 +1,16 @@
 <template>
+	<view>
+		<text>运动</text>
+		<tabbar :current="0" />
+	</view>
 </template>
-<map :scale='18' id="myMap" style="width: 100%;" :style="{height: mapHeight + 'px'}" :markers="markers"
-	:longitude="longitude" :latitude="latitude" :circles="circles"></map>
+
 <script>
+	export default {
+		onLoad() {
+			uni.hideTabBar();
+		},
+	}
 </script>
 
 <style>
diff --git a/teamwork/pages/team/main.vue b/teamwork/pages/team/main.vue
new file mode 100644
index 0000000000000000000000000000000000000000..30bce172a6c540aec59b3593bfd2aa4b6304b9f3
--- /dev/null
+++ b/teamwork/pages/team/main.vue
@@ -0,0 +1,17 @@
+<template>
+	<view>
+		<text>小队</text>
+		<tabbar :current="3" />
+	</view>
+</template>
+
+<script>
+	export default {
+		onLoad() {
+			uni.hideTabBar();
+		},
+	}
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git "a/teamwork/static/tabbar/\345\217\221\347\216\260.png" "b/teamwork/static/tabbar/\345\217\221\347\216\260.png"
new file mode 100644
index 0000000000000000000000000000000000000000..7fcb14e9a74648d5edd64a03a4b73a98e63555b1
Binary files /dev/null and "b/teamwork/static/tabbar/\345\217\221\347\216\260.png" differ
diff --git "a/teamwork/static/tabbar/\345\234\210\345\255\220.png" "b/teamwork/static/tabbar/\345\234\210\345\255\220.png"
new file mode 100644
index 0000000000000000000000000000000000000000..9ec29714e28dd9306a0ad92b86f7f81f0dc17bbd
Binary files /dev/null and "b/teamwork/static/tabbar/\345\234\210\345\255\220.png" differ
diff --git "a/teamwork/static/tabbar/\346\210\221\347\232\204.png" "b/teamwork/static/tabbar/\346\210\221\347\232\204.png"
new file mode 100644
index 0000000000000000000000000000000000000000..65bd6f86655289e5713d2796e9f2ec93105d0c45
Binary files /dev/null and "b/teamwork/static/tabbar/\346\210\221\347\232\204.png" differ
diff --git "a/teamwork/static/tabbar/\350\277\220\345\212\250.png" "b/teamwork/static/tabbar/\350\277\220\345\212\250.png"
new file mode 100644
index 0000000000000000000000000000000000000000..33089587747d9b47e1520970b5f851ce5157c797
Binary files /dev/null and "b/teamwork/static/tabbar/\350\277\220\345\212\250.png" differ
diff --git "a/teamwork/static/tabbar/\351\230\237\344\274\215.png" "b/teamwork/static/tabbar/\351\230\237\344\274\215.png"
new file mode 100644
index 0000000000000000000000000000000000000000..ec95c340f6d6c7a5382348c42f97cc068bc9f93b
Binary files /dev/null and "b/teamwork/static/tabbar/\351\230\237\344\274\215.png" differ