From bb6012b01d7c303d669ecc7da8af184573c79693 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Fri, 13 Nov 2020 17:36:33 +0800
Subject: [PATCH 01/34] =?UTF-8?q?=E6=94=B9=E6=88=90s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/index.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/index.html b/public/index.html
index 0ee7c33..9253348 100644
--- a/public/index.html
+++ b/public/index.html
@@ -7,15 +7,15 @@
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
     <title><%= htmlWebpackPlugin.options.title %></title>
-    <link href="http://imgcache.qq.com/open/qcloud/video/tcplayer/tcplayer.css" rel="stylesheet">
+    <link href="https://imgcache.qq.com/open/qcloud/video/tcplayer/tcplayer.css" rel="stylesheet">
         <!-- 如需在IE8、9浏览器中初始化播放器，浏览器需支持Flash并在页面中引入 -->
         <!--[if lt IE 9]>
         <script src="//imgcache.qq.com/open/qcloud/video/tcplayer/ie8/videojs-ie8.js"></script>
         <![endif]-->
         <!-- 如果需要在 Chrome Firefox 等现代浏览器中通过H5播放hls，需要引入 hls.js -->
-        <script src="http://imgcache.qq.com/open/qcloud/video/tcplayer/lib/hls.min.0.8.8.js"></script>
+        <script src="https://imgcache.qq.com/open/qcloud/video/tcplayer/lib/hls.min.0.8.8.js"></script>
         <!-- 引入播放器 js 文件 -->
-        <script src="http://imgcache.qq.com/open/qcloud/video/tcplayer/tcplayer.min.js"></script>
+        <script src="https://imgcache.qq.com/open/qcloud/video/tcplayer/tcplayer.min.js"></script>
     <script>
         //designWidth:设计稿的实际宽度值，需要根据实际设置
         //maxWidth:制作稿的最大宽度值，需要根据实际设置

From 15903d525e31d5f26698d52a6339fbb10a0f11d2 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Mon, 16 Nov 2020 10:59:07 +0800
Subject: [PATCH 02/34] =?UTF-8?q?=E5=BC=95=E5=87=BA=E4=BA=86=E5=A4=96?=
 =?UTF-8?q?=E9=83=A8=E5=8F=AF=E4=BB=A5=E4=BD=BF=E7=94=A8=E7=9A=84=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/base.ts | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/api/base.ts b/src/api/base.ts
index 9dbec9a..db39dca 100644
--- a/src/api/base.ts
+++ b/src/api/base.ts
@@ -14,6 +14,25 @@ export interface Get {
 let login: MessageType;
 let count = 0;
 const div: any = document.getElementById("make");
+export function countadd(){
+    if(count == 0){
+        login = message.loading('加载中..', 0)
+        div.style.display = "block"
+    }
+    count++;
+}
+export function countdel(){
+    if(count != 0){
+        count--;
+        setTimeout(()=>{
+            if(count == 0){
+                login();
+                div.style.display = "none"
+            }
+            console.log(count)
+        }, 1000)
+    }
+}
 axios.interceptors.request.use((config)=>{
     if(count == 0){
         login = message.loading('加载中..', 0)
@@ -26,8 +45,8 @@ axios.interceptors.request.use((config)=>{
 axios.interceptors.response.use((response)=>{
     // console.log(response)
     if(count != 0){
+        count--;
         setTimeout(()=>{
-            count--;
             if(count == 0){
                 login();
                 div.style.display = "none"

From c493582885e64c0e8e6a5b5e621250154e0e80f7 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Mon, 16 Nov 2020 11:02:33 +0800
Subject: [PATCH 03/34] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BA=86--=E7=9A=84?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/base.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/api/base.ts b/src/api/base.ts
index db39dca..0558c98 100644
--- a/src/api/base.ts
+++ b/src/api/base.ts
@@ -23,8 +23,8 @@ export function countadd(){
 }
 export function countdel(){
     if(count != 0){
-        count--;
         setTimeout(()=>{
+            count--;
             if(count == 0){
                 login();
                 div.style.display = "none"
@@ -45,8 +45,8 @@ axios.interceptors.request.use((config)=>{
 axios.interceptors.response.use((response)=>{
     // console.log(response)
     if(count != 0){
-        count--;
         setTimeout(()=>{
+            count--;
             if(count == 0){
                 login();
                 div.style.display = "none"

From 1bf49e37b43b52983427a5e554adee5c04d5c6ee Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Mon, 16 Nov 2020 11:09:29 +0800
Subject: [PATCH 04/34] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BA=86=E5=BC=B9?=
 =?UTF-8?q?=E5=87=BA=E5=B1=82=E7=9A=84=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mine/RankList.vue | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/views/mine/RankList.vue b/src/views/mine/RankList.vue
index e744606..ab3b5a2 100644
--- a/src/views/mine/RankList.vue
+++ b/src/views/mine/RankList.vue
@@ -6,14 +6,14 @@
             <div class="hits">视频点击量</div>
         </div>
         <div class="list-body">
-            <div class="rank-item" v-for="item in rankData" :key="item.uid" :class="{'mine-item': item.uid === 5 }">
-                <div class="other-rank" :class="{'mine-rank': item.uid === 5 }">
+            <div class="rank-item" v-for="(item,index) in list" :key="index" :class="{'mine-item': item.isme }">
+                <div class="other-rank" :class="{'mine-rank': item.isme }">
                     <div class="ranking-number">
-                        <span v-if="item.uid === 5" class="mine">我的成绩</span>
+                        <span v-if="item.isme" class="mine">我的成绩</span>
                         <div v-else>
-                            <img src="@/static/images/rank_first.png" class="rank-img" v-if="item.id === 1" />
-                            <img src="@/static/images/rank_second.png" class="rank-img" v-else-if="item.id === 2" />
-                            <img src="@/static/images/rank_third.png" class="rank-img" v-else-if="item.id === 3" />
+                            <img src="@/static/images/rank_first.png" class="rank-img" v-if="index === 0" />
+                            <img src="@/static/images/rank_second.png" class="rank-img" v-else-if="index === 1" />
+                            <img src="@/static/images/rank_third.png" class="rank-img" v-else-if="index === 2" />
                             <span class="other" v-else>{{ item.id }}</span>
                         </div>
                     </div>
@@ -45,6 +45,11 @@ export default defineComponent({
     components: {
         UserOutlined
     },
+    props:{
+        list: {
+            type: Object
+        }
+    },
     setup() {
         interface RankItem {
             uid: number;

From edcee2f5928c2faf4c13156704845f09b4f5cda3 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Mon, 16 Nov 2020 11:20:17 +0800
Subject: [PATCH 05/34] =?UTF-8?q?=E6=9C=AA=E4=B8=8A=E4=BC=A0=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E6=96=87=E4=BB=B6=E4=B8=8D=E8=AE=A9=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/en.ts                    | 1 +
 src/i18n/zh.ts                    | 1 +
 src/views/mine/Archives.vue       | 8 +++++++-
 src/views/mine/ReleaseVideo.vue   | 7 +++++++
 src/views/mine/ReleaseWebcast.vue | 7 +++++++
 5 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/i18n/en.ts b/src/i18n/en.ts
index bdaf8f7..dabf9ae 100644
--- a/src/i18n/en.ts
+++ b/src/i18n/en.ts
@@ -301,6 +301,7 @@ export default {
     shijishichang: "Actual live broadcast duration",
     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",
     shichangtishi:"",
     renshutishi: '',
     tixianzhu: "",
diff --git a/src/i18n/zh.ts b/src/i18n/zh.ts
index e5d51b1..c8a8520 100644
--- a/src/i18n/zh.ts
+++ b/src/i18n/zh.ts
@@ -301,6 +301,7 @@ export default {
     shijishichang: "实际直播时长",
     cshipinyaoqiu1: "视频长度不能超过10分钟",
     cshipinyaoqiu2: "视频大小不能超过500m",
+    shangchuanwancheng: "请等待文件上传完成",
     shichangtishi:"",
     renshutishi: '',
     tixianzhu:"",
diff --git a/src/views/mine/Archives.vue b/src/views/mine/Archives.vue
index 030067f..a86f9cb 100644
--- a/src/views/mine/Archives.vue
+++ b/src/views/mine/Archives.vue
@@ -542,6 +542,7 @@ export default defineComponent({
         NavBottom,
     },
     setup() {
+        let issum = true;
         const lan: any = useI18n();
         interface SpeakItem {
             lang: string;
@@ -812,6 +813,10 @@ export default defineComponent({
             //  for(let i in toRaw(formData.value).willsay){
             //     console.log(toRaw(formData.value).willsay[i])
             // }
+            if(!issum){
+                message.error(lan.$t("shangchuanwancheng"))
+                return; 
+            }
             const uesrinfo = toRaw(formData.value);
             // for (let m = 0; m < toRaw(chiveslist.value).length; m++) {
             //     for (const i in uesrinfo.willsayValue) {
@@ -926,13 +931,14 @@ export default defineComponent({
         async function uploads(file: AntUpload) {
 
             uploadprogress.value = 0;
-
+            issum = false;
             const res = await uploadflie(file.file, (info: any) => {
                 console.log(info);
                 uploadprogress.value = info.percent.toFixed(2) * 100;
             });
             userinfo.value.video = res.video.url;
             userinfo.value.videoid = res.fileId;
+            issum = true;
         }
 
         if (formData.value.video != "") {
diff --git a/src/views/mine/ReleaseVideo.vue b/src/views/mine/ReleaseVideo.vue
index 4d44cc4..4df8159 100644
--- a/src/views/mine/ReleaseVideo.vue
+++ b/src/views/mine/ReleaseVideo.vue
@@ -147,6 +147,7 @@ export default defineComponent({
         NavBottom,
     },
     setup() {
+        let issum= true;
         const lan: any = useI18n();
         interface FileItem {
             video: Array<string>;
@@ -254,6 +255,7 @@ export default defineComponent({
         const uploadprogress: Ref<number> = ref(0);
         const ifallowvideo = ref<boolean>(false);
          async function uploads(file: AntUpload) {
+                issum = false;
                 console.log(file);
                 videofile.value = file.file;
                 videos.value[0].addEventListener("durationchange", () => {
@@ -268,6 +270,7 @@ export default defineComponent({
 
                 form.value.fileid = res.fileId;
                 form.value.fileurl = res.video.url;
+                issum = true;
         } 
 
         function beforeVideoUpload(info?: any) {
@@ -285,6 +288,10 @@ export default defineComponent({
          */
         const routes = useRoute();
         const onSubmit = async (e: FromSend) => {
+            if(!issum){
+                message.error(lan.$t("shangchuanwancheng"))
+                return; 
+            }
             e.preventDefault();
             console.log(toRaw(form.value), 111);
             console.log(toRaw(form.value).video[0].length);
diff --git a/src/views/mine/ReleaseWebcast.vue b/src/views/mine/ReleaseWebcast.vue
index 2d85636..51d457b 100644
--- a/src/views/mine/ReleaseWebcast.vue
+++ b/src/views/mine/ReleaseWebcast.vue
@@ -252,6 +252,7 @@ export default defineComponent({
         RankList,
     },
     setup() {
+        let issum = true;
         const lan: any = useI18n();
         // 表单数据
         const form = ref({
@@ -361,6 +362,10 @@ export default defineComponent({
             });
         }
         const onSubmit = (e: FromSend) => {
+            if(!issum){
+                message.error(lan.$t("shangchuanwancheng"))
+                return; 
+            }
             e.preventDefault();
             validate()
                 .then(() => {
@@ -475,6 +480,7 @@ export default defineComponent({
             }
         }
         async function uploads(file: AntUpload) {
+                issum = false;
                 console.log(file);
                 videofile.value = file.file;
                 videos.value[0].addEventListener("durationchange", () => {
@@ -489,6 +495,7 @@ export default defineComponent({
 
                 form.value.fileid = res.fileId;
                 form.value.fileurl = res.video.url;
+                issum = true;
         }
         const ifallowpic = ref<boolean>(false);
         async function uploadspic(file: AntUpload) {

From 12428827855501e6fd0a41abf84efd0194033d12 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Mon, 16 Nov 2020 11:44:46 +0800
Subject: [PATCH 06/34] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E7=9A=84=E8=BF=9B=E8=A1=8C=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/init.ts                  | 13 +++++++------
 src/store/index.ts                | 16 +++++++++++++++-
 src/views/mine/ReleaseWebcast.vue | 14 ++++++++++----
 3 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/src/i18n/init.ts b/src/i18n/init.ts
index 7ebf2c9..a6980c0 100644
--- a/src/i18n/init.ts
+++ b/src/i18n/init.ts
@@ -2,20 +2,21 @@ import zh from "./zh"
 import en from "./en"
 import { getset } from '@/api';
 import { geti18n } from '@/utils/i18n';
+import store from '@/store';
 getset().then((res: any)=>{
     zh.shichangtishi = `最短${res.timeLowerLimit}min, 最长${res.timeCeiling}min`
     en.shichangtishi = `The shortest is ${res.timeLowerLimit}min and the longest is ${res.timeCeiling}min`
     zh.renshutishi = `最少${res.lowerLimit}人, 最多${res.numberCeiling}人`
     en.renshutishi = `At least ${res.lowerLimit}, at most ${res.numberCeiling}`
-    en.shichangtishi = `Minimum ${res.lowerLimit} person, maximum ${res.numberCeiling} people`
+    // en.shichangtishi = `Minimum ${res.lowerLimit} person, maximum ${res.numberCeiling} people`
     zh.tixianzhu = `注：每笔提现收取${res.sxf}服务费，最低${ res.symbol + res.minmoney }`
     en.tixianzhu = `Note: ${res.sxf} service fee will be charged for each withdrawal, with a minimum of ${ res.symbol + res.minmoney }`
-    // const i18n = geti18n();
-    // const loc = i18n.locale.value;
-    // i18n.locale.value = '';
-    // i18n.locale.value = loc;
+    const i18n = geti18n();
+    const loc = i18n.locale.value;
+    i18n.locale.value = '';
+    i18n.locale.value = loc;
     console.log('i18n')
-
+    store.commit("setseting", res)
 })
 
 export default {
diff --git a/src/store/index.ts b/src/store/index.ts
index 12494fa..8ca4f4d 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -52,9 +52,23 @@ export default createStore({
       zoneid: 1,
       symbol: "$"
     },
-    islogin: false
+    islogin: false,
+    seting:{
+      lowerLimit: "",
+      minmoney: 0,
+      minwithdraw: "",
+      numberCeiling: "",
+      sxf: "",
+      symbol: "",
+      timeCeiling: "",
+      timeLowerLimit: "",
+    }
   },
   mutations: {
+    setseting(state, info){
+      console.log(info, 112)
+      state.seting = info
+    },
     setUserInfo(state, userinfo){
       userinfo.money = userinfo.money.toString()
       state.userinfo = userinfo
diff --git a/src/views/mine/ReleaseWebcast.vue b/src/views/mine/ReleaseWebcast.vue
index 51d457b..bbf090e 100644
--- a/src/views/mine/ReleaseWebcast.vue
+++ b/src/views/mine/ReleaseWebcast.vue
@@ -221,6 +221,7 @@
 </template>
 <script lang="ts">
 import {
+    computed,
     defineComponent,
     onBeforeUpdate,
     onMounted,
@@ -242,6 +243,7 @@ import dayjs from "dayjs";
 import { message } from "ant-design-vue";
 import router from "@/router";
 import { useI18n } from "@/utils/i18n";
+import store from '@/store';
 
 export default defineComponent({
     name: "ReleaseWebcast",
@@ -361,6 +363,7 @@ export default defineComponent({
                 form.value = res;
             });
         }
+        const seting = computed(() => store.state.seting)
         const onSubmit = (e: FromSend) => {
             if(!issum){
                 message.error(lan.$t("shangchuanwancheng"))
@@ -369,6 +372,8 @@ export default defineComponent({
             e.preventDefault();
             validate()
                 .then(() => {
+                        console.log(seting.value)
+
                     console.log(toRaw(form), 111);
                     const subdata: any = toRaw(form.value);
                     if (subdata.title == "") {
@@ -390,12 +395,13 @@ export default defineComponent({
                         message.error(lan.$t('zhiborenshuweikong'));
                         return;
                     } else {
-                        if(subdata.livetime < 30 || subdata.livetime > 120){
-                            message.error("直播时长最短30min, 最长120min");
+                        if(subdata.livetime < parseInt(seting.value.timeLowerLimit) || subdata.livetime > parseInt(seting.value.timeCeiling)){
+                            // console.log(subdata.livetime, subdata.livetime < seting.value.timeLowerLimit || subdata.livetime > seting.value.timeCeiling)
+                            message.error(lan.$t('shichangtishi'));
                             return ;
                         }
-                        if(subdata.livenumber > 4 || subdata.livenumber < 1){
-                            message.error("直播人数最少1人, 最多4人");
+                        if(subdata.livenumber > parseInt(seting.value.numberCeiling) || subdata.livenumber < parseInt(seting.value.lowerLimit)){
+                            message.error(lan.$t('renshutishi'));
                             return ;
                         }
                         if (!lives.value.status) {

From cb814e4fe2b2c3cb8491add697039af2682ab57b Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Tue, 17 Nov 2020 09:36:24 +0800
Subject: [PATCH 07/34] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BA=86=E7=9B=B4?=
 =?UTF-8?q?=E6=92=AD=E7=9A=84=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/css/room.css | 2 +-
 public/zhibo.html   | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/public/css/room.css b/public/css/room.css
index dc0eaed..9519afb 100644
--- a/public/css/room.css
+++ b/public/css/room.css
@@ -9,7 +9,7 @@ html{
 body{
     width: 100%;
     height: 100%;
-    background-color: #fff;
+    background-color: #F5F5F5;
     font-family: Futura,sans-serif;
 }
 video{
diff --git a/public/zhibo.html b/public/zhibo.html
index 208de06..4fe61fb 100644
--- a/public/zhibo.html
+++ b/public/zhibo.html
@@ -267,11 +267,12 @@
             <!-- content -->
             <div class="row-div" style="height: 100%; width: 100%; padding: 10px">
                 <div class="col-div" style="width: 340px; height: 100%; padding: 10px">
-                    <div class="col-div card" style="width: 100%; height: 100%">
+                    <div class="col-div card" style="width: 100%; height: 100%; padding: 23px">
                         <!-- 成员列表 -->
+                        <div style="width: 100%;">上课人员</div>
                         <div id="member-list" class="col-div" style="width: 100%; justify-content: flex-start; flex: 1">
                             <!-- member -->
-                            <div id="member-me" style="width: 100%; padding-left: 20px">
+                            <!-- <div id="member-me" style="width: 100%; padding-left: 20px">
                                 <div class="row-div member"
                                     style="width: 100%; height: 50px; justify-content: space-between">
                                     <div class="member-id">(我)</div>
@@ -283,7 +284,7 @@
                                             alt="">
                                     </div>
                                 </div>
-                            </div>
+                            </div> -->
                         </div>
                        
                     </div>

From fc9a05636c7fe38cdd8d07663dd0bff7954fde2f Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Tue, 17 Nov 2020 09:49:50 +0800
Subject: [PATCH 08/34] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E8=AF=AD?=
 =?UTF-8?q?=E8=A8=80=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/init.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/init.ts b/src/i18n/init.ts
index a6980c0..18f7a94 100644
--- a/src/i18n/init.ts
+++ b/src/i18n/init.ts
@@ -3,6 +3,7 @@ import en from "./en"
 import { getset } from '@/api';
 import { geti18n } from '@/utils/i18n';
 import store from '@/store';
+import { getValue } from '@/utils/common';
 getset().then((res: any)=>{
     zh.shichangtishi = `最短${res.timeLowerLimit}min, 最长${res.timeCeiling}min`
     en.shichangtishi = `The shortest is ${res.timeLowerLimit}min and the longest is ${res.timeCeiling}min`
@@ -20,7 +21,7 @@ getset().then((res: any)=>{
 })
 
 export default {
-    locale: "zh", //默认语言
+    locale: getValue("Lanvuage") || 'zh', //默认语言
     messages: {
         zh: zh,
         en: en

From 168daa14f9fa98b858b456a2b89ff7b7f1f7be9d Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Tue, 17 Nov 2020 09:59:30 +0800
Subject: [PATCH 09/34] =?UTF-8?q?=E5=B8=90=E5=8F=B7=E5=B7=B2=E5=AD=98?=
 =?UTF-8?q?=E5=9C=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/en.ts           | 1 +
 src/i18n/zh.ts           | 1 +
 src/views/login/Sign.vue | 7 +++++++
 3 files changed, 9 insertions(+)

diff --git a/src/i18n/en.ts b/src/i18n/en.ts
index dabf9ae..eb01cae 100644
--- a/src/i18n/en.ts
+++ b/src/i18n/en.ts
@@ -302,6 +302,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",
     shichangtishi:"",
     renshutishi: '',
     tixianzhu: "",
diff --git a/src/i18n/zh.ts b/src/i18n/zh.ts
index c8a8520..cdb9dfb 100644
--- a/src/i18n/zh.ts
+++ b/src/i18n/zh.ts
@@ -302,6 +302,7 @@ export default {
     cshipinyaoqiu1: "视频长度不能超过10分钟",
     cshipinyaoqiu2: "视频大小不能超过500m",
     shangchuanwancheng: "请等待文件上传完成",
+    zhanghaocunzai: "帐号已存在",
     shichangtishi:"",
     renshutishi: '',
     tixianzhu:"",
diff --git a/src/views/login/Sign.vue b/src/views/login/Sign.vue
index 61a38cb..12a655a 100644
--- a/src/views/login/Sign.vue
+++ b/src/views/login/Sign.vue
@@ -225,6 +225,7 @@ import { defineComponent, onMounted, reactive, ref, toRaw } from "vue";
 import NavTop from "@/components/NavTop.vue";
 import {
     checksmscode,
+    checkuser,
     getquhaolist,
     getwillsay,
     interests,
@@ -371,7 +372,13 @@ export default defineComponent({
                         phone.value.quhao + phone.value.phone,
                         phone.value.code
                     );
+                    
                     if (res) {
+                        const iszc =  await checkuser({phone: phone.value.phone})
+                        if(iszc.code == 0){
+                            message.error(lan.$t('zhanghaocunzai'))
+                            return ;
+                        }
                         stepnow.value = e;
 					}
  

From a340c38e79352f30855ead15f45b9ecb315a4c82 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Tue, 17 Nov 2020 10:42:17 +0800
Subject: [PATCH 10/34] =?UTF-8?q?=E5=BC=80=E5=90=AF=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/common.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/common.ts b/src/utils/common.ts
index dd9e018..7276adb 100644
--- a/src/utils/common.ts
+++ b/src/utils/common.ts
@@ -88,5 +88,5 @@ export function provenvideo(file: any): boolean{
             return true;
         }
     }
-    return true;
+    return false;
 }
\ No newline at end of file

From 8371a7188f6e694679b6ce4ef99091d298996d1c Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Tue, 17 Nov 2020 14:55:36 +0800
Subject: [PATCH 11/34] =?UTF-8?q?=E7=AB=AF=E8=A7=86=E9=A2=91=E4=BB=8B?=
 =?UTF-8?q?=E7=BB=8D?=
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 eb01cae..50a64de 100644
--- a/src/i18n/en.ts
+++ b/src/i18n/en.ts
@@ -90,7 +90,7 @@ export default {
     shuliandu: "Proficiency",
     jixutianjia: "Continue adding",
     xindemuyu: "Please enter your new mother tongue",
-    duanshipin: "Short video",
+    duanshipin: "Short video introduction",
     shipinyaoqiu: "Video requirements:",
     shipinyaoqiu1: "The time required for uploading video is within 30s",
     shipinyaoqiu2: "Support file size 100m",
diff --git a/src/i18n/zh.ts b/src/i18n/zh.ts
index cdb9dfb..6644ba9 100644
--- a/src/i18n/zh.ts
+++ b/src/i18n/zh.ts
@@ -90,7 +90,7 @@ export default {
     shuliandu:"熟练度",
     jixutianjia:"继续添加",
     xindemuyu:"请输入新的母语",
-    duanshipin:"短视频",
+    duanshipin:"短视频介绍",
     shipinyaoqiu:"视频要求：",
     shipinyaoqiu1:"上传视频时间要求为30s之内",
     shipinyaoqiu2:"支持文件大小100M",

From 6e19aa583d32d2aa52433f21d1e7ff7973d0344b Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Tue, 17 Nov 2020 15:07:54 +0800
Subject: [PATCH 12/34] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/common.ts             | 14 +++++++++++++-
 src/views/mine/ReleaseVideo.vue |  2 +-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/utils/common.ts b/src/utils/common.ts
index 7276adb..a8baff2 100644
--- a/src/utils/common.ts
+++ b/src/utils/common.ts
@@ -1,3 +1,4 @@
+
 /**
  * 图片转Base64
  */
@@ -79,10 +80,21 @@ export function provenimg(file: any): boolean | void{
  * @param name 图片名字
  */
 
-export function provenvideo(file: any): boolean{
+export function provenvideo(file: any, isvideo?: boolean): boolean{
     const type = ['flv', 'mp4', 'wmv', 'mov', 'avi'];
     const ntypearr = file.name.split('.');
     const ntype = ntypearr[ntypearr.length - 1];
+    if(isvideo){
+        const size = 500 * 1024 * 1024;
+        if(file.size > size){
+            return false;
+        }
+    }else{
+        const size = 100 * 1024 * 1024;
+        if(file.size > size){
+            return false;
+        }
+    }
     for(const i in type){
         if(type[i] == ntype){
             return true;
diff --git a/src/views/mine/ReleaseVideo.vue b/src/views/mine/ReleaseVideo.vue
index 4df8159..a905f78 100644
--- a/src/views/mine/ReleaseVideo.vue
+++ b/src/views/mine/ReleaseVideo.vue
@@ -330,7 +330,7 @@ export default defineComponent({
             }
         }
         function video(file: any){
-            return provenvideo(file)
+            return provenvideo(file, true)
         }
          function imgs(file: any){
             return provenimg(file)

From 9dad777061ba8a5ee7e6928f91ad5581a477e762 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Tue, 17 Nov 2020 15:09:10 +0800
Subject: [PATCH 13/34] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/common.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/utils/common.ts b/src/utils/common.ts
index a8baff2..f54cf43 100644
--- a/src/utils/common.ts
+++ b/src/utils/common.ts
@@ -1,3 +1,4 @@
+import { message } from 'ant-design-vue';
 
 /**
  * 图片转Base64
@@ -65,6 +66,11 @@ export function provenimg(file: any): boolean | void{
     const ntypearr = file.name.split('.');
     const ntype = ntypearr[ntypearr.length - 1];
     console.log(ntype)
+    const size = 2 * 1024 * 1024;
+    if(file.size > size){
+        message.error("最大2MB")
+        return false;
+    }
     let istype = false
     for(const i in type){
         if(type[i] == ntype){
@@ -87,11 +93,13 @@ export function provenvideo(file: any, isvideo?: boolean): boolean{
     if(isvideo){
         const size = 500 * 1024 * 1024;
         if(file.size > size){
+            message.error("最大500MB")
             return false;
         }
     }else{
         const size = 100 * 1024 * 1024;
         if(file.size > size){
+            message.error("最大100MB")
             return false;
         }
     }

From 5b1f165528c68f22d1dd19fa85d080896c985902 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Tue, 17 Nov 2020 16:04:36 +0800
Subject: [PATCH 14/34] =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=B0=B1=E5=87=BA=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                      | 1 +
 src/import-png.d.ts               | 8 ++++++++
 src/layout/Regime.vue             | 2 +-
 src/views/mine/Archives.vue       | 5 +++--
 src/views/mine/ReleaseVideo.vue   | 4 +++-
 src/views/mine/ReleaseWebcast.vue | 4 +++-
 yarn.lock                         | 5 +++++
 7 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 2fee0c7..86a6df9 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
     "trtc-js-sdk": "^4.6.5",
     "vod-js-sdk-v6": "^1.4.10",
     "vue": "^3.0.0-0",
+    "vue-cropper": "^0.5.5",
     "vue-router": "^4.0.0-0",
     "vuex": "^4.0.0-0"
   },
diff --git a/src/import-png.d.ts b/src/import-png.d.ts
index 607160a..faab5e1 100644
--- a/src/import-png.d.ts
+++ b/src/import-png.d.ts
@@ -18,6 +18,14 @@ declare module 'tim-js-sdk'{
     export default value;
 }
 
+declare module 'vue-cropper'{
+    const VueCropper: any
+    export {
+        VueCropper
+    }
+}
+
+
 declare var FB: any;
 
 declare var TCPlayer: any;
\ No newline at end of file
diff --git a/src/layout/Regime.vue b/src/layout/Regime.vue
index 65cd1f2..abb0adb 100644
--- a/src/layout/Regime.vue
+++ b/src/layout/Regime.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="mine" :style="{height:height + 'px'}">
         <NavTop :type="1" style="flex-shrink:0"></NavTop>
-        <div class="body">
+        <div class="body" id="rbody">
             <router-view/>
         </div>
     </div>
diff --git a/src/views/mine/Archives.vue b/src/views/mine/Archives.vue
index a86f9cb..e1533ef 100644
--- a/src/views/mine/Archives.vue
+++ b/src/views/mine/Archives.vue
@@ -930,11 +930,12 @@ export default defineComponent({
         const uploadprogress: Ref<number> = ref(0);
         async function uploads(file: AntUpload) {
 
-            uploadprogress.value = 0;
+            uploadprogress.value = 1;
             issum = false;
             const res = await uploadflie(file.file, (info: any) => {
                 console.log(info);
-                uploadprogress.value = info.percent.toFixed(2) * 100;
+                const jindu = info.percent.toFixed(2) * 100
+                uploadprogress.value =  jindu > 0 ? jindu : 1;
             });
             userinfo.value.video = res.video.url;
             userinfo.value.videoid = res.fileId;
diff --git a/src/views/mine/ReleaseVideo.vue b/src/views/mine/ReleaseVideo.vue
index a905f78..12d0d5d 100644
--- a/src/views/mine/ReleaseVideo.vue
+++ b/src/views/mine/ReleaseVideo.vue
@@ -258,13 +258,15 @@ export default defineComponent({
                 issum = false;
                 console.log(file);
                 videofile.value = file.file;
+                uploadprogress.value = 1;
                 videos.value[0].addEventListener("durationchange", () => {
                     console.log(videos.value[0].duration);
                     form.value.fileduration = videos.value[0].duration;
                 });
                 const res = await uploadflie(file.file, (info: any) => {
                     console.log(info);
-                    uploadprogress.value = info.percent.toFixed(2) * 100;
+                    const jindu = info.percent.toFixed(2) * 100
+                    uploadprogress.value = jindu > 0 ? jindu : 1;
                 });
                 console.log(res);
 
diff --git a/src/views/mine/ReleaseWebcast.vue b/src/views/mine/ReleaseWebcast.vue
index bbf090e..295aaaf 100644
--- a/src/views/mine/ReleaseWebcast.vue
+++ b/src/views/mine/ReleaseWebcast.vue
@@ -493,9 +493,11 @@ export default defineComponent({
                     console.log(videos.value[0].duration);
                     form.value.fileduration = videos.value[0].duration;
                 });
+                uploadprogress.value = 1;
                 const res = await uploadflie(file.file, (info: any) => {
                     console.log(info);
-                    uploadprogress.value = info.percent.toFixed(2) * 100;
+                    const jindu = info.percent.toFixed(2) * 100
+                    uploadprogress.value = jindu > 0 ? jindu : 1;
                 });
                 console.log(res);
 
diff --git a/yarn.lock b/yarn.lock
index 27c8437..3a94896 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9245,6 +9245,11 @@ vod-js-sdk-v6@^1.4.10:
     js-sha1 "^0.6.0"
     uuid "^3.3.2"
 
+vue-cropper@^0.5.5:
+  version "0.5.5"
+  resolved "https://registry.npmjs.org/vue-cropper/-/vue-cropper-0.5.5.tgz#9bd1ba563c7faa268abd52fb2af4c6c28d33c962"
+  integrity sha512-5mGaBlS1EwLxUFwHHX2Q8zOZSiVfBUjOfolR+ZNKwu7Rh3u+GhwHYOyFkgZHhhoQBBNdyVB28O6W+MpMimhCbA==
+
 vue-eslint-parser@^7.0.0, vue-eslint-parser@^7.1.1:
   version "7.1.1"
   resolved "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.1.1.tgz#c43c1c715ff50778b9a7e9a4e16921185f3425d3"

From 5b4a1efb3954f64826342f94178e042180b9dbbb Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Tue, 17 Nov 2020 16:27:40 +0800
Subject: [PATCH 15/34] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/Sign.vue | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/views/login/Sign.vue b/src/views/login/Sign.vue
index 12a655a..f35e98f 100644
--- a/src/views/login/Sign.vue
+++ b/src/views/login/Sign.vue
@@ -279,8 +279,9 @@ export default defineComponent({
          * 点击获取验证码  触发60S倒计时
          */
         let lock = false;
-        const getcode: () => void = () => {
+        const getcode = async () => {
             console.log(11111);
+            
             if (lock) {
                 return;
             }
@@ -288,6 +289,11 @@ export default defineComponent({
                 message.error(lan.$t('shoujihaoweikong'));
                 return;
             }
+            const iszc =  await checkuser({phone: phone.value.phone})
+            if(iszc.code == 0){
+                message.error(lan.$t('zhanghaocunzai'))
+                return ;
+            }
             lock = true;
             sendsms(phone.value.quhao, phone.value.phone);
             const timestep = setInterval(() => {
@@ -374,11 +380,7 @@ export default defineComponent({
                     );
                     
                     if (res) {
-                        const iszc =  await checkuser({phone: phone.value.phone})
-                        if(iszc.code == 0){
-                            message.error(lan.$t('zhanghaocunzai'))
-                            return ;
-                        }
+                       
                         stepnow.value = e;
 					}
  

From 64ee8b8a4f2016bcb86c0738cbccdb805b291c7b Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Tue, 17 Nov 2020 16:39:24 +0800
Subject: [PATCH 16/34] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=AD=97?=
 =?UTF-8?q?=E4=BD=93=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/regime/week.vue b/src/views/regime/week.vue
index 2274433..0e917e3 100644
--- a/src/views/regime/week.vue
+++ b/src/views/regime/week.vue
@@ -239,7 +239,7 @@
             }
             .times{
                 font-size: 11px;
-                color: #FFFA18;
+                color: #D12C2E;
             }
         }
     }

From bff5eef8fab731807d30d6ef2803b54b21d65f54 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Tue, 17 Nov 2020 16:41:52 +0800
Subject: [PATCH 17/34] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=90=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/mine/Cashout.vue b/src/views/mine/Cashout.vue
index 9b991c4..ed94981 100644
--- a/src/views/mine/Cashout.vue
+++ b/src/views/mine/Cashout.vue
@@ -153,7 +153,7 @@ export default defineComponent({
         const moneychange: (e: number) => void = (e: number) => {
             console.log(e);
         };
-        const yue=ref<number>(store.state.userinfo.moneyValue)
+        const yue=computed( () => store.state.userinfo.moneyValue)
         const danwei = computed(() => store.state.userinfo.symbol)
         // const yue = ref<number>(10000);
         // yue.value=store.state.userinfo.money

From 9f75d4a2f87d20a7007b34972a17bea81ef891ff Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Tue, 17 Nov 2020 16:50:28 +0800
Subject: [PATCH 18/34] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86title?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/VideoPlay.vue   | 18 +++++++++++++++---
 src/views/regime/VideoInfo.vue |  2 +-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/components/VideoPlay.vue b/src/components/VideoPlay.vue
index 9bc4a99..4b72385 100644
--- a/src/components/VideoPlay.vue
+++ b/src/components/VideoPlay.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="video">
-        
+        <div class="title">{{title}}</div>
         <video style="width:100%; height:100%;" :id="'a' + url" ></video>
     </div>
 </template>
@@ -10,12 +10,21 @@
     height: 563px;
     border-radius: 17px;
     background: white;
+    position: relative;
     // background-color: #0f0;
     overflow: hidden;
     >video{
         width: 100%;
         height: 100%;
     }
+    .title{
+        position: absolute;
+        top: 23px;
+        left: 51px;
+        font-size: 13px;
+        color: #fff;
+        z-index: 999;
+    }
 }
 </style>
 <script lang="ts">
@@ -25,8 +34,11 @@ import { onBeforeRouteLeave, useRouter } from 'vue-router';
 
 export default defineComponent({
     props:{
-        url:{
-            type:String
+        url: {
+            type: String
+        },
+        title: {
+            type: String
         }
     },
     setup(props, ctx){
diff --git a/src/views/regime/VideoInfo.vue b/src/views/regime/VideoInfo.vue
index 080218a..fc6bbb4 100644
--- a/src/views/regime/VideoInfo.vue
+++ b/src/views/regime/VideoInfo.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="videoinfo">
         <div class="info">
-            <VideoPlay :url="result.fileid"></VideoPlay>
+            <VideoPlay :title="result.title" :url="result.fileid"></VideoPlay>
             <VideoCont :videoid="result.videoid" :yuanyin="result.statusdesc" :date="result.createdAt" :watch="result.watch" :share="result.share" :status="result.status"></VideoCont>
         </div>
         <VideoReview :videoinfo="result.score" class="review" v-if="result.status == 1"></VideoReview>

From 0d6a2329d4b6bc2e75607bbd1dc1553abf576836 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Tue, 17 Nov 2020 17:38:47 +0800
Subject: [PATCH 19/34] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=9B=BA?=
 =?UTF-8?q?=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/mine/Cashout.vue b/src/views/mine/Cashout.vue
index ed94981..97714db 100644
--- a/src/views/mine/Cashout.vue
+++ b/src/views/mine/Cashout.vue
@@ -61,7 +61,7 @@
                                         </div>
                                     </div>
                                     <div class="zhanghao">
-                                        {{lan.$t('zhanghao')}}：6217 **** **** **** 175
+                                        {{lan.$t('zhanghao')}}：{{i.account}}
                                     </div>
                                 </div>
                             </a-radio>

From c73f45d27ef69e98963697a2ab1929cd05b93484 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Wed, 18 Nov 2020 09:40:56 +0800
Subject: [PATCH 20/34] =?UTF-8?q?=E5=8C=BA=E5=8F=B7=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index.ts            | 13 +++++++++----
 src/store/index.ts          | 19 +++++++++++++------
 src/views/login/Login.vue   |  9 ++++++---
 src/views/login/Sign.vue    |  9 ++++++---
 src/views/mine/Archives.vue |  7 +++++--
 5 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/src/api/index.ts b/src/api/index.ts
index 3e83d88..aa2cfc0 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -1022,17 +1022,22 @@ 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 ['人民币￥'];
+            return {hb: '人民币￥', qh};
         }else {
-            return [ '美元$']
+            return {hb: '美元$'}
         }
     }else{
         if(gj == "CN"){
-            return ["zh", "中文", '人民币￥'];
+            return {yy: "zh", yyx: "中文", hb: '人民币￥', qh};
         }else {
-            return ['en', 'English', '美元$']
+            return {yy: 'en', yyx: 'English', hb: '美元$', qh}
         }
     }
     
diff --git a/src/store/index.ts b/src/store/index.ts
index 8ca4f4d..5eed3e6 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -1,6 +1,7 @@
 import { getaddr, userinfo } from '@/api';
 import { setLanvuage } from '@/api/base';
 import { getValue, saveValue } from '@/utils/common';
+import { geti18n } from '@/utils/i18n';
 import { isProxy } from 'vue';
 import { createStore } from 'vuex'
 
@@ -62,6 +63,11 @@ export default createStore({
       symbol: "",
       timeCeiling: "",
       timeLowerLimit: "",
+    },
+    qh: {
+      code: "86",
+      ename: "China",
+      name: "中国",
     }
   },
   mutations: {
@@ -81,19 +87,20 @@ export default createStore({
       const split = new Date().toString().split(" ");
       const timeZoneFormatted = split[split.length - 2] + " " + split[split.length - 1];
       const lan = getValue("Lanvuage");
+      state.qh = data.qh.data;
       if(lan != null && lan){
         // state.userinfo.language = data[1] // English 中文
         // state.userinfo.languageValue = data[0] // 'en' 'zh'
         state.userinfo.zoneStr = timeZoneFormatted;
-        state.userinfo.currency = data[0];
+        state.userinfo.currency = data.hb;
       }else{
         console.log(data, 111)
-        state.userinfo.language = data[1] // English 中文
-        state.userinfo.languageValue = data[0] // 'en' 'zh'
+        state.userinfo.language = data.yyx // English 中文
+        state.userinfo.languageValue = data.yy // 'en' 'zh'
         state.userinfo.zoneStr = timeZoneFormatted;
-        state.userinfo.currency = data[2];
-        saveValue("Lanvuage", data[0]);
-        if( data[0] != 'zh'){
+        state.userinfo.currency = data.hb;
+        saveValue("Lanvuage", data.yx);
+        if( data.yx != geti18n().$s()){
           location.reload()
         }
         // setLanvuage(data[0]);
diff --git a/src/views/login/Login.vue b/src/views/login/Login.vue
index 1d88dd2..e8dc5ce 100644
--- a/src/views/login/Login.vue
+++ b/src/views/login/Login.vue
@@ -23,7 +23,7 @@
                   </a-select-option>
                   <a-select-option value="Jiangsu"> Jiangsu </a-select-option>
                 </a-select> -->
-                 <a-select :default-value="quhaolist[0].name + '+' + quhaolist[0].code" size="small" option-label-prop="label"  @change="getquhao" class="getcode" show-search >
+                 <a-select :default-value="mrqh.name + '+' + mrqh.code" size="small" option-label-prop="label"  @change="getquhao" class="getcode" show-search >
                     <a-select-option  v-for="(i,j) in quhaolist" :key="j" :value="i.name + '+' + i.code" :label="'+' + i.code">
                         {{i.name}}+{{i.code}}
                     </a-select-option>
@@ -117,13 +117,14 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, onMounted, reactive, ref } from "vue";
+import { computed, defineComponent, onMounted, reactive, ref } from "vue";
 import LoginTab from "@/components/login/LoginTab.vue";
 import NavTop from "@/components/NavTop.vue"
 import { checksmscode, getquhaolist, getwebvideolist, loginpass, sendsms } from '@/api';
 import { message } from 'ant-design-vue';
 import router from '@/router';
 import { useI18n } from '@/utils/i18n';
+import store from '@/store';
 
 export default defineComponent({
   name: "Login",
@@ -146,6 +147,7 @@ export default defineComponent({
       phone: '13152639856',
       password: '123456'
     })
+    const mrqh = computed(() => store.state.qh)
     const quhaolist = ref<any>([
     {
       code: "86",
@@ -281,7 +283,8 @@ export default defineComponent({
       tovideoxq,
       navto,
       lan,
-      slogin
+      slogin,
+      mrqh
     };
   },
 });
diff --git a/src/views/login/Sign.vue b/src/views/login/Sign.vue
index f35e98f..5a60f7e 100644
--- a/src/views/login/Sign.vue
+++ b/src/views/login/Sign.vue
@@ -23,7 +23,7 @@
                         >
                             <a-input-group compact>
                                 <a-select
-                                    :default-value="quhaolist[0].name + '+' + quhaolist[0].code"
+                                    :default-value="mrqh.name + '+' + mrqh.code"
                                     size="small"
                                     @change="getquhao"
                                     class="getcode"
@@ -221,7 +221,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, onMounted, reactive, ref, toRaw } from "vue";
+import { computed, defineComponent, onMounted, reactive, ref, toRaw } from "vue";
 import NavTop from "@/components/NavTop.vue";
 import {
     checksmscode,
@@ -235,6 +235,7 @@ import {
 import { message } from "ant-design-vue";
 import router from "@/router";
 import { useI18n } from "@/utils/i18n";
+import store from '@/store';
 
 export default defineComponent({
     name: "Sign",
@@ -260,6 +261,7 @@ export default defineComponent({
             jiaoshou: "",
         });
         const willsay = ref<any>();
+        const mrqh = computed(() => store.state.qh)
         const quhaolist = ref<any>([
             {
                 code: "86",
@@ -426,7 +428,8 @@ export default defineComponent({
             navto,
             lan,
             quhaolist,
-            getquhao
+            getquhao,
+            mrqh
         };
     },
 });
diff --git a/src/views/mine/Archives.vue b/src/views/mine/Archives.vue
index e1533ef..118dbea 100644
--- a/src/views/mine/Archives.vue
+++ b/src/views/mine/Archives.vue
@@ -383,7 +383,7 @@
                                 <!-- <a-input size="small" v-model:value="bindPhone.number" /> -->
                                 <a-input-group compact class="telbox">
                                     <a-select
-                                        :default-value="quhaolist[0].name + '+' + quhaolist[0].code"
+                                        :default-value="mrqh.name + '+' + mrqh.code"
                                         size="small"
                                         @change="getquhao"
                                         option-label-prop="label"
@@ -574,6 +574,8 @@ export default defineComponent({
         const chiveslist = ref<any>([[], []]);
         const languages = ref<unknown>([]);
         const quhaolist = ref<any>([]);
+        const mrqh = computed(() => store.state.qh)
+        
         const myquhao = ref<string>("");
 
         const mynewtel = ref<string>("");
@@ -1056,7 +1058,8 @@ export default defineComponent({
             isdisabled,
             setname,
             video,
-            imgs
+            imgs,
+            mrqh
         };
     },
 });

From 97a5090e0fcca0ca6eef60e8a6884a2bfb093eaa Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Wed, 18 Nov 2020 09:55:25 +0800
Subject: [PATCH 21/34] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=8C=BA=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/App.vue b/src/App.vue
index 02b5729..09a5386 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -21,7 +21,7 @@ export default defineComponent({
   setup(){
     console.log(i18ninit)
     const len = provideI18n(i18ninit);
-    len.locale.value = !getValue("Lanvuage") ? 'zh' : getValue("Lanvuage");
+    // len.locale.value = !getValue("Lanvuage") ? 'zh' : getValue("Lanvuage");
     if(getValue('token')){
       store.commit("login", true)
       store.dispatch("setUserInfo");
diff --git a/src/api/index.ts b/src/api/index.ts
index aa2cfc0..7193465 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -893,7 +893,8 @@ export async function register(data: any){
         name: data.name,
         email: data.emil,
         mtongue: data.muyu,
-        tlanguage: data.jiaoshou
+        tlanguage: data.jiaoshou,
+        language: getValue("Lanvuage") || 'zh' 
     })
     if(res.code == 0){
         message.success(res.msg)
diff --git a/src/store/index.ts b/src/store/index.ts
index 5eed3e6..339250c 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -99,8 +99,8 @@ export default createStore({
         state.userinfo.languageValue = data.yy // 'en' 'zh'
         state.userinfo.zoneStr = timeZoneFormatted;
         state.userinfo.currency = data.hb;
-        saveValue("Lanvuage", data.yx);
-        if( data.yx != geti18n().$s()){
+        saveValue("Lanvuage", data.yy);
+        if( data.yy != geti18n().$s()){
           location.reload()
         }
         // setLanvuage(data[0]);

From 49edb01a3fe0b140884a9632cfd89380b8b601d0 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Wed, 18 Nov 2020 10:10:48 +0800
Subject: [PATCH 22/34] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=97=B6=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue      |  9 +++++++++
 src/api/index.ts | 13 ++++++++++++-
 tsconfig.json    |  9 +++++++--
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 09a5386..d574b12 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -16,6 +16,7 @@ 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 from 'dayjs';
 
 export default defineComponent({
   setup(){
@@ -34,6 +35,14 @@ export default defineComponent({
     }
     const zh = zhCN
     const en = enUS
+    /* eslint-disable */
+    const utc = require('dayjs/plugin/utc') // dependent on utc plugin
+    /* eslint-disable */
+    const timezone = require('dayjs/plugin/timezone')
+    const days: any = dayjs;
+    dayjs.extend(utc)
+    dayjs.extend(timezone)
+    console.log(days.tz.guess())
     return{
       zh,
       en,
diff --git a/src/api/index.ts b/src/api/index.ts
index 7193465..6c822b1 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -3,6 +3,7 @@ import store from '@/store';
 import { LiveList, LivelistInfo, LoginData, UserInfo } from '@/types';
 import { getValue, saveValue } from '@/utils/common';
 import { message } from 'ant-design-vue';
+import dayjs from 'dayjs';
 import { del, get, post, put, setToken } from './base'
 
 
@@ -885,6 +886,14 @@ export async function checksmscode(phone: string, smscode: string){
 
 
 export async function register(data: any){
+    /* eslint-disable */
+    const utc = require('dayjs/plugin/utc') // dependent on utc plugin
+    /* eslint-disable */
+    const timezone = require('dayjs/plugin/timezone')
+    const days: any = dayjs;
+    dayjs.extend(utc)
+    dayjs.extend(timezone)
+
     const res = await post<any>("register",{
         mobile: data.phone,
         code: data.quhao,
@@ -894,7 +903,9 @@ export async function register(data: any){
         email: data.emil,
         mtongue: data.muyu,
         tlanguage: data.jiaoshou,
-        language: getValue("Lanvuage") || 'zh' 
+        language: getValue("Lanvuage") || 'zh',
+        zoneid: days.tz.guess()
+
     })
     if(res.code == 0){
         message.success(res.msg)
diff --git a/tsconfig.json b/tsconfig.json
index 931f75e..0229ce4 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,4 +1,5 @@
 {
+  "defaultSeverity": "error",
   "compilerOptions": {
     "target": "esnext",
     "module": "esnext",
@@ -35,6 +36,10 @@
     "tests/**/*.tsx"
   ],
   "exclude": [
-    "node_modules"
-  ]
+    "node_modules",
+    "tslint:recommended"
+  ],
+  "rules": {
+    "no-var-requires": false
+  }
 }

From f2b63a2fcc75387e3d2b80d50ce092896f716544 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Wed, 18 Nov 2020 10:23:22 +0800
Subject: [PATCH 23/34] =?UTF-8?q?=E5=BD=93=E5=A4=A9=E9=AB=98=E4=BA=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/regime/date.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/views/regime/date.vue b/src/views/regime/date.vue
index a77e6dc..07dac13 100644
--- a/src/views/regime/date.vue
+++ b/src/views/regime/date.vue
@@ -214,10 +214,15 @@ export default defineComponent({
                     const day = getDay(res[i].dateline)
                     for(const j in month.value.date){
                         for(const k in month.value.date[j]){
+                            console.log(month.value.day, 111)
+                            if(yue.value == 0 && month.value.date[j][k].day == month.value.day + 1){
+                                month.value.date[j][k].s = 1
+                            } 
                             if(month.value.date[j][k].day == day){
                                 if(month.value.date[j][k].list == undefined){
                                     month.value.date[j][k].list = [];
                                 }
+                             
                                 if(!month.value.date[j][k].s){
                                     month.value.date[j][k].s = res[i].livestatus
                                 }else if(month.value.date[j][k].s != 1){

From 849b04a1ee06d16769be659b8aae8a36573f0290 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Wed, 18 Nov 2020 10:23:34 +0800
Subject: [PATCH 24/34] =?UTF-8?q?=E5=BD=93=E5=A4=A9=E9=AB=98=E4=BA=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/regime/date.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/views/regime/date.vue b/src/views/regime/date.vue
index 07dac13..d544b22 100644
--- a/src/views/regime/date.vue
+++ b/src/views/regime/date.vue
@@ -214,8 +214,7 @@ export default defineComponent({
                     const day = getDay(res[i].dateline)
                     for(const j in month.value.date){
                         for(const k in month.value.date[j]){
-                            console.log(month.value.day, 111)
-                            if(yue.value == 0 && month.value.date[j][k].day == month.value.day + 1){
+                            if(yue.value == 0 && month.value.date[j][k].day == month.value.day){
                                 month.value.date[j][k].s = 1
                             } 
                             if(month.value.date[j][k].day == day){

From da8c001b440a2287a63f273f402661ec97c38913 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Wed, 18 Nov 2020 10:51:03 +0800
Subject: [PATCH 25/34] =?UTF-8?q?=E6=97=B6=E5=8C=BA=E6=B8=B2=E6=9F=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/index.ts        |  3 ++-
 src/utils/date.ts         | 14 ++++++++++++--
 src/views/regime/week.vue | 13 ++++++++++---
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/store/index.ts b/src/store/index.ts
index 339250c..51e3a2a 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -51,7 +51,8 @@ export default createStore({
       willsayValue: [{name: "0", level: 0}],
       zoneStr: "中途岛GMT-11:00",
       zoneid: 1,
-      symbol: "$"
+      symbol: "$",
+      zoneValue:""
     },
     islogin: false,
     seting:{
diff --git a/src/utils/date.ts b/src/utils/date.ts
index 9b73421..e58810e 100644
--- a/src/utils/date.ts
+++ b/src/utils/date.ts
@@ -64,8 +64,18 @@ export function getdate(yue?: number): GetDate{
 }
 
 
-export function getweek(time: string,zhou?: number){
-    let now = dayjs((!time ? undefined : time))
+export function getweek(time: string, id: string,zhou?: number){
+    /* 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;
+    console.log(id, 11111)
+    let now = days((!time ? undefined : time)).tz(id)
+    console.log(now, 11111)
+
     if(zhou != undefined){
         now = now.day(now.day() + (zhou * 6));
     }
diff --git a/src/views/regime/week.vue b/src/views/regime/week.vue
index 0e917e3..ed65f15 100644
--- a/src/views/regime/week.vue
+++ b/src/views/regime/week.vue
@@ -259,7 +259,7 @@ export default defineComponent({
     setup() {
         const zhou = ref(0);
         const time: any = useRoute().query.time;
-        const week = ref<any>(getweek(time));
+        const week = ref<any>(getweek(time, store.state.userinfo.zoneValue));
         const userid = store.state.userinfo.memberid;
         console.log(week.value);
         function getdates(userid: number){
@@ -291,7 +291,14 @@ export default defineComponent({
         const times = ref('');
         const xs = ref(0);
         setInterval(()=>{
-            const now = dayjs();
+            /* 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;
+            const now = days().tz(store.state.userinfo.zoneValue)
             const xiaoshi = now.hour()
             const fenzhong = now.minute()
             top.value = (xiaoshi + (fenzhong / 60)) * 0.63;
@@ -300,7 +307,7 @@ export default defineComponent({
         }, 2000)
 
         watch(zhou, (value) => {
-            week.value = getweek(time, value);
+            week.value = getweek(time, store.state.userinfo.zoneValue, value);
             console.log(week.value);
             getdates(userid)
         });

From 90ce114a7fc23c5e82062835179088981512b05f Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Wed, 18 Nov 2020 11:02:27 +0800
Subject: [PATCH 26/34] =?UTF-8?q?=E5=90=B8=E9=A1=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/index.html         | 2 +-
 src/views/regime/date.vue | 3 +++
 src/views/regime/week.vue | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/public/index.html b/public/index.html
index 9253348..7b136fa 100644
--- a/public/index.html
+++ b/public/index.html
@@ -79,7 +79,7 @@
             position: fixed;
             top: 0;
             left: 0;
-            z-index: 999;
+            z-index: 1001;
             display: none;
         }
     </style>
diff --git a/src/views/regime/date.vue b/src/views/regime/date.vue
index d544b22..a281392 100644
--- a/src/views/regime/date.vue
+++ b/src/views/regime/date.vue
@@ -99,6 +99,9 @@
             width: 1320px;
             height: 63px;
             display: flex;
+            position: sticky; 
+            top: -23px;
+            z-index: 1000;
             >div{
                 width: 100%;
                 height: 100%;
diff --git a/src/views/regime/week.vue b/src/views/regime/week.vue
index ed65f15..96a9ea3 100644
--- a/src/views/regime/week.vue
+++ b/src/views/regime/week.vue
@@ -122,6 +122,9 @@
             width: 1320px;
             height: 63px;
             display: flex;
+            position: sticky; 
+            top: -23px;
+            z-index: 1000;
             > div {
                 width: 100%;
                 height: 100%;

From 60d7a9905eeacc168629362aa4ab6b657ddef814 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Wed, 18 Nov 2020 14:05:25 +0800
Subject: [PATCH 27/34] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E6=96=87=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/en.ts               |   1 +
 src/i18n/zh.ts               |   1 +
 src/static/images/wenhao.png | Bin 0 -> 5545 bytes
 src/views/login/Login.vue    |   2 +-
 4 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 src/static/images/wenhao.png

diff --git a/src/i18n/en.ts b/src/i18n/en.ts
index 50a64de..9c01ff8 100644
--- a/src/i18n/en.ts
+++ b/src/i18n/en.ts
@@ -42,6 +42,7 @@ export default {
     banquan: "Copyright Beelink Inc. All rights reserved 2019-2022",
     zhanghao: "accounts",
     shuruzhanghao: "Please enter your email or mobile phone number",
+    shuruzhanghaol: "Please enter your email address or country number + mobile phone number（34690xxx）",
     mima: "password",
     shurumima: "Please enter your password",
     wangjimima: "Forget the password?",
diff --git a/src/i18n/zh.ts b/src/i18n/zh.ts
index 6644ba9..2115487 100644
--- a/src/i18n/zh.ts
+++ b/src/i18n/zh.ts
@@ -42,6 +42,7 @@ export default {
     banquan:"Beelink公司版权所有 2019—2022",
     zhanghao:"帐号",
     shuruzhanghao:"请输入您的邮箱或者手机号",
+    shuruzhanghaol:"请输入您的邮箱或者国家号+手机号（86186xxx）",
     mima:"密码",
     shurumima:"请输入您的密码",
     wangjimima:"忘记密码?",
diff --git a/src/static/images/wenhao.png b/src/static/images/wenhao.png
new file mode 100644
index 0000000000000000000000000000000000000000..4b0e87f2c9978b8aecaadb65ca977c7bf105d539
GIT binary patch
literal 5545
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

literal 0
HcmV?d00001

diff --git a/src/views/login/Login.vue b/src/views/login/Login.vue
index e8dc5ce..a5a03b6 100644
--- a/src/views/login/Login.vue
+++ b/src/views/login/Login.vue
@@ -53,7 +53,7 @@
               <a-input-group compact>
                 <a-input
                   style="width: 80%"
-                  :placeholder="lan.$t('shuruzhanghao')"
+                  :placeholder="lan.$t('shuruzhanghaol')"
                   v-model:value="userinfo.phone"
                 />
               </a-input-group>

From da5ad1202c16a28e5348b9d94c53960c38ed324d Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Wed, 18 Nov 2020 14:20:33 +0800
Subject: [PATCH 28/34] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=EF=BC=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/en.ts            |  4 ++++
 src/i18n/zh.ts            |  4 ++++
 src/views/mine/Wallet.vue | 23 ++++++++++++++++++++---
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/i18n/en.ts b/src/i18n/en.ts
index 9c01ff8..c62bfa7 100644
--- a/src/i18n/en.ts
+++ b/src/i18n/en.ts
@@ -304,6 +304,10 @@ export default {
     cshipinyaoqiu2: "Video size cannot exceed 500M",
     shangchuanwancheng: "Please wait for the file to be uploaded",
     zhanghaocunzai: "account already exists",
+    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)",
+    shouru3: "Attention! You can only change the currency once!",
     shichangtishi:"",
     renshutishi: '',
     tixianzhu: "",
diff --git a/src/i18n/zh.ts b/src/i18n/zh.ts
index 2115487..5da55ad 100644
--- a/src/i18n/zh.ts
+++ b/src/i18n/zh.ts
@@ -304,6 +304,10 @@ export default {
     cshipinyaoqiu2: "视频大小不能超过500m",
     shangchuanwancheng: "请等待文件上传完成",
     zhanghaocunzai: "帐号已存在",
+    shuoruguize: "收入规则说明",
+    shouru1: "直播收入=实际参加学生数x参加时长x单价",
+    shouru2: "单价：1对1，20欧/小时；1对N，10欧/小时/人（1<N<=4）",
+    shouru3: "请注意，货币一旦修改，不能变动",
     shichangtishi:"",
     renshutishi: '',
     tixianzhu:"",
diff --git a/src/views/mine/Wallet.vue b/src/views/mine/Wallet.vue
index 2bf4f66..6b7f020 100644
--- a/src/views/mine/Wallet.vue
+++ b/src/views/mine/Wallet.vue
@@ -157,7 +157,7 @@
     <div class="mingxilist" v-if="ifchina && listindex==2">
       <div class="mingxitop">
         <div class="tabs">
-          <span class="tabtitle">{{lan.$t('mingxichaxun')}}</span>
+          <span class="tabtitle">{{lan.$t('mingxichaxun')}}<img src="@/static/images/wenhao.png" @click="visible = true" /></span>
 
           <div :class="tabindex == 0 ? 'on' : ''" @click="tabchange(0)">
             {{lan.$t('quanbu')}}
@@ -201,6 +201,12 @@
         <a-pagination v-if="salelist.total" v-model:current="page" :total="salelist.total" :showLessItems="true" @change="pagechange"/>
       </div>
     </div>
+    <a-modal v-model:visible="visible" :footer="null" :title="lan.$t('shuoruguize')" @cancel="visible = false">
+      <p>{{lan.$t('shouru1')}}</p>
+      <p>{{lan.$t('shouru2')}}</p>
+      <p style="color:#D12C2E">{{lan.$t('shouru3')}}</p>
+    
+    </a-modal>
     <NavBottom class="navbottom"></NavBottom>
   </div>
 </template>
@@ -228,6 +234,7 @@ export default defineComponent({
     const state=ref<number>(0)
     const dates=ref<Array<string>>(["",""])
     const page = ref(1);
+    const visible = ref(true);
     onMounted(async () => {
       console.log(useRoute().query)
       listindex.value=1
@@ -311,7 +318,8 @@ export default defineComponent({
       del,
       store,
       pagechange,
-      lan
+      lan,
+      visible
     };
   },
 });
@@ -341,7 +349,7 @@ export default defineComponent({
     color: #111;
     padding: 11px 0;
     .tabtitle {
-      width: 60px;
+      // width: 60px;
       margin-right: 30px;
     }
     > div {
@@ -354,6 +362,15 @@ export default defineComponent({
         color: #08ae98;
       }
     }
+    >span{
+      display: flex;
+      align-items: center;
+      >img{
+        margin-left: 8px;
+        width: 13px;
+        height: 13px;
+      }
+    }
     .on {
       color: #08ae98;
       position: relative;

From 224bacbb2acca7060fe471640da63211e81e4a5f Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Wed, 18 Nov 2020 14:24:20 +0800
Subject: [PATCH 29/34] =?UTF-8?q?=E6=8F=90=E7=8E=B0=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/en.ts             | 2 +-
 src/i18n/init.ts           | 2 ++
 src/i18n/zh.ts             | 2 +-
 src/views/mine/Cashout.vue | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/i18n/en.ts b/src/i18n/en.ts
index c62bfa7..abefe1c 100644
--- a/src/i18n/en.ts
+++ b/src/i18n/en.ts
@@ -191,7 +191,7 @@ export default {
     tixianjine: "Withdrawal amount",
     quanbujine: "Total amount",
     yueshu: "Your balance is only",
-    zuiditixian: "Minimum withdrawal amount ￥ 100",
+    zuiditixian: "Minimum withdrawal amount",
     mingxichaxun: "Details inquiry",
     kaishiriqi: "Please select the start date",
     jieshuriqi: "Please select the end date",
diff --git a/src/i18n/init.ts b/src/i18n/init.ts
index 18f7a94..6fd37f3 100644
--- a/src/i18n/init.ts
+++ b/src/i18n/init.ts
@@ -12,6 +12,8 @@ getset().then((res: any)=>{
     // en.shichangtishi = `Minimum ${res.lowerLimit} person, maximum ${res.numberCeiling} people`
     zh.tixianzhu = `注：每笔提现收取${res.sxf}服务费，最低${ res.symbol + res.minmoney }`
     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
     const i18n = geti18n();
     const loc = i18n.locale.value;
     i18n.locale.value = '';
diff --git a/src/i18n/zh.ts b/src/i18n/zh.ts
index 5da55ad..cf0f698 100644
--- a/src/i18n/zh.ts
+++ b/src/i18n/zh.ts
@@ -194,7 +194,7 @@ export default {
     tixianjine:"提现金额",
     quanbujine:"全部金额",
     yueshu:"您的余额只有",
-    zuiditixian:"最低提现金额￥100",
+    zuiditixian:"最低提现金额",
     mingxichaxun:"明细查询",
     kaishiriqi:"请选择开始日期",
     jieshuriqi:"请选择结束日期",
diff --git a/src/views/mine/Cashout.vue b/src/views/mine/Cashout.vue
index 97714db..587e6fa 100644
--- a/src/views/mine/Cashout.vue
+++ b/src/views/mine/Cashout.vue
@@ -180,7 +180,7 @@ export default defineComponent({
             if (accountlist.value.length == 0) {
                 message.error(lan.$t('kongzhanghaoliebiao'));
                 return;
-            } else if (payinfo.value.money < 100) {
+            } else if (payinfo.value.money < store.state.seting.minwithdraw) {
                 message.error(lan.$t('zuiditixian'));
                 return;
             } else if (payinfo.value.money > yue.value) {

From 5e2db3ad91be2303bfa180d1c5e18f074e4e1d77 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Wed, 18 Nov 2020 14:28:21 +0800
Subject: [PATCH 30/34] =?UTF-8?q?=E5=A4=B4=E5=83=8F=E5=92=8C=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Menu.vue     | 5 ++++-
 src/views/mine/Archives.vue | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/Menu.vue b/src/components/Menu.vue
index cda7c59..a6b3f9f 100644
--- a/src/components/Menu.vue
+++ b/src/components/Menu.vue
@@ -2,7 +2,10 @@
     <div class="menu">
         <div class="user" style="overflow: hidden;">
             <div class="user" :class="{'seltop': selnum == 0}">
-                <img :src="userinfo.img" alt="" class="head">
+                <!-- <img :src="userinfo.img" alt="" class="head"> -->
+                <a-avatar :size="85" shape="circle" class="head" :src="userinfo.img">
+                    <template v-slot:icon><UserOutlined /></template>
+                </a-avatar>
                 <div class="name">{{userinfo.name}}</div>
             </div>
         </div>
diff --git a/src/views/mine/Archives.vue b/src/views/mine/Archives.vue
index 118dbea..6a1a80b 100644
--- a/src/views/mine/Archives.vue
+++ b/src/views/mine/Archives.vue
@@ -1350,6 +1350,9 @@ export default defineComponent({
             line-height: 23px;
             cursor: pointer;
             user-select: none;
+            position: fixed;
+            bottom: 100px;
+            right: 300px;
         }
         // .submit-btn:hover {
         //     background: #08ae98;

From 5c7ff10cc8a8c6555397ea8be4668a593fd80acf Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Wed, 18 Nov 2020 14:34:28 +0800
Subject: [PATCH 31/34] =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E9=80=80=E5=87=BA=20?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4top=E8=B4=A7=E5=B8=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Menu.vue   |  8 +++++++-
 src/components/NavTop.vue | 29 +----------------------------
 src/i18n/en.ts            |  2 ++
 src/i18n/zh.ts            |  2 ++
 4 files changed, 12 insertions(+), 29 deletions(-)

diff --git a/src/components/Menu.vue b/src/components/Menu.vue
index a6b3f9f..a25f5bd 100644
--- a/src/components/Menu.vue
+++ b/src/components/Menu.vue
@@ -23,7 +23,7 @@
             <div style="overflow: hidden;">
                 <div class="item" :class="{'selbottom': selnum == list.length - 1}"></div>
             </div>
-            <div class="item loginout" @click="logout">
+            <div class="item loginout" @click="visible = true">
                 <div class="route">
                     <img src="../static/images/tuichu.png" alt="" class="icon">
                     <div class="title">
@@ -32,6 +32,9 @@
                 </div>
             </div>
         </div>
+        <a-modal v-model:visible="visible" :title="lan.$t('tishi')" @ok="logout">
+            <p>{{lan.$t('querentuichu')}}</p>
+        </a-modal>
     </div>
 </template>
 <style lang="scss" scoped>
@@ -223,6 +226,8 @@ export default defineComponent({
             selnum.value = index;
         }
 
+        const visible = ref(false);
+
         function logout(): void{
             console.log("退出")
             store.commit("login", false)
@@ -240,6 +245,7 @@ export default defineComponent({
             logout,
             mouse,
             lan,
+            visible,
             jiantou: require('../static/images/jiantou.png'),
             jiantous: require('../static/images/kuozhan1.png')
         }
diff --git a/src/components/NavTop.vue b/src/components/NavTop.vue
index a7df2a5..6ac89fc 100644
--- a/src/components/NavTop.vue
+++ b/src/components/NavTop.vue
@@ -41,34 +41,7 @@
                 </template>
             </a-dropdown>
             
-            <a-dropdown :trigger="['click']" :getPopupContainer="triggerNode => triggerNode.parentNode" v-if="islogin">
-                <div class="item" @click="e => e.preventDefault()">
-                    <img src="@/static/images/qianbi.png" alt="" class="icon">
-                    <div class="name">{{userinfo.currency}}</div>
-                    <img src="@/static/images/jiantou2.png" alt="" class="down">
-                </div>
-                <template v-slot:overlay>
-                    <a-menu style="max-height:70vh;overflow: auto;">
-                        <!-- 货币 -->
-                        <a-menu-item  v-for="(i,j) in currencylist" :key="j" style="position: relative;">
-                            <div class="selitem" @click="currencychange(i.value)">
-                                <span :style="{'color': i.name == userinfo.currency ? '#06C7AE' : ''}">{{i.name}} </span>
-                                <img src="@/static/images/duihao.png" alt="" v-if="i.name == userinfo.currency" class="duihao">
-                            </div>
-                        </a-menu-item>
-                        <!-- <a-menu-item key="1">
-                            <div class="selitem">
-                                <span>时区2b</span>
-                            </div>
-                        </a-menu-item>
-                        <a-menu-item key="3">
-                            <div class="selitem">
-                                <span>时区3b</span>
-                            </div>
-                        </a-menu-item> -->
-                    </a-menu>
-                </template>
-            </a-dropdown>
+          
             <a-dropdown :trigger="['click']" :getPopupContainer="triggerNode => triggerNode.parentNode">
                 <div class="item" @click="e => e.preventDefault()">
                     <img src="@/static/images/yuyan.png" alt="" class="icon">
diff --git a/src/i18n/en.ts b/src/i18n/en.ts
index abefe1c..1f2f14d 100644
--- a/src/i18n/en.ts
+++ b/src/i18n/en.ts
@@ -308,6 +308,8 @@ export default {
     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)",
     shouru3: "Attention! You can only change the currency once!",
+    tishi: "tip",
+    querentuichu: "You confirm to exit?",
     shichangtishi:"",
     renshutishi: '',
     tixianzhu: "",
diff --git a/src/i18n/zh.ts b/src/i18n/zh.ts
index cf0f698..1e63c5a 100644
--- a/src/i18n/zh.ts
+++ b/src/i18n/zh.ts
@@ -308,6 +308,8 @@ export default {
     shouru1: "直播收入=实际参加学生数x参加时长x单价",
     shouru2: "单价：1对1，20欧/小时；1对N，10欧/小时/人（1<N<=4）",
     shouru3: "请注意，货币一旦修改，不能变动",
+    tishi: "提示",
+    querentuichu: "您确认退出？",
     shichangtishi:"",
     renshutishi: '',
     tixianzhu:"",

From cc18504959bc4ef1a9eb8895b56555e08e1250f5 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Wed, 18 Nov 2020 14:41:52 +0800
Subject: [PATCH 32/34] =?UTF-8?q?=E7=9B=B4=E6=92=AD=E7=A6=81=E6=AD=A2?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mine/ReleaseWebcast.vue | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/views/mine/ReleaseWebcast.vue b/src/views/mine/ReleaseWebcast.vue
index 295aaaf..79d1ddb 100644
--- a/src/views/mine/ReleaseWebcast.vue
+++ b/src/views/mine/ReleaseWebcast.vue
@@ -7,6 +7,7 @@
                     size="small"
                     v-model:value="form.title"
                     :placeholder="lan.$t('shuruzhibobiaoti')"
+                    @click="isEntitled = jinzhi"
                 />
             </a-form-item>
             <a-form-item :label="lan.$t('zhibofengmian')" class="item-cover" :rules="{ required: true, message: 'Please input Activity name', trigger: 'blur'}">
@@ -110,7 +111,7 @@
                     </p>
                 </div> -->
             </a-form-item>
-            <a-form-item :label="lan.$t('kaishishijian')" :rules="{ required: true, message: 'Please input Activity name', trigger: 'blur'}">
+            <a-form-item :label="lan.$t('kaishishijian')" @click="isEntitled = jinzhi" :rules="{ required: true, message: 'Please input Activity name', trigger: 'blur'}">
                 
                 <!-- <a-input
           size="small"
@@ -123,6 +124,7 @@
                     format="YYYY-MM-DD HH:mm"
                     :value="form.dateline"
                     :disabled-date="disabledDate"
+                    @click="isEntitled = jinzhi"
                     @change="startchange"
                     :placeholder="lan.$t('shezhikaishishijian')"
                     :getCalendarContainer="
@@ -139,6 +141,7 @@
                 <a-input
                     size="small"
                     v-model:value="form.livetime"
+                    @click="isEntitled = jinzhi"
                     :placeholder="lan.$t('shuruzhiboshijian')"
                     type="number"
                 />
@@ -153,6 +156,7 @@
                 <a-input
                     size="small"
                     v-model:value="form.livenumber"
+                    @click="isEntitled = jinzhi"
                     :placeholder="lan.$t('shuruzhiborenshu')"
                     type="number"
                 />
@@ -162,6 +166,7 @@
             <a-form-item :label="lan.$t('zhibojianjie')" class="brief">
                 <a-textarea
                     v-model:value="form.desc"
+                    @click="isEntitled = jinzhi"
                     :autoSize="true"
                     class="brief-textarea"
                     :maxlength="200"
@@ -274,6 +279,9 @@ export default defineComponent({
         const videofile = ref<File>();
         const videos = ref<Array<any>>([]);
         const lives = ref<any>({});
+        const jinzhi = ref(false)
+        const isEntitled: Ref<boolean> = ref(false);
+
         /**
          * 验证直播时间
          */
@@ -365,6 +373,10 @@ export default defineComponent({
         }
         const seting = computed(() => store.state.seting)
         const onSubmit = (e: FromSend) => {
+            if(jinzhi.value){
+                isEntitled.value = true;
+
+            }
             if(!issum){
                 message.error(lan.$t("shangchuanwancheng"))
                 return; 
@@ -426,7 +438,6 @@ export default defineComponent({
                     console.log("error", err);
                 });
         };
-        const isEntitled: Ref<boolean> = ref(false);
         /**
          * 隐藏无资格提示
          */
@@ -517,11 +528,11 @@ export default defineComponent({
                 //  picinfo.url=res.video.url
                 form.value.img = res.video.url;
         }
-
         getlivest().then((res) => {
             if (res) {
                 isEntitled.value = true;
                 lives.value = res;
+                jinzhi.value = true;
             }
         });
         function beforeUploadpic(info?: any) {
@@ -552,9 +563,17 @@ export default defineComponent({
             }
         }
         function video(file: any){
+            if(jinzhi.value){
+                isEntitled.value = true;
+                return false;
+            }
             return provenvideo(file)
         }
          function imgs(file: any){
+             if(jinzhi.value){
+                isEntitled.value = true;
+                return false;
+            }
             return provenimg(file)
         }
 
@@ -593,7 +612,8 @@ export default defineComponent({
             onquxiao,
             isquxiao,
             video,
-            imgs
+            imgs,
+            jinzhi
         };
     },
 });

From d88448060f77f3817acf2ea73ea738610389f330 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Wed, 18 Nov 2020 14:48:58 +0800
Subject: [PATCH 33/34] =?UTF-8?q?=E8=B4=A7=E5=B8=81=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/en.ts              | 1 +
 src/i18n/zh.ts              | 1 +
 src/views/mine/Archives.vue | 8 +++++++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/i18n/en.ts b/src/i18n/en.ts
index 1f2f14d..3c3046f 100644
--- a/src/i18n/en.ts
+++ b/src/i18n/en.ts
@@ -310,6 +310,7 @@ export default {
     shouru3: "Attention! You can only change the currency once!",
     tishi: "tip",
     querentuichu: "You confirm to exit?",
+    huobitishi: "Attention! You can only change the currency once!",
     shichangtishi:"",
     renshutishi: '',
     tixianzhu: "",
diff --git a/src/i18n/zh.ts b/src/i18n/zh.ts
index 1e63c5a..f83341d 100644
--- a/src/i18n/zh.ts
+++ b/src/i18n/zh.ts
@@ -310,6 +310,7 @@ export default {
     shouru3: "请注意，货币一旦修改，不能变动",
     tishi: "提示",
     querentuichu: "您确认退出？",
+    huobitishi: "请注意，货币一旦修改，不能变动。",
     shichangtishi:"",
     renshutishi: '',
     tixianzhu:"",
diff --git a/src/views/mine/Archives.vue b/src/views/mine/Archives.vue
index 6a1a80b..5f0b8f3 100644
--- a/src/views/mine/Archives.vue
+++ b/src/views/mine/Archives.vue
@@ -493,6 +493,9 @@
                 {{ lan.$t("baocun") }}
             </div>
         </div>
+        <a-modal v-model:visible="huobi" :footer="null" :title="lan.$t('tishi')" >
+            <p>{{lan.$t('huobitishi')}}</p>
+        </a-modal>
         <nav-bottom></nav-bottom>
     </div>
 </template>
@@ -557,6 +560,7 @@ export default defineComponent({
         const userinfo = computed(() => {
             return store.state.userinfo;
         });
+        const huobi = ref(false);
         // 表单数据
         const currencyindex = ref<string>(userinfo.value.currency);
         const formData = ref(toRaw(userinfo.value));
@@ -972,6 +976,7 @@ export default defineComponent({
 
         function currencychange(e?: any) {
             console.log(e);
+            huobi.value = true;
             userinfo.value.currencyValue = e;
             // editsystemsetting({currency:e})
         }
@@ -1059,7 +1064,8 @@ export default defineComponent({
             setname,
             video,
             imgs,
-            mrqh
+            mrqh,
+            huobi
         };
     },
 });

From b33960434751d8487e29ef5457c480197d04ca95 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Wed, 18 Nov 2020 14:54:52 +0800
Subject: [PATCH 34/34] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A7=E5=B8=81?=
 =?UTF-8?q?=E4=B9=8B=E5=90=8E=E7=A6=81=E6=AD=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/index.ts          | 3 ++-
 src/views/mine/Archives.vue | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/store/index.ts b/src/store/index.ts
index 51e3a2a..c33920c 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -52,7 +52,8 @@ export default createStore({
       zoneStr: "中途岛GMT-11:00",
       zoneid: 1,
       symbol: "$",
-      zoneValue:""
+      zoneValue:"",
+      currencytag: 0
     },
     islogin: false,
     seting:{
diff --git a/src/views/mine/Archives.vue b/src/views/mine/Archives.vue
index 5f0b8f3..7fbee00 100644
--- a/src/views/mine/Archives.vue
+++ b/src/views/mine/Archives.vue
@@ -283,6 +283,7 @@
                             "
                             @change="currencychange"
                             v-model:value="currencyindex"
+                            :disabled="userinfo.currencytag == 1"
                         >
                             <a-select-option
                                 v-for="(item, index) in currencylist"