diff --git a/pageD/privateChat/privateChat.vue b/pageD/privateChat/privateChat.vue index a34f460..2cf173c 100644 --- a/pageD/privateChat/privateChat.vue +++ b/pageD/privateChat/privateChat.vue @@ -128,6 +128,8 @@ this.friend = JSON.parse(options.id); this.currentUser = this.imService.currentUser; let privateMessages = this.imService.getPrivateMessages(this.friend.uuid); + this.imService.uid = this.friend.uuid; + this.messages = privateMessages.sentMessages; this.pendingMessages = privateMessages.pendingMessages; @@ -153,6 +155,7 @@ this.imService.onPrivateHistoryLoad = (friendId, messages) =>{}; //将未读消息数清零 this.imService.resetFriendUnReadMessage(this.friend); + this.imService.uid = 0; }, methods: { bindtapInput(){ diff --git a/pages/index/index.vue b/pages/index/index.vue index 6888b10..9f6e93b 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -262,7 +262,8 @@ loading: '努力加载中', nomore: '实在没有了' }, - refresher:true + refresher:true, + zqie:false } }, components: { @@ -354,7 +355,11 @@ tabLiveList() { uni.showLoading({ title: "loading..." - }) + }) + if(this.zqie){ + return ; + } + this.zqie = true; this.$u.api.tabLiveList({page:this.live_page}).then((res) => { // uni.stopPullDownRefresh(); this.status_live = "loading"; @@ -371,6 +376,7 @@ } else if (res.data.data.length == 0 && this.live_page > 1) { this.status_live = "nomore"; } else { + console.log(this.live_page,1223) this.tabLiveLists = this.tabLiveLists.concat(res.data.data); console.log(this.tabLiveLists) } @@ -381,6 +387,8 @@ } else { this.status_live = "nomore" } + this.zqie = false; + }) }, diff --git a/pages/zhibo/index.nvue b/pages/zhibo/index.nvue index 3050fb9..876bf7a 100644 --- a/pages/zhibo/index.nvue +++ b/pages/zhibo/index.nvue @@ -29,7 +29,7 @@ - + 发送 diff --git a/static/imservice.js b/static/imservice.js index b276f2c..9d85284 100644 --- a/static/imservice.js +++ b/static/imservice.js @@ -8,6 +8,8 @@ import GoEasyIM from './goeasy-im-1.0.9'; // import GoEasyIM from './goeasy-im-1.1.1'; import restApi from './restapi'; +import music from './music.mp3' + function Friend(uuid, name, avatar,time = "", text = "",date = "",unReadMessage = 0) { this.uuid = uuid; @@ -52,6 +54,8 @@ function IMService() { //群聊消息记录,map格式,每个群对应一个数组 this.groupMessages = {}; + + this.uid = 0; /* * 监听器们 @@ -283,6 +287,14 @@ IMService.prototype.initialIMListeners = function () { friends.sort(paixu) } + if(message.senderId != this.uid){ + const innerAudioContext = uni.createInnerAudioContext(); + innerAudioContext.autoplay = true; + innerAudioContext.src = music; + innerAudioContext.onPlay(() => { + console.log('开始播放'); + }); + } let that = this if(!friend && friend == undefined){ diff --git a/static/music.mp3 b/static/music.mp3 new file mode 100644 index 0000000..61c030b Binary files /dev/null and b/static/music.mp3 differ