修正登录问题

components/login/login.vue

@@ -10,7 +10,7 @@
 			</view>
 			<!-- 中间竖线 -->
 			<view class="login-middleline"></view>
-			<ChooseRole v-show="visibleChooseRole" v-on:onChoose="onChoose"></ChooseRole>
+			<!-- <ChooseRole v-show="visibleChooseRole" v-on:onChoose="onChoose"></ChooseRole> -->
 			<LoginByPWD class="showborder" v-show="visibleLoginByPWD" v-on:onLogin="onLogin" v-on:onForget="onForget"></LoginByPWD>
 			<ResetPWD v-show="visibleResetPWD" v-on:onLogin="onLogin"></ResetPWD>
 		</view>
@@ -18,18 +18,18 @@
 </template>
 
 <script>
-	import ChooseRole from './chooseRole.vue'
+	// import ChooseRole from './chooseRole.vue'
 	import LoginByPWD from './loginByPWD.vue'
 	import ResetPWD from './resetPWD.vue'
 	export default {
 		components: {
-			ChooseRole,
+			// ChooseRole,
 			LoginByPWD,
 			ResetPWD
 		},
 		data() {
 			return {
-				visibleChooseRole: true,
+				// visibleChooseRole: true,
 				visibleLoginByPWD: false,
 				visibleResetPWD: false,
 				//当前登录类型T教师S学生
@@ -38,22 +38,22 @@
 		},
 		methods: {
 			initData() {
-				this.visibleChooseRole = true;
-				this.visibleLoginByPWD = false;
+				// this.visibleChooseRole = true;
+				this.visibleLoginByPWD = true;
 				this.visibleResetPWD = false;
 			},
 			onLogin: function() {
 				// console.log("登录成功login");
 				getApp().globalData.bLogin = true;
 				this.$emit("onLogin");
-				this.visibleChooseRole = false;
+				// this.visibleChooseRole = false;
 				this.visibleLoginByPWD = false;
 				this.visibleResetPWD = false;
 			},
 			onChoose(type) {
 				// console.log("onChoose", type)
 				this.roleType = type;
-				this.visibleChooseRole = false;
+				// this.visibleChooseRole = false;
 				this.visibleLoginByPWD = true;
 				mydata_userInfo.role = type;
 			},

components/login/loginByPWD.vue

@@ -95,9 +95,11 @@
 							if (data.Image != '') {
 								mydata_userInfo.avatarSrc = data.Image;
 							}
+							console.log("登陆成功data=",data);
 							mydata_userInfo.Name = data.Name;
 							mydata_userInfo.UserID = data.UserID;
 							mydata_userInfo.Position = data.Position;
+							mydata_userInfo.role = data.Type;
 							// console.log("登陆成功，个人信息", mydata_userInfo);
 							if (mydata_userInfo.role == '老师') {
 								userController.updateStudentList(null,null);