Merge branch '03/03GRADE' into 11/24SAAS

src/utils/request.js

@@ -118,6 +118,7 @@ service.interceptors.response.use(
         vue.$message.error(`登录过期，请重新登录！`);
         removeToken();
         setToken("");
+        console.log('清空之后的tocken',getToken())
         await store.dispatch("user/resetToken").then(() => {
           setTimeout(async () => {
           location.reload();

src/utils/request2.js

@@ -129,12 +129,12 @@ service.interceptors.response.use(
         console.log('进入403')
         console.log('进入403token',getToken())
         vue.$message.error(`登录过期，请重新登录！`);
-        setToken("");
         removeToken();
-
-        store.dispatch("user/resetToken").then(() => {
-          setTimeout(() => {
-            location.reload();
+        setToken("");
+        console.log('清空之后的tocken',getToken())
+        await store.dispatch("user/resetToken").then(() => {
+          setTimeout(async () => {
+          location.reload();
           }, 1000);
         });