From 2a58f2f63fd23905eebbfc0c5b203c95c545a952 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Fri, 14 Aug 2020 09:19:11 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=94=B6=E8=B5=B7=E9=94=AE=E7=9B=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/zhibo/index.nvue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pages/zhibo/index.nvue b/pages/zhibo/index.nvue
index ea4c2a7..d3b35e4 100644
--- a/pages/zhibo/index.nvue
+++ b/pages/zhibo/index.nvue
@@ -471,6 +471,7 @@ export default {
 				this.chatRoomService.sendMessages(this.room.id, message);
         this.danmutext = ""
         this.danmu = false
+        uni.hideKeyboard()
 			},
     whenNewMessage (message) {//新消息监听
       // if(message.type == this.room.MessageType.PROP){

From 90e9e069154405153f8c2c92db9d9619e4168576 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Fri, 14 Aug 2020 09:26:59 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=90=8D=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.vue  | 7 ++++---
 pages/zhibo/index.nvue | 3 ++-
 static/imservice.js    | 9 ++++++---
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index 308c4e7..598b997 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -45,11 +45,11 @@
 							<view class="list">
 								<view>
 									<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 style="margin-left:20rpx">
 									<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>
 							<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) => {
 					 // uni.stopPullDownRefresh();
-                    this.status = "loading";
+					this.status = "loading";
+					console.log(res)
                     if (res.errCode == 0) {
                         uni.hideLoading();
                         if (this.page == 1) {
diff --git a/pages/zhibo/index.nvue b/pages/zhibo/index.nvue
index d3b35e4..6d0227f 100644
--- a/pages/zhibo/index.nvue
+++ b/pages/zhibo/index.nvue
@@ -457,7 +457,8 @@ export default {
     if(!this.chatRoomService.status){
       uni.showToast({
           title: '连接聊天室中，请稍等',
-          duration: 2000
+          duration: 2000,
+          icon: "none"
       });
       return
     }
diff --git a/static/imservice.js b/static/imservice.js
index 57453ef..e89503b 100644
--- a/static/imservice.js
+++ b/static/imservice.js
@@ -107,7 +107,8 @@ IMService.prototype.initialContacts = function (friendList) {
         uni.request({
             url:"https://dmmall.sdbairui.com/api/Specialci/getAtwillUserInfo",
             data:{
-                userId:i[0]
+                userId:i[0],
+                markup:1
             },
             method:"POST",
             header:{
@@ -285,7 +286,8 @@ IMService.prototype.initialIMListeners = function () {
                 uni.request({
                     url:"https://dmmall.sdbairui.com/api/Specialci/getAtwillUserInfo",
                     data:{
-                        userId:message.senderId
+                        userId:message.senderId,
+                        markup:1
                     },
                     method:"POST",
                     header:{
@@ -527,7 +529,8 @@ IMService.prototype.sendMessagesSetStorage = function (friendId,message){
         uni.request({
             url:"https://dmmall.sdbairui.com/api/Specialci/getAtwillUserInfo",
             data:{
-                userId:friendId
+                userId:friendId,
+                markup:1
             },
             method:"POST",
             header:{