diff --git a/app/index.html b/app/index.html index 21ec580473590ed915d4a480db9cfcb9d020fec9..d7ea08b273ebd41610f04d2fb69a4b0796ebd92a 100644 --- a/app/index.html +++ b/app/index.html @@ -4,7 +4,7 @@ - Signature + Signatrust
diff --git a/app/src/App.vue b/app/src/App.vue index 184738496d902b7600648b4f4bb43cdf659ff074..f23ba4d617cd8e39702f456fc226aeb77f27afbe 100644 --- a/app/src/App.vue +++ b/app/src/App.vue @@ -3,11 +3,13 @@ import AppHeader from "@/components/AppHeader.vue"; import { useRoute, useRouter } from "vue-router"; import { getToken } from "@/api/show"; import { showGuard } from "@/shared/utils/login"; +import { useDataStore } from "@/store/data"; +const useData = useDataStore(); const router = useRouter(); const route = useRoute(); const queryToken = () => { getToken() - .then(() => router.push("./")) + .then((res:any) => {useData.email = res.email}) .catch(() => showGuard()); }; queryToken() diff --git a/app/src/api/request.ts b/app/src/api/request.ts index 0d0fbf29d68177bd7c41914d7bc3e0692b82c489..2df5f4bd68bb3d97c53b0f46ab605fb07e9e71b4 100644 --- a/app/src/api/request.ts +++ b/app/src/api/request.ts @@ -48,15 +48,15 @@ service.interceptors.response.use( // 超出 2xx 范围的状态码都会触发该函数。 // 对响应错误做点什么 if (error.response.status === 401) { - // ElMessage.error('Please log in again'); - // tokenFailIndicateLogin(); + ElMessage.error('Please log in again'); showGuard(); } - if (error.response.status === 403) { - // router.replace({path:'/'}); - // useUserStore.state.dialogFormVisible = true; + // if (error.response.status === 400) { + // ElMessage.error('Wrong request'); + // } + if (error.response.status === 500) { + ElMessage.error('Server error'); } - console.log(error); return Promise.reject(error); } ); diff --git a/app/src/components/AppFooter.vue b/app/src/components/AppFooter.vue index 0b00775a78e456d4a0e1bc2aafcc536c59dacc0b..0cae870c0f748d76f3946bfbc4503e2b0783f6db 100644 --- a/app/src/components/AppFooter.vue +++ b/app/src/components/AppFooter.vue @@ -60,19 +60,19 @@ const linksData = { const RIGHT_LIST=[ { - NAME: '品牌', + NAME: 'Trademark', URL: '/other/brand/', }, { - NAME: '隐私政策', + NAME: 'Privacy Policy', URL: '/other/privacy/', }, { - NAME: '法律声明', + NAME: 'Legal Notice', URL: '/other/legal/', }, { - NAME: '服务状态', + NAME: 'Service Status', URL: 'https://status.openeuler.org/', }, ]; @@ -105,7 +105,7 @@ const handleNavClick = (path: string) => { diff --git a/app/src/components/AppHeader.vue b/app/src/components/AppHeader.vue index dde50bded24efa2032e0756808743fd9597813d8..9bd07f623e5c383c668418a22a3ade6da23880ab 100644 --- a/app/src/components/AppHeader.vue +++ b/app/src/components/AppHeader.vue @@ -2,31 +2,42 @@ import { ref, onMounted, reactive, watch } from "vue"; import { showGuard, logout, useStoreData, getUserAuth } from "@/shared/utils/login"; import { useRouter } from "vue-router"; +import { useDataStore } from "@/store/data"; +const useData = useDataStore(); const router = useRouter(); const isLogin = ref(false); -const name = ref("Admin"); const dropdownCommand = (type: string) => { if (type === "logout") { isLogin.value = false; } }; const toTokens = () => { - router.push({ - path: "/apiTokens", - }); + router.push("/tokens"); +}; +const toHome = () => { + router.push("/"); +}; +const toOpenEuler = () => { + window.open("https://openeuler.org"); };