@@ -47,9 +26,7 @@
{{ t("landing.english") }}
-
- {{ lang.lang === 'zh' ? '中文' : 'English' }}
-
+
@@ -67,24 +44,20 @@
import useStore from "@/store/index.ts";
-import {ref} from "vue";
-import {DownOutlined} from '@ant-design/icons-vue';
+import {h, ref} from "vue";
+import {TranslationOutlined} from '@ant-design/icons-vue';
import {useI18n} from "vue-i18n";
-import variables from "@/assets/styles/colors.module.scss";
import {useRouter} from "vue-router";
-
const {t, locale} = useI18n();
const router = useRouter();
const lang = useStore().lang;
+
async function changeLang(language: any) {
lang.lang = language;
locale.value = language;
}
-async function changeTheme(theme: any) {
- app.setThemeName(theme);
-}
const app = useStore().theme;
const isDarkMode = ref
(app.darkMode === "dark");
diff --git a/src/layout/Landing/Header/index.scss b/src/layout/Landing/Header/index.scss
index 9807ff2..667822a 100644
--- a/src/layout/Landing/Header/index.scss
+++ b/src/layout/Landing/Header/index.scss
@@ -8,6 +8,7 @@
justify-content: center;
transition: background-color 0.3s;
z-index: 3;
+ box-shadow: 0 0 10px rgba(0, 0, 0, 0.15);
.landing-header-logo {
display: inline-block;
diff --git a/src/layout/default/Header/Header.vue b/src/layout/default/Header/Header.vue
new file mode 100644
index 0000000..150ad2f
--- /dev/null
+++ b/src/layout/default/Header/Header.vue
@@ -0,0 +1,33 @@
+
+
+
+
+
diff --git a/src/layout/default/Header/index.scss b/src/layout/default/Header/index.scss
new file mode 100644
index 0000000..7f90287
--- /dev/null
+++ b/src/layout/default/Header/index.scss
@@ -0,0 +1,40 @@
+.header-main {
+ height: 60px;
+ width: 100%;
+ min-width: 1200px;
+ min-height: 60px;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ background-color: rgba(255, 255, 255, 0.38);
+ backdrop-filter: blur(20px);
+ transition: background-color 0.3s;
+ z-index: 3;
+ box-shadow: 0 0 10px rgba(0, 0, 0, 0.15);
+
+ .header-logo-container {
+ min-width: 280px;
+ cursor: pointer;
+ }
+
+ .header-menu-container {
+ width: 30%;
+
+ .header-menu-item {
+ min-width: 60px;
+
+ .header-menu-item-btn {
+ font-size: 16px;
+ }
+ }
+
+ .header-user-container {
+ min-width: 130px;
+
+ .header-user-avatar {
+ cursor: pointer;
+ }
+ }
+ }
+
+}
diff --git a/src/locales/language/en.ts b/src/locales/language/en.ts
index c0c1c71..de00f32 100644
--- a/src/locales/language/en.ts
+++ b/src/locales/language/en.ts
@@ -101,5 +101,7 @@ export default {
replySuccess: 'reply success！',
replyError: 'reply failed！',
illegalImage: 'illegal image！',
+ loadingMore: 'loading more',
+ noMore: 'no more',
}
};
diff --git a/src/locales/language/zh.ts b/src/locales/language/zh.ts
index 30c712a..cd84445 100644
--- a/src/locales/language/zh.ts
+++ b/src/locales/language/zh.ts
@@ -100,6 +100,8 @@ export default {
replySuccess: '回复成功！',
replyError: '回复失败！',
illegalImage: ' 非法图片！',
+ loadingMore: '加载更多',
+ noMore: '没有更多了',
}
};
diff --git a/src/router/router.ts b/src/router/router.ts
index af2cdbb..f7cfecc 100644
--- a/src/router/router.ts
+++ b/src/router/router.ts
@@ -3,7 +3,6 @@ import login from './modules/login';
import useStore from "@/store";
import {message} from "ant-design-vue";
-import {close, start} from '@/components/Nprogress/nprogress.ts';
import notFound from "./modules/notFound.ts";
import landing from "./modules/landing.ts";
import mainRouter from "./modules/main_router.ts";
@@ -26,7 +25,7 @@ const router: Router = createRouter({
});
router.beforeEach((to, _from, next) => {
- start();
+ // start();
const user = useStore().user;
const token: string | undefined = user.user.refreshToken;
const userId: string | undefined = user.user.uid;
@@ -59,6 +58,6 @@ router.beforeEach((to, _from, next) => {
router.afterEach(() => {
// 关闭进度条
- close();
+ // close();
});
export default router;
diff --git a/src/utils/alova/service.ts b/src/utils/alova/service.ts
index 9571028..67d3874 100644
--- a/src/utils/alova/service.ts
+++ b/src/utils/alova/service.ts
@@ -32,10 +32,6 @@ const {onAuthRequired, onResponseRefreshToken} = createServerTokenAuthentication
user.user.accessToken = access_token;
user.user.refreshToken = refresh_token;
user.user.uid = uid;
- } else {
- message.error(i18n.global.t('error.loginExpired'));
- localStorage.removeItem('user');
- window.location.href = '/login';
}
}
}
diff --git a/src/views/Main/MainPage.vue b/src/views/Main/MainPage.vue
index ba3b4d2..ecc034a 100644
--- a/src/views/Main/MainPage.vue
+++ b/src/views/Main/MainPage.vue
@@ -1,28 +1,19 @@
-
获取登录用户角色
- {{ data }}
+
+