Merge branch 'master' of http://192.168.0.105:10010/r/zhny_web

guanqb

2022-08-31 b8ef6f8946de7dc00d9711eb6ba9d1aefe24cde1

 src/store/modules/user.js

@@ -4,7 +4,15 @@
import {isURL, validatenull} from '@/util/validate'
import {deepClone} from '@/util/util'
import website from '@/config/website'
import {loginByUsername, loginBySocial, getUserInfo, logout, refreshToken, getButtons} from '@/api/user'
import {
  loginByUsername,
  loginBySocial,
  getUserInfo,
  logout,
  refreshToken,
  getButtons,
  loginInfoByToken
} from '@/api/user'
import {getTopMenu, getRoutes} from '@/api/system/menu'
import md5 from 'js-md5'

@@ -46,6 +54,30 @@
    $farmId: 0
  },
  actions: {
    loginInfoByToken({commit}) {
      return new Promise((resolve,reject) => {
        loginInfoByToken().then(res => {
          const data = res.data
          if (data.code == 200) {
            commit('SET_TOKEN', data.data.access_token)
            commit('SET_REFRESH_TOKEN', data.data.refresh_token)
            commit('SET_TENANT_ID', data.data.tenant_id)
            commit('SET_USER_INFO', data.data)
            commit('DEL_ALL_TAG')
            commit('CLEAR_LOCK')

          } else {
            Message({
              message: data.error_description,
              type: 'error'
            })
          }
          resolve();
        }).catch(error => {
          reject(error);
        })
      })
    },
    //根据用户名登录
    LoginByUsername({commit}, userInfo) {
      return new Promise((resolve, reject) => {
@@ -244,7 +276,7 @@
    },
    SET_USER_INFO: (state, userInfo) => {
      if (validatenull(userInfo.avatar)) {
        userInfo.avatar = "/img/bg/mg.png";
        userInfo.avatar = "/zhny-web/img/bg/mg.png";
      }
      state.userInfo = userInfo;
      setStore({name: 'userInfo', content: state.userInfo})