From e7b3f694b062b31e1a18b5593a789eb939f94644 Mon Sep 17 00:00:00 2001 From: luyuan <1162963624@qq.com> Date: Tue, 10 Nov 2020 10:58:42 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E6=B3=A8?= =?UTF-8?q?=E5=86=8C=E7=9A=84=E6=90=9C=E7=B4=A2=E5=92=8C=E6=A1=A3=E6=A1=88?= =?UTF-8?q?=E7=9A=84=E6=88=91=E8=BF=98=E4=BC=9A=E8=AF=B4=E7=A6=81=E6=AD=A2?= =?UTF-8?q?=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/login/Sign.vue | 5 +++-- src/views/mine/Archives.vue | 15 ++++++++++++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/views/login/Sign.vue b/src/views/login/Sign.vue index 330a0e2..3c8c0de 100644 --- a/src/views/login/Sign.vue +++ b/src/views/login/Sign.vue @@ -23,16 +23,17 @@ > {{ i.name }}+{{ i.code }} diff --git a/src/views/mine/Archives.vue b/src/views/mine/Archives.vue index db0c233..90868d9 100644 --- a/src/views/mine/Archives.vue +++ b/src/views/mine/Archives.vue @@ -119,6 +119,7 @@ index) in chiveslist[1]" :key="index" :value="item.name" + :disabled="isdisabled(item.name)" > {{ item.name }} @@ -929,8 +930,19 @@ export default defineComponent({ function choosewillsay(e?: any) { console.log(formData.value.willsayValue); + console.log(e); } + + function isdisabled(name: string){ + for(const i in formData.value.willsay){ + if(formData.value.willsay[i].name == name){ + return true; + }else{ + return false; + } + } + } function currencychange(e?: any) { console.log(e); @@ -994,7 +1006,8 @@ export default defineComponent({ showname, uploadspic, lan, - interestslist + interestslist, + isdisabled }; }, }); From e515b8266dd9f27b39ab80c6ef8144ff5e7aa7aa Mon Sep 17 00:00:00 2001 From: luyuan <1162963624@qq.com> Date: Tue, 10 Nov 2020 11:00:54 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=91=A8?= =?UTF-8?q?=E5=8E=86=E6=98=BE=E7=A4=BA010=20=E7=9A=84=E5=B0=8F=E6=97=B6?= 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 b24fdef..2274433 100644 --- a/src/views/regime/week.vue +++ b/src/views/regime/week.vue @@ -40,7 +40,7 @@
- {{ item > 10 ? item - 1 : "0" + (item - 1) }}:00-{{ + {{ item > 9 ? item - 1 : "0" + (item - 1) }}:00-{{ item > 9 ? item : "0" + item }}:00
From b0a6592373eaf98013cc66c166feb4b47588fa4e Mon Sep 17 00:00:00 2001 From: luyuan <1162963624@qq.com> Date: Tue, 10 Nov 2020 14:56:42 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E4=B8=AA?= =?UTF-8?q?=E4=BA=BA=E4=B8=AD=E5=BF=83=E5=92=8C=E7=9B=B4=E6=92=AD=E8=A7=86?= =?UTF-8?q?=E9=A2=91item=E9=AB=98=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/LiveItem.vue | 2 +- src/components/VideoItem.vue | 2 +- src/i18n/en.ts | 2 +- src/i18n/zh.ts | 2 +- src/utils/common.ts | 34 +++++++++++++++++++++++++++++++++ src/views/mine/Archives.vue | 16 ++++++++++++++-- src/views/mine/ReleaseVideo.vue | 6 +++++- 7 files changed, 57 insertions(+), 7 deletions(-) diff --git a/src/components/LiveItem.vue b/src/components/LiveItem.vue index b63d46b..53babdf 100644 --- a/src/components/LiveItem.vue +++ b/src/components/LiveItem.vue @@ -36,7 +36,7 @@