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

This commit is contained in:
2020-10-30 14:55:59 +08:00
30 changed files with 1618 additions and 1042 deletions

View File

@@ -3,18 +3,18 @@
<div class="nav">
<div class="tabs">
<div :class="tabindex == 1 ? 'on' : ''" @click="tabchange(1)">
全部直播
{{lan.$t('quanbuzhibo')}}
</div>
<div :class="tabindex == 0 ? 'on' : ''" @click="tabchange(0)">
未开始
{{lan.$t('weikaishi')}}
</div>
<div :class="tabindex == 2 ? 'on' : ''" @click="tabchange(2)">
已结束
{{lan.$t('yijieshu')}}
</div>
</div>
<div class="sel">
<img src="@/static/images/sousuo.png" alt="" class="icon" />
<input placeholder="请输入想要搜索的直播标题" type="text" @keyup.enter="sel()" v-model="input" />
<input :placeholder="lan.$t('zhibosousuo')" type="text" @keyup.enter="sel()" v-model="input" />
</div>
</div>
<div class="list" v-if="tabindex == 1">
@@ -173,11 +173,13 @@ import { defineComponent, onMounted, ref } from "vue";
import LiveItem from "@/components/LiveItem.vue";
import { getlivelist } from "@/api";
import { LivelistInfo } from "@/types";
import { useI18n } from '@/utils/i18n';
export default defineComponent({
components: {
LiveItem,
},
setup() {
const lan: any = useI18n();
const page = ref(1);
const tabindex = ref(1);
const livelist = ref<LivelistInfo>({
@@ -211,7 +213,8 @@ export default defineComponent({
tabchange,
livelist,
input,
sel
sel,
lan
};
},
});

View File

@@ -2,7 +2,7 @@
<div class="liveing">
<div class="top">
<div class="left">直播页面</div>
<div class="left">{{lan.$t('zhiboyemian')}}</div>
<div class="right">
<img src="@/static/images/liveshare.png" alt="" @click="fenxiang()" />
<img src="@/static/images/liveend.png" alt="" @click="visible = true" />
@@ -56,7 +56,7 @@
</div>
</div>
<a-modal v-model:visible="visible" title="Basic Modal" @ok="guanbi">
<p>您确认关闭直播吗</p>
<p>{{lan.$t('querenguanbi')}}</p>
</a-modal>
</div>
</template>
@@ -198,6 +198,7 @@ import { getliveinfo, livestop, luzhi, usersig } from '@/api';
import { useRoute } from 'vue-router';
import store from '@/store';
import { message } from 'ant-design-vue';
import { useI18n } from '@/utils/i18n';
export default defineComponent({
components: {
@@ -205,6 +206,7 @@ export default defineComponent({
LiveingWatcher,
},
setup() {
const lan: any = useI18n();
console.log(1);
let client: any;
let localStream: any;
@@ -402,7 +404,8 @@ export default defineComponent({
qiehuan,
roominfo,
guanbi,
visible
visible,
lan
}
},
});

View File

@@ -1,10 +1,10 @@
<template>
<div class="subscriber">
<div class="top">
<div class="title">我的订阅者{{teacherlikedlist.total}}</div>
<div class="title">{{lan.$t('dingyuezhe')}}{{teacherlikedlist.total}}</div>
<div class="sel">
<img src="@/static/images/sousuo.png" alt="" class="icon" />
<input type="text" placeholder="请输入想要搜索的学生姓名" v-model="condition.title" @keyup.enter="search(condition)"/>
<input type="text" :placeholder="lan.$t('sousuodingyue')" v-model="condition.title" @keyup.enter="search(condition)"/>
</div>
</div>
<div class="mid">
@@ -15,38 +15,38 @@
<div>
<div class="info">
<div class="infoitem">
<span class="label">姓名:</span>
<span class="label">{{lan.$t("xingming")}}:</span>
<span class="one-line-hide">{{i.name}}</span>
</div>
<div class="infoitem">
<span class="label">所在国家:</span>
<span class="label">{{lan.$t('suozaiguojia')}}:</span>
<span class="one-line-hide">{{i.live}}</span>
</div>
<div class="infoitem">
<span class="label">年龄:</span>
<span class="label">{{lan.$t('nianling')}}:</span>
<span class="one-line-hide">{{i.age}}</span>
</div>
</div>
<div class="info">
<div class="infoitem">
<span class="label">学生母语:</span>
<span class="label">{{lan.$t('xueshengmuyu')}}:</span>
<span class="one-line-hide">{{i.mtongue }}</span>
</div>
<div class="infoitem">
<span class="label">兴趣点:</span>
<span class="label">{{lan.$t('xingqudian')}}:</span>
<span class="one-line-hide">{{i.interestStr}}</span>
</div>
<div class="infoitem">
<span class="label">语言等级:</span>
<span class="label">{{lan.$t("yuyandengji")}}:</span>
<span class="one-line-hide">asd</span>
</div>
<div>参加平台直播课程总时长<span class="time">{{i.longtime}}min</span></div>
<div>{{lan.$t('canyupingtaishichang')}}<span class="time">{{i.longtime}}min</span></div>
</div>
</div>
</div>
@@ -166,11 +166,13 @@
</style>
<script lang="ts">
import { getteacherliked } from '@/api';
import { useI18n } from '@/utils/i18n';
import { defineComponent, onMounted, ref, toRaw } from "vue";
export default defineComponent({
name: "Subscriber",
components: {},
setup() {
const lan: any = useI18n();
const page = ref(1);
const teacherlikedlist =ref<any>({
@@ -194,7 +196,8 @@ export default defineComponent({
teacherlikedlist,
condition,
title,
search
search,
lan
};
},
});

View File

@@ -3,21 +3,21 @@
<div class="nav">
<div class="tabs">
<div :class="tabindex == 4 ? 'on' : ''" @click="tabchange(4)">
全部视频
{{lan.$t('quanbushipin')}}
</div>
<div :class="tabindex == 0 ? 'on' : ''" @click="tabchange(0)">
审核中
{{lan.$t('shenhezhong')}}
</div>
<div :class="tabindex == 2 ? 'on' : ''" @click="tabchange(2)">
未通过
{{lan.$t('weitongguo')}}
</div>
<div :class="tabindex == 1 ? 'on' : ''" @click="tabchange(1)">
已发布
{{lan.$t('yifabu')}}
</div>
</div>
<div class="sel">
<img src="@/static/images/sousuo.png" alt="" class="icon" />
<input type="text" placeholder="请输入想要搜索的直播标题" @keyup.enter="sel()" v-model="input"/>
<input type="text" :placeholder="lan.$t('shipinsousuo')" @keyup.enter="sel()" v-model="input"/>
</div>
</div>
<div class="list" v-if="tabindex == 4">
@@ -195,11 +195,13 @@ import { defineComponent, onMounted, reactive, ref, UnwrapRef } from "vue";
import VideoItem from "@/components/VideoItem.vue";
import { getvideolist } from "@/api";
import { useRoute } from 'vue-router';
import { useI18n } from '@/utils/i18n';
export default defineComponent({
components: {
VideoItem,
},
setup() {
const lan: any = useI18n();
const page = ref(1);
const tabindex = ref(4);
interface VideoList {
@@ -251,7 +253,8 @@ export default defineComponent({
videolist,
sel,
input,
pagechange
pagechange,
lan
};
},
});