From dd08807e8edb8f55a8e69e7be4a81ffbe891516f Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Tue, 3 Nov 2020 15:37:06 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E8=AF=AD=E8=A8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/base.ts           | 6 +++++-
 src/components/NavTop.vue | 8 +++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/api/base.ts b/src/api/base.ts
index 70ce126..9dbec9a 100644
--- a/src/api/base.ts
+++ b/src/api/base.ts
@@ -80,11 +80,15 @@ const put: Get = async function (url: string, data?: unknown){
 function setToken(){
     axios.defaults.headers.common['Authorization'] = "Bearer " + getValue("token");
 }
+function setLanvuage(yuyan: string){
+    axios.defaults.headers.common['Language'] = yuyan;
+}
 
 export {
     get,
     post,
     del,
     put,
-    setToken
+    setToken,
+    setLanvuage
 }
\ No newline at end of file
diff --git a/src/components/NavTop.vue b/src/components/NavTop.vue
index 81167e0..0fb74c2 100644
--- a/src/components/NavTop.vue
+++ b/src/components/NavTop.vue
@@ -208,6 +208,7 @@ import { computed, defineComponent, onMounted, ref } from 'vue';
 import { useRoute } from 'vue-router';
 import axios from 'axios'
 import { useI18n } from '@/utils/i18n';
+import { setLanvuage } from '@/api/base';
 
 export default defineComponent({
     props:{
@@ -318,8 +319,13 @@ export default defineComponent({
         }
         function setlanguage(e?: any){
             console.log(e)
-            editsystemsetting({language:e})
+            if(store.state.islogin){
+                editsystemsetting({language:e})
+            }else {
+                setLanvuage(e)
+            }
             lan.locale.value = e
+            
         }
         function toindex(){
             router.push("/")

From 52f58a846af47b6dc799e9c76363437b82bb0d52 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Tue, 3 Nov 2020 15:39:14 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=AE=BD?=
 =?UTF-8?q?=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mine/Archives.vue | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/views/mine/Archives.vue b/src/views/mine/Archives.vue
index ec82c18..3dc90ed 100644
--- a/src/views/mine/Archives.vue
+++ b/src/views/mine/Archives.vue
@@ -47,7 +47,7 @@
                         <div class="label">{{ lan.$t("laiziguojia") }}</div>
                         <a-select
                             v-model:value="userinfo.country"
-                            style="width: 171px"
+                            style="width: 1.71rem"
                             size="small"
                             ref="select"
                             show-search
@@ -76,7 +76,7 @@
                         <div class="label">{{ lan.$t("jiaoshou") }}</div>
                         <a-select
                             v-model:value="userinfo.tlanguageValue"
-                            style="width: 171px"
+                            style="width: 1.71rem"
                             size="small"
                             show-search
                             ref="select"
@@ -104,7 +104,7 @@
                                 >
                                     <a-select
                                         v-model:value="lang.name"
-                                        style="width: 171px"
+                                        style="width: 1.71rem"
                                         size="small"
                                         ref="select"
                                         show-search
@@ -155,7 +155,7 @@
                         <div class="label">{{ lan.$t("muyu") }}</div>
                         <!-- <a-select
                             v-model:value="userinfo.mtongue"
-                            style="width: 171px"
+                            style="width: 1.71rem"
                             size="small"
                             ref="select"
                             :getPopupContainer="triggerNode => triggerNode.parentNode"
@@ -252,7 +252,7 @@
                         <div class="label">{{ lan.$t("shiqu") }}</div>
                         <a-select
                             v-model:value="userinfo.zoneStr"
-                            style="width: 171px"
+                            style="width: 1.71rem"
                             size="small"
                             ref="select"
                             show-search
@@ -272,7 +272,7 @@
                     <div class="input-box currency-box">
                         <div class="label">{{ lan.$t("huobi") }}</div>
                         <a-select
-                            style="width: 171px"
+                            style="width: 1.71rem"
                             size="small"
                             ref="select"
                             :getPopupContainer="
@@ -294,7 +294,7 @@
                         <div class="label">{{ lan.$t("yuyan") }}</div>
                         <a-select
                             v-model:value="userinfo.languageValue"
-                            style="width: 171px"
+                            style="width: 1.71rem"
                             size="small"
                             ref="select"
                             :getPopupContainer="
@@ -1063,7 +1063,7 @@ export default defineComponent({
                         align-self: flex-start;
                     }
                     .ant-input {
-                        width: 171px;
+                        width: 1.71rem;
                         padding: 6px 11px;
                         border-radius: 3px;
                         border: 1px solid #dcdfe0;
@@ -1119,7 +1119,7 @@ export default defineComponent({
                 }
                 .video-lang {
                     .upload-image {
-                        width: 171px;
+                        width: 1.71rem;
                         height: 96px;
                         border: 1px solid #dcdfe0;
                         border-radius: 3px;

From 289938ec46ca670c579a12fb613c61d39e35973e Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Tue, 3 Nov 2020 16:00:07 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E9=80=80?=
 =?UTF-8?q?=E5=87=BA=E7=99=BB=E5=BD=95=E4=B8=8D=E7=81=B5=E6=95=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Menu.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/Menu.vue b/src/components/Menu.vue
index 94a8040..e0ef828 100644
--- a/src/components/Menu.vue
+++ b/src/components/Menu.vue
@@ -20,8 +20,8 @@
             <div style="overflow: hidden;">
                 <div class="item" :class="{'selbottom': selnum == list.length - 1}"></div>
             </div>
-            <div class="item loginout">
-                <div class="route" @click="logout">
+            <div class="item loginout" @click="logout">
+                <div class="route">
                     <img src="../static/images/tuichu.png" alt="" class="icon">
                     <div class="title">
                         {{lan.$t('tuichu')}}
@@ -210,6 +210,7 @@ export default defineComponent({
         }
 
         function logout(): void{
+            console.log("退出")
             store.commit("login", false)
             saveValue("token", "");
             setToken();

From 07d5ee35fc4188ffea7e2ffa449e0ae854c1063a Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Tue, 3 Nov 2020 16:04:19 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E7=9A=84=E8=AF=AD=E8=A8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/Sign.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/login/Sign.vue b/src/views/login/Sign.vue
index ea1651e..0d9c365 100644
--- a/src/views/login/Sign.vue
+++ b/src/views/login/Sign.vue
@@ -146,7 +146,7 @@
                                     <a-select-option
                                         v-for="(item, index) in willsay"
                                         :key="index"
-                                        :value="item.languageid"
+                                        :value="item.value"
                                     >
                                         {{ item.name }}
                                     </a-select-option>
@@ -224,6 +224,7 @@ import {
     checksmscode,
     getquhaolist,
     getwillsay,
+    interests,
     register,
     sendsms,
 } from "@/api";
@@ -262,7 +263,7 @@ export default defineComponent({
                 name: "中国",
             },
         ]);
-        getwillsay().then((res) => {
+        interests().then((res) => {
             willsay.value = res;
         });
         onMounted(async () => {

From 2d13a4500a9129b6dec450d084d1b74c9e16f65d Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Tue, 3 Nov 2020 16:56:30 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/Sign.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/login/Sign.vue b/src/views/login/Sign.vue
index 0d9c365..d5f5a6d 100644
--- a/src/views/login/Sign.vue
+++ b/src/views/login/Sign.vue
@@ -483,7 +483,7 @@ export default defineComponent({
                 position: relative;
                 z-index: 999;
             }
-            .getcode {
+            ::v-deep(.getcode) {
                 font-size: 15px;
                 color: #08ae98;
                 width: 313px;
@@ -491,6 +491,9 @@ export default defineComponent({
                 line-height: 30px;
                 cursor: pointer;
             }
+            ::v-deep(.ant-select-selection){
+                background-color: unset;
+            }
             .orginfo {
                 margin-top: 178px;
             }