{{userinfo.zoneStr}}
@@ -41,7 +41,7 @@
- 
{{userinfo.currency}}
@@ -97,7 +97,7 @@
-
+
@@ -282,6 +282,8 @@ export default defineComponent({
})
const nowroute=ref("")
+ const islogin = computed(()=>store.state.islogin)
+
function navto(index: number | string){
if(!store.state.islogin){
return ;
@@ -337,7 +339,8 @@ export default defineComponent({
setlanguage,
nowroute,
toindex,
- lan
+ lan,
+ islogin
}
}
})
From 719a17956438d02607c2e1a9d1f197db68e904f6 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Tue, 3 Nov 2020 09:26:59 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E9=80=80?=
=?UTF-8?q?=E5=87=BA=EF=BC=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/Menu.vue | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/components/Menu.vue b/src/components/Menu.vue
index 84a6657..94a8040 100644
--- a/src/components/Menu.vue
+++ b/src/components/Menu.vue
@@ -7,7 +7,7 @@
{{lan.$t('rili')}}
+
@@ -215,10 +215,7 @@ export default defineComponent({
setToken();
router.replace("/");
}
-
- function tuichu(){
- console.log(1121)
- }
+
return{
list,
@@ -227,7 +224,6 @@ export default defineComponent({
userinfo,
logout,
mouse,
- tuichu,
lan,
jiantou: require('../static/images/jiantou.png'),
jiantous: require('../static/images/kuozhan1.png')
From 613dc56db229246b5d40a820ff6c3118b96df0eb Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Tue, 3 Nov 2020 09:49:01 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E5=8C=BA=E5=8F=B7=E5=8F=AA=E6=98=BE?=
=?UTF-8?q?=E7=A4=BA=E6=95=B0=E5=AD=97=20=E6=B7=BB=E5=8A=A0=E4=BA=86?=
=?UTF-8?q?=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/login/Login.vue | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/views/login/Login.vue b/src/views/login/Login.vue
index 00fee23..812cc27 100644
--- a/src/views/login/Login.vue
+++ b/src/views/login/Login.vue
@@ -23,8 +23,8 @@
Jiangsu
-->
-
-
+
+
{{i.name}}+{{i.code}}
@@ -206,6 +206,7 @@ export default defineComponent({
function getquhao(e?: any){
console.log(e)
myquhao.value = e.toString()
+ myquhao.value = myquhao.value.split("+")[1];
console.log(myquhao.value)
}
function login(): void {
From 74ccc85a0d59c3a71ba12efee979df786682e6d6 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Tue, 3 Nov 2020 10:17:52 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E9=80=89?=
=?UTF-8?q?=E6=8B=A9=E8=AF=AD=E8=A8=80=E4=B8=8D=E5=88=B7=E6=96=B0=E7=9A=84?=
=?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/index.ts | 6 ++++++
src/views/mine/Archives.vue | 42 +++++++++++++++++++++++++++----------
2 files changed, 37 insertions(+), 11 deletions(-)
diff --git a/src/api/index.ts b/src/api/index.ts
index 1d327b1..5d4345a 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -1005,3 +1005,9 @@ export async function getaddr() {
// const res = await get('StopMCUMixTranscode', {roomid});
// console.log(res)
// }
+
+export async function interests() {
+ const res = await get('interests');
+ return res.data;
+}
+
diff --git a/src/views/mine/Archives.vue b/src/views/mine/Archives.vue
index 0302c5f..ec82c18 100644
--- a/src/views/mine/Archives.vue
+++ b/src/views/mine/Archives.vue
@@ -85,9 +85,9 @@
"
>
{{ item.name }}
@@ -516,6 +516,7 @@ import {
getlanguages,
getquhaolist,
getzonelist,
+ interests,
putmember,
sendsms,
} from "@/api/index";
@@ -549,6 +550,10 @@ export default defineComponent({
const formData = ref(toRaw(userinfo.value));
watch(userinfo, () => {
formData.value = toRaw(userinfo.value);
+ // console.log(lan.$s(), formData.value.languageValue)
+ if(lan.$s() != formData.value.languageValue){
+ location.reload();
+ }
console.log(userinfo.value.currencyValue, "listsssss");
currencyindex.value = userinfo.value.currency;
console.log(currencyindex.value, "listsssss");
@@ -586,6 +591,20 @@ export default defineComponent({
zoneid: 1,
},
]);
+ const interestslist = ref([
+ {
+ "dictionaryid": 202,
+ "name": "中文",
+ "alias": "",
+ "code": "104110001000",
+ "position": 1,
+ "publish": 1,
+ "value": "1",
+ "deleted_at": null,
+ "created_at": "2020-08-13 18:17:18",
+ "updated_at": "2020-08-13 18:17:18"
+ }
+ ])
onMounted(async () => {
chiveslist.value = await getarchives();
languages.value = await getlanguages();
@@ -593,8 +612,8 @@ export default defineComponent({
myquhao.value = quhaolist.value[0].code;
currencylist.value = await getcurrencys();
zonelist.value = await getzonelist();
+ interestslist.value = await interests();
// currencyindex.value=userinfo.value.currencyValue
-
console.log(userinfo.value);
});
@@ -974,6 +993,7 @@ export default defineComponent({
showname,
uploadspic,
lan,
+ interestslist
};
},
});
@@ -1176,7 +1196,7 @@ export default defineComponent({
.confirm-btn {
display: inline-block;
border-radius: 2px;
- background: #ccc;
+ background: #07ad97;
font-size: 9px;
font-weight: 500;
color: #ffffff;
@@ -1188,9 +1208,9 @@ export default defineComponent({
padding: 0 17px;
}
- .confirm-btn:hover {
- background: #07ad97;
- }
+ // .confirm-btn:hover {
+ // background: #07ad97;
+ // }
}
.password-container {
.title {
@@ -1254,7 +1274,7 @@ export default defineComponent({
.submit-btn {
width: 63px;
height: 23px;
- background: #ccc;
+ background: #08ae98;
border-radius: 3px;
font-size: 10px;
font-weight: 500;
@@ -1264,9 +1284,9 @@ export default defineComponent({
cursor: pointer;
user-select: none;
}
- .submit-btn:hover {
- background: #08ae98;
- }
+ // .submit-btn:hover {
+ // background: #08ae98;
+ // }
}
::v-deep(.ant-upload-list) {
display: none;
From 4552d2946943b5625d811e4e5bc74016161788cd Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Tue, 3 Nov 2020 10:34:22 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E8=83=8C?=
=?UTF-8?q?=E6=99=AF=E8=89=B2=20=E6=B7=BB=E5=8A=A0=E4=BA=86=E9=99=90?=
=?UTF-8?q?=E5=88=B6=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/VideoReview.vue | 8 ++++----
src/views/mine/ReleaseVideo.vue | 8 ++++----
src/views/mine/ReleaseWebcast.vue | 16 ++++++++++++----
3 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/src/components/VideoReview.vue b/src/components/VideoReview.vue
index da5bddf..658ff9f 100644
--- a/src/components/VideoReview.vue
+++ b/src/components/VideoReview.vue
@@ -76,15 +76,15 @@
width: 62px;
height: 22px;
margin-top: 30px;
- background-color: #ccc;
+ background-color: #07AD97;
text-align: center;
line-height: 22px;
color: #fff;
cursor: pointer;
font-size: 9px;
- &:hover{
- background-color: #07AD97;
- }
+ // &:hover{
+ // background-color: #;
+ // }
}
}
diff --git a/src/views/mine/ReleaseVideo.vue b/src/views/mine/ReleaseVideo.vue
index 0b544ca..e5622a9 100644
--- a/src/views/mine/ReleaseVideo.vue
+++ b/src/views/mine/ReleaseVideo.vue
@@ -424,14 +424,14 @@ export default defineComponent({
padding: 0;
width: 63px;
height: 23px;
- background: #ccc;
+ background: #08ae98;
border-radius: 3px;
font-size: 10px;
font-weight: 500;
color: #ffffff;
- &:hover {
- background: #08ae98;
- }
+ // &:hover {
+ // background: #08ae98;
+ // }
}
}
.video-cover {
diff --git a/src/views/mine/ReleaseWebcast.vue b/src/views/mine/ReleaseWebcast.vue
index c7b9bc0..1042521 100644
--- a/src/views/mine/ReleaseWebcast.vue
+++ b/src/views/mine/ReleaseWebcast.vue
@@ -122,6 +122,7 @@
show-time
format="YYYY-MM-DD HH:mm"
:value="form.dateline"
+ :disabled-date="disabledDate"
@change="startchange"
:placeholder="lan.$t('shezhikaishishijian')"
:getCalendarContainer="
@@ -515,6 +516,12 @@ export default defineComponent({
}
}
+ function disabledDate(current: any){
+ console.log(current + 0)
+ const now = dayjs().date(dayjs().date() - 1);
+ return current && current < now;
+ }
+
return {
labelCol: { span: 4 },
wrapperCol: { span: 14 },
@@ -545,6 +552,7 @@ export default defineComponent({
ifallowupload,
fankui,
lan,
+ disabledDate
};
},
});
@@ -621,14 +629,14 @@ export default defineComponent({
padding: 0;
width: 63px;
height: 23px;
- background: #ccc;
+ background: #08ae98;
border-radius: 3px;
font-size: 10px;
font-weight: 500;
color: #ffffff;
- &:hover{
- background: #08ae98;
- }
+ // &:hover{
+ // background: #08ae98;
+ // }
}
}
.item-cover {
From 23ef42471de88b7b3d70bf355ebaf04155c99599 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Tue, 3 Nov 2020 10:35:22 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=86=E8=A7=86?=
=?UTF-8?q?=E9=A2=91=E7=AE=80=E4=BB=8B=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/mine/ReleaseVideo.vue | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/views/mine/ReleaseVideo.vue b/src/views/mine/ReleaseVideo.vue
index e5622a9..d41f431 100644
--- a/src/views/mine/ReleaseVideo.vue
+++ b/src/views/mine/ReleaseVideo.vue
@@ -298,8 +298,6 @@ export default defineComponent({
return;
} else if (subdata.fileurl == "") {
message.error(lan.$t("wenjianweikong"));
- } else if (subdata.desc == "") {
- message.error(lan.$t("jianjieweikong"));
} else {
if (routes.query.id) {
form.value.id = routes.query.id;
From 6517439bc333baeb05fbeca29bbaae5a1110fa7a Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Tue, 3 Nov 2020 10:35:55 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=86=E7=9B=B4?=
=?UTF-8?q?=E6=92=AD=E7=AE=80=E4=BB=8B=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/mine/ReleaseWebcast.vue | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/views/mine/ReleaseWebcast.vue b/src/views/mine/ReleaseWebcast.vue
index 1042521..2ac07d3 100644
--- a/src/views/mine/ReleaseWebcast.vue
+++ b/src/views/mine/ReleaseWebcast.vue
@@ -373,9 +373,6 @@ export default defineComponent({
} else if (subdata.livenumber == "") {
message.error(lan.$t('zhiborenshuweikong'));
return;
- } else if (subdata.desc == "") {
- message.error(lan.$t('zhibojianjieweikong'));
- return;
} else {
if(subdata.livetime < 30 || subdata.livetime > 120){
message.error("直播时长最短30min, 最长120min");
From 3e6f314bb752b6dd4aefc2fd93059afa6d912be5 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Tue, 3 Nov 2020 10:39:26 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E8=A7=86?=
=?UTF-8?q?=E9=A2=91=E6=B7=BB=E5=8A=A0=E5=92=8C=E7=9B=B4=E6=92=AD=E6=B7=BB?=
=?UTF-8?q?=E5=8A=A0=E7=9A=84=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/index.ts | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/api/index.ts b/src/api/index.ts
index 5d4345a..400ea7d 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -168,6 +168,7 @@ export async function liveadd(data: any) {
console.log(res)
if(res.code==0){
message.success(res.msg)
+ router.push("/regime/live")
}else{
message.error(res.msg)
}
@@ -189,6 +190,7 @@ export async function videoadd( form: any,data: any) {
desc: "",
video: [""],
}
+ router.push("/regime/video")
}else{
message.error(res.msg)
}
From 2388dcf1e7a3c277703a63bc63ee73f1b56443bc Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Tue, 3 Nov 2020 10:41:02 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=A7=86=E9=A2=91?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0*?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/mine/ReleaseVideo.vue | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/views/mine/ReleaseVideo.vue b/src/views/mine/ReleaseVideo.vue
index d41f431..8b0bcb2 100644
--- a/src/views/mine/ReleaseVideo.vue
+++ b/src/views/mine/ReleaseVideo.vue
@@ -2,14 +2,14 @@
+
-
+
Date: Tue, 3 Nov 2020 10:50:56 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=B4=A6=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/mine/Addaccount.vue | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/views/mine/Addaccount.vue b/src/views/mine/Addaccount.vue
index 68508df..ea4462e 100644
--- a/src/views/mine/Addaccount.vue
+++ b/src/views/mine/Addaccount.vue
@@ -7,7 +7,7 @@
{{ lan.$t("shangchuanshipin") }}
-
-
{{lan.$t('xuanzezhanghu')}}
+ *{{lan.$t('xuanzezhanghu')}}
- {{lan.$t('xingming')}}
+ *{{lan.$t('xingming')}}
- {{lan.$t('kahao')}}
+ *{{lan.$t('kahao')}}
- {{lan.$t('kaihuhang')}}
+ *{{lan.$t('kaihuhang')}}
- {{lan.$t('zhanghao')}}
+ *{{lan.$t('zhanghao')}}
-
{{lan.$t('saomabangding')}}
+ *{{lan.$t('saomabangding')}}
{{lan.$t('zhu')}}：
@@ -106,11 +106,11 @@
- {{lan.$t('zhanghuming')}}
+ *{{lan.$t('zhanghuming')}}
- {{lan.$t('yinhangzhanghu')}}
+ *{{lan.$t('yinhangzhanghu')}}
-
{{lan.$t(yinhangbic)}} /swift code
+ *{{lan.$t(yinhangbic)}} /swift code
- {{lan.$t('zhanghao')}}
+ *{{lan.$t('zhanghao')}}