Merge pull request 'zj' (#86) from zj into master

Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/86
This commit is contained in:
asd 2020-10-27 09:10:13 +08:00
commit 1e94852bc2
5 changed files with 65 additions and 8 deletions

View File

@ -184,6 +184,8 @@ export async function videoadd( form: any,data: any) {
desc: "",
video: [""],
}
}else{
message.error(res.msg)
}
}

View File

@ -1,7 +1,7 @@
<template>
<div class="logintab">
<div :class="selected==1?'tab tab1':'tab'" @click="tabchange(1)">手机号登录</div>
<div :class="selected==2?'tab tab1':'tab'" @click="tabchange(2)">账号密码登录</div>
<div :class="selected==1?'tab tab1':'tab'" @mouseover="tabchange(1)">手机号登录</div>
<div :class="selected==2?'tab tab1':'tab'" @mouseover="tabchange(2)">账号密码登录</div>
</div>
</template>

View File

@ -210,15 +210,35 @@ export default defineComponent({
}
function login(): void {
console.log(userinfo.phone,userinfo.password)
if(userinfo.phone==''){
message.error("帐号不能为空")
} else if(userinfo.password==""){
message.error("密码不能为空")
}else{
loginpass(userinfo.phone,userinfo.password)
}
}
function sublogin(){
console.log(11)
//
if(phone.value==''){
message.error("手机号不能为空")
return
}else if(!(/^1[3-9]\d{9}$/.test(phone.value))){
message.error("手机号码有误,请重填");
return
} else if(code.value==""){
// console.log(phone.value)
console.log((/^1[3-9]\d{9}$/.test(phone.value)))
message.error("验证码不能为空")
return
}else{
loginpass(phone.value,'',1,code.value)
}
// checksmscode(myquhao.value+phone.value,code.value)
loginpass(phone.value,'',1,code.value)
}
function tovideoxq(e?: number){
@ -347,6 +367,9 @@ export default defineComponent({
margin-top: 45px;
margin-bottom: 178px;
}
.submit:hover{
background: #06C7AE;
}
.forget {
color: #08ae98;
font-size: 12px;
@ -406,6 +429,11 @@ export default defineComponent({
}
}
}
.lessonitem:hover{
.lessonname{
color: #06C7AE;
}
}
}
.icons {
margin-right: 41px;
@ -459,6 +487,9 @@ export default defineComponent({
line-height: 29px;
border-radius: 15px;
}
.more:hover{
background: #ccc;
}
.icon{
width: 9px;
height: 12px;

View File

@ -905,6 +905,10 @@ export default defineComponent({
line-height: 22px;
padding: 0 17px;
}
.confirm-btn:hover{
background:#ccc;
}
}
.password-container {
.title {
@ -978,6 +982,9 @@ export default defineComponent({
cursor: pointer;
user-select: none;
}
.submit-btn:hover{
background: #ccc;
}
}
::v-deep(.ant-upload-list) {
display: none;

View File

@ -1,7 +1,7 @@
<template>
<div>
<div class="lists">
<div class="listitem">
<div class="listitem" @click="navto(1)">
<div class="top">
<img src="@/static/images/zhibotjicon.png" alt="" class="icon" />
<span>直播列表</span>
@ -24,7 +24,7 @@
</div>
</div>
</div>
<div class="listitem">
<div class="listitem" @click="navto(2)">
<div class="top">
<img src="@/static/images/shipintjicon.png" alt="" class="icon" />
<span class="label1">视频列表</span>
@ -47,7 +47,7 @@
</div>
</div>
</div>
<div class="listitem">
<div class="listitem" @click="navto(3)">
<div class="top">
<img src="@/static/images/dingyuetjicon.png" alt="" class="icon" />
<span class="label2">订阅列表</span>
@ -74,6 +74,7 @@
import { defineComponent, onMounted, ref } from "vue";
import NavBottom from "@/components/NavBottom.vue";
import { getstatisticlist } from "@/api"
import router from '@/router';
export default defineComponent({
name: "Liststatistic",
components: {
@ -84,8 +85,24 @@ export default defineComponent({
onMounted(async ()=>{
statistics.value = await getstatisticlist()
})
function navto(e?: number){
switch(e){
case 1:
router.push("/regime/live");
break;
case 2:
router.push("/regime/video")
break;
case 3:
router.push("/regime/subscriber")
}
}
// console.log(statistics,111)
return {statistics};
return {
statistics,
navto
};
},
});
</script>