diff --git a/common/config.js b/common/config.js
index 059450c..949925a 100644
--- a/common/config.js
+++ b/common/config.js
@@ -1,10 +1,10 @@
 // 线上地址
-// const Api_url='http://146.56.228.75:20021/api'
-// const img_domian = 'http://146.56.228.75:20021/'
+const Api_url='http://146.56.228.75:20021/api'
+const img_domian = 'http://146.56.228.75:20021/'
 
 //本地测试地址
-const Api_url='http://zhjw.cc/api'
-const img_domian = 'http://zhjw.cc/'
+// const Api_url='http://zhjw.cc/api'
+// const img_domian = 'http://zhjw.cc/'
 
 const IsDemo = false
 
diff --git a/pages.json b/pages.json
index 00b9143..74f5d6c 100644
--- a/pages.json
+++ b/pages.json
@@ -361,7 +361,7 @@
       "path": "pages/market/index/index",
       "style": {
         "navigationBarTitleText": "首页",
-        "navigationStyle": "default",
+        "navigationStyle": "custom",
         "navigationBarBackgroundColor": "#fff",
         "navigationBarTextStyle": "black"
       }
diff --git a/pages/market/index/index.vue b/pages/market/index/index.vue
index 935b035..d2a8ea4 100644
--- a/pages/market/index/index.vue
+++ b/pages/market/index/index.vue
@@ -1,5 +1,11 @@
 <template>
 	<view class="assemble">
+
+    <!--自定义导航栏-->
+    <view class="navbar_section">
+      <view class="title">我的</view>
+    </view>
+
 		<view style="height: 20rpx;"></view>
 		<view class="div-style">
 			<view style="height: 38vh;">
@@ -166,7 +172,23 @@
 	}
 </script>
 
-<style>
+<style lang="less" scoped>
+
+
+//自定义导航栏
+.navbar_section{
+  border: 1px solid #fff;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  background: #fff;
+  .title{
+    padding: 20rpx 0;
+    font-size: 30rpx;
+    color: #858585;
+  }
+}
+
 	.assemble {
 		width: 100%;
 		height: 100vh;
diff --git a/pages/student/login/login.vue b/pages/student/login/login.vue
index 87887cf..bff543d 100644
--- a/pages/student/login/login.vue
+++ b/pages/student/login/login.vue
@@ -47,8 +47,8 @@ import medicationApi from '@/api/medication.js';
 			}
 		},
 		onLoad() {
-			uni.hideHomeButton()
-			console.log(uni.getStorageSync('um_id'))
+			// uni.hideHomeButton()
+			// console.log(uni.getStorageSync('um_id'))
 		},
 		methods: {
 			input(e) {
@@ -62,16 +62,41 @@ import medicationApi from '@/api/medication.js';
 					url: '/pages/student/login/forgot'
 				})
 			},
+      //登陆
 			login() {
 				let item = {};
 				item['username'] = this.user
 				item['password'] = this.password1
+        //登陆
         medicationApi.login(item).then(res => {
-					if (res.status == 200) {
+					if (res.code == 1) {
+            res.data.userType = 2
+
 						uni.setStorageSync('token', res.data.token);
-						uni.switchTab({
-							url: '/pages/my/my'
-						})
+						uni.setStorageSync('userType', res.data.userType);
+
+						let url_path = ''
+						switch (String(res.data.userType)) {
+              case '1'://教练
+                url_path = '/pages/coach/home/index'
+                break;
+              case '2'://销售
+                url_path = '/pages/market/index/index'
+                break;
+              case '3'://学员
+                url_path = '/pages/student/index/index'
+                break;
+                default:
+                  uni.showToast({
+                    title: '用户类型错误',
+                    icon: 'none'
+                  })
+                  return;
+            }
+
+            uni.navigateTo({
+              url: url_path
+            })
 					} else {
 						uni.showToast({
 							title: res.msg,