From f0fde7114562274a65ed6a37d3d515a2ede4a559 Mon Sep 17 00:00:00 2001
From: asd <374367073@qq.com>
Date: Thu, 22 Oct 2020 09:12:24 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index.ts            | 36 +++++++++++++++--
 src/store/index.ts          |  1 +
 src/types/index.d.ts        |  1 +
 src/views/login/Login.vue   | 67 +++++++++++++++++++++++++++----
 src/views/mine/Archives.vue | 79 +++++++++++++++++++++++++++++++------
 5 files changed, 162 insertions(+), 22 deletions(-)

diff --git a/src/api/index.ts b/src/api/index.ts
index 1b80077..e537d0c 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -12,8 +12,15 @@ import { del, get, post, put, setToken } from './base'
  * @param password 密码
  */
 
-export async function loginpass(phone: string, password: string){
-    const res = await post<LoginData>("login",{type: 2,username: phone, password: password});
+export async function loginpass(phone: string, password: string,type?:number,smscode?:string){
+    let newdata={}
+    if(type==1){
+         newdata={type:type?type:2,username: phone, smscode: smscode}
+    }else{
+         newdata={type:type?type:2,username: phone, password: password}
+    }
+    
+    const res = await post<LoginData>("login",newdata);
     console.log(res.code)
     if(res.code == 1){
         message.error(res.msg)
@@ -576,6 +583,16 @@ export async function checkuser(data?:any){
     }
 }
 
+/**
+ * 获取区号列表
+ */
+export async function getquhaolist() {
+    const res=await get("phonecodes")
+    // console.log(res)
+    return res.data
+}
+
+
 /**
  * 发送验证码 
  * @param phone 手机号 
@@ -746,7 +763,20 @@ export async function cancellive(id: number, status: number){
     }
 }
 
-
+/**
+ * 修改手机号
+ */
+export async function changetel(e:string) {
+    const res = await put(`member/${store.state.userinfo.memberid}`,{mobile:e});
+    console.log(res)
+    if(res.code == 0){
+        message.success("修改成功")
+        return true;
+    }else{
+        message.error(res.msg);
+        return false;
+    } 
+}
 
 
 /**
diff --git a/src/store/index.ts b/src/store/index.ts
index 3755e95..256cfbb 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -10,6 +10,7 @@ export default createStore({
       country: "",
       countryValue: "",
       cover: "",
+      code:"",
       created_at: "",
       currency: "",
       currencyValue: "",
diff --git a/src/types/index.d.ts b/src/types/index.d.ts
index 805d22e..0ba4ae5 100644
--- a/src/types/index.d.ts
+++ b/src/types/index.d.ts
@@ -61,6 +61,7 @@ export interface UserInfo {
     video: string;
     desc: string;
     money: string;
+   
 }
 
 
diff --git a/src/views/login/Login.vue b/src/views/login/Login.vue
index 8048b8a..aebb51d 100644
--- a/src/views/login/Login.vue
+++ b/src/views/login/Login.vue
@@ -17,11 +17,17 @@
           <a-form :layout="formLayout">
             <a-form-item label="手机号" class="form-item">
               <a-input-group compact>
-                <a-select default-value="Zhejiang" class="getcode">
+                <!-- <a-select default-value="Zhejiang" class="getcode">
                   <a-select-option value="Zhejiang">
                     中国+0086
                   </a-select-option>
                   <a-select-option value="Jiangsu"> Jiangsu </a-select-option>
+                </a-select> -->
+                 <a-select :default-value="quhaolist[0].code" size="small"  @change="getquhao" class="getcode">
+                    <a-select-option  v-for="(i,j) in quhaolist" :key="j" :value="i.code">
+                        {{i.name}}+{{i.code}}
+                    </a-select-option>
+                    <!-- <a-select-option value="Jiangsu"> Jiangsu </a-select-option> -->
                 </a-select>
                 <div class="line"></div>
                 <a-input v-model:value="phone" style="width: 50%" placeholder="请输入您的手机号" />
@@ -33,10 +39,10 @@
                   点击获取验证码{{ time == 60 ? "" : "(" + time + ")" }}
                 </div>
                 <div class="line"></div>
-                <a-input style="width: 50%" placeholder="请输入您的验证码" />
+                <a-input style="width: 50%" placeholder="请输入您的验证码" v-model:value="code"/>
               </a-input-group>
             </a-form-item>
-            <div class="submit">立即登录</div>
+            <div class="submit" @click="sublogin">立即登录</div>
             <div>Beelink公司版权所有 2019—2022</div>
           </a-form>
         </div>
@@ -146,10 +152,11 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, reactive, ref } from "vue";
+import { defineComponent, onMounted, reactive, ref } from "vue";
 import LoginTab from "@/components/login/LoginTab.vue";
 import NavTop from "@/components/NavTop.vue"
-import { loginpass } from '@/api';
+import { getquhaolist, loginpass, sendsms } from '@/api';
+import { message } from 'ant-design-vue';
 
 export default defineComponent({
   name: "Login",
@@ -165,10 +172,26 @@ export default defineComponent({
     const tabselected = ref(1);  //tab切换的标志
     const time = ref(60);//倒计时
     const phone = ref(""); // 手机号
+    const code =ref("")
+    const myquhao=ref("86")
     const userinfo = reactive({
       phone: '13152639856',
       password: '123456'
     })
+    const quhaolist = ref<any>([
+    {
+      code: "86",
+      id: 214,
+      name: "中国"
+    }
+    ])
+
+    onMounted(async ()=>{
+        quhaolist.value=await getquhaolist()
+        console.log(quhaolist.value,"listsssss")
+    })
+
+
     /**
      * @param val  子组件传过来的值
      */
@@ -182,10 +205,25 @@ export default defineComponent({
      * @param 
      * 点击获取验证码 触发倒计时
      */
+     let lock=false
     const getcode: () => void = () => {
       console.log(phone.value);
-      const timestep = setInterval(() => {
+         if (lock) {
+          console.log("lock")
+          return;
+        }
+        if (phone.value == "") {
+            message.error("手机号不能为空");
+            return;
+        }
+        lock = true;
+        console.log(myquhao.value,"quhao")
+        sendsms(myquhao.value + phone.value, 0);
+        const timestep = setInterval(() => {
         console.log(11112);
+     
+        
+
         time.value = time.value - 1;
         if (time.value > 0) {
           console.log();
@@ -195,11 +233,21 @@ export default defineComponent({
         }
       }, 1000);
     };
+    function getquhao(e ?:any){
+            console.log(e)
+            myquhao.value=e.toString()
+            console.log(myquhao.value)
+        }
     function login(): void {
         console.log(userinfo.phone,userinfo.password)
         loginpass(userinfo.phone,userinfo.password)
 
     }
+
+    function sublogin(){
+      console.log(11)
+       loginpass(phone.value,'',1,code.value)
+    }
     return {
       formLayout,
       tabselected,
@@ -208,7 +256,12 @@ export default defineComponent({
       time,
       phone,
       login,
-      userinfo
+      userinfo,
+      quhaolist,
+      getquhao,
+      code,
+      myquhao,
+      sublogin
     };
   },
 });
diff --git a/src/views/mine/Archives.vue b/src/views/mine/Archives.vue
index 9b0f47d..68519f0 100644
--- a/src/views/mine/Archives.vue
+++ b/src/views/mine/Archives.vue
@@ -209,7 +209,7 @@
                             <div class="form-item">
                                 <label class="label">手机验证码</label>
                                 <a-input size="small" v-model:value="verificationCode" />
-                                <div @click="sendVerificationCode(userinfo.mobile)" class="confirm-btn">获取验证码<span v-if="remainTime>0">（{{ remainTime }}s）</span></div>
+                                <div @click="sendVerificationCode(userinfo.code+userinfo.mobile)" class="confirm-btn">获取验证码<span v-if="remainTime>0">（{{ remainTime }}s）</span></div>
                             </div>
                         </div>
                         <div @click="nextPhoneStep" class="confirm-btn">下一步</div>
@@ -220,15 +220,25 @@
                         <div class="form-box">
                             <div class="form-item">
                                 <label class="label">手机号</label>
-                                <a-input size="small" v-model:value="bindPhone.number" />
+                                <!-- <a-input size="small" v-model:value="bindPhone.number" /> -->
+                                <a-input-group compact class="telbox">
+                                    <a-select :default-value="quhaolist[0].code" size="small"  @change="getquhao">
+                                        <a-select-option  v-for="(i,j) in quhaolist" :key="j" :value="i.code">
+                                            {{i.name}}+{{i.code}}
+                                        </a-select-option>
+                                        <!-- <a-select-option value="Jiangsu"> Jiangsu </a-select-option> -->
+                                    </a-select>
+                                    <div class="line"></div>
+                                    <a-input v-model:value="mynewtel" size="small"   placeholder="请输入您的手机号" />
+                                </a-input-group>
                             </div>
                             <div class="form-item">
                                 <label class="label">手机验证码</label>
                                 <a-input size="small" v-model:value="bindPhone.code" />
-                                <div @click="sendVerificationCode" class="confirm-btn">获取验证码<span v-if="remainTime>0">（{{ remainTime }}s）</span></div>
+                                <div @click="sendVerificationCode(myquhao+mynewtel)" class="confirm-btn">获取验证码<span v-if="remainTime>0">（{{ remainTime }}s）</span></div>
                             </div>
                         </div>
-                        <div @click="nextPhoneStep" class="confirm-btn">绑定手机</div>
+                        <div @click="updatePhoneNumber" class="confirm-btn">绑定手机</div>
                     </div>
                 </a-modal>
                 <!-- 修改密码 -->
@@ -277,7 +287,7 @@ import { uploadflie } from "@/utils/vod"
 import store from '@/store';
 import smile from "@/static/images/smile.png"
 import smilet from "@/static/images/smilet.png"
-import { editpassword, getarchives, getlanguages, putmember, sendsms } from "@/api/index"
+import { changetel, checksmscode, editpassword, getarchives, getlanguages, getquhaolist, putmember, sendsms } from "@/api/index"
 import { message } from 'ant-design-vue';
 
 export default defineComponent({
@@ -306,9 +316,16 @@ export default defineComponent({
 
         const chiveslist = ref<any>([[],[]]);
         const languages = ref<unknown>([])
+        const quhaolist = ref<any>([])
+        const myquhao=ref<string>("")
+
+        const mynewtel=ref<string>("")
         onMounted(async ()=>{
             chiveslist.value = await getarchives()
             languages.value = await getlanguages()
+            quhaolist.value=await getquhaolist()
+            myquhao.value=quhaolist.value[0].code
+            console.log(quhaolist.value,"listsssss")
         })
 
         /**
@@ -370,10 +387,11 @@ export default defineComponent({
         /**
          * 发送验证码
          */
-        function sendVerificationCode(phone: string): void {
+        function sendVerificationCode(tel: string): void {
             if(remainTime.value === 0) {
                 computedVerificationCode();
-                sendsms(phone, 0)
+                console.log(tel,"send")
+                sendsms(tel, 0)
             }
         }
         // 绑定手机号是否是第二步
@@ -389,16 +407,45 @@ export default defineComponent({
         /**
          * 绑定手机号下一步
          */
-        function nextPhoneStep(): void {
-            isSecondStep.value = true;
+        async function nextPhoneStep(): Promise<void> {
+            
+            remainTime.value = 0    
+            if(!isSecondStep.value){
+                console.log(formData.value.code)
+                if(verificationCode.value == ""){
+                    return ;
+                }
+                const res=await checksmscode(formData.value.code+formData.value.mobile,verificationCode.value)
+                console.log(res,"0.0")
+                if(res){
+                    isSecondStep.value = true;
+                }
+                // isSecondStep.value = true;
+            }
+
+
+            // isSecondStep.value = true;
         }
         /**
          * 修改手机号
          * @return { void }
          */
-        function updatePhoneNumber (): void {
+        async function updatePhoneNumber (): Promise<void> {
             console.log('修改手机号');
-            
+            console.log(mynewtel.value,myquhao.value,bindPhone.code)
+            const res=await checksmscode(myquhao.value+mynewtel.value,bindPhone.code.toString())
+            console.log(res,"xiugai")
+            if(res){
+                const res1=await changetel(mynewtel.value)
+                if(res1){
+                     store.dispatch("setUserInfo");
+                     updatePhoneVisible.value=false
+                }
+            }
+        }
+        function getquhao(e ?:any){
+            console.log(e)
+            myquhao.value=e.toString()
         }
         // 是否显示修改密码框
         const updatePasswordVisible: Ref<boolean> = ref(false);
@@ -553,7 +600,11 @@ export default defineComponent({
             chiveslist,
             languages,
             uploadprogress,
-            choosewillsay
+            choosewillsay,
+            mynewtel,
+            quhaolist,
+            getquhao,
+            myquhao
         }
     }
 });
@@ -567,6 +618,10 @@ export default defineComponent({
     padding: 46px;
     border-radius: 17px;
     position: relative;
+    .telbox{
+        margin-left:15px;
+        font-size: 12px;
+    }
     .update-btn {
         font-size: 11px;
         color: #08AE98;

From ef856495601b9768aeb18b378d156d53a1937361 Mon Sep 17 00:00:00 2001
From: asd <374367073@qq.com>
Date: Thu, 22 Oct 2020 09:36:19 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/Login.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/login/Login.vue b/src/views/login/Login.vue
index aebb51d..38ebeba 100644
--- a/src/views/login/Login.vue
+++ b/src/views/login/Login.vue
@@ -155,7 +155,7 @@
 import { defineComponent, onMounted, reactive, ref } from "vue";
 import LoginTab from "@/components/login/LoginTab.vue";
 import NavTop from "@/components/NavTop.vue"
-import { getquhaolist, loginpass, sendsms } from '@/api';
+import { checksmscode, getquhaolist, loginpass, sendsms } from '@/api';
 import { message } from 'ant-design-vue';
 
 export default defineComponent({
@@ -246,7 +246,9 @@ export default defineComponent({
 
     function sublogin(){
       console.log(11)
-       loginpass(phone.value,'',1,code.value)
+      // 
+      // checksmscode(myquhao.value+phone.value,code.value)
+      loginpass(phone.value,'',1,code.value)
     }
     return {
       formLayout,

From ed00c1d3f452a2e1e920efc6a9903adea63c4466 Mon Sep 17 00:00:00 2001
From: asd <374367073@qq.com>
Date: Thu, 22 Oct 2020 11:13:54 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index.ts          | 32 +++++++++++++++++++++-
 src/components/NavTop.vue | 57 +++++++++++++++++++++++++++++----------
 src/views/login/Login.vue |  2 +-
 3 files changed, 75 insertions(+), 16 deletions(-)

diff --git a/src/api/index.ts b/src/api/index.ts
index e537d0c..9a57d52 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -565,7 +565,7 @@ export async function addcomment(data?:any):Promise<void> {
     code: number;
     msg: string;
  }
-export async function checkuser(data?:any){
+export async function checkuser(data?: any) {
     const newdata={number:""}
     newdata.number=data.phone
     const res = await get<CheckuserRule>('checkUser',newdata);
@@ -592,6 +592,36 @@ export async function getquhaolist() {
     return res.data
 }
 
+/**
+ * 获取时区列表
+ */
+export async function getzonelist():Promise<any>{
+    const res=await get("timezones")
+    // console.log(res)
+    return res.data
+}
+
+/**
+ * 修改时区 货币 语言  
+ */
+export async function editsystemsetting(e?: any): Promise<boolean> {
+    let newdata={}
+    newdata=e
+    const res = await put(`member/${store.state.userinfo.memberid}`,newdata);
+    console.log(res)
+    if(res.code == 0){
+        message.success("修改成功")
+        return true;
+    }else{
+        message.error(res.msg);
+        return false;
+    } 
+}
+
+/**
+ * 货币列表
+ */
+
 
 /**
  * 发送验证码 
diff --git a/src/components/NavTop.vue b/src/components/NavTop.vue
index 4020ab5..2595157 100644
--- a/src/components/NavTop.vue
+++ b/src/components/NavTop.vue
@@ -20,21 +20,22 @@
                 </div>
                 <template v-slot:overlay>
                     <a-menu>
-                        <a-menu-item key="0">
+                        <!-- 时区 -->
+                        <a-menu-item  v-for="(i,j) in zonelist" :key="j" @click="zonechange(i.zoneid)">
                             <div class="selitem">
-                                <span>时区1</span>
+                                <span>{{i.city}}{{i.gmt}}</span>
                             </div>
                         </a-menu-item>
-                        <a-menu-item key="1">
+                        <!-- <a-menu-item key="1">
                             <div class="selitem">
-                                <span>时区2</span>
+                                <span>时区2a</span>
                             </div>
                         </a-menu-item>
                         <a-menu-item key="3">
                             <div class="selitem">
-                                <span>时区3</span>
+                                <span>时区3a</span>
                             </div>
-                        </a-menu-item>
+                        </a-menu-item> -->
                     </a-menu>
                 </template>
             </a-dropdown>
@@ -47,19 +48,20 @@
                 </div>
                 <template v-slot:overlay>
                     <a-menu>
+                        <!-- 货币 -->
                         <a-menu-item key="0">
                             <div class="selitem">
-                                <span>时区1</span>
+                                <span>时区1b</span>
                             </div>
                         </a-menu-item>
                         <a-menu-item key="1">
                             <div class="selitem">
-                                <span>时区2</span>
+                                <span>时区2b</span>
                             </div>
                         </a-menu-item>
                         <a-menu-item key="3">
                             <div class="selitem">
-                                <span>时区3</span>
+                                <span>时区3b</span>
                             </div>
                         </a-menu-item>
                     </a-menu>
@@ -73,19 +75,20 @@
                 </div>
                 <template v-slot:overlay>
                     <a-menu>
+                        <!-- 语言 -->
                         <a-menu-item key="0">
                             <div class="selitem">
-                                <span>时区1</span>
+                                <span>时区1c</span>
                             </div>
                         </a-menu-item>
                         <a-menu-item key="1">
                             <div class="selitem">
-                                <span>时区2</span>
+                                <span>时区2cc</span>
                             </div>
                         </a-menu-item>
                         <a-menu-item key="3">
                             <div class="selitem">
-                                <span>时区3</span>
+                                <span>时区3c</span>
                             </div>
                         </a-menu-item>
                     </a-menu>
@@ -174,9 +177,10 @@
 }
 </style>
 <script lang="ts">
+import { editsystemsetting, getzonelist } from '@/api';
 import router from '@/router';
 import store from '@/store';
-import { computed, defineComponent, ref } from 'vue';
+import { computed, defineComponent, onMounted, ref } from 'vue';
 import { useRoute } from 'vue-router';
 
 export default defineComponent({
@@ -191,6 +195,15 @@ export default defineComponent({
         const routes = useRoute();
         console.log(routes.path);
         const types = ref(props.type)
+        const zonelist=ref<any>([{
+            city: "中途岛",
+            gmt: "GMT-11:00",
+            id: "Pacific/Midway",
+            zoneid: 1
+
+        }])
+        const selectedzone=ref([])
+        const currencylist=ref([])
         console.log(types.value)
         interface Nav{
             name: string;
@@ -228,11 +241,27 @@ export default defineComponent({
             }
             
         }
+        onMounted(async () => {
+            zonelist.value=await getzonelist()
+            // console.log(zonelist.value)
+            // currencylist.value=await getcurrencys()
+        })
+        
+        function zonechange(e?: any){
+            // console.log(e,1002)
+            editsystemsetting({zoneid:e})
+        }
+        
+
         return {
             nav,
             types,
             navto,
-            userinfo
+            userinfo,
+            zonelist,
+            zonechange,
+            selectedzone,
+            currencylist
         }
     }
 })
diff --git a/src/views/login/Login.vue b/src/views/login/Login.vue
index 38ebeba..b62f5cc 100644
--- a/src/views/login/Login.vue
+++ b/src/views/login/Login.vue
@@ -188,7 +188,7 @@ export default defineComponent({
 
     onMounted(async ()=>{
         quhaolist.value=await getquhaolist()
-        console.log(quhaolist.value,"listsssss")
+        // console.log(quhaolist.value,"listsssss")
     })
 
 

From bf3ba7228e9b51dff02798c7e80728c777043635 Mon Sep 17 00:00:00 2001
From: asd <374367073@qq.com>
Date: Thu, 22 Oct 2020 11:21:04 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index.ts            | 6 +++---
 src/views/login/Login.vue   | 4 ++--
 src/views/mine/Archives.vue | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/api/index.ts b/src/api/index.ts
index 5a3246f..72b134e 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -12,7 +12,7 @@ import { del, get, post, put, setToken } from './base'
  * @param password 密码
  */
 
-export async function loginpass(phone: string, password: string,type?:number,smscode?:string){
+export async function loginpass(phone: string, password: string,type?: number,smscode?: string){
     let newdata={}
     if(type==1){
          newdata={type:type?type:2,username: phone, smscode: smscode}
@@ -595,7 +595,7 @@ export async function getquhaolist() {
 /**
  * 获取时区列表
  */
-export async function getzonelist():Promise<any>{
+export async function getzonelist(): Promise<any>{
     const res=await get("timezones")
     // console.log(res)
     return res.data
@@ -796,7 +796,7 @@ export async function cancellive(id: number, status: number){
 /**
  * 修改手机号
  */
-export async function changetel(e:string) {
+export async function changetel(e: string) {
     const res = await put(`member/${store.state.userinfo.memberid}`,{mobile:e});
     console.log(res)
     if(res.code == 0){
diff --git a/src/views/login/Login.vue b/src/views/login/Login.vue
index b62f5cc..1dcd4e9 100644
--- a/src/views/login/Login.vue
+++ b/src/views/login/Login.vue
@@ -233,9 +233,9 @@ export default defineComponent({
         }
       }, 1000);
     };
-    function getquhao(e ?:any){
+    function getquhao(e?: any){
             console.log(e)
-            myquhao.value=e.toString()
+            myquhao.value = e.toString()
             console.log(myquhao.value)
         }
     function login(): void {
diff --git a/src/views/mine/Archives.vue b/src/views/mine/Archives.vue
index ca77175..cb6f3e4 100644
--- a/src/views/mine/Archives.vue
+++ b/src/views/mine/Archives.vue
@@ -443,7 +443,7 @@ export default defineComponent({
                 }
             }
         }
-        function getquhao(e ?:any){
+        function getquhao(e?: any){
             console.log(e)
             myquhao.value=e.toString()
         }

From a97f2448e77dd509722455681522eff1e9e71373 Mon Sep 17 00:00:00 2001
From: asd <374367073@qq.com>
Date: Fri, 23 Oct 2020 09:00:02 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E7=9B=B4=E6=92=AD=E5=AD=A6=E7=94=9F?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index.ts               |  13 ++-
 src/components/LiveCount.vue   |  14 ++-
 src/components/NavTop.vue      |  62 +++++++---
 src/components/VideoCont.vue   |   2 +-
 src/router/index.ts            |   4 +
 src/views/regime/SignupStu.vue | 205 +++++++++++++++++++++++++++++++++
 src/views/regime/VideoInfo.vue |   2 +-
 7 files changed, 281 insertions(+), 21 deletions(-)
 create mode 100644 src/views/regime/SignupStu.vue

diff --git a/src/api/index.ts b/src/api/index.ts
index 72b134e..70b6482 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -611,6 +611,7 @@ export async function editsystemsetting(e?: any): Promise<boolean> {
     console.log(res)
     if(res.code == 0){
         message.success("修改成功")
+        store.dispatch("setUserInfo");
         return true;
     }else{
         message.error(res.msg);
@@ -621,7 +622,10 @@ export async function editsystemsetting(e?: any): Promise<boolean> {
 /**
  * 货币列表
  */
-
+export async function getcurrencys(){
+    const res=await get("currencys")
+    return res.data
+}
 
 /**
  * 发送验证码 
@@ -765,6 +769,13 @@ export async function getliveinfo(id: number){
     return {...liveinfo,studentlist}
 }
 
+/**
+ * 参与直播的学生列表
+ */
+export async function getstudentlist(data?: any) {
+    const studentlist = (await get<StudentList[]>("studentLive",data)).data;
+    return studentlist
+}
 
 /**
  * 直播日历
diff --git a/src/components/LiveCount.vue b/src/components/LiveCount.vue
index 075dcb2..375661e 100644
--- a/src/components/LiveCount.vue
+++ b/src/components/LiveCount.vue
@@ -2,14 +2,14 @@
     <div class="cont">
         <div class="title">
         <div>上课学生</div>
-        <div class="more">查看详情</div>
+        <div class="more" @click="toxq">查看详情</div>
         </div>
         <div class="info">
         <div class="item" v-for="(i, j) in list" :key="j">
             <div style="display: flex">
                 <img :src="i.img" alt="" />
                 <div class="stuinfo">
-                    <div>{{ i.name }}</div>
+                    <div>{{ i.name }} {{zid}}</div>
                     <div class="lessonname">{{ i.interest }}</div>
                 </div>
             </div>
@@ -236,12 +236,14 @@
 </style>
 <script lang="ts">
 import { cancellive, refusedtolive } from '@/api';
+import router from '@/router';
 import { defineComponent, ref, toRaw, watch } from "vue";
 
 export default defineComponent({
     props: {
         info: Array,
         livestatus: Number,
+        zid:Number
     },
     setup(props) {
         const modalNode = () => document.getElementsByClassName('modal-container')[0]
@@ -275,6 +277,11 @@ export default defineComponent({
                 hidePhoneModal();
             }
         }
+        function toxq(){
+            router.push({path:"/regime/studentlist",query:{liveid:props.zid}})
+            console.log(props.zid,"aaa")
+        }
+
         
         return {
             list,
@@ -283,7 +290,8 @@ export default defineComponent({
             updatePhoneVisible,
             hidePhoneModal,
             sum,
-            text
+            text,
+            toxq
         };
     },
 });
diff --git a/src/components/NavTop.vue b/src/components/NavTop.vue
index 2595157..b3015b9 100644
--- a/src/components/NavTop.vue
+++ b/src/components/NavTop.vue
@@ -49,12 +49,12 @@
                 <template v-slot:overlay>
                     <a-menu>
                         <!-- 货币 -->
-                        <a-menu-item key="0">
-                            <div class="selitem">
-                                <span>时区1b</span>
+                        <a-menu-item  v-for="(i,j) in currencylist" :key="j">
+                            <div class="selitem" @click="currencychange(i.value)">
+                                <span>{{i.name}}</span>
                             </div>
                         </a-menu-item>
-                        <a-menu-item key="1">
+                        <!-- <a-menu-item key="1">
                             <div class="selitem">
                                 <span>时区2b</span>
                             </div>
@@ -63,7 +63,7 @@
                             <div class="selitem">
                                 <span>时区3b</span>
                             </div>
-                        </a-menu-item>
+                        </a-menu-item> -->
                     </a-menu>
                 </template>
             </a-dropdown>
@@ -76,12 +76,12 @@
                 <template v-slot:overlay>
                     <a-menu>
                         <!-- 语言 -->
-                        <a-menu-item key="0">
-                            <div class="selitem">
-                                <span>时区1c</span>
+                        <a-menu-item  v-for="(i,j) in languagelist" :key="j">
+                            <div class="selitem" @click="setlanguage(i.value)">
+                                <span>{{i.name}}</span>
                             </div>
                         </a-menu-item>
-                        <a-menu-item key="1">
+                        <!-- <a-menu-item key="1">
                             <div class="selitem">
                                 <span>时区2cc</span>
                             </div>
@@ -90,7 +90,7 @@
                             <div class="selitem">
                                 <span>时区3c</span>
                             </div>
-                        </a-menu-item>
+                        </a-menu-item> -->
                     </a-menu>
                 </template>
             </a-dropdown>
@@ -177,7 +177,7 @@
 }
 </style>
 <script lang="ts">
-import { editsystemsetting, getzonelist } from '@/api';
+import { editsystemsetting, getcurrencys, getlanguages, getzonelist } from '@/api';
 import router from '@/router';
 import store from '@/store';
 import { computed, defineComponent, onMounted, ref } from 'vue';
@@ -203,7 +203,30 @@ export default defineComponent({
 
         }])
         const selectedzone=ref([])
-        const currencylist=ref([])
+        const currencylist=ref<any>([{
+            alias: "CNY",
+            code: "104110041000",
+            createdAt: "2020-08-19 11:54:59",
+            deletedAt: null,
+            dictionaryid: 241,
+            name: "人民币￥",
+            position: 1,
+            publish: 1,
+            updatedAt: "2020-08-19 11:54:59",
+            value: "1"
+        }])
+        const languagelist=ref<any>({
+            alias: "",
+            code: "104110011000",
+            createdAt: "2020-08-14 11:08:28",
+            deletedAt: null,
+            dictionaryid: 210,
+            name: "中文",
+            position: 1,
+            publish: 1,
+            updatedAt: "2020-08-14 11:08:28",
+            value: "zh"
+        })
         console.log(types.value)
         interface Nav{
             name: string;
@@ -244,14 +267,20 @@ export default defineComponent({
         onMounted(async () => {
             zonelist.value=await getzonelist()
             // console.log(zonelist.value)
-            // currencylist.value=await getcurrencys()
+            currencylist.value=await getcurrencys()
+            languagelist.value=await getlanguages()
         })
         
         function zonechange(e?: any){
             // console.log(e,1002)
             editsystemsetting({zoneid:e})
         }
-        
+        function currencychange(e?: any){
+            editsystemsetting({currency:parseInt(e)})
+        }
+        function setlanguage(e?: any){
+            editsystemsetting({language:e})
+        }
 
         return {
             nav,
@@ -261,7 +290,10 @@ export default defineComponent({
             zonelist,
             zonechange,
             selectedzone,
-            currencylist
+            currencylist,
+            currencychange,
+            languagelist,
+            setlanguage
         }
     }
 })
diff --git a/src/components/VideoCont.vue b/src/components/VideoCont.vue
index 3585cfe..cd64f97 100644
--- a/src/components/VideoCont.vue
+++ b/src/components/VideoCont.vue
@@ -1,4 +1,4 @@
-<template>
+  <template>
   <div class="cont">
     <div class="title">视频数据</div>
     <div class="info">
diff --git a/src/router/index.ts b/src/router/index.ts
index 583f76c..f691c2b 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -81,6 +81,10 @@ const routes: Array<RouteRecordRaw> = [
         path: "subscriber",
         component: () => import("../views/regime/Subscriber.vue")
       },
+      {
+        path: "studentlist",
+        component: () => import("../views/regime/SignupStu.vue")
+      },
       {
         path: "live",
         component: () => import("../views/regime/Live.vue")
diff --git a/src/views/regime/SignupStu.vue b/src/views/regime/SignupStu.vue
new file mode 100644
index 0000000..72e7f7b
--- /dev/null
+++ b/src/views/regime/SignupStu.vue
@@ -0,0 +1,205 @@
+<template>
+  <div class="subscriber">
+    <div class="top">
+      <div class="title">直播报名学生</div>
+      <div class="sel">
+        <img src="@/static/images/sousuo.png" alt="" class="icon" />
+           <input type="text" placeholder="请输入想要搜索的学生姓名" v-model="condition.title" @keyup.enter="search(condition)"/>
+      </div>
+    </div>
+    <div class="mid">
+      {{teacherlikedlist}}
+      <div class="studentlist">
+        <div class="stuitem" v-for="(i,j) in teacherlikedlist.data" :key="j">
+          <img :src="i.img" alt="" class="photo" />
+          <div>
+            <div class="info">
+              <div class="infoitem">
+                <span class="label">姓名:</span>
+                <span class="one-line-hide">{{i.name}}</span>
+              </div>
+
+              <div class="infoitem">
+                <span class="label">所在国家:</span>
+                <span class="one-line-hide">{{i.live}}</span>
+              </div>
+
+              <div class="infoitem">
+                <span class="label">年龄:</span>
+                <span class="one-line-hide">{{i.age}}</span>
+              </div>
+            </div>
+
+            <div class="info">
+              <div class="infoitem">
+                <span class="label">学生母语:</span>
+                <span class="one-line-hide">{{i.mtongue	}}</span>
+              </div>
+
+              <div class="infoitem">
+                <span class="label">兴趣点:</span>
+                <span class="one-line-hide">{{i.interestStr}}</span>
+              </div>
+
+              <div class="infoitem">
+                <span class="label">语言等级:</span>
+                <span class="one-line-hide">asd</span>
+              </div>
+
+              <div>参加平台直播课程总时长：<span class="time">{{i.longtime}}min</span></div>
+            </div>
+          </div>
+        </div>
+
+      </div>
+    </div>
+    <!-- <div class="pages">
+      <a-pagination v-model:current="page" :total="teacherlikedlist.total" :showLessItems="true" @change="pagechange"/>
+    </div> -->
+  </div>
+</template>
+<style lang="scss" scoped>
+.subscriber {
+  width: 100%;
+  // height: 706px;
+  background-color: #fff;
+  border-radius: 17px;
+  // padding: 40px;
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding-bottom: 200px;
+  .top {
+    display: flex;
+    width: 1241px;
+    justify-content: space-between;
+    align-items: center;
+    margin-top: 21px;
+    border-bottom: 1px solid #eeeeee;
+    padding-bottom: 6px;
+    .title {
+      font-size: 13px;
+      color: #121212;
+      font-weight: bold;
+    }
+    .sel {
+      // width: 171px;
+      height: 26px;
+      border: 1px solid #999;
+      display: flex;
+      align-items: center;
+      // padding: 8px;
+      border-radius: 4px;
+      padding-right:30px;
+      > img {
+        width: 11px;
+        height: 11px;
+        margin-left:5px
+      }
+      > input {
+        width: 170px;
+        font-size: 9px;
+        line-height: 1;
+        margin-left: 6px;
+        border: none;
+        outline: none;
+      }
+    }
+  }
+  .mid {
+    .studentlist {
+      width: 1241px;
+      margin: 0 auto;
+      .stuitem {
+        height: 131px;
+        border-bottom: 1px solid #eeeeee;
+        display: flex;
+        align-items: center;
+        .photo {
+          width: 74px;
+          height: 74px;
+          background: #125cb4;
+          border-radius: 50%;
+        }
+        .info {
+          margin-left: 35px;
+          display: flex;
+          font-size: 12px;
+          color: #121212;
+          line-height: 45px;
+          .infoitem {
+            width: 194px;
+            display: flex;
+            .label{
+              flex-shrink: 0;
+            }
+          }
+        }
+
+        .time {
+          color: #08AE98;
+        }
+      }
+    }
+  }
+  .pages {
+    position: absolute;
+    bottom: 114px;
+    display: flex;
+    justify-content: center;
+    ::v-deep(.ant-pagination-next) > .ant-pagination-item-link,
+    ::v-deep(.ant-pagination-prev) > .ant-pagination-item-link,
+    ::v-deep(.ant-pagination-item),
+    ::v-deep(.ant-pagination-jump-next-custom-icon),
+    ::v-deep(.ant-pagination-jump-prev-custom-icon) {
+      border: 1px solid #08ae98;
+    }
+    ::v-deep(.ant-pagination-item-active) a {
+      color: #fff;
+    }
+    ::v-deep(.ant-pagination-item-active) {
+      background-color: #08ae98;
+    }
+  }
+}
+</style>
+<script lang="ts">
+import { getstudentlist, getteacherliked } from '@/api';
+import { defineComponent, onMounted, ref, toRaw } from "vue";
+import { useRoute } from 'vue-router';
+export default defineComponent({
+  name: "Subscriber",
+  components: {},
+  setup() {
+    const page = ref(1);
+    const teacherlikedlist =ref<any>({
+
+    });
+    const title=ref('')
+    const condition = ref<any>({
+      title:"",
+      id:Number(useRoute().query.liveid)
+    })
+    onMounted(async () => {
+      console.log(useRoute().query.liveid,"mmmmmmm")
+      const id=useRoute().query.liveid
+      teacherlikedlist.value=await getstudentlist({id:Number(id)})
+    });
+    async function search(e: any){
+      teacherlikedlist.value=await getstudentlist(e)
+    }
+    async function pagechange(){
+      teacherlikedlist.value=await getstudentlist(toRaw(condition.value))
+    }
+    
+    return {
+      page,
+      teacherlikedlist,
+      condition,
+      title,
+      search
+    };
+  },
+});
+</script>
\ No newline at end of file
diff --git a/src/views/regime/VideoInfo.vue b/src/views/regime/VideoInfo.vue
index c7b6ca4..92ba954 100644
--- a/src/views/regime/VideoInfo.vue
+++ b/src/views/regime/VideoInfo.vue
@@ -2,7 +2,7 @@
     <div class="videoinfo">
         <div class="info">
             <VideoPlay :url="result.fileurl"></VideoPlay>
-            <VideoCont :videoid="result.videoid"  :date="result.created_at" :watch="result.watch" :share="result.share" :status="result.status"></VideoCont>
+            <VideoCont :videoid="result.videoid"  :date="result.createdAt" :watch="result.watch" :share="result.share" :status="result.status"></VideoCont>
         </div>
         <VideoReview class="review"></VideoReview>
     </div>

From 71dac353721d4eb60b0b94a7c98643600c6c967d Mon Sep 17 00:00:00 2001
From: asd <374367073@qq.com>
Date: Fri, 23 Oct 2020 09:55:27 +0800
Subject: [PATCH 6/6] =?UTF-8?q?login=20=E5=8F=B3=E8=BE=B9=E7=9A=84?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index.ts               |  9 +++++
 src/components/NavTop.vue      |  2 +-
 src/views/login/Login.vue      | 73 ++++++++++++++--------------------
 src/views/mine/Wallet.vue      | 13 ++++--
 src/views/regime/SignupStu.vue |  7 ++--
 5 files changed, 51 insertions(+), 53 deletions(-)

diff --git a/src/api/index.ts b/src/api/index.ts
index 70b6482..3297742 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -627,6 +627,15 @@ export async function getcurrencys(){
     return res.data
 }
 
+/**
+ * 登录右侧 视频列表
+ */
+export async function getwebvideolist() {
+    const res=await get("webvideos")
+    console.log(res)
+    return res.data
+}
+
 /**
  * 发送验证码 
  * @param phone 手机号 
diff --git a/src/components/NavTop.vue b/src/components/NavTop.vue
index b3015b9..24867a2 100644
--- a/src/components/NavTop.vue
+++ b/src/components/NavTop.vue
@@ -43,7 +43,7 @@
             <a-dropdown :trigger="['click']" :getPopupContainer="triggerNode => triggerNode.parentNode">
                 <div class="item" @click="e => e.preventDefault()">
                     <img src="@/static/images/qianbi.png" alt="" class="icon">
-                    <div class="name">{{userinfo.currency}}</div>
+                    <div class="name">{{userinfo.currencyValue}}</div>
                     <img src="@/static/images/jiantou2.png" alt="" class="down">
                 </div>
                 <template v-slot:overlay>
diff --git a/src/views/login/Login.vue b/src/views/login/Login.vue
index 1dcd4e9..a1d8503 100644
--- a/src/views/login/Login.vue
+++ b/src/views/login/Login.vue
@@ -79,48 +79,14 @@
         <div class="topdesc">Beelink 开启您的美好学习生活</div>
 
         <div class="lessons">
-          <div class="lessonitem">
-            <div class="pic"></div>
+          <div class="lessonitem" v-for="(i,j) in videolist" :key="j" @click="tovideoxq(i.videoid)">
+            <img :src="i.img" alt="" class="pic"/>
             <div class="lessonname">
-              西班牙语A1级教学
-              <span class="score">7.5分</span>
-            </div>
-          </div>
-          <div class="lessonitem">
-            <div class="pic"></div>
-            <div class="lessonname">
-              西班牙语A1级教学
-              <span class="score">7.5分</span>
-            </div>
-          </div>
-          <div class="lessonitem">
-            <div class="pic"></div>
-            <div class="lessonname">
-              西班牙语A1级教学
-              <span class="score">7.5分</span>
-            </div>
-          </div>
-          <div class="lessonitem">
-            <div class="pic"></div>
-            <div class="lessonname">
-              西班牙语A1级教学
-              <span class="score">7.5分</span>
-            </div>
-          </div>
-          <div class="lessonitem">
-            <div class="pic"></div>
-            <div class="lessonname">
-              西班牙语A1级教学
-              <span class="score">7.5分</span>
-            </div>
-          </div>
-          <div class="lessonitem">
-            <div class="pic"></div>
-            <div class="lessonname">
-              西班牙语A1级教学
-              <span class="score">7.5分</span>
+              <div>{{i.title}}</div>
+              <span class="score">{{i.score}}分</span>
             </div>
           </div>
+        
         </div>
         <div class="icons">
           <img src="@/static/images/weixin.png" alt="" class="icon" />
@@ -155,8 +121,9 @@
 import { defineComponent, onMounted, reactive, ref } from "vue";
 import LoginTab from "@/components/login/LoginTab.vue";
 import NavTop from "@/components/NavTop.vue"
-import { checksmscode, getquhaolist, loginpass, sendsms } from '@/api';
+import { checksmscode, getquhaolist, getwebvideolist, loginpass, sendsms } from '@/api';
 import { message } from 'ant-design-vue';
+import router from '@/router';
 
 export default defineComponent({
   name: "Login",
@@ -185,10 +152,12 @@ export default defineComponent({
       name: "中国"
     }
     ])
+    const videolist=ref<any>([{}])
 
     onMounted(async ()=>{
         quhaolist.value=await getquhaolist()
-        // console.log(quhaolist.value,"listsssss")
+        videolist.value=await getwebvideolist()
+        console.log(videolist.value,"listsssss")
     })
 
 
@@ -250,6 +219,11 @@ export default defineComponent({
       // checksmscode(myquhao.value+phone.value,code.value)
       loginpass(phone.value,'',1,code.value)
     }
+
+    function tovideoxq(e?: number){
+      console.log(e)
+      router.push("/regime/videoinfo?id="+e)
+    }
     return {
       formLayout,
       tabselected,
@@ -263,7 +237,9 @@ export default defineComponent({
       getquhao,
       code,
       myquhao,
-      sublogin
+      sublogin,
+      videolist,
+      tovideoxq
     };
   },
 });
@@ -402,14 +378,23 @@ export default defineComponent({
           .pic {
             width: 200px;
             height: 112px;
-            background: #98a6b8;
+            // background: #98a6b8;
             border-radius: 18px 18px 0px 0px;
           }
           .lessonname {
             color: #121212;
             font-size: 12px;
-            line-height: 45px;
+            // line-height: 45px;
             text-indent: 17px;
+            height: 45px;
+            display: flex;
+            align-items: center;
+            >div{
+              width: 140px;
+              white-space:nowrap;
+              overflow: hidden;
+              text-overflow:ellipsis;
+            }
             .score {
               color: #f55456;
             }
diff --git a/src/views/mine/Wallet.vue b/src/views/mine/Wallet.vue
index e903340..1076f07 100644
--- a/src/views/mine/Wallet.vue
+++ b/src/views/mine/Wallet.vue
@@ -29,10 +29,15 @@
             <div class="texts">
               <div>账户余额</div>
               <div class="num">
-                <span class="moneyicon" v-if="ifchina">￥</span>
-                <span class="moneyicon" v-else> $ </span>
-                {{store.state.userinfo.moneyValue}}
-                
+                <!-- <span class="moneyicon" v-if="ifchina">￥</span>
+                <span class="moneyicon" v-else> $ </span> -->
+                {{store.state.userinfo.money.split('.')[0]}}
+                 <span class="float">{{store.state.userinfo.money.split('.')[1]?'.'+store.state.userinfo.money.split('.')[1]:'.00'}}</span>
+
+                <!-- {{store.state.userinfo.money.split('.')[0]}}
+                 <span class="float">{{'.'+store.state.userinfo.money.split('.')[1]}}</span> -->
+
+
                 <!-- {{store.state.userinfo.money.split('.')[0]}}
                  <span class="float">{{store.state.userinfo.money.split('.')[1]?'.'+store.state.userinfo.money.split('.')[1]:''}}</span> -->
                 
diff --git a/src/views/regime/SignupStu.vue b/src/views/regime/SignupStu.vue
index 72e7f7b..e0ca98b 100644
--- a/src/views/regime/SignupStu.vue
+++ b/src/views/regime/SignupStu.vue
@@ -8,9 +8,8 @@
       </div>
     </div>
     <div class="mid">
-      {{teacherlikedlist}}
       <div class="studentlist">
-        <div class="stuitem" v-for="(i,j) in teacherlikedlist.data" :key="j">
+        <div class="stuitem" v-for="(i,j) in teacherlikedlist" :key="j">
           <img :src="i.img" alt="" class="photo" />
           <div>
             <div class="info">
@@ -43,10 +42,10 @@
 
               <div class="infoitem">
                 <span class="label">语言等级:</span>
-                <span class="one-line-hide">asd</span>
+                <span class="one-line-hide">{{i.levelStr}}</span>
               </div>
 
-              <div>参加平台直播课程总时长：<span class="time">{{i.longtime}}min</span></div>
+              <div>参加平台直播课程总时长：<span class="time">{{i.length}}min</span></div>
             </div>
           </div>
         </div>