Merge remote-tracking branch 'origin/develop' into local-test

rts-sim-testing-message

@@ -1 +1 @@
-Subproject commit 7629f290ea612d4ce368c40d4cf793dffc4b21ec
+Subproject commit 5b0baec461fba33bcb76212ce2b1a19d1b79057f

src/boot/axios.ts

@@ -67,7 +67,7 @@ export class ApiError {
 // for each client)
 const api = axios.create({ baseURL: getHttpBase() });
 let isOpenDialog = false; // 认证弹窗是否打开
-let quanXianDialog = false; // 权限提示弹窗是否打开
+const quanXianDialog = false; // 权限提示弹窗是否打开
 
 const CancelToken = axios.CancelToken;
 const source = CancelToken.source();
@@ -108,23 +108,23 @@ export default boot(({ app, router }) => {
           .onCancel(() => {
             isOpenDialog = false;
           });
-      } else if (
+        // } else if (
-        err.response &&
+        //   err.response &&
-        err.response.status === 403 &&
+        //   err.response.status === 403 &&
-        !quanXianDialog
+        //   !quanXianDialog
-      ) {
+        // ) {
-        quanXianDialog = true;
+        //   quanXianDialog = true;
-        Dialog.create({
+        //   Dialog.create({
-          title: '无权限',
+        //     title: '无权限',
-          message: '你没有该页面访问权限',
+        //     message: '你没有该页面访问权限',
-          persistent: true,
+        //     persistent: true,
-        })
+        //   })
-          .onOk(() => {
+        //     .onOk(() => {
-            quanXianDialog = false;
+        //       quanXianDialog = false;
-          })
+        //     })
-          .onCancel(() => {
+        //     .onCancel(() => {
-            quanXianDialog = false;
+        //       quanXianDialog = false;
-          });
+        //     });
       }
       return Promise.reject(ApiError.from(err));
     }