Compare commits

..

No commits in common. "6a361e3245e30df5ffbb1169f053b489ef354a31" and "0bc6be9b9f5b2998c8be8dfec52c90908cf232ba" have entirely different histories.

2 changed files with 8 additions and 40 deletions

View File

@ -179,7 +179,6 @@
}) })
return false return false
} else { } else {
console.log(123)
me.loginIn(res.data.token); // me.loginIn(res.data.token); //
// //
uni.setStorageSync('user_info',res.data); uni.setStorageSync('user_info',res.data);

View File

@ -336,13 +336,10 @@ export default {
}; };
}, },
onLoad(a) { onLoad(a) {
this.url = a.url; this.url = a.url;
this.id = a.id this.id = a.id
console.log(this.url); console.log(this.url);
let that = this; let that = this;
uni.getSystemInfo({ uni.getSystemInfo({
success(a) { success(a) {
console.log(a.windowHeight); console.log(a.windowHeight);
@ -404,8 +401,7 @@ export default {
} }
}) })
//当前用户 //当前用户
try { uni.request({
uni.request({
url:"https://dmmall.sdbairui.com/api/Member/MemberInfo", url:"https://dmmall.sdbairui.com/api/Member/MemberInfo",
method:"POST", method:"POST",
header:{ header:{
@ -413,54 +409,28 @@ export default {
}, },
success(res){ success(res){
console.log(res,111) console.log(res,111)
var currentUser = { var currentUser = {
id : res.data.data.MemberArray.member_mobile + "", id : "12",
nickname : res.data.data.MemberArray.member_nickname, nickname :"123",
avatar: res.data.data.MemberArray.member_avatar avatar: "1223"
}; };
var room = { var room = {
id : a.id + "", id : "123",
name : a.id + "" name : "123"
}; };
console.log(room,currentUser) console.log(room,currentUser)
//构造chatRoomService //构造chatRoomService
that.chatRoomService = new ChatRoomService(room, currentUser); that.chatRoomService = new ChatRoomService(room, currentUser);
that.chatRoomService.initialWhenNewMessage(that.whenNewMessage); that.chatRoomService.initialWhenNewMessage(that.whenNewMessage);
that.chatRoomService.connectGoEasyIM(); that.chatRoomService.connectGoEasyIM();
//获取当前聊天室数据 //获取当前聊天室数据
that.room = that.chatRoomService.room; that.room = that.chatRoomService.room;
setTimeout(function() {
that.chatRoomService.quitRoom();
that.chatRoomService = {}
}, 1000);
setTimeout(function(){
that.chatRoomService = new ChatRoomService(room, currentUser);
that.chatRoomService.initialWhenNewMessage(that.whenNewMessage);
that.chatRoomService.connectGoEasyIM();
//获取当前聊天室数据
that.room = that.chatRoomService.room;
}, 2000);
} }
}) })
} catch (error) {
console.log("错误")
}
}, },
onBackPress () {//返回取消订阅
//断开连接
this.chatRoomService.quitRoom();
},
beforeDestroy () {
this.chatRoomService.quitRoom();
},
methods:{ methods:{
sendMessage (messageType, content) {//发送消息 sendMessage (messageType, content) {//发送消息
console.log(123) console.log(123)
@ -482,7 +452,6 @@ export default {
// }, 300) // }, 300)
console.log(message) console.log(message)
this.danmulist.push(message) this.danmulist.push(message)
if(this.danmulist.length > 7){ if(this.danmulist.length > 7){
this.danmulist = this.danmulist.slice(this.danmulist.length - 7) this.danmulist = this.danmulist.slice(this.danmulist.length - 7)
} }