From 39fa3b08016ca90e2fa6c965f60ce0a4b6520678 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Mon, 2 Nov 2020 09:58:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BA=86=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E5=9B=BD=E5=AE=B6=E4=B8=8D=E8=83=BD=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/i18n.ts           |  2 +-
 src/views/mine/Archives.vue | 52 +++++++++++++++++++++++++------------
 2 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/src/utils/i18n.ts b/src/utils/i18n.ts
index c03d8b7..a2e7ad4 100644
--- a/src/utils/i18n.ts
+++ b/src/utils/i18n.ts
@@ -13,7 +13,7 @@ const createI18n = (config: Config) => ({
     locale: ref(config.locale),
     messages: config.messages,
     $t(key: string) {
-        console.log(key)
+        // console.log(key)
         return this.messages[this.locale.value][key];
     },
     $s(){
diff --git a/src/views/mine/Archives.vue b/src/views/mine/Archives.vue
index 28d4bf4..e84ca54 100644
--- a/src/views/mine/Archives.vue
+++ b/src/views/mine/Archives.vue
@@ -50,6 +50,8 @@
                             style="width: 171px"
                             size="small"
                             ref="select"
+                            show-search
+                            @change="selguojia"
                             :getPopupContainer="
                                 (triggerNode) => triggerNode.parentNode
                             "
@@ -57,7 +59,7 @@
                             <a-select-option
                                 v-for="(item, index) in chiveslist[0]"
                                 :key="index"
-                                :value="item.name"
+                                :value="item.id"
                             >
                                 {{ item.name }}
                             </a-select-option>
@@ -77,6 +79,7 @@
                             v-model:value="userinfo.tlanguageValue"
                             style="width: 171px"
                             size="small"
+                            show-search
                             ref="select"
                             :getPopupContainer="
                                 (triggerNode) => triggerNode.parentNode
@@ -105,6 +108,7 @@
                                         style="width: 171px"
                                         size="small"
                                         ref="select"
+                                        show-search
                                         @change="choosewillsay"
                                         :getPopupContainer="
                                             (triggerNode) =>
@@ -253,6 +257,7 @@
                             style="width: 171px"
                             size="small"
                             ref="select"
+                            show-search
                             :getPopupContainer="
                                 (triggerNode) => triggerNode.parentNode
                             "
@@ -548,7 +553,6 @@ export default defineComponent({
             formData.value = toRaw(userinfo.value);
             console.log(userinfo.value.currencyValue, "listsssss");
             currencyindex.value = userinfo.value.currency;
-
             console.log(currencyindex.value, "listsssss");
         });
         const modalNode = () =>
@@ -803,22 +807,30 @@ export default defineComponent({
             console.log(uesrinfo);
 
             // console.log(toRaw(formData.value));
-            if (userinfo.value.currency == "") {
-                if (userinfo.value.currencyValue != "") {
-                    for (let i = 0; i < currencylist.value.length; i++) {
-                        if (
-                            userinfo.value.currencyValue ==
-                            currencylist.value[i].name
-                        ) {
-                            userinfo.value.currency = (i + 1).toString();
-                        }
-                    }
-                }
-            }
-
-            const reg = /^\w+((.\w+)|(-\w+))@[A-Za-z0-9]+((.|-)[A-Za-z0-9]+).[A-Za-z0-9]+$/;
+            // if (uesrinfo.currency == "") {
+            //     if (uesrinfo.currencyValue != "") {
+            //         for (let i = 0; i < currencylist.value.length; i++) {
+            //             if (
+            //                 uesrinfo.currencyValue ==
+            //                 currencylist.value[i].name
+            //             ) {
+            //                 uesrinfo.currency = currencylist.value[i].value;
+            //             }
+            //         }
+            //     }
+            // }
+            // eslint-disable-next-line
+            const reg = /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/;
             console.log(userinfo.value.email);
-            console.log();
+            // console.log();
+            // for (let i = 0; i < currencylist.value.length; i++) {
+            //     if (
+            //         uesrinfo.currencyValue ==
+            //         currencylist.value[i].name
+            //     ) {
+            //         uesrinfo.currency = currencylist.value[i].value;
+            //     }
+            // }
             if (reg.test(userinfo.value.email)) {
                 putmember(uesrinfo);
             } else {
@@ -858,6 +870,7 @@ export default defineComponent({
             if (formData.value.video != "" && uploadprogress.value == 0) {
                 uploadprogress.value = 100;
             }
+            console.log(formData.value.country)
         });
 
         function choosewillsay(e?: any) {
@@ -881,6 +894,10 @@ export default defineComponent({
             //  picinfo.url=res.video.url
             formData.value.img = res.video.url;
         }
+        function selguojia(e: any){
+            userinfo.value.countryValue = e;
+            console.log(e)
+        }
 
         return {
             modalNode,
@@ -923,6 +940,7 @@ export default defineComponent({
             showname,
             uploadspic,
             lan,
+            selguojia
         };
     },
 });