From cfc2b60f71080a3a07245f18bd352d0669c1463d Mon Sep 17 00:00:00 2001 From: luyuan <1162963624@qq.com> Date: Wed, 18 Nov 2020 15:18:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=92=B1=E5=8C=85=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/index.ts | 4 ++-- src/views/mine/Addaccount.vue | 11 ++++++----- src/views/mine/Wallet.vue | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/api/index.ts b/src/api/index.ts index 6c822b1..ea1d1d7 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -390,8 +390,8 @@ export async function getaccountinfo(data?: any){ /** * 账户编辑 */ -export async function editaccount(data?: any){ - const res=await put('wallect/'+data); +export async function editaccount( id: any,data?: any){ + const res=await put('wallect/' +id ,data); if(res.code==0){ message.success("修改成功") } diff --git a/src/views/mine/Addaccount.vue b/src/views/mine/Addaccount.vue index 0da1c4a..10eed62 100644 --- a/src/views/mine/Addaccount.vue +++ b/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)); diff --git a/src/views/mine/Wallet.vue b/src/views/mine/Wallet.vue index 6b7f020..a7f52a2 100644 --- a/src/views/mine/Wallet.vue +++ b/src/views/mine/Wallet.vue @@ -234,7 +234,7 @@ export default defineComponent({ const state=ref(0) const dates=ref>(["",""]) const page = ref(1); - const visible = ref(true); + const visible = ref(false); onMounted(async () => { console.log(useRoute().query) listindex.value=1 -- 2.47.2 From 8a33d29b54a36439610035a12e4e0bf780c2e671 Mon Sep 17 00:00:00 2001 From: luyuan <1162963624@qq.com> Date: Wed, 18 Nov 2020 15:21:51 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=BD=AC=E7=A0=81=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/VideoItem.vue | 5 ++++- src/i18n/en.ts | 1 + src/i18n/zh.ts | 1 + src/views/regime/Video.vue | 4 ++++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/components/VideoItem.vue b/src/components/VideoItem.vue index e01640e..c89c76b 100644 --- a/src/components/VideoItem.vue +++ b/src/components/VideoItem.vue @@ -24,7 +24,7 @@
- {{lan.$t('shenhezhong')}} + {{transcoding == 0 ? lan.$t('zhuanmazhong') : lan.$t('shenhezhong')}}
{{lan.$t('weitongguo')}} @@ -168,6 +168,9 @@ export default defineComponent({ }, status:{ type:Number + }, + transcoding: { + type: Number } }, setup() { diff --git a/src/i18n/en.ts b/src/i18n/en.ts index 3c3046f..01e389b 100644 --- a/src/i18n/en.ts +++ b/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: "", diff --git a/src/i18n/zh.ts b/src/i18n/zh.ts index f83341d..a3d3159 100644 --- a/src/i18n/zh.ts +++ b/src/i18n/zh.ts @@ -311,6 +311,7 @@ export default { tishi: "提示", querentuichu: "您确认退出？", huobitishi: "请注意，货币一旦修改，不能变动。", + zhuanmazhong: "转码中", shichangtishi:"", renshutishi: '', tixianzhu:"", diff --git a/src/views/regime/Video.vue b/src/views/regime/Video.vue index 6239859..f63edbe 100644 --- a/src/views/regime/Video.vue +++ b/src/views/regime/Video.vue @@ -38,6 +38,7 @@ :status="i.status" :watch="i.watch" :share="i.share" + :transcoding="i.transcoding" >
@@ -54,6 +55,7 @@ :livenum="i.statusname" :status="i.status" :watch="i.watch" + :transcoding="i.transcoding" :share="i.share" > @@ -70,6 +72,7 @@ :livenum="i.statusname" :status="i.status" :watch="i.watch" + :transcoding="i.transcoding" :share="i.share" > @@ -86,6 +89,7 @@ :livenum="i.statusname" :status="i.status" :watch="i.watch" + :transcoding="i.transcoding" :share="i.share" > -- 2.47.2