diff --git a/src/utils/request.js b/src/utils/request.js index ba73a25..8c11b7d 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -2,6 +2,7 @@ import axios from "axios"; import router from "@/router/index.js"; const baseURL = "https://gep.ljsea.xyz/"; //const baseURL= "http://localhost:8083"; +//const baseURL="https://pm.ljsea.top"; const request = axios.create({ baseURL: baseURL, }); diff --git a/src/views/Chat.vue b/src/views/Chat.vue index e5b3b66..d835a9a 100644 --- a/src/views/Chat.vue +++ b/src/views/Chat.vue @@ -363,8 +363,12 @@ export default { console.log("msg_:", data.data); let msg_data=JSON.parse(data.data) _this.MsgList.push(msg_data); - if(_this.cur_user_id != msg_data.FromUserID){ - _this.hasUnreadMsg[msg_data.FromUserID] = true; + if(_this.cur_user_id != msg_data.FromUserID || _this.cur_group_id != msg_data.GroupID){ + if(msg_data.GroupID===0){ + _this.hasUnreadMsg[msg_data.FromUserID] = true; + }else{ + _this.hasUnreadMsg["g_"+msg_data.GroupID] = true; + } }else{ _this.scrollToBottom(); } diff --git a/src/views/UserList.vue b/src/views/UserList.vue index b91beb6..22a5d5e 100644 --- a/src/views/UserList.vue +++ b/src/views/UserList.vue @@ -180,6 +180,13 @@ export default { handleCurrentChange() { alert("页码发生变化" + val); }, + startChat(index){ + + localStorage.setItem("to_user_id", this.tableData[index].ID); + localStorage.setItem("to_user_name", this.tableData[index].Name); + router.push("/im"); + + }, async displayMyInfo() { let result = {}; diff --git a/src/views/VideoList.vue b/src/views/VideoList.vue index 83b97ae..6ab93e2 100644 --- a/src/views/VideoList.vue +++ b/src/views/VideoList.vue @@ -47,7 +47,7 @@ export default { for (let i = 0; i < len; i++) { //this.file_sum_size += parseFloat(data[i].file_size); - data[i].file_size = parseFloat(data[i].file_size / 1024 / 1024).toFixed( + data[i].FileSize = parseFloat(data[i].FileSize/ 1024 / 1024).toFixed( 2 ); }