diff --git a/src/api/base.ts b/src/api/base.ts index c24fb1a..d409b9c 100644 --- a/src/api/base.ts +++ b/src/api/base.ts @@ -11,6 +11,7 @@ export interface Get { } axios.interceptors.response.use((response)=>{ + console.log(response) if(response.data.code == 1001){ router.push("/") } @@ -35,6 +36,12 @@ const del: Get = async function (url: string, data?: unknown){ return res.data; } +const put: Get = async function (url: string, data?: unknown){ + const res = await axios.put(url, {params:data}) + return res.data; +} + + function setToken(){ axios.defaults.headers.common['Authorization'] = "Bearer " + getValue("token"); } @@ -43,5 +50,6 @@ export { get, post, del, + put, setToken } \ No newline at end of file diff --git a/src/api/index.ts b/src/api/index.ts index 0e21d97..7cbc3f9 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -37,7 +37,7 @@ export async function userinfo(){ const user = await get('personalInfo'); // console.log(user.data.img) if(user.code == 1001){ - // router.push("/") + router.push("/") return '未登录'; } return { @@ -277,7 +277,7 @@ export async function sendsms(phone: string, type: number): Promise{ } /** - * 获取国家数据 + * 获取国家与语言数据 */ interface Countries{ @@ -296,3 +296,24 @@ export async function getarchives(): Promise<[Countries[],Willsay[]]>{ } +/** + * 客户端语言 + */ + +interface Language { + dictionaryid: number; + name: string; + alias: string; + code :string; + position: number; + publish: number; + value: string; + deleted_at: null; + created_at: string; + updated_at: string; +} + +export async function getlanguages(): Promise{ + + return (await get("languages")).data; +} \ No newline at end of file diff --git a/src/store/index.ts b/src/store/index.ts index 6e09a39..bc8aca6 100644 --- a/src/store/index.ts +++ b/src/store/index.ts @@ -56,7 +56,9 @@ export default createStore({ actions: { async setUserInfo({ commit }){ const user = await userinfo(); - commit('setUserInfo', user); + if(user != '未登录'){ + commit('setUserInfo', user); + } } }, modules: { diff --git a/src/views/mine/Archives.vue b/src/views/mine/Archives.vue index 374784f..d0e6546 100644 --- a/src/views/mine/Archives.vue +++ b/src/views/mine/Archives.vue @@ -94,9 +94,19 @@
- + +
@@ -171,8 +181,8 @@ ref="select" :getPopupContainer="triggerNode => triggerNode.parentNode" > - - {{ item }} + + {{ item.name }}
@@ -259,14 +269,14 @@