Merge branch 'master' of http://gitlab.oytour.com/youjie/boyuecend

# Conflicts:
#	src/stores/systemConfig.ts

src/App.vue

@@ -37,6 +37,8 @@ onMounted(async () => {
   try {
     // 初始化系统配置（在最开始执行）
     await systemConfigStore.initialize(location.hostname)
+
+    //await systemConfigStore.getGroupInfoAsync()
     
     // 初始化 Arco Design 国际化
     await configureArcoLocale(locale.value)

src/api/OtaRequest.ts

@@ -73,8 +73,8 @@ service.interceptors.response.use(
         sessionStorage.removeItem('tempToken');
         sessionStorage.removeItem('otaUserInfo');
         useUserStore().signOutAsync();
+        location.href= '/login';
       }
-      location.href= '/login';
     }
     
     // 如果有响应数据，尝试提取错误信息

src/i18n/locales/en.ts

@@ -210,6 +210,11 @@ export default {
     invalidFormat: 'Invalid email format',
     checkFailed: 'Email validation failed, please try again later',
   },
+  notPermission: {
+    title: 'Access Denied',
+    description: 'You do not have permission to access this page. Please contact your administrator to request access.',
+    backHome: 'Back to Home',
+  },
   personal: {
     completeProfile: 'Complete Profile',
     orderCenter: 'Order Center',

src/i18n/locales/vi.ts

@@ -210,6 +210,11 @@ export default {
     invalidFormat: 'Định dạng email không chính xác',
     checkFailed: 'Xác thực email thất bại, vui lòng thử lại sau',
   },
+  notPermission: {
+    title: 'Truy cập bị từ chối',
+    description: 'Bạn không có quyền truy cập trang này. Vui lòng liên hệ quản trị viên để được cấp quyền.',
+    backHome: 'Quay lại trang chủ',
+  },
   personal: {
     completeProfile: 'Hoàn thiện thông tin',
     orderCenter: 'Trung tâm đơn hàng',

src/i18n/locales/zh-CN.ts

@@ -210,6 +210,11 @@ export default {
     invalidFormat: '邮箱格式不正确',
     checkFailed: '邮箱验证失败，请稍后重试',
   },
+  notPermission: {
+    title: '访问被拒绝',
+    description: '你没有权限访问这个页面，请联系管理员获取权限。',
+    backHome: '返回首页',
+  },
   personal: {
     completeProfile: '完善资料',
     orderCenter: '订单中心',

src/i18n/locales/zh-TW.ts

@@ -210,6 +210,11 @@ export default {
     invalidFormat: '郵箱格式不正確',
     checkFailed: '郵箱驗證失敗，請稍後重試',
   },
+  notPermission: {
+    title: '訪問被拒絕',
+    description: '你沒有權限訪問這個頁面，請聯繫管理員獲取權限。',
+    backHome: '返回首頁',
+  },
   personal: {
     completeProfile: '完善資料',
     orderCenter: '訂單中心',

src/views/auth/Error404.vue

-<template>
-  <div class="fixed-center text-center">
-    <p>
-      <img
-        src="~assets/sad.svg"
-        style="width:30vw;max-width:150px;"
-      >
-    </p>
-    <p class="text-faded">
-      Sorry, nothing here...<strong>(404)</strong>
-    </p>
-    <q-btn
-      color="secondary"
-      style="width:200px;"
-      to="/"
-      label="Go back"
-    />
-  </div>
-</template>
-
-<script >
-
-</script>

src/views/personalCenter/index.vue

 <template>
-    <div class="h-screen flex justify-center pb-[12px] h-[797px]">
+    <!-- h-screen  -->
+    <div class="flex justify-center pb-[12px] h-[797px]">
         <div class="h-full flex justify-between w-[1200px]">
             <!-- 左侧导航栏 -->
             <LeftView class="pt-[25px]"