diff --git a/common/api/user.js b/common/api/user.js
index 6c60a7e..b29867f 100644
--- a/common/api/user.js
+++ b/common/api/user.js
@@ -54,7 +54,12 @@ export default {
 					member_mobile: member_mobile, 
 					sms_code: sms_code
 				});
-			}
+			},
+			// 标签的列表
+			labelList({}) {
+				return vm.$u.post('StartUp/labelList', {});
+			},
+			
         }
     }
 }
\ No newline at end of file
diff --git a/pageA/login/login.vue b/pageA/login/login.vue
index 06383a0..79cf9ee 100644
--- a/pageA/login/login.vue
+++ b/pageA/login/login.vue
@@ -96,7 +96,7 @@
 		},
 		onLoad() {
 			// 数据的请求
-			this.apiwelcome()
+			this.apiwelcome()	
 		},
 		methods: {
 			apiwelcome() {
@@ -155,8 +155,13 @@
 							data: res.data,
 							success: function() {
 								console.log('success');
+								// 跳转首页
+								uni.switchTab({
+									url: '/pages/index/index'
+								});
 							}
 						});
+						
 						// 存储接口请求所需token
 						uni.setStorage({
 							key: 'token',
diff --git a/pageA/topick/topick.vue b/pageA/topick/topick.vue
index fb1912c..800b00c 100644
--- a/pageA/topick/topick.vue
+++ b/pageA/topick/topick.vue
@@ -10,7 +10,7 @@
 			</view>
 			<!-- 标签 -->
 			<view class="tab_lable">
-				<view :class="{'cur': rSelect.indexOf(index)!=-1}" v-for="(item,index) in tab_lables" :key="index" @click="tapClick(index)">{{item}}</view>
+				<view :class="{'cur': rSelect.indexOf(index)!=-1}" v-for="(item,index) in tab_lables" :key="index" @click="tapClick(index)">{{item.name}}</view>
 			</view>
 			<!-- 提交按钮 -->
 			<view class="submites" @click="toHomePage">{{submites}}</view>
@@ -28,11 +28,19 @@
 				value: '',
 				login: '登录',
 				show: false,
-				tab_lables: ["科技", "科技", "科技", "科技", "科技", "科技", "科技", "科技", "科技", "科技"],
+				tab_lables: [],
 				submites: '选好了进入首页',
 				rSelect:[]
 			};
 		},
+		onLoad(){
+			
+					// 列表的方法
+				this.labelList()
+		},
+		
+		mounted(){
+		},
 		methods: {
 			// 选中某个复选框时，由checkbox时触发
 			checkboxChange(e) {
@@ -59,7 +67,17 @@
 				uni.switchTab({
 					url: '/pages/index/index'
 				});
-			}
+			},
+			// 标签的列表展示
+			labelList(){
+				console.log("11111222")
+				this.$u.api.labelList({
+					
+				}).then((res) => {
+					console.log(res)
+					this.tab_lables = res.data
+				})
+			},
 		}
 	};
 </script>