diff --git a/src/api/video.js b/src/api/video.js index 3089fda..4f7cf66 100644 --- a/src/api/video.js +++ b/src/api/video.js @@ -45,18 +45,26 @@ export const getVideoListService = (data) => { let b1=Date.parse(data[key][0]); let b2=Date.parse(data[key][1]); let begin = getTimeString(b1).toString().slice(0, 10) + " 00:00:00"; //begin=data[key][0].toLocaleString().slice(0,10)+hour+":00:00"; - params.append("begin", begin); + //alert(begin) let end = getTimeString(b2).toString().slice(0, 10) + " 23:59:59"; - params.append("end", end); + //转为时间戳 + let end_date = Date.parse(end)/1000; + let begin_date = Date.parse(begin)/1000; + params.append("begin", begin_date); + params.append("end", end_date); continue; } else { let b1=Date.parse(data[key][0]); let b2=Date.parse(data[key][1]); - let begin = getTimeString(b1).toString().slice(0, 10) + hour + ":00:00"; //begin=data[key][0].toLocaleString().slice(0,10)+hour+":00:00"; - params.append("begin", begin); - let end = getTimeString(b2).toString().slice(0, 10) + hour + ":59:59"; - params.append("end", end); + let begin = getTimeString(b1).toString().slice(0, 10) + " "+hour + ":00:00"; //begin=data[key][0].toLocaleString().slice(0,10)+hour+":00:00"; + //params.append("begin", begin); + let end = getTimeString(b2).toString().slice(0, 10) + " "+hour + ":59:59"; + console.log("begin:",begin); + let end_date = Date.parse(end)/1000; + let begin_date = Date.parse(begin)/1000; + params.append("begin", begin_date); + params.append("end", end_date); continue; } diff --git a/src/utils/request.js b/src/utils/request.js index ec6b994..cdf65a8 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -4,6 +4,7 @@ import router from "@/router/index.js"; const baseURL = "https://tx.ljsea.top/"; //const baseURL= "http://localhost:8083"; //const baseURL="https://pm.ljsea.top"; +//const baseURL = "https://gep.ljsea.xyz/"; const request = axios.create({ baseURL: baseURL, }); diff --git a/src/views/Chat.vue b/src/views/Chat.vue index cabc3bf..55bfc1c 100644 --- a/src/views/Chat.vue +++ b/src/views/Chat.vue @@ -162,7 +162,10 @@ - +
+
+
+ +