Merge pull request 'xbx' (#135) from xbx into master

Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/135

src/api/index.ts

@@ -390,8 +390,8 @@ export async function getaccountinfo(data?: any){
 /**
  * 账户编辑
  */
-export async function editaccount(data?: any){
-    const res=await put<Liveaddrule>('wallect/'+data);
+export async function editaccount( id: any,data?: any){
+    const res=await put<Liveaddrule>('wallect/' +id ,data);
     if(res.code==0){
         message.success("修改成功")
     }

src/components/VideoItem.vue

@@ -24,7 +24,7 @@
             </div>
         </div>
         <div class="state audit" v-if="status==0">
-            {{lan.$t('shenhezhong')}}
+            {{transcoding == 0 ? lan.$t('zhuanmazhong') : lan.$t('shenhezhong')}}
         </div>
          <div class="state audit fail" v-if="status==2">
             {{lan.$t('weitongguo')}}
@@ -168,6 +168,9 @@ export default defineComponent({
         },
         status:{
             type:Number
+        },
+        transcoding: {
+            type: Number
         }
     },
     setup() {

src/i18n/en.ts

@@ -311,6 +311,7 @@ export default {
     tishi: "tip",
     querentuichu: "You confirm to exit?",
     huobitishi: "Attention! You can only change the currency once!",
+    zhuanmazhong: "Transcoding in",
     shichangtishi:"",
     renshutishi: '',
     tixianzhu: "",

src/i18n/zh.ts

@@ -311,6 +311,7 @@ export default {
     tishi: "提示",
     querentuichu: "您确认退出？",
     huobitishi: "请注意，货币一旦修改，不能变动。",
+    zhuanmazhong: "转码中",
     shichangtishi:"",
     renshutishi: '',
     tixianzhu:"",

src/views/mine/Addaccount.vue

@@ -274,7 +274,7 @@ export default defineComponent({
                     } else {
                         if (toRaw(accountinfo.value).accountid) {
                             console.log(300);
-                            editaccount(toRaw(accountinfo.value).accountid);
+                            editaccount(toRaw(accountinfo.value).accountid, accountinfo.value);
                         } else {
                             console.log(111);
                             accountadd(toRaw(accountinfo.value));
@@ -286,7 +286,7 @@ export default defineComponent({
                     } else {
                         if (toRaw(accountinfo.value).accountid) {
                             console.log(300);
-                            editaccount(toRaw(accountinfo.value).accountid);
+                            editaccount(toRaw(accountinfo.value).accountid, accountinfo.value);
                         } else {
                             console.log(111);
                             accountadd(toRaw(accountinfo.value));
@@ -295,7 +295,7 @@ export default defineComponent({
                 } else if (accountinfofin.type == 1) {
                     if (toRaw(accountinfo.value).accountid) {
                         console.log(300);
-                        editaccount(toRaw(accountinfo.value).accountid);
+                        editaccount(toRaw(accountinfo.value).accountid, accountinfo.value);
                     } else {
                         console.log(111);
                         accountadd(toRaw(accountinfo.value));
@@ -313,7 +313,8 @@ export default defineComponent({
                         message.error(lan.$t("kaihuhangweikong"));
 					} else {
                         if (toRaw(accountinfo.value).accountid) {
-                            editaccount(toRaw(accountinfo.value).accountid);
+                            editaccount(toRaw(accountinfo.value).accountid, accountinfo.value);
+
                         } else {
                             accountadd(toRaw(accountinfo.value));
                         }
@@ -325,7 +326,7 @@ export default defineComponent({
                     } else {
                         if (toRaw(accountinfo.value).accountid) {
                             console.log(300);
-                            editaccount(toRaw(accountinfo.value).accountid);
+                            editaccount(toRaw(accountinfo.value).accountid, accountinfo.value);
                         } else {
                             console.log(111);
                             accountadd(toRaw(accountinfo.value));

src/views/mine/Wallet.vue

@@ -234,7 +234,7 @@ export default defineComponent({
     const state=ref<number>(0)
     const dates=ref<Array<string>>(["",""])
     const page = ref(1);
-    const visible = ref(true);
+    const visible = ref(false);
     onMounted(async () => {
       console.log(useRoute().query)
       listindex.value=1

src/views/regime/Video.vue

@@ -38,6 +38,7 @@
         :status="i.status"
         :watch="i.watch"
         :share="i.share"
+        :transcoding="i.transcoding"
       ></VideoItem>
     </div>
 
@@ -54,6 +55,7 @@
         :livenum="i.statusname"
         :status="i.status"
         :watch="i.watch"
+        :transcoding="i.transcoding"
         :share="i.share"
       ></VideoItem>
     </div>
@@ -70,6 +72,7 @@
         :livenum="i.statusname"
         :status="i.status"
         :watch="i.watch"
+        :transcoding="i.transcoding"
         :share="i.share"
       ></VideoItem>
     </div>
@@ -86,6 +89,7 @@
         :livenum="i.statusname"
         :status="i.status"
         :watch="i.watch"
+        :transcoding="i.transcoding"
         :share="i.share"
       ></VideoItem>
     </div>