feat: #调整登录逻辑

src/permission.js

@@ -32,7 +32,9 @@ router.beforeEach(async (to, from, next) => {
       } else {
         try {
           // get user info
-          const { roles } = await store.dispatch('user/getInfo');
+          const info = await store.dispatch('user/getInfo');
+          console.log(info);
+          let roles = [];
           // await store.dispatch('user/getInfo');
 
           // generate accessible routes map based on roles

src/store/modules/user.js

@@ -36,41 +36,41 @@ const actions = {
   login({ commit }, userInfo) {
     console.log(userInfo);
     const { phone, code } = userInfo;
-    // return new Promise((resolve, reject) => {
-    //   const data = {
-    //     token: 'admin-token'
-    //   };
-    //   commit('SET_TOKEN', data.token);
-    //   setToken(data.token);
-    //   resolve();
-    // });
     return new Promise((resolve, reject) => {
-      login({
-        data: {
-          account: phone,
-          signInType: 'MOBILE_NUMBER_SMS',
-          smsCode: code
-        }
-      })
-        .then(response => {
-          const { data } = response;
-
-          if (data.token) {
-            commit('SET_TOKEN', data.token);
-            setToken(data.token);
-            resolve();
-          } else {
-            reject(data.message);
-          }
-        })
-        .catch(error => {
-          reject(error);
-        });
+      const data = {
+        token: 'admin-token'
+      };
+      commit('SET_TOKEN', data.token);
+      setToken(data.token);
+      resolve();
     });
+    // return new Promise((resolve, reject) => {
+    //   login({
+    //     data: {
+    //       account: phone,
+    //       signInType: 'MOBILE_NUMBER_SMS',
+    //       smsCode: code
+    //     }
+    //   })
+    //     .then(response => {
+    //       const { data } = response;
+
+    //       if (data.token) {
+    //         commit('SET_TOKEN', data.token);
+    //         setToken(data.token);
+    //         resolve();
+    //       } else {
+    //         reject(data.message);
+    //       }
+    //     })
+    //     .catch(error => {
+    //       reject(error);
+    //     });
+    // });
   },
 
   // get user info
-  getInfo({ commit, state }) {
+  getInfo({ commit, state, dispatch }) {
     // return new Promise((resolve, reject) => {
     //   const data = {
     //     roles: ['admin'],
@@ -92,11 +92,10 @@ const actions = {
     return new Promise((resolve, reject) => {
       getInfo(state.token)
         .then(async response => {
-          console.log(response);
-          const { data } = response;
+          const { data, success } = response;
 
-          if (!success && !data) {
-            dispatch('user/logout');
+          if (!success) {
+            dispatch('logout');
             return reject('Verification failed, please Login again.');
           }
 
@@ -112,8 +111,7 @@ const actions = {
           resolve(data);
         })
         .catch(error => {
-          console.error('-dada');
-          dispatch('user/logout');
+          dispatch('logout');
           reject(error);
         });
     });
@@ -121,19 +119,19 @@ const actions = {
 
   // user logout
   logout({ commit, state }) {
-    return new Promise((resolve, reject) => {
-      logout(state.token)
-        .then(() => {
-          removeToken(); // must remove  token  first
-          resetRouter();
-          commit('RESET_STATE');
-          commit('SET_ROLES', []);
-          resolve();
-        })
-        .catch(error => {
-          reject(error);
-        });
-    });
+    // return new Promise((resolve, reject) => {
+    // logout(state.token)
+    // .then(() => {
+    removeToken(); // must remove  token  first
+    resetRouter();
+    commit('RESET_STATE');
+    commit('SET_ROLES', []);
+    resolve();
+    //     })
+    //     .catch(error => {
+    //       reject(error);
+    //     });
+    // });
   },
 
   // remove token