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

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

Browse Source 
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/47
This commit is contained in:
luyuan 2020-10-15 15:44:23 +08:00
commit f58ccbb11d
8 changed files with 97 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/base.ts
View File

@ -37,7 +37,7 @@ const del: Get = async function (url: string, data?: unknown){
}
const put: Get = async function (url: string, data?: unknown){
const res = await axios.put(url, {params:data})
const res = await axios.put(url, data)
return res.data;
}

14
src/api/index.ts
View File

@ -3,7 +3,7 @@ import store from '@/store';
import { LiveList, LoginData, UserInfo, VideoInfo } from '@/types';
import { saveValue } from '@/utils/common';
import { message } from 'ant-design-vue';
import { del, get, post, setToken } from './base'
import { del, get, post, put, setToken } from './base'
/**
@ -165,8 +165,8 @@ export async function getstatisticlist() {
* 发布直播
*/
interface Liveaddrule{
code:number,
msg:string
code: number,
msg: string
}
export async function liveadd(data:any) {
const res = await post<Liveaddrule>('live',data);
@ -316,4 +316,12 @@ interface Language {
export async function getlanguages(): Promise<Language[]>{
return (await get<Language[]>("languages")).data;
}
/**
* 修改我的档案
*/
export async function putmember(data: unknown): Promise<Liveaddrule>{
return (await put<Liveaddrule>(`member/${store.state.userinfo.memberid}`, data) )
}

16
src/components/LiveItem.vue
View File

@ -3,7 +3,7 @@
<img :src="img" alt="" class="cover">
<img src="@/static/images/play.png" alt="" class="play">
<div class="title">
{{title}}
<div class="one-line-hide">{{title}}</div>
<span class="lv">{{score}}分</span>
</div>
<div class="info">
@ -57,9 +57,10 @@
height: 23px;
}
.title{
margin: 18px;
margin-top: 16px;
margin-bottom: 0;
font-display: 11px;
margin-left: 18px;
color: #111;
display: flex;
align-items: center;
@ -68,6 +69,7 @@
margin-left: 11px;
font-size: 10px;
color: #f55455;
flex-shrink: 0;
}
}
.info{
@ -149,7 +151,7 @@ export default defineComponent({
type:String
},
score:{
type:Number
type:String
},
date:{
type:String
@ -162,6 +164,9 @@ export default defineComponent({
},
status:{
type:Number
},
zid:{
type: Number
}
},
setup(props){
@ -177,7 +182,10 @@ export default defineComponent({
case 3:
url = '/regeime/liveing';
}
router.push(url)
console.log(props.zid);
if(props.zid != undefined){
router.push({path: url,query: { id: props.zid }})
}
}
return {
navto

65
src/components/LivePlay.vue
View File

@ -1,19 +1,80 @@
<template>
<div class="video">
<video src=""></video>
<div class="liveinfo">
<div class="left">
<div>
<img src="@/static/images/livelesson.png" alt="" class="icon">
<span>西班牙语</span>
</div>
<div>
<img src="@/static/images/livewatch.png" alt="" class="icon">
<span>2020-09-11 18:30</span>
</div>
<div>
<img src="@/static/images/livetimetake.png" alt="" class="icon">
<span>30min</span>
</div>
<div>
<img src="@/static/images/shoucang.png" alt="" class="icon">
<span class="score">5.0分</span>
</div>
</div>
<div class="right">
编辑信息
</div>
</div>
</div>
</template>
<style lang="scss" scoped>
.video {
width: 976px;
height: 563px;
border-radius: 18px 18px 0px 0px;
border-radius: 18px;
background-color: #0f0;
overflow: hidden;
> video {
width: 100%;
height: 100%;
height: 505px;
}
.liveinfo{
display: flex;
justify-content: space-between;
height: 58px;
align-items: center;
background-color: #fff;
.left{
display: flex;
color: #121212;
font-size: 13px;
margin-left: 29px;
.score{
color: #D22C2E;
font-size: 13px;
}
>div{
margin-right: 57px;
}
.icon{
width: 25px;
height:24px;
margin-right: 6px;
}
}
.right{
width: 74px;
height: 29px;
border:1px solid #08AE98;
border-radius: 3px;
margin-right: 29px;
color: #08AE98;
font-size: 13px;
line-height: 29px;
font-weight: bold;
text-align: center;
}
}
}
</style>
<script lang="ts">

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

@ -166,7 +166,7 @@ export default defineComponent({
const time = ref(60);//倒计时
const phone = ref(""); // 手机号
const userinfo = reactive({
phone: '15652030036',
phone: '13152639856',
password: '123456'
})
/**

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

@ -276,7 +276,7 @@ import { uploadflie } from "@/utils/vod"
import store from '@/store';
import smile from "@/static/images/smile.png"
import smilet from "@/static/images/smilet.png"
import { getarchives, getlanguages } from "@/api/index"
import { getarchives, getlanguages, putmember } from "@/api/index"
export default defineComponent({
name: "Archives",
@ -433,6 +433,9 @@ export default defineComponent({
*/
function submitInfo (): void {
console.log(toRaw(formData.value));
putmember(toRaw(formData.value)).then((res) => {
console.log(res)
})
}

2
src/views/regime/Live.vue
View File

@ -12,7 +12,7 @@
</div>
</div>
<div class="list" v-if="tabindex==1">
<LiveItem :type="2" v-for="(i,j) in livelist" :key="j" :img="i.img" :title="i.title" :score="i.score" :date="i.starttime" :takehour="i.vodduration" :livenum="i.livenumber" :status="i.livestatus"></LiveItem>
<LiveItem :type="2" v-for="(i,j) in livelist" :key="j" :img="i.img" :title="i.title" :score="i.score" :date="i.starttime" :takehour="i.vodduration" :livenum="i.livenumber" :status="i.livestatus" :zid="i.liveid"></LiveItem>
</div>
<div class="list" v-if="tabindex==2">

65
src/views/regime/Livedetail.vue
View File

@ -3,29 +3,7 @@
<div class="info">
<div class="liveplay">
<liveplay></liveplay>
<div class="liveinfo">
<div class="left">
<div>
<img src="@/static/images/livelesson.png" alt="" class="icon">
<span>西班牙语</span>
</div>
<div>
<img src="@/static/images/livewatch.png" alt="" class="icon">
<span>2020-09-11 18:30</span>
</div>
<div>
<img src="@/static/images/livetimetake.png" alt="" class="icon">
<span>30min</span>
</div>
<div>
<img src="@/static/images/shoucang.png" alt="" class="icon">
<span class="score">5.0分</span>
</div>
</div>
<div class="right">
编辑信息
</div>
</div>
</div>
<LiveCount></LiveCount>
@ -45,43 +23,7 @@
background: white;
border-radius: 18px;
margin-right: 29px;
.liveinfo{
display: flex;
justify-content: space-between;
height: 58px;
align-items: center;
.left{
display: flex;
color: #121212;
font-size: 13px;
margin-left: 29px;
.score{
color: #D22C2E;
font-size: 13px;
}
>div{
margin-right: 57px;
}
.icon{
width: 25px;
height:24px;
margin-right: 6px;
}
}
.right{
width: 74px;
height: 29px;
border:1px solid #08AE98;
border-radius: 3px;
margin-right: 29px;
color: #08AE98;
font-size: 13px;
line-height: 29px;
font-weight: bold;
text-align: center;
}
}
}
}
.review {
@ -94,6 +36,7 @@ import { defineComponent } from "vue";
import liveplay from "@/components/LivePlay.vue"
import LiveCount from "@/components/LiveCount.vue";
import VideoReview from "@/components/VideoReview.vue";
import { useRoute } from 'vue-router';
export default defineComponent({
components: {
LiveCount,
@ -101,7 +44,7 @@ export default defineComponent({
VideoReview,
},
setup() {
console.log(1);
console.log(useRoute().query.id);
},
});
</script>