theluyuan/beelink
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/108
This commit is contained in:
luyuan 2020-11-03 10:51:34 +08:00
commit 3665d7613a
9 changed files with 84 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/api/index.ts
View File

@ -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;
}

8
src/components/Menu.vue
View File

@ -7,7 +7,7 @@
</div>
</div>
<div class="list" @mouseout="tuichu()">
<div class="list">
<div v-for="(i,j) in list" :key="j" style="overflow: hidden;" @click="routeto(j)">
<div class="item" :class="{'selitem': j == selnum, 'seltop': j == selnum - 1, 'selbottom': j == selnum + 1}">
<div class="route">
@ -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')

11
src/components/NavTop.vue
View File

@ -12,7 +12,7 @@
</div>
<div style="width: 100%"></div>
<div class="setting">
<a-dropdown :trigger="['click']" :getPopupContainer="triggerNode => triggerNode.parentNode">
<a-dropdown :trigger="['click']" :getPopupContainer="triggerNode => triggerNode.parentNode" v-if="islogin">
<div class="item" @click="e => e.preventDefault()">
<img src="@/static/images/shijian.png" alt="" class="icon">
<div class="name">{{userinfo.zoneStr}}</div>
@ -41,7 +41,7 @@
</template>
</a-dropdown>
<a-dropdown :trigger="['click']" :getPopupContainer="triggerNode => triggerNode.parentNode">
<a-dropdown :trigger="['click']" :getPopupContainer="triggerNode => triggerNode.parentNode" v-if="islogin">
<div class="item" @click="e => e.preventDefault()">
<img src="@/static/images/qianbi.png" alt="" class="icon">
<div class="name">{{userinfo.currency}}</div>
@ -97,7 +97,7 @@
</a-menu>
</template>
</a-dropdown>
<div class="item" style="border-right: none;" @click="navto('/regime/date')">
<div class="item" style="border-right: none;" @click="navto('/regime/date')" v-if="islogin">
<img src="@/static/images/rili.png" alt="" class="icon">
<div class="name">{{lan.$t('rili')}}</div>
</div>
@ -282,6 +282,8 @@ export default defineComponent({
})
const nowroute=ref<string>("")
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
}
}
})

8
src/components/VideoReview.vue
View File

@ -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: #;
// }
}
}

5
src/views/login/Login.vue
View File

@ -23,8 +23,8 @@
</a-select-option>
<a-select-option value="Jiangsu"> Jiangsu </a-select-option>
</a-select> -->
<a-select :default-value="quhaolist[0].code" size="small" @change="getquhao" class="getcode">
<a-select-option v-for="(i,j) in quhaolist" :key="j" :value="i.code">
<a-select :default-value="quhaolist[0].name + '+' + quhaolist[0].code" size="small" option-label-prop="label" @change="getquhao" class="getcode" show-search >
<a-select-option v-for="(i,j) in quhaolist" :key="j" :value="i.name + '+' + i.code" :label="'+' + i.code">
{{i.name}}+{{i.code}}
</a-select-option>
<!-- <a-select-option value="Jiangsu"> Jiangsu </a-select-option> -->
@ -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 {

20
src/views/mine/Addaccount.vue
View File

@ -7,7 +7,7 @@
</div>
<div class="line"></div>
<div class="choose">
<div class="label">{{lan.$t('xuanzezhanghu')}}</div>
<div class="label"><span style="color:red">*</span>{{lan.$t('xuanzezhanghu')}}</div>
<!-- <a-radio></a-radio> -->
<div v-if="lan.$s()=='zh'">
<a-radio-group
@ -58,11 +58,11 @@
<a-form >
<div>
<div class="infoitem">
<span class="label label1">{{lan.$t('xingming')}}</span>
<span class="label label1"><span style="color:red">*</span>{{lan.$t('xingming')}}</span>
<a-input v-model:value="accountinfo.mname" class="shuru" :placeholder="lan.$t('shuruxingming')" />
</div>
<div class="infoitem">
<span class="label label1">{{lan.$t('kahao')}}</span>
<span class="label label1"><span style="color:red">*</span>{{lan.$t('kahao')}}</span>
<a-input
v-model:value="accountinfo.bankcode"
class="shuru"
@ -70,7 +70,7 @@
/>
</div>
<div class="infoitem">
<span class="label label1">{{lan.$t('kaihuhang')}}</span>
<span class="label label1"><span style="color:red">*</span>{{lan.$t('kaihuhang')}}</span>
<a-input
v-model:value="accountinfo.bankname"
class="shuru shuru2"
@ -83,7 +83,7 @@
<div class="cashoutmoney" v-if="accountinfo.type == 2 && lan.$s()=='zh'">
<div>
<div class="infoitem">
<span class="label label1">{{lan.$t('zhanghao')}}</span>
<span class="label label1"><span style="color:red">*</span>{{lan.$t('zhanghao')}}</span>
<a-input
v-model:value="accountinfo.account"
class="shuru"
@ -93,7 +93,7 @@
</div>
</div>
<div class="cashoutmoney" v-if="accountinfo.type == 1 && lan.$s()=='zh'">
<div class="label label1">{{lan.$t('saomabangding')}}</div>
<div class="label label1"><span style="color:red">*</span>{{lan.$t('saomabangding')}}</div>
<div class="ewmbox">
<img src="@/static/images/erweima.png" alt="" class="ewmpic" />
<div class="desc">{{lan.$t('zhu')}}：</div>
@ -106,11 +106,11 @@
<div class="cashoutmoney" v-if="paytypeforign == 1 && lan.$s()=='en'">
<div>
<div class="infoitem">
<span class="label label1">{{lan.$t('zhanghuming')}}</span>
<span class="label label1"><span style="color:red">*</span>{{lan.$t('zhanghuming')}}</span>
<a-input v-model="accountinfo.mname" class="shuru" :placeholder="lan.$t('shuruxingming')" />
</div>
<div class="infoitem">
<span class="label label1">{{lan.$t('yinhangzhanghu')}}</span>
<span class="label label1"><span style="color:red">*</span>{{lan.$t('yinhangzhanghu')}}</span>
<a-input
v-model="accountinfo.bankcode"
class="shuru shuru2"
@ -118,7 +118,7 @@
/>
</div>
<div class="infoitem infoitem1">
<div class="label label1 label2"> {{lan.$t(yinhangbic)}} /swift code </div>
<div class="label label1 label2"> <span style="color:red">*</span>{{lan.$t(yinhangbic)}} /swift code </div>
<a-input
v-model="accountinfo.bankname"
class="shuru shuru1"
@ -131,7 +131,7 @@
<div class="cashoutmoney" v-if="paytypeforign == 2 && lan.$s()=='en'">
<div>
<div class="infoitem">
<span class="label label1">{{lan.$t('zhanghao')}}</span>
<span class="label label1"><span style="color:red">*</span>{{lan.$t('zhanghao')}}</span>
<a-input
v-model:value="accountinfo.account"
class="shuru"

42
src/views/mine/Archives.vue
View File

@ -85,9 +85,9 @@
"
>
<a-select-option
v-for="(item, index) in chiveslist[1]"
v-for="(item, index) in interestslist"
:key="index"
:value="item.languageid"
:value="parseInt(item.value)"
>
{{ item.name }}
</a-select-option>
@ -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<any>([
{
"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;

15
src/views/mine/ReleaseVideo.vue
View File

@ -2,14 +2,14 @@
<div class="upload-video">
<a-form :label-col="labelCol" :wrapper-col="wrapperCol">
<div class="title">{{ lan.$t("shangchuanshipin") }}</div>
<a-form-item :label="lan.$t('shipinbiaoti')">
<a-form-item :label="lan.$t('shipinbiaoti')" :rules="{ required: true, message: 'Please input Activity name', trigger: 'blur'}">
<a-input
size="small"
v-model:value="form.title"
:placeholder="lan.$t('shurushipinbiaoti')"
/>
</a-form-item>
<a-form-item :label="lan.$t('shipinfengmian')" class="video-cover">
<a-form-item :label="lan.$t('shipinfengmian')" class="video-cover" :rules="{ required: true, message: 'Please input Activity name', trigger: 'blur'}">
<div style="display: flex">
<a-upload
list-type="picture"
@ -54,6 +54,7 @@
<a-form-item
:label="lan.$t('shipinjieshao')"
class="video-introduction"
:rules="{ required: true, message: 'Please input Activity name', trigger: 'blur'}"
>
<a-upload
list-type="picture"
@ -298,8 +299,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;
@ -424,14 +423,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 {

19
src/views/mine/ReleaseWebcast.vue
View File

@ -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="
@ -372,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");
@ -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 {