-
@@ -136,11 +136,12 @@ const data = reactive({
dbScore: '',
hits: '',
content: '',
- }
+ },
+ list: []
},
relate: [],
loading: false,
- currentTabIndex: 0,
+ currentTabId: '',
})
// 对部分信息过长进行处理
@@ -157,7 +158,7 @@ const handleLongText = (t: string): string => {
onBeforeMount(() => {
let link = router.currentRoute.value.query.link
ApiGet('/filmDetail', {id: link}).then((resp: any) => {
- if (resp.status === "ok") {
+ if (resp.code === 0) {
data.detail = resp.data.detail
// 去除影视简介中的无用内容和特殊标签格式等
data.detail.name = data.detail.name.replace(/(～.*～)/g, '')
@@ -166,12 +167,13 @@ onBeforeMount(() => {
// 处理过长数据
data.detail.descriptor.actor = handleLongText(data.detail.descriptor.actor)
data.detail.descriptor.director = handleLongText(data.detail.descriptor.director)
+ data.currentTabId = resp.data.detail.list[0].id
data.loading = true
} else {
ElMessage({
type: "error",
dangerouslyUseHTMLString: true,
- message: resp.message,
+ message: resp.msg,
})
}
})
@@ -179,12 +181,12 @@ onBeforeMount(() => {
})
// 播放源切换
-const changeTab = (index:number)=>{
- data.currentTabIndex = index
+const changeTab = (id:string)=>{
+ data.currentTabId = id
}
// 选集播放点击事件
-const play = (change: { source: number, episode: number }) => {
+const play = (change: { source: string, episode: number }) => {
router.push({path: `/play`, query: {id: `${router.currentRoute.value.query.link}`, ...change}})
}
diff --git a/client/src/views/index/Home.vue b/client/src/views/index/Home.vue
index 6355852..303fe55 100644
--- a/client/src/views/index/Home.vue
+++ b/client/src/views/index/Home.vue
@@ -1,10 +1,10 @@
-
+
-
{{ item.nav.name }}
diff --git a/client/src/views/index/Play.vue b/client/src/views/index/Play.vue
index 14f9de9..d0c9d70 100644
--- a/client/src/views/index/Play.vue
+++ b/client/src/views/index/Play.vue
@@ -42,16 +42,14 @@
@@ -85,8 +83,8 @@ import {VideoPlayer} from '@videojs-player/vue'
import 'video.js/dist/video-js.css'
// 播放源切换事件
-const changeTab = (index: number) => {
- data.currentTabIndex = index
+const changeTab = (id: string) => {
+ data.currentTabId = id
}
// 播放页所需数据
@@ -124,14 +122,14 @@ const data = reactive({
dbScore: '',
hits: '',
content: '',
- }
+ },
+ list: [],
},
current: {index: 0, episode: '', link: ''},
currentTabName: '',
- currentPlayFrom: 0,
currentEpisode: 0,
relate: [],
- currentTabIndex: 0,
+ currentTabId: '', // 当前播放源ID
// @videojs-player 播放属性设置
autoplay: true,
options: {
@@ -142,40 +140,52 @@ const data = reactive({
},
})
//
-const hasNext = computed(() => data.current.index != data.detail.playList[data.currentPlayFrom].length - 1)
+const hasNext = computed(() => {
+ let flag = false
+ data.detail.list.forEach((item:any)=>{
+ if (data.currentTabId == item.id) {
+ flag = data.current.index != item.linkList.length - 1
+ }
+ })
+ return flag
+})
// 获取路由信息
const router = useRouter()
onBeforeMount(() => {
let query = router.currentRoute.value.query
ApiGet(`/filmPlayInfo`, {id: query.id, playFrom: query.source, episode: query.episode}).then((resp: any) => {
- if (resp.status === 'ok') {
+ if (resp.code === 0) {
data.detail = resp.data.detail
data.current = {index: resp.data.currentEpisode, ...resp.data.current}
- data.currentPlayFrom = resp.data.currentPlayFrom
+ // data.currentPlayFrom = resp.data.currentPlayFrom
data.currentEpisode = resp.data.currentEpisode
data.relate = resp.data.relate
// 设置当前选中的播放源
data.currentTabName = `tab-${query.source}`
// 设置当前的视频播放url
data.options.src = data.current.link
+ // 设置当前播放源ID信息
+ data.currentTabId = resp.data.currentPlayFrom
data.loading = true
} else {
- ElMessage.error("影片信息加载失败,请尝试刷新页面!!!")
+ ElMessage.error({message: resp.msg})
}
})
})
// 点击播集数播放对应影片
-const playChange = (play: { sourceIndex: number, episodeIndex: number, target: any }) => {
- let currPlay = data.detail.playList[play.sourceIndex][play.episodeIndex]
- data.current = {index: play.episodeIndex, episode: currPlay.episode, link: currPlay.link}
- data.currentEpisode = play.episodeIndex
- data.options.src = currPlay.link
- data.options.title = data.detail.name + " " + currPlay.episode
- data.currentPlayFrom = play.sourceIndex
- data.currentTabIndex = play.sourceIndex
-
+const playChange = (play: { sourceId: string, episodeIndex: number, target: any }) => {
+ data.detail.list.forEach((item:any)=>{
+ if (item.id == play.sourceId) {
+ let currPlay =item.linkList[play.episodeIndex]
+ data.current = {index: play.episodeIndex, episode: currPlay.episode, link: currPlay.link}
+ data.currentEpisode = play.episodeIndex
+ data.options.src = currPlay.link
+ data.options.title = data.detail.name + " " + currPlay.episode
+ data.currentTabId = play.sourceId
+ }
+ })
}
// player相关事件
@@ -212,10 +222,11 @@ const isAutoPlay = () => {
}
// 点击下一集按钮
const playNext = () => {
- if (data.current.index == data.detail.playList[data.currentPlayFrom].length - 1) {
+ // 如果不存在下一集信息则直接返回
+ if (!hasNext.value) {
return
}
- playChange({sourceIndex: data.currentPlayFrom, episodeIndex: data.current.index + 1, target: ''})
+ playChange({sourceId: data.currentTabId, episodeIndex: data.current.index + 1, target: ''})
if (data.autoplay) {
setTimeout(() => {
document.getElementsByTagName("video")[0].play()
diff --git a/client/src/views/manage/Index.vue b/client/src/views/manage/Index.vue
index 2db2d8f..87efe65 100644
--- a/client/src/views/manage/Index.vue
+++ b/client/src/views/manage/Index.vue
@@ -18,9 +18,7 @@ onMounted(()=>{