|
@@ -251,7 +251,7 @@
|
|
|
|
|
|
|
|
<li class="list" v-for="(item, index) in msgList.msg_list" :key="index">
|
|
<li class="list" v-for="(item, index) in msgList.msg_list" :key="index">
|
|
|
<!-- me -->
|
|
<!-- me -->
|
|
|
- <div class="list_msgBox1" v-if="item.send_real_name == userName">
|
|
|
|
|
|
|
+ <div class="list_msgBox1" v-if="item.is_right == true">
|
|
|
<div
|
|
<div
|
|
|
style="
|
|
style="
|
|
|
background: #60fba5;
|
|
background: #60fba5;
|
|
@@ -284,7 +284,7 @@
|
|
|
</div>
|
|
</div>
|
|
|
<!-- you -->
|
|
<!-- you -->
|
|
|
<div
|
|
<div
|
|
|
- v-else-if="item.recv_user_id == this.getUserObj.user_id"
|
|
|
|
|
|
|
+ v-else-if="item.is_right == false"
|
|
|
class="list_msgBox2"
|
|
class="list_msgBox2"
|
|
|
>
|
|
>
|
|
|
<div>
|
|
<div>
|
|
@@ -701,6 +701,7 @@ export default {
|
|
|
|
|
|
|
|
// 文本消息功能初始化
|
|
// 文本消息功能初始化
|
|
|
msgInit() {
|
|
msgInit() {
|
|
|
|
|
+ var that = this
|
|
|
if (typeof WebSocket === "undefined") {
|
|
if (typeof WebSocket === "undefined") {
|
|
|
alert("您的浏览器不支持socket!");
|
|
alert("您的浏览器不支持socket!");
|
|
|
} else {
|
|
} else {
|
|
@@ -716,7 +717,7 @@ export default {
|
|
|
console.log(event);
|
|
console.log(event);
|
|
|
};
|
|
};
|
|
|
this.websock.onmessage = event => {
|
|
this.websock.onmessage = event => {
|
|
|
- console.log("WebSocket:消息");
|
|
|
|
|
|
|
+ // console.log("WebSocket:消息");
|
|
|
// console.log(JSON.parse(event.data));
|
|
// console.log(JSON.parse(event.data));
|
|
|
var data = JSON.parse(event.data);
|
|
var data = JSON.parse(event.data);
|
|
|
if (data.action == "none") {
|
|
if (data.action == "none") {
|
|
@@ -725,17 +726,25 @@ export default {
|
|
|
console.log(data.data);
|
|
console.log(data.data);
|
|
|
var datArr = data.data; // 总数据
|
|
var datArr = data.data; // 总数据
|
|
|
if (datArr.length !== 0) {
|
|
if (datArr.length !== 0) {
|
|
|
|
|
+ // for (var i = 0; i < datArr.length; i++) {
|
|
|
|
|
+ // for (var j = 0; j < datArr[i].msg_list.length; j++) {
|
|
|
|
|
+ // if (
|
|
|
|
|
+ // this.getUserObj.user_id ==
|
|
|
|
|
+ // datArr[i].msg_list[j].recv_user_id
|
|
|
|
|
+ // ) {
|
|
|
|
|
+ // data.data[i].msg_list = data.data[i].msg_list.reverse();
|
|
|
|
|
+ // this.msgList = data.data[i];
|
|
|
|
|
+ // return;
|
|
|
|
|
+ // // console.log(111)
|
|
|
|
|
+ // }
|
|
|
|
|
+ // }
|
|
|
|
|
+ // }
|
|
|
|
|
+
|
|
|
for (var i = 0; i < datArr.length; i++) {
|
|
for (var i = 0; i < datArr.length; i++) {
|
|
|
- for (var j = 0; j < datArr[i].msg_list.length; j++) {
|
|
|
|
|
- if (
|
|
|
|
|
- this.getUserObj.user_id ==
|
|
|
|
|
- datArr[i].msg_list[j].recv_user_id
|
|
|
|
|
- ) {
|
|
|
|
|
- data.data[i].msg_list = data.data[i].msg_list.reverse();
|
|
|
|
|
- this.msgList = data.data[i];
|
|
|
|
|
- return;
|
|
|
|
|
- // console.log(111)
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ if (this.getUserObj.user_id == datArr[i].user_id) {
|
|
|
|
|
+ data.data[i].msg_list = data.data[i].msg_list.reverse();
|
|
|
|
|
+ that.msgList = data.data[i];
|
|
|
|
|
+ console.log(data.data[i])
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -759,6 +768,7 @@ export default {
|
|
|
} else if (data.action == "recv_video") {
|
|
} else if (data.action == "recv_video") {
|
|
|
// 获取当前点击用户的房间号以及登录房间所需的Token
|
|
// 获取当前点击用户的房间号以及登录房间所需的Token
|
|
|
// console.log(JSON.parse(event.data));
|
|
// console.log(JSON.parse(event.data));
|
|
|
|
|
+ console.log(data)
|
|
|
var data = JSON.parse(event.data);
|
|
var data = JSON.parse(event.data);
|
|
|
this.RoomID = data.data.room_id; // 房间号
|
|
this.RoomID = data.data.room_id; // 房间号
|
|
|
this.Token = data.data.room_token; // Token
|
|
this.Token = data.data.room_token; // Token
|
|
@@ -772,6 +782,7 @@ export default {
|
|
|
)
|
|
)
|
|
|
.then(result => {
|
|
.then(result => {
|
|
|
if (result == true) {
|
|
if (result == true) {
|
|
|
|
|
+ console.log('0000000000000000000000000000000000000登录成功')
|
|
|
this.plugFlow(); //推流
|
|
this.plugFlow(); //推流
|
|
|
this.videoVisible = true;
|
|
this.videoVisible = true;
|
|
|
}
|
|
}
|