diff --git a/src/api/index.ts b/src/api/index.ts index 1d327b1..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) } @@ -1005,3 +1007,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/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 @@ -
+
@@ -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') diff --git a/src/components/NavTop.vue b/src/components/NavTop.vue index bab71f2..81167e0 100644 --- a/src/components/NavTop.vue +++ b/src/components/NavTop.vue @@ -12,7 +12,7 @@
- +
{{userinfo.zoneStr}}
@@ -41,7 +41,7 @@ - +
{{userinfo.currency}}
@@ -97,7 +97,7 @@ -
+
{{lan.$t('rili')}}
@@ -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 } } }) 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/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 { 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('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')}} {{ 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; diff --git a/src/views/mine/ReleaseVideo.vue b/src/views/mine/ReleaseVideo.vue index 0b544ca..8b0bcb2 100644 --- a/src/views/mine/ReleaseVideo.vue +++ b/src/views/mine/ReleaseVideo.vue @@ -2,14 +2,14 @@
{{ lan.$t("shangchuanshipin") }}
- + - +
120){ message.error("直播时长最短30min, 最长120min"); @@ -515,6 +513,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 +549,7 @@ export default defineComponent({ ifallowupload, fankui, lan, + disabledDate }; }, }); @@ -621,14 +626,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 {