登录bug

ebc-middle-platform/src/components/loginer.vue

@@ -145,31 +145,49 @@ export default {
      this.loging = true
      this.$refs.loginForm.validate((valid) => {
        if (valid) {
          this.$test
            .post(services.login.LOGIN, {userCode: this.loginForm.userName, passWord: this.loginForm.password})
            .then((data) => {
              if (data.FLAG === 'SUCCESS') {
                if (this.rememberMe) {
                  localStorage.setItem(KEY_USER_NAME, data.RESULT.CODE)
                } else {
                  localStorage.removeItem(KEY_USER_NAME)
                }
          this.doLogin({userCode: this.loginForm.userName, passWord: this.loginForm.password}).then((data) => {
            this.$store.commit('setLogged', true)
            if (this.rememberMe) {
              localStorage.setItem(KEY_USER_NAME, data.userName)
            } else {
              localStorage.removeItem(KEY_USER_NAME)
            }
            const roles = {
              permissionList: ['exception']
            }
            this.$test
              .post(services.login.FIND_MENUS, {userCode: data.RESULT.CODE})
              .then((data) => {
                const roles = {
                  permissionList: ['exception']
                }
                this.$test
                  .post(services.login.FIND_MENUS, {userCode: data.RESULT.CODE})
                  .then((data) => {
                    localStorage.setItem('menus',  JSON.stringify(data))
                    store.dispatch(`permission/${GENERATE_ROUTES}`, roles)
                  })
                this.$router.push({ name: this.homeName })
              } else {
                this.$Message.danger(data.MESSAGE)
              }
              this.loging = false
            })
                localStorage.setItem('menus',  JSON.stringify(data))
                store.dispatch(`permission/${GENERATE_ROUTES}`, roles)
              })
            this.$router.push({ name: this.homeName })
          }).catch((e) => {
            this.loging = false
            this.$Message.danger(e)
          })
          // this.$test
          //   .post(services.login.LOGIN, )
          //   .then((data) => {
          //     if (data.FLAG === 'SUCCESS') {
          //       if (this.rememberMe) {
          //         localStorage.setItem(KEY_USER_NAME, data.RESULT.CODE)
          //       } else {
          //         localStorage.removeItem(KEY_USER_NAME)
          //       }
          //
          //
          //       this.$router.push({ name: this.homeName })
          //     } else {
          //       this.$Message.danger(data.MESSAGE)
          //     }
          //     this.loging = false
          //   })
        } else {
          this.loging = false
          this.$Message.danger(this.$t('aidp.common.input_incorrect', { field: this.$t('aidp.account.username') + this.$t('aidp.common.or') + this.$t('aidp.account.password') }))

ebc-middle-platform/src/modules/ootb/user/store/actions.js

@@ -7,6 +7,7 @@ import {
} from './constants'
import { KEY_USER_CODE, KEY_TOKEN } from '@/constants'
import services from "../../../../conf/services";
/**
 * 用户登录
@@ -17,11 +18,11 @@ import { KEY_USER_CODE, KEY_TOKEN } from '@/constants'
 */
export function doLogin({ commit, state }, data) {
  return new Promise((resolve, reject) => {
    http.$http
      .post(Services.aidp.LOGIN, data)
    http.$test
      .post(Services.login.LOGIN, data)
      .then(ret => {
        if (ret.data.code === '0') {
          let payload = ret.data.data
        if (ret.FLAG === 'SUCCESS') {
          let payload = ret
          commit(LOGIN, payload)
          window.localStorage.setItem(KEY_USER_CODE, state.userCode)
          window.localStorage.setItem(KEY_TOKEN, state.token)

ebc-middle-platform/src/router.js

@@ -23,6 +23,7 @@ const router = new VueRouter({
})
router.beforeEach((to, from, next) => {
  console.log(to, from, next)
  GLoading.$create().start()
  /*
   * 在每次视图切换时检查当前用户是否处于登
@@ -36,7 +37,8 @@ router.beforeEach((to, from, next) => {
   * 单客户端判断。
   * 参见src/frame.vue和src/store.js文件中的逻辑。
   */
  let isLogged = router.app.$options.store.getters['user/isLogged']
  let isLogged = router.app.$options.store.getters.getLogged
  // let isLogged = router.app.$options.store.getters['user/isLogged']
  // router.app.$store.commit('setTitle', to.meta.title)
  if (to.meta.ignoreAuth === true) {
    if (isLogged === true && to.path === '/login') {

ebc-middle-platform/src/store.js

@@ -62,7 +62,9 @@ const store = new Vuex.Store({
    map_param: {
      center: [33.597844, 123.647472],
      zoom: 11
    }
    },
    reLoad: false,
    isLogged: false
  },
  mutations: {
    // 改变语言
@@ -87,6 +89,12 @@ const store = new Vuex.Store({
    },
    setMapParam(state, token) {
      state.map_param = token
    },
    setReLoad(state, token) {
      state.reLoad = token
    },
    setLogged(state, token) {
      state.isLogged = token
    }
  },
  getters: {
@@ -118,6 +126,12 @@ const store = new Vuex.Store({
    },
    getMapParam(state) {
      return state.map_param
    },
    getReLoad(state) {
      return state.reLoad
    },
    getLogged(state) {
      return state.isLogged
    }
  },
  modules: {