diff --git a/api/login/index.js b/api/login/index.js index c0a1988..d92810c 100644 --- a/api/login/index.js +++ b/api/login/index.js @@ -5,12 +5,17 @@ const api = { login: 'passport/login', loginMpWx: 'passport/loginMpWx', loginMpWxMobile: 'passport/loginMpWxMobile', + loginPw:'passport/loginPw', //手机号密码登录 } // 用户登录(手机号+验证码) export function login(data) { return request.post(api.login, data) } +// 用户登录(手机号+密码) +export function loginPw(data) { + return request.post(api.loginPw, data) +} // 微信小程序快捷登录(获取微信用户基本信息) export function loginMpWx(data, option) { diff --git a/pages/login/index.vue b/pages/login/index.vue index 178c123..a65ee4f 100644 --- a/pages/login/index.vue +++ b/pages/login/index.vue @@ -132,6 +132,7 @@ import { checkLogin, showError } from '@/core/app' app.isLoading = true store.dispatch('Login', { smsCode: '6459', + vpass: app.vpass, mobile: app.mobile }) .then(result => { diff --git a/store/modules/user.js b/store/modules/user.js index 172f1b8..613a276 100644 --- a/store/modules/user.js +++ b/store/modules/user.js @@ -45,6 +45,19 @@ const user = { .catch(reject) }) }, + + // 用户登录(普通登录: 输入手机号和密码) + LoginPw({ commit }, data) { + return new Promise((resolve, reject) => { + LoginApi.loginPw({ form: data }) + .then(response => { + const result = response.data + loginSuccess(commit, result) + resolve(response) + }) + .catch(reject) + }) + }, // 微信小程序一键授权登录(获取用户基本信息) LoginMpWx({ commit }, data) {