From b5e81088af13805c749ed0fd7b3c78d48df66458 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Sun, 25 Oct 2020 22:43:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                   |  3 +++
 src/components/Menu.vue       |  2 +-
 src/store/index.ts            |  1 +
 src/views/mine/Addaccount.vue |  2 +-
 src/views/mine/Archives.vue   | 27 ++++++++++++++-------------
 src/views/mine/Wallet.vue     |  4 +++-
 src/views/regime/Video.vue    | 10 +++++-----
 7 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index c44ad5c..a0aa075 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -34,6 +34,9 @@ export default defineComponent({
 </script>
 
 <style lang="scss">
+div {
+  user-select: none;
+}
 .one-line-hide {
   overflow: hidden;
   text-overflow: ellipsis;
diff --git a/src/components/Menu.vue b/src/components/Menu.vue
index d05431b..290440f 100644
--- a/src/components/Menu.vue
+++ b/src/components/Menu.vue
@@ -3,7 +3,7 @@
         <div class="user" style="overflow: hidden;">
             <div class="user" :class="{'seltop': selnum == 0}">
                 <img :src="userinfo.img" alt="" class="head">
-                <div class="name">{{userinfo.username}}</div>
+                <div class="name">{{userinfo.name}}</div>
             </div>
         </div>
         
diff --git a/src/store/index.ts b/src/store/index.ts
index c9780e9..ff3c8ac 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -51,6 +51,7 @@ export default createStore({
   },
   mutations: {
     setUserInfo(state, userinfo){
+      userinfo.money = userinfo.money.toString()
       state.userinfo = userinfo
     },
     login(state, islogin: boolean){
diff --git a/src/views/mine/Addaccount.vue b/src/views/mine/Addaccount.vue
index 01f8091..93e4899 100644
--- a/src/views/mine/Addaccount.vue
+++ b/src/views/mine/Addaccount.vue
@@ -19,7 +19,7 @@
           >
             <a-radio :value="4">
               <img src="@/static/images/bank.png" alt="" class="icon icon1" />
-              <span>银行卡zzz</span>
+              <span>银行卡</span>
             </a-radio>
             <a-radio :value="2">
               <img src="@/static/images/walletzfb.png" alt="" class="icon" />
diff --git a/src/views/mine/Archives.vue b/src/views/mine/Archives.vue
index 728355c..34a56c0 100644
--- a/src/views/mine/Archives.vue
+++ b/src/views/mine/Archives.vue
@@ -34,14 +34,14 @@
                     <div class="input-box teach-lang">
                         <div class="label">教授</div>
                         <a-select
-                            v-model:value="userinfo.tlanguage"
+                            v-model:value="userinfo.tlanguageValue"
                             style="width: 171px"
                             size="small"
                             ref="select"
                             :getPopupContainer="triggerNode => triggerNode.parentNode"
                         >
-                            <a-select-option v-for="(item, index) in ['英语', '法语']" :key="index" :value="item">
-                                {{ item }}
+                            <a-select-option v-for="(item, index) in chiveslist[1]" :key="index" :value="item.languageid">
+                                {{ item.name }}
                             </a-select-option>
                         </a-select>
                     </div>
@@ -169,7 +169,7 @@
                             :getPopupContainer="triggerNode => triggerNode.parentNode"
                         >
                             <a-select-option v-for="(item, index) in currencylist" :key="index" :value="item.value">
-                                {{item.name}}
+                                {{item.value}}{{item.name}}
                             </a-select-option>
                         </a-select>
                     </div>
@@ -524,28 +524,29 @@ export default defineComponent({
             //  for(let i in toRaw(formData.value).willsay){
             //     console.log(toRaw(formData.value).willsay[i])
             // }
+            const uesrinfo = toRaw(formData.value)
             for(let m=0;m<toRaw(chiveslist.value).length;m++){
-                for(const i in toRaw(formData.value).willsayValue){
+                for(const i in uesrinfo.willsayValue){
                 // console.log(toRaw(formData.value).willsayValue[i])
                
-                    if(typeof toRaw(formData.value).willsay[i].name=='string'){
+                    if(typeof uesrinfo.willsay[i].name=='string'){
                        
                         // console.log(toRaw(chiveslist.value))
-                        if(toRaw(formData.value).willsay[i].name==toRaw(chiveslist.value)[m].name){
-                            toRaw(formData.value).willsayValue[i].name=toRaw(chiveslist.value)[m].languageid
+                        if(uesrinfo.willsay[i].name==toRaw(chiveslist.value)[m].name){
+                            uesrinfo.willsayValue[i].name=toRaw(chiveslist.value)[m].languageid
                         }
                     }else{
-                        toRaw(formData.value).willsayValue[i].name=toRaw(formData.value).willsay[i].name
+                        uesrinfo.willsayValue[i].name=uesrinfo.willsay[i].name
                         
                     }
                      
-               toRaw(formData.value).willsayValue[i].level=toRaw(formData.value).willsay[i].level
+               uesrinfo.willsayValue[i].level=uesrinfo.willsay[i].level
                 }
             }
-            console.log(toRaw(formData.value).willsayValue)
+            console.log(uesrinfo)
            
-            console.log(toRaw(formData.value));
-            putmember(toRaw(formData.value))
+            // console.log(toRaw(formData.value));
+            putmember(uesrinfo)
             // putmember(toRaw(formData.value)).then((res) => {
             //     console.log(res)
             // })
diff --git a/src/views/mine/Wallet.vue b/src/views/mine/Wallet.vue
index 2fa8db7..2c068f0 100644
--- a/src/views/mine/Wallet.vue
+++ b/src/views/mine/Wallet.vue
@@ -252,7 +252,9 @@ export default defineComponent({
       salelist.value=await saleinfo({bdate:dateString[0],edate:dateString[1],status:state.value,page:page.value});
     }
     async function del(e: number){
-      deleteaccount(e)
+      await deleteaccount(e);
+      accountlist.value = await getwallect();
+        
     }
     async function pagechange(e: any) {
       console.log(e)
diff --git a/src/views/regime/Video.vue b/src/views/regime/Video.vue
index c7b1038..610bd4d 100644
--- a/src/views/regime/Video.vue
+++ b/src/views/regime/Video.vue
@@ -8,10 +8,10 @@
         <div :class="tabindex == 0 ? 'on' : ''" @click="tabchange(0)">
           审核中
         </div>
-        <div :class="tabindex == 1 ? 'on' : ''" @click="tabchange(1)">
+        <div :class="tabindex == 2 ? 'on' : ''" @click="tabchange(2)">
           未通过
         </div>
-        <div :class="tabindex == 2 ? 'on' : ''" @click="tabchange(2)">
+        <div :class="tabindex == 1 ? 'on' : ''" @click="tabchange(1)">
           已发布
         </div>
       </div>
@@ -52,7 +52,7 @@
         :share="i.share"
       ></VideoItem>
     </div>
-    <div class="list" v-if="tabindex == 1">
+    <div class="list" v-if="tabindex == 2">
       <VideoItem
         v-for="(i, j) in videolist.data"
         :key="j"
@@ -67,7 +67,7 @@
         :share="i.share"
       ></VideoItem>
     </div>
-    <div class="list" v-if="tabindex == 2">
+    <div class="list" v-if="tabindex == 1">
       <VideoItem
         v-for="(i, j) in videolist.data"
         :key="j"
@@ -228,7 +228,7 @@ export default defineComponent({
     });
     async function tabchange(e: number) {
       tabindex.value = e;
-      videolist.value = await getvideolist({title: input.value,page:page.value,status:e});
+      videolist.value = await getvideolist({title: input.value,page:page.value,status:e == 4 ? '' : 0});
       // console.log(videolist)
     }
     async function sel(){