Merge remote-tracking branch 'origin/develop' into local-test
All checks were successful
CI / Docker-Build (push) Successful in 2m33s

This commit is contained in:
joylink_fanyuhong 2024-10-11 17:08:40 +08:00
commit 07be0a8d5a
2 changed files with 19 additions and 19 deletions

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

View File

@ -67,7 +67,7 @@ export class ApiError {
// for each client) // for each client)
const api = axios.create({ baseURL: getHttpBase() }); const api = axios.create({ baseURL: getHttpBase() });
let isOpenDialog = false; // 认证弹窗是否打开 let isOpenDialog = false; // 认证弹窗是否打开
let quanXianDialog = false; // 权限提示弹窗是否打开 const quanXianDialog = false; // 权限提示弹窗是否打开
const CancelToken = axios.CancelToken; const CancelToken = axios.CancelToken;
const source = CancelToken.source(); const source = CancelToken.source();
@ -108,23 +108,23 @@ export default boot(({ app, router }) => {
.onCancel(() => { .onCancel(() => {
isOpenDialog = false; 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)); return Promise.reject(ApiError.from(err));
} }