diff --git a/src/components/utils/modules.js b/src/components/utils/modules.js index 098a1d3..644b79e 100644 --- a/src/components/utils/modules.js +++ b/src/components/utils/modules.js @@ -86,8 +86,9 @@ export const user = { }) } else return Promise.reject("缺少登录code") }, - autoLogin({dispatch}, params = {nickName: '微信用户'}) { - const {loginWay = 'std', phoneCode} = params + autoLogin({dispatch, commit, rootState}, params = {nickName: '微信用户'}) { + const {loginWay = rootState.loginWay || "std", phoneCode} = params + commit("setLoginWay", loginWay) if (loginWay == "admin") { return phoneCode ? dispatch("getCode", params).then(code => dispatch('getAdminToken', {...params, code})).then(() => dispatch('getUserInfo', loginWay)) : Promise.reject("缺少手机号授权") } else return dispatch("getCode").then(code => dispatch("getToken", {...params, code})).then(() => dispatch('getUserInfo', loginWay)) diff --git a/src/store/index.js b/src/store/index.js index e380af6..5c6b78c 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -7,12 +7,16 @@ Vue.use(Vuex) const store = new Vuex.Store({ state: { - token: "" + token: "", + loginWay: "std",//std 标准,qujing:曲靖定制登录,admin:G端小程序登录 }, mutations: { setToken(state, token) { state.token = token }, + setLoginWay(state, way) { + state.loginWay = way + }, logout(state, showToast) { state.token = "" state.user = {}