Merge branch 'master' of http://8.140.50.127:3000/JSY/jsy-app

pages/login.vue

@@ -78,6 +78,11 @@
 		onLoad,
 	} from "@dcloudio/uni-app"
 	import store from '@/store'
+	import {
+		getToken,
+		setToken,
+		removeToken
+	} from '@/utils/auth'
 	import {
 		rsaEncrypt,
 		rsaDecrypt
@@ -112,6 +117,11 @@
 		}
 		// //页面加载完后，重置这个参数
 		// getApp().globalData.updateApp = false;
+
+		// 如果存在token，则直接登录
+		if (getToken()) {
+			loginSuccess()
+		}
 	})
 
 	// tabs标签
@@ -267,7 +277,7 @@
 				data: {
 					mobilePhone: loginObj.phone,
 					uuid: loginObj.uuid,
-					code:loginObj.code
+					code: loginObj.code
 				}
 			}
 		}
@@ -277,6 +287,16 @@
 		store
 			.dispatch(loginAPI.url, loginAPI.data)
 			.then(res => {
+				//如果记住密码
+				if (rememberPassword.value) {
+					uni.setStorageSync("jsy_remember", true)
+					uni.setStorageSync("jsy_username", loginForm.value.loginName)
+					uni.setStorageSync("jsy_password", loginForm.value.password)
+				} else {
+					uni.removeStorageSync("jsy_remember")
+					uni.removeStorageSync("jsy_username")
+					uni.removeStorageSync("jsy_password")
+				}
 				loginSuccess()
 			})
 			.catch(error => {
@@ -293,16 +313,6 @@
 		uni.showLoading({
 			mask: true
 		});
-		//如果记住密码
-		if (rememberPassword.value) {
-			uni.setStorageSync("jsy_remember", true)
-			uni.setStorageSync("jsy_username", loginForm.value.loginName)
-			uni.setStorageSync("jsy_password", loginForm.value.password)
-		} else {
-			uni.removeStorageSync("jsy_remember")
-			uni.removeStorageSync("jsy_username")
-			uni.removeStorageSync("jsy_password")
-		}
 		// 保存用户基本信息
 		store.dispatch("GetInfo").then(result => {
 			if (result.code == 200) {