Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj

This commit is contained in:
asd
2020-10-15 15:45:23 +08:00
8 changed files with 97 additions and 74 deletions

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'
})
/**

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)
})
}

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">

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>