1

src/permission.js

@@ -20,23 +20,6 @@ router.beforeEach(async(to, from, next) => {
   const hasToken = getToken()
 
   if (hasToken && hasToken !== 'undefined' && hasToken !== 'null') {
-    if (store.state.user.isDefaultPwd === 0) {
-      await store.dispatch('user/setIsDefaultPwd')
-    }
-    if (store.state.user.isDefaultPwd === 2 && to.path !== '/info/password') {
-      await MessageBox.alert('您的密码强度过于简单，需重新设置',
-        '提示', {
-          confirmButtonText: '修改密码',
-          type: 'warning',
-          closeOnClickModal: false,
-          showClose: false
-        })
-      next({
-        path: '/info/password',
-        replace: true
-      })
-      return
-    }
     if (to.path === '/login') {
       // if is logged in, redirect to the home page
       next({ path: '/' })

src/store/modules/user.js

@@ -1,6 +1,7 @@
 import { login, logout, getInfo, checkUser } from '@/api/me'
 import { getToken, setToken, removeToken } from '@/utils/auth'
 import { resetRouter } from '@/router'
+import { MessageBox } from 'element-ui'
 
 const getDefaultState = () => {
   return {
@@ -10,16 +11,12 @@ const getDefaultState = () => {
     adminId: '',
     department: {},
     role: [],
-    isDefaultPwd: 0 // 0未校验过 1校验通过 2校验未通过
   }
 }
 
 const state = getDefaultState()
 
 const mutations = {
-  SET_IS_DEFAULT_PWD: (state, status) => {
-    state.isDefaultPwd = status
-  },
   RESET_STATE: (state) => {
     Object.assign(state, getDefaultState())
   },
@@ -49,7 +46,6 @@ const actions = {
     const { username, password, pretend_user } = userInfo
     return new Promise((resolve, reject) => {
       login({ username: username.trim(), password: password, pretend_user }).then(response => {
-        console.log(response)
         const { access_token, expires_in } = response
         commit('SET_TOKEN', access_token)
         setToken(access_token, expires_in / 60 / 24)
@@ -61,7 +57,7 @@ const actions = {
   },
 
   // get user info
-  getInfo({ commit, state }) {
+  getInfo({ commit, state, dispatch }) {
     return new Promise((resolve, reject) => {
       getInfo(state.token).then(response => {
         const { name, avatar, id, role, department } = response
@@ -72,6 +68,7 @@ const actions = {
         commit('SET_ADMIN_ID', id)
         commit('SET_ROLE', role)
         resolve(response)
+        dispatch('setIsDefaultPwd')
       }).catch(error => {
         reject(error)
       })
@@ -85,7 +82,6 @@ const actions = {
         removeToken() // must remove  token  first
         resetRouter()
         commit('RESET_STATE')
-        commit('SET_IS_DEFAULT_PWD', 0)
         resolve()
       }).catch(error => {
         reject(error)
@@ -104,10 +100,15 @@ const actions = {
   setIsDefaultPwd({ commit }) {
     return new Promise((resolve, reject) => {
       checkUser().then(_ => {
-        commit('SET_IS_DEFAULT_PWD', 1)
         resolve()
       }).catch(_ => {
-        commit('SET_IS_DEFAULT_PWD', 2)
+        MessageBox.alert('您的密码强度过于简单，需重新设置',
+          '提示', {
+            confirmButtonText: '修改密码',
+            type: 'warning',
+            closeOnClickModal: false,
+            showClose: false
+          })
         resolve()
       })
     })

src/views/system/components/Account.vue

@@ -6,10 +6,10 @@
     <el-form-item label="手机号" prop="mobile">
       <el-input v-model.trim="form.mobile" />
     </el-form-item>
-    <el-form-item label="密码" prop="password">
+    <el-form-item label="密码(8位以上包含字母、数字、特殊字符)" prop="password">
       <el-input v-model.trim="form.password" type="password" />
     </el-form-item>
-    <el-form-item label="确认密码" prop="cpassword">
+    <el-form-item label="确认密码" prop="password">
       <el-input v-model.trim="form.cpassword" type="password" />
     </el-form-item>
     <el-form-item label="签名图片" prop="sign_id">