diff --git a/src/api/user.js b/src/api/user.js index 80792f2..a36631c 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -5,7 +5,7 @@ export const loginService = (loginData) => { for (let key in loginData) { params.append(key, loginData[key]) } - return request.post('/user/login', params) + return request.post('/user/login', params,) } export const registerService = (registerData) => { diff --git a/src/api/video.js b/src/api/video.js index eeb6622..6eacae3 100644 --- a/src/api/video.js +++ b/src/api/video.js @@ -13,10 +13,11 @@ export const getVideoListService = (data) => { for (let key in data) { if(key === 'entrydate' && data[key].length > 0){ console.log(data[key]); - let begin=data[key][0].toISOString().slice(0,10)+" 00:00:00"; + let begin=data[key][0].toLocaleString().slice(0,10)+" 00:00:00"; console.log("begin="+begin.toString()); params.append("begin", begin); - let end=data[key][0].toISOString().slice(0,10)+" 23:59:59"; + let end=data[key][1].toLocaleString().slice(0,10)+" 23:59:59"; + console.log("end="+end.toString()); params.append("end", end); continue; } diff --git a/src/utils/request.js b/src/utils/request.js index d444bc1..911a9f5 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -10,6 +10,10 @@ request.interceptors.response.use( if(result.status!==200 ){ router.push("/login") } + if(result.data.message==="NOT_LOGIN"){ + localStorage.removeItem("token"); + router.push("/login") + } if(result.data.code===0){ return result.data; }else{ diff --git a/src/views/Video.vue b/src/views/Video.vue index 4742e99..5bdd874 100644 --- a/src/views/Video.vue +++ b/src/views/Video.vue @@ -38,7 +38,7 @@ nextTick(() => { localStorage.getItem("userId") + "&token=" + localStorage.getItem("token"), //视频地址 - type: "application/vnd.apple.mpegurl", + type: localStorage.getItem("video_name").split('.')[1]==="m3u8" ?"application/vnd.apple.mpegurl":"video/mp4", }, ], controlBar: { diff --git a/src/views/VideoList.vue b/src/views/VideoList.vue index 0182f2b..35771a7 100644 --- a/src/views/VideoList.vue +++ b/src/views/VideoList.vue @@ -54,10 +54,10 @@ export default { }, playVideo(index) { var id = this.tableData[index].id; - var name = this.tableData[index].name; + var name = this.tableData[index].video_name; localStorage.setItem("video_id", id); localStorage.setItem("video_name", name); - alert("id=" + id + " name=" + name); + //alert("id=" + id + " name=" + name); router.push("/video"); }, }, @@ -95,7 +95,7 @@ export default { - + 查询 @@ -131,7 +131,7 @@ export default {