From 7bb07135950620bc63bf4cdc2fd68e8679317745 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Mon, 23 Nov 2020 10:23:20 +0800
Subject: [PATCH 01/13] =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/mine/Archives.vue b/src/views/mine/Archives.vue
index 2134965..16d159d 100644
--- a/src/views/mine/Archives.vue
+++ b/src/views/mine/Archives.vue
@@ -1391,8 +1391,8 @@ export default defineComponent({
             line-height: 23px;
             cursor: pointer;
             user-select: none;
-            position: absolute;
-            top: 1.5rem;
+            position: fixed;
+            top: 2.3rem;
             right: 1rem;
 
         }
-- 
2.45.2


From 8ccc7e7b0d49412c11b1b09101577de60e55ab21 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Mon, 23 Nov 2020 10:27:04 +0800
Subject: [PATCH 02/13] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=A4=B4=E5=83=8F?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index.ts | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/api/index.ts b/src/api/index.ts
index 1348f6e..5449749 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -783,6 +783,7 @@ export async function putmember(data: any): Promise<any>{
     }
     console.log(newdata)
     const res = await put<Liveaddrule>(`member/${store.state.userinfo.memberid}`, newdata)
+   
     store.dispatch("setUserInfo");
     return res;
 }
@@ -1080,10 +1081,20 @@ export async function getset() {
 
 export async function setheadimg(src: string){
     const res = await put(`member/${store.state.userinfo.memberid}`,{img: src});
+    if(res.code == 0){
+        message.success(res.msg)
+    }else{
+        message.error(res.msg);
+    } 
     console.log(res)
 }
 
 export async function setusername(src: string){
     const res = await put(`member/${store.state.userinfo.memberid}`,{name: src});
+    if(res.code == 0){
+        message.success(res.msg)
+    }else{
+        message.error(res.msg);
+    } 
     console.log(res)
 }
-- 
2.45.2


From a472d4e25115b3b142c61319af4a9c82004eebb1 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Mon, 23 Nov 2020 14:51:23 +0800
Subject: [PATCH 03/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=B0=8F?=
 =?UTF-8?q?=E6=95=B0=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mine/Archives.vue       | 3 ++-
 src/views/mine/ReleaseVideo.vue   | 4 +++-
 src/views/mine/ReleaseWebcast.vue | 8 ++++++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/views/mine/Archives.vue b/src/views/mine/Archives.vue
index 16d159d..d78570f 100644
--- a/src/views/mine/Archives.vue
+++ b/src/views/mine/Archives.vue
@@ -960,7 +960,8 @@ export default defineComponent({
             issum = false;
             const res = await uploadflie(file.file, (info: any) => {
                 console.log(info);
-                const jindu = info.percent.toFixed(2) * 100
+                let jindu: number = info.percent.toFixed(2) * 100;
+                jindu = parseInt(jindu + "");
                 uploadprogress.value =  jindu > 0 ? jindu : 1;
             });
             userinfo.value.video = res.video.url;
diff --git a/src/views/mine/ReleaseVideo.vue b/src/views/mine/ReleaseVideo.vue
index 12d0d5d..400ce8f 100644
--- a/src/views/mine/ReleaseVideo.vue
+++ b/src/views/mine/ReleaseVideo.vue
@@ -231,7 +231,9 @@ export default defineComponent({
            
                 const res = await uploadflie(file.file, (info: any) => {
                     console.log(info);
-                    uploadpicprogress.value = info.percent.toFixed(2) * 100;
+                    let jindu: number = info.percent.toFixed(2) * 100;
+                    jindu = parseInt(jindu + "");
+                    uploadpicprogress.value = jindu || 1;
                 });
                 console.log(res);
                 form.value.img = res.video.url;
diff --git a/src/views/mine/ReleaseWebcast.vue b/src/views/mine/ReleaseWebcast.vue
index a800266..30d1da8 100644
--- a/src/views/mine/ReleaseWebcast.vue
+++ b/src/views/mine/ReleaseWebcast.vue
@@ -511,7 +511,9 @@ export default defineComponent({
                 uploadprogress.value = 1;
                 const res = await uploadflie(file.file, (info: any) => {
                     console.log(info);
-                    const jindu = info.percent.toFixed(2) * 100
+                    // const jindu = info.percent.toFixed(2) * 100
+                    let jindu: number = info.percent.toFixed(2) * 100;
+                    jindu = parseInt(jindu + "");
                     uploadprogress.value = jindu > 0 ? jindu : 1;
                 });
                 console.log(res);
@@ -525,7 +527,9 @@ export default defineComponent({
                 uploadpicprogress.value = 1;
                 const res = await uploadflie(file.file, (info: any) => {
                     console.log(info);
-                    uploadpicprogress.value = info.percent.toFixed(2) * 100 || 1;
+                    let jindu: number = info.percent.toFixed(2) * 100;
+                    jindu = parseInt(jindu + "");
+                    uploadpicprogress.value = jindu || 1;
                 });
                 console.log(res);
 
-- 
2.45.2


From 01fb7035790189df40ee27e893967363aba74fb0 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Mon, 23 Nov 2020 14:59:20 +0800
Subject: [PATCH 04/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=B8=90?=
 =?UTF-8?q?=E5=8F=B7=E5=AD=98=E5=9C=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/en.ts | 2 +-
 src/i18n/zh.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/en.ts b/src/i18n/en.ts
index a1d3fcc..c207865 100644
--- a/src/i18n/en.ts
+++ b/src/i18n/en.ts
@@ -303,7 +303,7 @@ export default {
     cshipinyaoqiu1: "The video should be no longer than 10 minutes",
     cshipinyaoqiu2: "Video size cannot exceed 500M",
     shangchuanwancheng: "Please wait for the file to be uploaded",
-    zhanghaocunzai: "account already exists",
+    zhanghaocunzai: "This number is already registered as a student",
     shouruguize: "Description of revenue rules",
     shouru1: "Live Revenue=Actual attendess x Actual duration x unit price",
     shouru2: "1 on 1, 20€/hour; 1 on N, 10€/hour/person, (1<N<=4)",
diff --git a/src/i18n/zh.ts b/src/i18n/zh.ts
index 3cdef6e..75ec07e 100644
--- a/src/i18n/zh.ts
+++ b/src/i18n/zh.ts
@@ -303,7 +303,7 @@ export default {
     cshipinyaoqiu1: "视频长度不能超过10分钟",
     cshipinyaoqiu2: "视频大小不能超过500m",
     shangchuanwancheng: "请等待文件上传完成",
-    zhanghaocunzai: "帐号已存在",
+    zhanghaocunzai: "该手机已注册学生端账号",
     shuoruguize: "收入规则说明",
     shouru1: "直播收入=实际参加学生数x参加时长x单价",
     shouru2: "单价：1对1，20欧/小时；1对N，10欧/小时/人（1<N<=4）",
-- 
2.45.2


From 62e57ff9254447fd4b69ceac32a391cbfedb41b8 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Mon, 23 Nov 2020 15:29:28 +0800
Subject: [PATCH 05/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=BC=B9?=
 =?UTF-8?q?=E5=87=BA=E5=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/Sign.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/login/Sign.vue b/src/views/login/Sign.vue
index 78d71f0..a9a5b39 100644
--- a/src/views/login/Sign.vue
+++ b/src/views/login/Sign.vue
@@ -294,7 +294,7 @@ export default defineComponent({
             }
             const iszc =  await checkuser({phone: phone.value.phone})
             if(iszc.data){
-                message.error(lan.$t('zhanghaocunzai'))
+                message.error(iszc.msg)
                 return ;
             }
             lock = true;
-- 
2.45.2


From 82146f266d1e13a7c303a7803e91047514b0bf7f Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Mon, 23 Nov 2020 15:34:56 +0800
Subject: [PATCH 06/13] =?UTF-8?q?=E5=8A=A0=E5=A4=A7=E4=BA=86=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/mine/Archives.vue b/src/views/mine/Archives.vue
index d78570f..e26acfa 100644
--- a/src/views/mine/Archives.vue
+++ b/src/views/mine/Archives.vue
@@ -1381,15 +1381,15 @@ export default defineComponent({
             }
         }
         .submit-btn {
-            width: 63px;
-            height: 23px;
+            width: 70px;
+            height: 28px;
             background: #08ae98;
             border-radius: 3px;
             font-size: 10px;
             font-weight: 500;
             color: #ffffff;
             text-align: center;
-            line-height: 23px;
+            line-height: 28px;
             cursor: pointer;
             user-select: none;
             position: fixed;
-- 
2.45.2


From 1adbc1f46932d4f9f1812d61f945532f4ad601a1 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Mon, 23 Nov 2020 15:41:20 +0800
Subject: [PATCH 07/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/en.ts      | 2 ++
 src/i18n/zh.ts      | 2 ++
 src/utils/common.ts | 9 ++++++---
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/i18n/en.ts b/src/i18n/en.ts
index c207865..9d46070 100644
--- a/src/i18n/en.ts
+++ b/src/i18n/en.ts
@@ -312,6 +312,8 @@ export default {
     querentuichu: "You confirm to exit?",
     huobitishi: "Attention! You can only change the currency once!",
     zhuanmazhong: "Transcoding in",
+    leixingcuowu:"File type error",
+    zuida:"maximum",
     shichangtishi:"",
     renshutishi: '',
     tixianzhu: "",
diff --git a/src/i18n/zh.ts b/src/i18n/zh.ts
index 75ec07e..bfa6df7 100644
--- a/src/i18n/zh.ts
+++ b/src/i18n/zh.ts
@@ -312,6 +312,8 @@ export default {
     querentuichu: "您确认退出？",
     huobitishi: "请注意，货币一旦修改，不能变动。",
     zhuanmazhong: "转码中",
+    leixingcuowu:"文件类型错误",
+    zuida:"最大",
     shichangtishi:"",
     renshutishi: '',
     tixianzhu:"",
diff --git a/src/utils/common.ts b/src/utils/common.ts
index f54cf43..7eaffce 100644
--- a/src/utils/common.ts
+++ b/src/utils/common.ts
@@ -1,4 +1,6 @@
 import { message } from 'ant-design-vue';
+import { geti18n } from './i18n';
+const lan = geti18n()
 
 /**
  * 图片转Base64
@@ -68,7 +70,7 @@ export function provenimg(file: any): boolean | void{
     console.log(ntype)
     const size = 2 * 1024 * 1024;
     if(file.size > size){
-        message.error("最大2MB")
+        message.error(lan.$t('zuida') + "2MB")
         return false;
     }
     let istype = false
@@ -93,13 +95,13 @@ export function provenvideo(file: any, isvideo?: boolean): boolean{
     if(isvideo){
         const size = 500 * 1024 * 1024;
         if(file.size > size){
-            message.error("最大500MB")
+            message.error(lan.$t('zuida') + "500MB")
             return false;
         }
     }else{
         const size = 100 * 1024 * 1024;
         if(file.size > size){
-            message.error("最大100MB")
+            message.error(lan.$t('zuida') + "100MB")
             return false;
         }
     }
@@ -108,5 +110,6 @@ export function provenvideo(file: any, isvideo?: boolean): boolean{
             return true;
         }
     }
+    message.error(lan.$t("leixingcuowu"))
     return false;
 }
\ No newline at end of file
-- 
2.45.2


From dd476ddcf96c3307056673e243dc9423eed358f2 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Mon, 23 Nov 2020 16:02:14 +0800
Subject: [PATCH 08/13] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E7=9B=B4?=
 =?UTF-8?q?=E6=92=AD=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/en.ts                    |   1 +
 src/i18n/init.ts                  |   4 ++--
 src/i18n/zh.ts                    |   1 +
 src/static/images/gantanhao.png   | Bin 0 -> 1894 bytes
 src/views/mine/ReleaseWebcast.vue |  27 +++++++++++++++++++--------
 5 files changed, 23 insertions(+), 10 deletions(-)
 create mode 100644 src/static/images/gantanhao.png

diff --git a/src/i18n/en.ts b/src/i18n/en.ts
index 9d46070..c48398d 100644
--- a/src/i18n/en.ts
+++ b/src/i18n/en.ts
@@ -314,6 +314,7 @@ export default {
     zhuanmazhong: "Transcoding in",
     leixingcuowu:"File type error",
     zuida:"maximum",
+    zhibotishi1:"Congratulations on your qualification for beelink live streaming course.",
     shichangtishi:"",
     renshutishi: '',
     tixianzhu: "",
diff --git a/src/i18n/init.ts b/src/i18n/init.ts
index 42961a6..6405f05 100644
--- a/src/i18n/init.ts
+++ b/src/i18n/init.ts
@@ -14,8 +14,8 @@ getset().then((res: any)=>{
     en.tixianzhu = `Note: ${res.sxf} service fee will be charged for each withdrawal, with a minimum of ${ res.symbol + res.minmoney }`
     zh.zuiditixian = "最低提现金额" + res.symbol + res.minwithdraw
     en.zuiditixian = "Minimum withdrawal amount " + res.symbol + res.minwithdraw
-    zh.zhibotishi = `恭喜您在beelink有直播课资格。直播资格按照每周浏览量排名，前${res.views}名基本直播资格。`
-    en.zhibotishi = `Congratulations on your qualification for beelink live streaming course. The top ${res.views} basic live streaming qualifications are ranked according to the number of views per week`
+    zh.zhibotishi = `直播资格按照每周浏览量排名，前${res.views}名基本直播资格。`
+    en.zhibotishi = `The top ${res.views} basic live streaming qualifications are ranked according to the number of views per week`
     const i18n = geti18n();
     const loc = i18n.locale.value;
     i18n.locale.value = '';
diff --git a/src/i18n/zh.ts b/src/i18n/zh.ts
index bfa6df7..d70d87b 100644
--- a/src/i18n/zh.ts
+++ b/src/i18n/zh.ts
@@ -314,6 +314,7 @@ export default {
     zhuanmazhong: "转码中",
     leixingcuowu:"文件类型错误",
     zuida:"最大",
+    zhibotishi1:"恭喜您在Beelink有直播课资格",
     shichangtishi:"",
     renshutishi: '',
     tixianzhu:"",
diff --git a/src/static/images/gantanhao.png b/src/static/images/gantanhao.png
new file mode 100644
index 0000000000000000000000000000000000000000..19ae03c5926d8388d9c65c9b845003953fb178aa
GIT binary patch
literal 1894
zcmaJ?c~BE)91SSQ4IZ3|tf6ulvPlS-L;?*tBtQTmDiu^>vLO+ZT{bHTcr~JUL==I7
zCpzF!YDYoQB8tX~stk(NK~b!Th+3+MQNh8|Zd9;;l<v&#cg%b5cYN=g-IN$V+tJR;
zjzAzd3Zr>R_!wY*ZLIO{mZ3ToK6qmM6f7B*V_FFc5jZk<2?PjLk_;#blE`whu0i1h
z!WciLI0Z`)#j&KYiYzf>$T}5*vk8RoNF5@PW<nUS1j<mV*~H#6=ZSz)#wN}W6;VV8
z7g8vrb5STcH(o5w&6F}_#K;IBT*tx%R1hWsbgE@)4NJ!+e$r*(bMrPx1U^BqOg8az
zQYoTDfD5A#5K0aUmQv}Vz)U8Y8WuulGD!f9LS=vy21pGFriQWT6c&vJe0hj?G*l*M
zCGiAbV&N+`QGsCy3k0=VEm<2vhS3a=%49M@3Js*uf^kH!CP$4)birzk@2~<7(nwJy
zf+=A&U{;hYftO=!BA)5z5>&{DtXlJ>O?bmVodf}?WQw_@VW3F#|4@}`1g*i6ps)G<
zr?5txgFs*sq=A>CQvBfLzUEK}i;F@M3`WH;yll9Oi3%8lH3}F3xLkABm_WdMrCJ7S
zHG!WvA`wfd)?gB~6cX~-L|lceRLWR%K^Q+Ygc3%JqDE1v{3r&K6T%Tt1spyjgvp;d
zbC}D6rOQ>28XM-yzH(=d$~D_Th2W8S5UR|EWC9dc0iVidDM!zRKC0dqu59#NLPzC-
zcru{*aQ}7K!&|t6%+nF;;)@aULu%adC~j?2)4WFf#<U7~9I@{H<sB;&%@U7aZ@!Xi
z+T0G-$QvsHlZ%BR($WVlL&(n9@x?Nl*Z8CqbzuGn?&*Z)+Qh4ruGLl3sU_?4+vOqh
zvL}OgOx=Aw+Uy&HgL|0?t605*<&T~Yt^jWih9BE^`vtbHJTUuSZDNb(Si+hX%hh^8
zi~QLIy<4xr;x@<H!{TCE+FiS!jIM}Rd+Vz0`{d4t^p=If{sjZoORK%7Se$PNtOoCm
z@v9#=?{v0fvDfd2i+#nyw7(~itlS%@mrq=<xI|%brZa4Vj5FN(1#86=N0}kxa-RKu
zo31>+8SH3oo#W5++I@uG7m}MFzjP|?Gu3a*-c?p?bU(5C<Aa=zh`hSH>65P309*f@
zd~dAvT2lpk{cPWu*&TxFlsn3!4pw))-@o+U;n2G26c2I2-tanf)to!m*fRYwr{0~#
zhlNKKlby29O!TmDGO*s=BPA?cYc<QJb#pFRTNtZP{nnYhMwZb&r?W)$^zqzN?qhe`
z9(X9x|M*PbzYFZKvQG7Q#ou4vla+pMr_mMI*rerb>Na$?S<LtBF7=<+#I7POekqPg
zcexqLyi;F#(IPLX=l<$jhPO4o2aRHCe}u=!lEZH48gkJ-lIy!=fk^E@<(^8H#VI=j
z4#(=Rb#BXader8)h<-h1T!7xTv%)`OQuM9Ff{j)eON`~66<!<QmjwYE1`LG@+q6FR
zC8<mIpO>#QMUq<L;u;i&H#J6^IqG?qk2W_l49@C~53wtcPopd<Sreqc$&(gc8CQl*
zosc<U{feaxSMoWWn92#d*fe_UhD*E2*R@yugY>SQ+idqADVQ34d>WD;u(;IFRpTK?
znHtg!?-;gER!mjqUq;3pkXm2Dtw>8R^{J~F>MZBkTh2FpUs)9S-bX*_)yi(vr&?gL
zDl<CWkl2Oxio(V=tv~vvGkkj;T@#mmEYIC~Z&bKTA7Ss4Em<csC-toqbC!7~eB4U&
z`mHi*%HEB^N;oz1F|SJBbL;FbR+J3LC`{%*Kwq~%JQrK6IrOCW^dd{21P4<^UG$AE
z)WP5LO1ZT)W=fk@l>6Gx|LwG}D^S*w9|G@h?K@pCuM3?LXAyaM&jH`<OC#KD@4E1N
zuXQLI+7Z$(#j`5s_G7Va1jNpPT3h`3#94cGmoLLL*4k7aH$*9jq&I#eT%d?9A=!#2
z?#fSRKkxRlg-iX%__a22>o+HW?b!|ff+H*3XT7$3`m{Ns&O2-QSsTTzW)p8uymS4V
zp{~RiE~{J&&Tj1QntY<-2ZGKV@k@Pt^3cPKE$rtmRh6niUnAl8<VVMf!We&;|9nDz
LJnv{!`r3a0IzQ|S

literal 0
HcmV?d00001

diff --git a/src/views/mine/ReleaseWebcast.vue b/src/views/mine/ReleaseWebcast.vue
index 30d1da8..e3bb555 100644
--- a/src/views/mine/ReleaseWebcast.vue
+++ b/src/views/mine/ReleaseWebcast.vue
@@ -222,8 +222,13 @@
             <p>{{ lan.$t("querenquxiao") }}</p>
         </a-modal>
         <nav-bottom></nav-bottom>
-        <div class="tishi" v-if="false">
-            {{ lan.$t("zhibotishi") }}
+        <div class="tishi" v-if="true">
+            <img src="@/static/images/gantanhao.png" alt="">
+            <div>
+                {{ lan.$t("zhibotishi1") }}<br />
+                {{ lan.$t("zhibotishi") }}
+            </div>
+            
             
         </div>
     </div>
@@ -638,13 +643,19 @@ export default defineComponent({
     position: relative;
     .tishi{
         position: absolute;
-        top: 40%;
-        right: 15%;
-        width: 25%;
+        top: 60px;
+        right: 64px;
         line-height: 0.17rem;
-    font-size: 0.1rem;
-    font-weight: 500;
-    color: #808080;
+        font-size: 0.1rem;
+        font-weight: 500;
+        color: #808080;
+        display: flex;
+        align-items: center;
+        color:#07ad97;
+        > img{
+            width: 40px;
+            margin-right: 10px;
+        }
     }
     ::v-deep(.ant-form) {
         .title {
-- 
2.45.2


From 22e93bcdaac07687bd72bb283a8d6f9c98365304 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Mon, 23 Nov 2020 16:12:43 +0800
Subject: [PATCH 09/13] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=BA=86icon?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/static/images/tishihei.png | Bin 0 -> 6248 bytes
 src/views/mine/Archives.vue    |   8 +++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 src/static/images/tishihei.png

diff --git a/src/static/images/tishihei.png b/src/static/images/tishihei.png
new file mode 100644
index 0000000000000000000000000000000000000000..a953314b3168f86577adac75d728944c84d2f6b6
GIT binary patch
literal 6248
zcmai3_dDE8y!|d~v!d6Cx`c?DB6?c{i-_J!bWxWT(PNbmL`@KF^@ti>)F>-z2+_+%
zu!vrwx4ZAXf54sRnfd%M^PK6=oO32h`<W`mP3D^b08pqQp6C){?|&HzA(Z9D6&OMQ
zdnu~vLkTGmYWEfZm^jp)DCqlIZe`v0P;cPbQw8JKp=XE{dTSgvB}#F45=Eh{vq^zX
zV(P{+YmR-abJ>iV8sO#T7o(@I<YYIC7UE|o<Em1QQs~a%O1TK$KG<z-{=MDivw|y{
zcU;MoJm20P6!OZx4j2#-IaX{2zai-)$}n9}w9cr68(Vpif#HjPp=7SsApk;#{eMeh
zYfv_c4P<XxsMf(I1n7MVk!t!|0|&5<4L{SPNQht}x7XG_4HJQ=v*#6E?lMBrgLXOj
z8FB=uz*l7DX~r;MbO*lkX<c}Jmz^wo_S+tvlq2y~U+3?kjfUxiav?zX_2#jD;w0@(
z^KQ-M;I;bCY5wJn#a}G$@(1s)Nf@f(0QYc0v-+jsqI5KJ9>}AIwg|a&9Oy9YzTWG>
zt_F~0G+P4LEAZS?{swvun4EUt!vLCA=L_AsEI~Qt3(q}A|MH;4WD<A^73@5sIcn!8
zurxDZpdz$a2f4@bbJ!=wR=%d&g9I)nPFaJ^rI0wfeRyXFId_`^5$6J5x?imO1L&Oz
zA%PAu0>tRSDC5^4dIttH9XDZ$h8)CzXEuaYuz2OEU?b31MPaq#8e>8XhOy#y=Nw|j
zA~7cTwFt*XqqHS*R5FQ`x%i=4TH~A%BYJ;ca@yt@&^SW$Kv=#=L3nDCLm0rzlch+{
z<gEY+8hvNMv%4>D*o0C9RLqcHzYKNLaz||e)=Lx;A7vv7ybMlLyNjYEInTPKu1-65
zY7Z7Ep4<HKIv0O7b42%CtK~c)OLu;d3mr}ol&miRpE3i;#r_1*QT<qD1V9glHb2t@
zh{K&gUUZjo*i;aUAG*`BkiUcm7VpwNGAXxYR<ff+5&T5{oBS>vif25SWp9hQ&0lNF
zI+zGyIj0xYs;@@}cjt_ewFsPL7mP&G4WWyouj?YuP$egHd`P;br%^k`lmDy@c8?de
zURvmI;3tU^?%0<FQ$Md($`8`D&xXla4puuwW83i5dluMppQ(`S;!WP@`1Q&-%V>-g
zTzD2(vSu@h(G<-=gAkfvIB;{2{S%qL1@Q+CZyjF_`)9XdWi@G{?zoU#T<)Xa+^>;0
z?BlC?rAu|FXn)s)eGh5^k)GG|jp&0qRaiaD3v#-H3#;qJ+uOTs;=%_g;F5}gBcYHJ
zZ{nmrw}m1obsRmFfP`;mTW$M^ZU?H!eC+TRT6h2PE>p5JcBDB#@Dn6~Zv0o+T<g3^
zBC<C1?Ki#3!Sv{+5~%~@ha#`|q|`{*%u6aO2GVHZ5@Leh`<=AwCN?(pVJT+lkLN|v
z8h)}~3msJ#Yfk*YX`WzTZMFv1QN9_}gG7;Kq+PvXNsv*N*TDX%$!zVIa+4rI?|wRS
zCLup<gD}|!R~hA$W-)fes5-otX84Ss<<I{jep#^+#|D!({DP=VQIde{my0*jeaL)v
zoHNiCKF!42&&tJ#vq#-r)AbnyPTfM{mMDoNN<0GYS;dbkSH=U}U#pf!?`3!Eh^ePs
zh4_AX8gqaFd+ffx^I4i~w+)=IV49@lsCF7HN%AsRS_QrA-usPTN!H||LYSP<-rYH*
zc|(4f<~eVdO8)HEcna9p*j3-9HjA^&*<pTnsihFXa`hJZo#gFgod>w~uj}!l-@yqD
z_RNePa{=^*u`2o^DYhVlD1^e*+$x0s`%7}5@31^N&9>$9AW7dso0$@Ec+J0C_V0FF
z3eI=QFSWODL|+UUf-yQjmI|e(q{}!#iZVSnx-C<^J6(((k#m$>nxH+o$S0M)_W!n&
zLCExJ1Dv!8|ITq%ML^`L4vQi04Q{Z7=jD@~#3&`ua@~5F_*1d=hnry-y#PuC^!H^=
zX1{Ec5)ck1yMO%HP^uvL50BN)mqP6WPf#g-YdX5?qBKu_106n*g~`0<y#j^Dh<F3u
zJTJ|<nphuB%S9GCr-q`mFA1Y}SflMUtc%ApkQTpzy*9q!(swBNNQI)D>O2*kQi~jp
zq#?#9`ZPH9AEWnrTU^}X*{4=5v~T>&z4Fe>0<mKn%6qswZTm@)%K>NC7TvD;E?jfE
zzEiSoX02?OM<moJJc_M~7X<vS5S3y#oj*NiE|pVw8+NCrAQ@5HaX6c`O0+$&w)}D5
zuBP4oQq6Ef6OQrqHQy5o*N{vMtQ$EP=Zr6vVP`71xBlS_fErO(Mpn{xJoELQU>xqy
zxKGJ1gM}ogmWtBsac^qMDj02AOSSsvx}ZJ$C^Q6I)L(bnfmD%246<^b@j4b?!vmm3
zSE>H=suf*-@4~7gc2MJBjq)Mky}!&boX8GN%$it6;)`yU<@Ljh^eY>**s)IGF?G=|
zA6pBeaFeA2%7LVyaPz7<S~=y}%q(dG|C7pb^<~8)JB`Mwe^QMiRT}7pLYE)CsyP0M
zJkg>RzqGSsqaof4j>6*?Mceda2tF+CSGo@w^0^^fcd-E4<NJ?IYuSnJrGwku0g@F&
zeqn<dc2s}V(5ebQ{yp}l43;MI+#C?py|6Gb0y-umE+gL{ZuD>J1bkPb<Y?j5$wXJB
zm8bPC^a|Q&dPT>xpC{&xk-%T+k)_G{O1|K%xRIezF*jNIg{q24wHiq+KlWL~z!L@X
z`jPd<*Qr+!g;91&bG-$0@T4K+$-L_$Y9Hr0PG9Q;6>DgxP#di^1}Pb>PIu8ZBJL?a
zTqlCH99KS#CzqSNHN1B-l;JSIq+s5B>G@axkd0csZ%+V{ftR=#`utHqQeUX%OtV#6
zD%he-^_Rd~P>_d6<+<1oc?<c|JU`n5FaK8lUyHXsf8=F~>HM}Kkw5flu@DrhL0Z96
z9L_>oqdK=)>s%GY+?AE++}@9ef~**;%x^?)MD@hJR?<rWL&F9RdtFEMoDv@Nk9~hL
zcTdoYV%XvRkoTl=o1Holc8R}z-=^Z0L)_xu4EUX?;p(|s?T1E%NkEnRP@}UXZ)9n=
z6{oZtSpw@%l(Ki#4}U(iul5khkym46;7t7LZh4RR4%k*Cy6l-c2<z_<lrCkqIHZvO
zLou+EaRKHiuXG;MVkQ8h7Q?#^&C-4RASa`xh#R}lhmU+3#MmCYj3l48c|YVJyYa)H
z6z$6eAx+?{)6_PGjT03-sfPTtS7l8Bp!aLy5L@=d@6_fJ-PZKp9@&C`(G^OKV$bGq
zU($_Fw172#b3`tQV7ajk$yO!s?5*#knyTf(sUobPnNcUgMX;TAV6p04v(GH$N;*yY
z77XJQAIliVQR@ss*|JqfJzRWXTW&q2XGKS5FSP0fQe;kdWHybFmUiD#C}o6AZpsTi
zgxuElxTZ9%1Kf8R11_?b)oPaW%+b^*wv8SSORFl_<Ba-f4;~oB<6>2Y&kCQSZ-+Pt
z_k*CGUDv$0acvRO8_z_0Ck31GhJ?Jlk>?yDJ8`_$8FHq=za*dUf8)LTJ0uMSpc0&=
zN3`!qIz$;znbx)M*|d=AuCbDCC2~p7-L@G{#Xq)u+}&}8=Z<$n0X9JaLvP|3jeNC&
zKNZ+&UcVPH)T`D|H}iCAFhAXTU5c@Nse5qYsg7j6t?22ABmfe)-8Hv|bQ(|X(Qj@o
zbxsjHupDeKi-}++%@xF?bZcKvJt2l&(O4I|la9!l?WZ2-uaZF90a)=r5>nHHgHI{4
z28{p$*PE!e7ZJe)K;aJ)Z@~o11*fSRG~_mtzZDz(qNYSI$G#u$j^bg|5Tf$~?E~Zc
z!x8CUuS0-~95w=pT$ZKaK3ll@sPCTxzUDFbntVVMesIp9WY5iA&q~S?jVXHpa3j|w
zns`S1_!}+j{Xw0Z9fC>f5+ay1ei^#|`iJibd1un-MNNm9V4ql`jpKZW4Pt!X->#h?
z0wrAV5^2TF)5UnQ9r}Z8Bo{BKycgnWr62NE0f?&?*Uix<U054))mC;iwaoy7Q*o_D
zsAp(hO&t-eSnKBsYT~_Mg|En)1%E)17GFaiwA6MZMx!NnO)Ulj-;bo)@fZkt6rhGF
z_|vxx>J>GRYP8kki}Mw)*9W){NoUN5{Kqu5mypIKhrsfuk_C|n^{?)(CfW(PU!4g{
zd#ZGr${*_TSNE?2?S*T}0~9;j^*yGW<J(CVMG9q{u^5mfFEP>lVsH;Z7@oW)t2aNJ
zaEGn#8%OS2Kp)3ump*nR!e*P_WYHt3kC@uB-k9BYe<vwY{6#r|ub*mxPyPF5Gt`0p
zMJ~Lljpwg*onoOR^W}y4DPs_Imr`xiXHmzUME;(aU6qcIs+GIxT|de&xs+(%vU<ZF
zf7?n)UNe9@IH83H3~x!9%@tQiV`&9~t@t>BBxH|{aFxw_jC>_1;gJ|C{;q7C-vGJ$
zAnf!NEB@h5y@OxEOslUBQ;~7;aI}H@hx<3X#<5cG2#pzM8$akYrH9wpr2UEGF>GT~
z{aePgy?si|lJSp#RM;E<ewuuH?xVu~mP9|AuZe-P;WUf|=xg|MPs#nSA-7vE#~grY
zqfpJL<s7|QrgA5!hKK--pjxM3!!e1Zo<d#jxY=o4P{LS|qiv%OZ(Ph+zF!zik@4wK
z4g20vy8q)Oqg5)8L71OdEyn6Fy=BJ#5>&j7%yf)juO){0DV_Nhn^lah9i9<y=-l7`
zcK_-%Mzds;5`7YRpsss~3~Lf7<-!LLeVTb?66ZhC`0Yd};@P+`Gq4xGds%SiK&Zcu
z6ozBI5Fu`+sv{E?l=R*>!fpY3RQnr+XVhU*$8Tl&V8J0ThR9K9_0!7SQKZ@t75RQ0
z;Y3~Bxp=PI+N5w<pCsE2dk%&*m(b(vEC;psvehS0-Wj=TeNhm2pwf4zu_E%4Zyy9F
zk(tP!d_>eYIYU@!B8u&X_!CWc!FVEAn?jAlIHwLP>5}<}8f;#tYRq%z&!={M>~;xX
zOdbP^Ec5RRUganpK1>QqQ+OTwLKu#KTsYa{&(*F5RI-@6iD5@Ntr-1hA|><Y`zdxC
z${<DS=M2whf36ujlrsweHoh;IbvE|bT}GSZTGQE>8%3ZzCh>D}d|778kDF-cfww_0
zdCufZ3g_uBjOxI$ob#?3MXU-v8u%co2Vlj{2nx%1t&LW0BCpc29t?+e*lShA=W-6e
z7t|>KzZS#E5*lUtQc9tlCQp56UxBFm0~1d?i-l5IS;{w9mR;y6&{Hah8nmlu-egO`
zj-H~M$h$^1klanPXn6<M!MQKWP;`O(g9+A_4}k)EJ-<q)jH~J4_t*$S&|lPL6P`>H
zAc2pnVl+^_U4%<QjJDHLLsw#LitTf`?ltI3a7_b<87p5y-v8ba`~T|H9BYO?$tGL!
zD(sgIB@)4$@~=#zWCb<<`RKa#PiNMs4Sz}kav!oDqc$_tza=ebVqM!;R6q&%J3|UX
ztJqr>!u}!Po+j2E#@zp2`f~r&D*O8%WI!ig`9SYJO>oE)Or^PNEO!2I)>9=*vs;5W
zJi097kVCAd*GJvknF|kw*Ry{v6|3pNQ!JUddf_IfN#JEZVn0*3948=3aSD%t>ce}+
zzsq$@_nKcc0nm(>kDi%Np3pCLUcAm9`asy#jCdT|;eEwBg8vvu-%Ijt{5U<k*$hCv
z7gY9HHFmfM{`tD>A>aAyF;JmhWl*;!vgP^fTlDe^cw;<O`P3~y%lytfHE-=N5j_aU
zvv+y2tVnB6LTt~9)7inV*skw#Dbq{MDy@Z!7NGEGSr^1&WSa5{bptyveY(eu%be~?
zT1D$h&33&arLM+3j4}Qjq}zV{>D5j2rcCF~csAmtJC6fZwGU&FFi6pMI?{J;CZ_Qw
zeS>i$5i!ig?XRan9{7lDQ(h{!0)*nLOF!mHVJ&(2@7CgMR5|ET7E^J)A~8&wTmzVo
z#NHC0NjD)5Zp&sqOzLiiKq>Z~u;%rc(kCp$>E0oM8>%vh)3$fueyLB>gbna-62of$
zXfAf8iaLZ{H|wcLt*@K$0M*W(E;naiWyVcJ-td-v5d;cPjS#FW>uLLU&2Cc~Y&7{w
zK<71Jmuj(_;a}ACk#(cGb`ft?G<FNV7Vbl*V#<jsWt3mq9;+T8%a(@w8mYKDYMEki
zl%8i`Xgs-#Ci^P^8l6|j($QZ0DrG{0Q=kk@Av(I%>He5FT%!C0eUcQ18;8)ESMQ{}
zh~&`Nu8ykKqdo{-a$KKd!?tF*A5l<4b`X05S^36vh__xa9OoOH5T}isGwi;^+Ic=!
z_0TDt6HvS^v;GhxR!qVjNcYMA{!&Km=xW%Aj)mj`6SqvjJ#?kHRk5;-HC3yMI@R&L
zxTmX3bp*oLkY|c|+iIG{ZP}&7jaVhatFq%+vvL8&4CI}woD;4g%CY_OCIe%>=UiBo
zr&)$$AelPZe=dCUmV>z}JCC{HYh}l44Wjx&us^!$M@)0=$}-@;XYv9o9qCedbXeQ*
ztAggl+(-!2Z83Ju`nHyW5UlS(#|s0mjt<(fr4XG#m@NR!lGMrcI?yj-&+0Cd{Sw-O
znJZ8Js<yt6t0~5awz{z~PqpE8tbX|?QHka8`gInGCFkoW5ke|nk%J$BP}y(yhWgH)
zElT0;kFBI6?UfytM4v<bhETK(iBEPRt@Zvf{of(f>HR_LMgtG1+swc}$JQ1;TBi&d
zc*@wB;P=X%S&rR;D(8Z6ensD*)Kal7-Rx<tJqA~Ni>6CzkACPq&GL<NjLH6JvZz%M
zoHqC<x-^~v_VQl?iND5A2H4*pK1J}1B7Jb1H@b^%v$iceKaf#%`ZLMEB|Q7MKhOsH
zn}l0=^p9hG;azW>HHgyX<EB4LW}&>fXIaE;X?UgC_V?C0*=b!24@OBnS2$Z-_dv#A
zvrn$N%_4s$0clsu2ZX;0SVBx3r?r>`Zh$^C+Ia|)FyeNJ$sKH6a3!%bKV8ftC!u;E
z=;gp3*aFEhnn{$Tk2L)f<TBF5LGEGvE5v=`y3f~6ixgI<py;=$VabJ=9VaVp$KMR?
zi53!Px-Ss$Xd&m09x>Ey=y2Xt9?cC*3Ew^FXGJ#6tc9%D3*A<VqYj{TbA=>z1eK=b
z`dnTU43@KYapoP#mWq9r>8N8KA?@lfRP~ft#IlKEU3;Z@Kz-Ti*RlhQ9f~(fj|57r
zC_@U{gIKtUem2+n@lLT~N|L%U0Th8R!Rt3uZ-ONtQL6~IWe1cV1RBKkh$g|<U7>F3
z-HSFl=I<dDcW0hwHEML7dyhT*Pq6MJq6^PNywSC<U^HO(o}GqT9S;B!?1^dI_K(IM
z_C`L=0bmw1)2e{V7gENiwWmTrhuBwHY8iZAvwfXVPuHg2f?j#Q>;O_PXj5oGuG7cw
zn}V+!!?vs_s32&2s@)5(*!L^79P@Wa6wcX(fo11fY<WuZp1hNAhkN2NK%WyV#O3|$
zTcmw9Ge|MGkAxf%0iC=EUFX4M+A{?(y~a$BC^a?o+fQTJL$k#heplu<)$^z1`?Qbv
zRm`=W8w$WprBR1O@G6{^u0QLL1u%H~>>V+l>pJj{&-!-|bsM&G^$2+`2-qBtQi!JX
zT(Sa7#`!oqtji53aR-ka8te6I+zx_5M-Y*Jtr>8Eto?dsFa(0R6{RT~qdJ1Nw7x(1
z&NJIC7lx;w>&rs(u$bkQNrDRMZe>g{-rF<?CAe6v%4F|ysW?*_>T|HHpwV<>14+(@
zeO)1m$NBf7Z8sU2R%7#&WyNiV0F%d}CKS^@z1TqQX(AwSbzjZiN_2#Y9$>e%>!k=r
z0E2T53=U)fNJ7GiEQ!EMGvpxvI0s-t>)io?3I62DdPfWXD+Hb*fApWP8e&uJV{Y5n
z|Cy()cp`BNzYJlmnKLVh(+0T5b)}a*_N8+`Wa#N}%O_u$SH;l)ebHN&1NH5(kDvsZ
zgQON<6(O9AHQ6^^ls$+ZoRBl)3AA`u1M3s^VCObbPUs@I*O4PBp8;xgHL`1KHEF>~
z!NZ>z^143z^tm=C!RNhs`%x9skw~ih$FY*F)$VM1?;*%j=b@vWDkS2uZ-p_yJsFz&
zypAvt11jW8;YotRFei(6Jx)+E`m!w}jphUlln~RIff)?YJ=|4UMF~*@eRWoAMs5VF
meY}e$Yk;7;{$G#_dENQ3Bh$pPXu{V4pr-unNrj?S=>Gs94y3XG

literal 0
HcmV?d00001

diff --git a/src/views/mine/Archives.vue b/src/views/mine/Archives.vue
index e26acfa..cbab9d8 100644
--- a/src/views/mine/Archives.vue
+++ b/src/views/mine/Archives.vue
@@ -507,7 +507,11 @@
             </div>
         </div>
         <a-modal v-model:visible="huobi" :footer="null" :title="lan.$t('tishi')" >
-            <p>{{lan.$t('huobitishi')}}</p>
+            <div style=" display: flex;align-items: center;">
+                <img style=" width: 50px;margin-right: 15px;" src="@/static/images/tishihei.png" alt="">
+                <p style="margin-top: 1em">{{lan.$t('huobitishi')}}</p>
+            </div>
+            
         </a-modal>
         <a-modal v-model:visible="touxiang" width="6rem" :footer="null">
             <imghead @upload="imgupload" v-if="touxiang" :url="imgfire"></imghead>
@@ -1108,6 +1112,7 @@ export default defineComponent({
 </script>
 
 <style lang="scss" scoped>
+
 .archives {
     width: 100%;
     min-width: 700px;
@@ -1115,6 +1120,7 @@ export default defineComponent({
     padding: 46px;
     border-radius: 17px;
     position: relative;
+   
     .telbox {
         margin-left: 15px;
         font-size: 12px;
-- 
2.45.2


From 9cefed9bfec55a267f439ea2e3ef98c309453582 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Mon, 23 Nov 2020 16:32:54 +0800
Subject: [PATCH 10/13] =?UTF-8?q?=E6=8D=A2=E6=88=90=E4=BA=86=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E5=AE=9A=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue        |  2 ++
 src/api/index.ts   | 76 +++++++++++++++++++++++++++++++++-------------
 src/store/index.ts |  2 ++
 3 files changed, 59 insertions(+), 21 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index d574b12..f2e6b6c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -17,6 +17,7 @@ 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 from 'dayjs';
+import { getaddr } from './api';
 
 export default defineComponent({
   setup(){
@@ -24,6 +25,7 @@ export default defineComponent({
     const len = provideI18n(i18ninit);
     // len.locale.value = !getValue("Lanvuage") ? 'zh' : getValue("Lanvuage");
     if(getValue('token')){
+      console.log("token")
       store.commit("login", true)
       store.dispatch("setUserInfo");
     }else{
diff --git a/src/api/index.ts b/src/api/index.ts
index 5449749..e17f566 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -1039,28 +1039,62 @@ export async function luzhi(roomid: string){
     console.log(res)
 }
 
-export async function getaddr() {
-    const res = await get<any>('ip');
-    const gj = res.data.address.split("|")[0];
-    const lan = getValue("Lanvuage");
-    const qh = await get<any>('countryCode', {
-        longitude: res.data.content.point.x,
-        latitude: res.data.content.point.y
-    });
-    console.log(qh) 
-    if(lan != null && lan){
-        if(gj == "CN"){
-            return {hb: '人民币￥', qh};
-        }else {
-            return {hb: '美元$'}
+export function getaddr() {
+    return new Promise((r)=>{
+        console.log("开始定位")
+        const lan = getValue("Lanvuage");
+        if ("geolocation" in navigator) {
+            /* 地理位置服务可用 */
+            navigator.geolocation.getCurrentPosition(async (res) => {
+                console.log(res, 'res')
+                const qh = await get<any>('countryCode', {
+                    longitude: res.coords.longitude,
+                    latitude: res.coords.latitude
+                });
+                console.log(qh) 
+                if(lan != null && lan){
+                    if(qh.data.ename == "China"){
+                        r({hb: '人民币￥', qh});
+                    }else {
+                        r({hb: '美元$'})
+                    }
+                }else{
+                    if(qh.data.ename == "China"){
+                        r({yy: "zh", yyx: "中文", hb: '人民币￥', qh});
+                    }else {
+                        r({yy: 'en', yyx: 'English', hb: '美元$', qh})
+                    }
+                }
+            },(err) => {
+                console.log(err, 'err')
+            })
+        } else {
+            /* 地理位置服务不可用 */
+            console.log("无法定位")
         }
-    }else{
-        if(gj == "CN"){
-            return {yy: "zh", yyx: "中文", hb: '人民币￥', qh};
-        }else {
-            return {yy: 'en', yyx: 'English', hb: '美元$', qh}
-        }
-    }
+    })
+    
+    // const res = await get<any>('ip');
+    // const gj = res.data.address.split("|")[0];
+    // const lan = getValue("Lanvuage");
+    // const qh = await get<any>('countryCode', {
+    //     longitude: res.data.content.point.x,
+    //     latitude: res.data.content.point.y
+    // });
+    // console.log(qh) 
+    // if(lan != null && lan){
+    //     if(gj == "CN"){
+    //         return {hb: '人民币￥', qh};
+    //     }else {
+    //         return {hb: '美元$'}
+    //     }
+    // }else{
+    //     if(gj == "CN"){
+    //         return {yy: "zh", yyx: "中文", hb: '人民币￥', qh};
+    //     }else {
+    //         return {yy: 'en', yyx: 'English', hb: '美元$', qh}
+    //     }
+    // }
     
 }
 
diff --git a/src/store/index.ts b/src/store/index.ts
index 483d750..5b6776d 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -126,11 +126,13 @@ export default createStore({
         commit('setUserInfo', user);
       } else {
         const info = await getaddr();
+        console.log(info,11256445)
         commit("setLanguage", info)
       }
     },
     async getip({ commit }){
       const info = await getaddr();
+      console.log(info,11256445);
       commit("setLanguage", info)
     }
   },
-- 
2.45.2


From 845a492d69cb26362074c1c5831d748b670acaef Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Mon, 23 Nov 2020 16:34:40 +0800
Subject: [PATCH 11/13] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E7=A6=81?=
 =?UTF-8?q?=E6=AD=A2=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/api/index.ts b/src/api/index.ts
index e17f566..3a577cc 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -1066,6 +1066,7 @@ export function getaddr() {
                     }
                 }
             },(err) => {
+                message.error(err.message)
                 console.log(err, 'err')
             })
         } else {
-- 
2.45.2


From ce377863639c86af504052c934cd132a746ac08f Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Mon, 23 Nov 2020 16:43:01 +0800
Subject: [PATCH 12/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E8=AF=AD?=
 =?UTF-8?q?=E8=A8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/LiveItem.vue   |  2 +-
 src/components/ReviewItem.vue |  2 +-
 src/i18n/en.ts                | 30 +++++++++++++++---------------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/components/LiveItem.vue b/src/components/LiveItem.vue
index ebe09ef..1763edf 100644
--- a/src/components/LiveItem.vue
+++ b/src/components/LiveItem.vue
@@ -4,7 +4,7 @@
         <img src="@/static/images/play.png" alt="" class="play">
         <div class="title">
             <div class="one-line-hide">{{title}}</div> 
-            <span class="lv">{{score}} {{lan.$t('fen')}}</span>
+            <span class="lv">{{score}}</span>
         </div>
         <div class="info">
             <div class="datetime">
diff --git a/src/components/ReviewItem.vue b/src/components/ReviewItem.vue
index fd3e17c..fbdc521 100644
--- a/src/components/ReviewItem.vue
+++ b/src/components/ReviewItem.vue
@@ -11,7 +11,7 @@
                     </div>
                     
                 </div>
-                <div class="num">{{(score+'').split('.')[1]?score:score+'.0'}} {{lan.$t('fen')}}</div>
+                <div class="num">{{(score+'').split('.')[1]?score:score+'.0'}}</div>
             </div>
             <div class="all" @click="findall(replyid)" >
                 <span>{{lan.$t('suoyouhuifu')}}</span>
diff --git a/src/i18n/en.ts b/src/i18n/en.ts
index c48398d..3131299 100644
--- a/src/i18n/en.ts
+++ b/src/i18n/en.ts
@@ -1,29 +1,29 @@
 export default {
-    zhiboguanli: "Live broadcast management",
-    shipinguanli: "Video management",
-    dingyuezheguanli: "Subscriber management",
-    gerenzhongxin: "Personal Center",
+    zhiboguanli: "Live",
+    shipinguanli: "Vide",
+    dingyuezheguanli: "Followers",
+    gerenzhongxin: "Profile",
     rili: "calendar",
-    quanbuzhibo: "All live",
-    weikaishi: "Not started",
-    yijieshu: "Finished",
+    quanbuzhibo: "All",
+    weikaishi: "Planning",
+    yijieshu: "Completed",
     zhibosousuo: "Please enter the live title you want to search",
     haiweikaishi: "Not yet",
     jinruzhibo: "Enter live",
-    chakanhuifang: "View playback",
-    quanbushipin: "All videos",
-    shenhezhong: "Under review",
+    chakanhuifang: "Replay",
+    quanbushipin: "All",
+    shenhezhong: "Reviewing",
     weitongguo: "Failed",
     yifabu: "Published",
     shipinsousuo: "Please enter the live title you want to search",
     wodedingyuezhe: "My subscribers",
     xingming: "name",
-    suozaiguojia: "Country of residence",
+    suozaiguojia: "Country",
     nianling: "Age",
-    xueshengmuyu: "Students' mother tongue",
-    xingqudian: "Points of interest",
+    xueshengmuyu: "Speak",
+    xingqudian: "Learn",
     yuyandengji: "Language level",
-    canyupingtaishichang: "Total duration of live broadcast on the platform",
+    canyupingtaishichang: "Attended course",
     sousuoxuesheng: "Please enter the name of the student you want to search",
     huanying: "Hello, welcome",
     beelink: "Beelink",
@@ -173,7 +173,7 @@ export default {
     querenjujue: "Confirm rejection",
     zhiboyemian: "Live page",
     querenguanbi: "Are you sure you want to close the live broadcast",
-    dingyuezhe: "My subscribers",
+    dingyuezhe: "My Followers",
     sousuodingyue: "Please enter the name of the student you want to search",
     wodeqianbao: "My wallet",
     lijitixian: "Immediate withdrawal",
-- 
2.45.2


From 15ede903bd1e8ab5f4f329ee28ee54fc522bb0a7 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Mon, 23 Nov 2020 16:58:37 +0800
Subject: [PATCH 13/13] =?UTF-8?q?=E6=97=B6=E9=92=9F=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/date.ts         | 15 ++++++++++-----
 src/views/regime/date.vue | 16 ++++++++++------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/utils/date.ts b/src/utils/date.ts
index fdad371..2e43f61 100644
--- a/src/utils/date.ts
+++ b/src/utils/date.ts
@@ -15,11 +15,16 @@ interface GetDate{
     end: string;
 }
 
-export function getdate(yue?: number): GetDate{
-    let now = dayjs()
-    if(yue != undefined){
-        now = now.month(now.month() + yue);
-    }
+export function getdate(yue: number,id: string): GetDate{
+     /* eslint-disable */
+     const utc = require('dayjs/plugin/utc') // dependent on utc plugin
+     /* eslint-disable */
+     const timezone = require('dayjs/plugin/timezone')
+     dayjs.extend(utc)
+     dayjs.extend(timezone)
+     const days: any = dayjs;
+    let now = days().tz(id)
+    now = now.month(now.month() + yue);
     yue = now.month() + 1;
     const day = now.date() // 当前天
     const zhou = now.day(); // 当前周
diff --git a/src/views/regime/date.vue b/src/views/regime/date.vue
index 6512883..93a0573 100644
--- a/src/views/regime/date.vue
+++ b/src/views/regime/date.vue
@@ -202,9 +202,8 @@ export default defineComponent({
     },
     setup(){
         console.log(1)
-        const date = getdate();
-        console.log(date)
-        const month: any = ref(date);
+        
+        const month: any = ref({zhou:0,data:[]});
         const yue = ref(0);
         const userid = computed(() => {
             return store.state.userinfo.memberid;
@@ -249,16 +248,17 @@ export default defineComponent({
         }
         function xia(){
             yue.value  = yue.value + 1;
-            month.value = getdate(yue.value)
+            month.value = getdate(yue.value, store.state.userinfo.zoneValue)
             getdates(userid.value)
         }
         
         watch(userid, ()=> {
+            month.value = getdate(0, store.state.userinfo.zoneValue)
             getdates(userid.value);
         })
         function shang(){
             yue.value  = yue.value  - 1;
-            month.value = getdate(yue.value)
+            month.value = getdate(yue.value, store.state.userinfo.zoneValue)
             getdates(userid.value)
         }
       
@@ -276,7 +276,11 @@ export default defineComponent({
             }
             router.push({path: url,query: { id: id }})
         }
-        getdates(userid.value);
+        if(userid.value != 0){
+            month.value = getdate(0, store.state.userinfo.zoneValue)
+            getdates(userid.value);
+
+        }
         return {
             month,
             xia,
-- 
2.45.2