theluyuan/deming
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request 'xbx' (#187) from xbx into master

Browse Source 
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/187
This commit is contained in:
luyuan 2020-08-14 09:41:41 +08:00
commit b3398be7e1
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pages/index/index.vue
View File

@ -45,11 +45,11 @@
<view class="list"> <view class="list">
<view> <view>
<zhiboItem v-for="item in tabLiveLists.filter((_, index) => !(index&1))" :zid="item.live_id" :rid="item.chatroom_id" <zhiboItem v-for="item in tabLiveLists.filter((_, index) => !(index&1))" :zid="item.live_id" :rid="item.chatroom_id"
:key="item.live_id" :name="item.store_name" :image="item.cover_img" :url="item.url" :item="item" @updateList="updateList"></zhiboItem> :key="item.live_id" :name="item.room_name" :image="item.cover_img" :url="item.url" :item="item" @updateList="updateList"></zhiboItem>
</view> </view>
<view style="margin-left:20rpx"> <view style="margin-left:20rpx">
<zhiboItem v-for="item in tabLiveLists.filter((_, index) => index&1)" :zid="item.live_id" :rid="item.chatroom_id" <zhiboItem v-for="item in tabLiveLists.filter((_, index) => index&1)" :zid="item.live_id" :rid="item.chatroom_id"
:key="item.live_id" :name="item.store_name" :image="item.cover_img" :url="item.url" :item="item" @updateList="updateList"></zhiboItem> :key="item.live_id" :name="item.room_name" :image="item.cover_img" :url="item.url" :item="item" @updateList="updateList"></zhiboItem>
</view> </view>
</view> </view>
<u-loadmore class="load-size" color="#999999" :status="status" icon-type="iconType" margin-top="50" margin-bottom="50" :load-text="loadText" /> <u-loadmore class="load-size" color="#999999" :status="status" icon-type="iconType" margin-top="50" margin-bottom="50" :load-text="loadText" />
@ -308,7 +308,8 @@
}) })
this.$u.api.tabLiveList({page:this.page}).then((res) => { this.$u.api.tabLiveList({page:this.page}).then((res) => {
// uni.stopPullDownRefresh(); // uni.stopPullDownRefresh();
this.status = "loading"; this.status = "loading";
console.log(res)
if (res.errCode == 0) { if (res.errCode == 0) {
uni.hideLoading(); uni.hideLoading();
if (this.page == 1) { if (this.page == 1) {

4
pages/zhibo/index.nvue
View File

@ -457,7 +457,8 @@ export default {
if(!this.chatRoomService.status){ if(!this.chatRoomService.status){
uni.showToast({ uni.showToast({
title: '连接聊天室中，请稍等', title: '连接聊天室中，请稍等',
duration: 2000 duration: 2000,
icon: "none"
}); });
return return
} }
@ -471,6 +472,7 @@ export default {
this.chatRoomService.sendMessages(this.room.id, message); this.chatRoomService.sendMessages(this.room.id, message);
this.danmutext = "" this.danmutext = ""
this.danmu = false this.danmu = false
uni.hideKeyboard()
}, },
whenNewMessage (message) {//新消息监听 whenNewMessage (message) {//新消息监听
// if(message.type == this.room.MessageType.PROP){ // if(message.type == this.room.MessageType.PROP){

9
static/imservice.js
View File

@ -107,7 +107,8 @@ IMService.prototype.initialContacts = function (friendList) {
uni.request({ uni.request({
url:"https://dmmall.sdbairui.com/api/Specialci/getAtwillUserInfo", url:"https://dmmall.sdbairui.com/api/Specialci/getAtwillUserInfo",
data:{ data:{
userId:i[0] userId:i[0],
markup:1
}, },
method:"POST", method:"POST",
header:{ header:{
@ -285,7 +286,8 @@ IMService.prototype.initialIMListeners = function () {
uni.request({ uni.request({
url:"https://dmmall.sdbairui.com/api/Specialci/getAtwillUserInfo", url:"https://dmmall.sdbairui.com/api/Specialci/getAtwillUserInfo",
data:{ data:{
userId:message.senderId userId:message.senderId,
markup:1
}, },
method:"POST", method:"POST",
header:{ header:{
@ -527,7 +529,8 @@ IMService.prototype.sendMessagesSetStorage = function (friendId,message){
uni.request({ uni.request({
url:"https://dmmall.sdbairui.com/api/Specialci/getAtwillUserInfo", url:"https://dmmall.sdbairui.com/api/Specialci/getAtwillUserInfo",
data:{ data:{
userId:friendId userId:friendId,
markup:1
}, },
method:"POST", method:"POST",
header:{ header:{