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

api/login.js

@@ -26,7 +26,7 @@ export function getCodePhone(data) {
 }
 
 //手机号登录
-export function phoneLogin(mobilePhone,code, uuid) {
+export function phoneLogin(mobilePhone,code, uuid,appType) {
 	return request({
 		url: '/auth/loginPhone',
 		headers: {
@@ -36,7 +36,8 @@ export function phoneLogin(mobilePhone,code, uuid) {
 		data: {
 			mobilePhone,
 			code,
-			uuid
+			uuid,
+			appType
 		}
 	})
 }

store/modules/user.js

@@ -99,7 +99,7 @@ const user = {
 			const code = data.code;
 			const uuid = data.uuid;
 			return new Promise((resolve, reject) => {
-				phoneLogin(mobilePhone,code, uuid)
+				phoneLogin(mobilePhone,code, uuid,2)
 					.then(res => {
 						setToken(res.data.access_token)
 						commit("SET_TOKEN", res.data.access_token)