From 7ac5c7c7a8b306303c1d06e485dc2c01115004a7 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Tue, 24 Nov 2020 15:54:51 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E5=87=BA=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue             | 122 ++++++++++++++++++++++------------------
 src/api/index.ts        |   4 ++
 src/components/Menu.vue |   2 +
 3 files changed, 73 insertions(+), 55 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 9d4499d..d776ca6 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,75 +1,87 @@
 <template>
-  <!-- <div id="nav">
+    <!-- <div id="nav">
     <router-link to="/">Home</router-link> |
     <router-link to="/about">About</router-link>
-  </div> --> 
-  <a-config-provider :locale="len.$s() == 'zh' ? zh : en">
-    <router-view/>
-  </a-config-provider>
+  </div> -->
+    <a-config-provider :locale="len.$s() == 'zh' ? zh : en">
+        <router-view />
+    </a-config-provider>
 </template>
 <script lang="ts">
-import { defineComponent } from 'vue';
-import router from './router';
-import store from './store';
-import { getValue } from './utils/common';
-import { provideI18n } from "@/utils/i18n"
-import i18ninit from "@/i18n/init"
-import enUS from 'ant-design-vue/es/locale/en_US';
-import zhCN from 'ant-design-vue/es/locale/zh_CN';
-import dayjs, { locale } from 'dayjs';
-import { getaddr } from './api';
-import { useRoute } from 'vue-router';
+import { defineComponent } from "vue";
+import router from "./router";
+import store from "./store";
+import { getValue } from "./utils/common";
+import { provideI18n } from "@/utils/i18n";
+import i18ninit from "@/i18n/init";
+import enUS from "ant-design-vue/es/locale/en_US";
+import zhCN from "ant-design-vue/es/locale/zh_CN";
+import dayjs, { locale } from "dayjs";
+import { getaddr } from "./api";
+import { useRoute } from "vue-router";
 
 export default defineComponent({
-  setup(){
-    console.log(i18ninit)
-    const len = provideI18n(i18ninit);
-    // len.locale.value = !getValue("Lanvuage") ? 'zh' : getValue("Lanvuage");
-    if(getValue('token')){
-      console.log("token")
-      store.commit("login", true)
-      store.dispatch("getcode");
-      store.dispatch("setUserInfo");
-      const patn = useRoute().path;
-      if(patn == "/"){
-        router.push("/mine/archives").then(()=>{
-          location.reload()
-        })
-      }
-    }else{
-      
-      console.log('ip')
-      store.dispatch("getip");
-      store.commit('setWlan')
-      router.push("/")
-    }
-    const zh = zhCN
-    const en = enUS
-    
+    setup() {
+        console.log(i18ninit);
+        const len = provideI18n(i18ninit);
+        function GetUrlRelativePath() {
+            const url = document.location.toString();
+            const arrUrl = url.split("//");
 
-    return{
-      zh,
-      en,
-      len
-    }
-  }
-})
+            const start = arrUrl[1].indexOf("/");
+            let relUrl = arrUrl[1].substring(start); //stop省略，截取从start开始到结尾的所有字符
+
+            if (relUrl.indexOf("?") != -1) {
+                relUrl = relUrl.split("?")[0];
+            }
+            return relUrl;
+        }
+        // len.locale.value = !getValue("Lanvuage") ? 'zh' : getValue("Lanvuage");
+        if (getValue("token")) {
+            console.log("token");
+            store.commit("login", true);
+            store.dispatch("getcode");
+            store.dispatch("setUserInfo");
+            const patn = useRoute().path;
+
+            console.log(GetUrlRelativePath(), 444);
+            if (GetUrlRelativePath() == "/") {
+                router.push("/mine/archives").then(() => {
+                    location.reload();
+                });
+            }
+        } else {
+            console.log("ip");
+            store.dispatch("getip");
+            store.commit("setWlan");
+            router.push("/");
+        }
+        const zh = zhCN;
+        const en = enUS;
+
+        return {
+            zh,
+            en,
+            len,
+        };
+    },
+});
 </script>
 
 <style lang="scss">
 div {
-  user-select: none;
+    user-select: none;
 }
 .one-line-hide {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
 }
 input::-webkit-outer-spin-button,
 input::-webkit-inner-spin-button {
-  -webkit-appearance: none;
+    -webkit-appearance: none;
 }
-input[type="number"]{
-  -moz-appearance: textfield;
+input[type="number"] {
+    -moz-appearance: textfield;
 }
 </style>
diff --git a/src/api/index.ts b/src/api/index.ts
index 5f009af..eee83b3 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -1167,3 +1167,7 @@ export async function setusername(src: string){
     } 
     console.log(res)
 }
+
+export async function logoutapi() {
+    await get("logout");
+}
\ No newline at end of file
diff --git a/src/components/Menu.vue b/src/components/Menu.vue
index a25f5bd..595d49e 100644
--- a/src/components/Menu.vue
+++ b/src/components/Menu.vue
@@ -130,6 +130,7 @@
 }
 </style>
 <script lang="ts">
+import { logoutapi } from '@/api';
 import { setToken } from '@/api/base';
 import router from '@/router';
 import store from '@/store';
@@ -230,6 +231,7 @@ export default defineComponent({
 
         function logout(): void{
             console.log("退出")
+            logoutapi()
             store.commit("login", false)
             saveValue("token", "");
             setToken();