From 7d13fc8e850274c4c561621c85748fb9fa3f98a1 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Sat, 15 Aug 2020 13:36:16 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E7=9B=B4=E6=92=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pages/zhibo/index.nvue b/pages/zhibo/index.nvue
index eb1ef7c..edbb7e7 100644
--- a/pages/zhibo/index.nvue
+++ b/pages/zhibo/index.nvue
@@ -445,6 +445,7 @@ export default {
           that.room = that.chatRoomService.room;
           that.chatRoomService.initialWhenOnlineUserChange(that.newpeople)
           that.chatRoomService.initialWhenNewMessage(that.whenNewMessage);
+          this.$forceUpdate();
           console.log(that.room)
         }
       })
@@ -467,6 +468,7 @@ export default {
     },
     newpeople(list){
       this.room.onlineUsers = list
+      console.log(list.users.length)
       this.$forceUpdate();
     },
     sendMessage (messageType, content) {//发送消息

From be2780fbc4296ab4b07ff48f07d04b5d6f007276 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Sat, 15 Aug 2020 13:42:51 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/imservice.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/imservice.js b/static/imservice.js
index 688b6fd..bb6be96 100644
--- a/static/imservice.js
+++ b/static/imservice.js
@@ -800,7 +800,6 @@ IMService.prototype.listenerGroupPresence = function () {
     this.im.on(GoEasyIM.EVENT.GROUP_PRESENCE, (event) => {
         //更新在线用户数
         this.room.onlineUsers.count = event.groupOnlineCount;
-
         if (event.action == 'join' || event.action == 'online') {
             let userData = JSON.parse(event.userData);
             //添加新用户
@@ -887,6 +886,7 @@ IMService.prototype.subscribeRoomMessage = function (room, user) {
      this.subscribePresence(this.room.id);
      //订阅聊天室消息
     //  this.subscribeRoomMessage(this.room.id);
+    this.initialOnlineUsers(this.room.id)
     this.im.subscribeGroup([this.room.id])
         .then(result => {
             console.log('消息订阅成功')

From 6f0ed8e3f9c71443ba621ecdc2a44b33be43cee5 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Sat, 15 Aug 2020 15:37:16 +0800
Subject: [PATCH 3/5] =?UTF-8?q?i=E5=B9=B4=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/zhibo/index.nvue | 66 ++++++++++++++++++++----------------------
 1 file changed, 31 insertions(+), 35 deletions(-)

diff --git a/pages/zhibo/index.nvue b/pages/zhibo/index.nvue
index edbb7e7..ca6e9c8 100644
--- a/pages/zhibo/index.nvue
+++ b/pages/zhibo/index.nvue
@@ -1,6 +1,6 @@
 <template>
   <view>
-    <video :src="url" class="vodio" autoplay="true" :show-fullscreen-btn="false" :show-play-btn="false" :enable-progress-gesture="false" :show-center-play-btn="false" :show-progress="false" :controls="false" :style="{'height':height}" @error="errors>
+    <video :src="url" class="vodio" autoplay="true" :show-fullscreen-btn="false" :show-play-btn="false" :enable-progress-gesture="false" :show-center-play-btn="false" :show-progress="false" :controls="false" :style="{'height':height}" @error="errors" >
 
     </video>
     <view class="user" :style="{'top': top}">
@@ -418,41 +418,37 @@ export default {
       }
     })
     //当前用户
-    try {
-         uni.request({
-        url:"https://dmmall.sdbairui.com/api/Member/MemberInfo",
-        method:"POST",
-        header:{
-            'Authorization' : 'Bearer' + " " + token
-        },
-        success(res){
-          console.log(res,111)
-             var currentUser = {
-            id : res.data.data.MemberArray.member_mobile + "",
-            nickname : res.data.data.MemberArray.member_nickname,
-            avatar: res.data.data.MemberArray.member_avatar 
-          };
-
-          var room = {
-              id : a.rid + "",
-              name : a.rid + ""
-          };
-           that.chatRoomService = getApp().globalData.im
-          console.log(room,currentUser)
-          //构造chatRoomService
-          that.chatRoomService.subscribeRoomMessage(room,currentUser)
-          //获取当前聊天室数据
-          that.room = that.chatRoomService.room;
-          that.chatRoomService.initialWhenOnlineUserChange(that.newpeople)
-          that.chatRoomService.initialWhenNewMessage(that.whenNewMessage);
-          this.$forceUpdate();
-          console.log(that.room)
-        }
-      })
-    } catch (error) {
-      console.log("错误")
+     var currentUser = {}
+    if(this.$store.state.hasLogin){
+      const user = uni.getStorageSync('user_info');
+      currentUser = {
+        id : user.member.member_id,
+        nickname : user.member.member_nickname,
+        avatar: user.member.member_avatar 
+      };
+    }else{
+      const user = uni.getStorageSync('morenimg');
+      currentUser = {
+        id : new Date().getTime(),
+        nickname : "123",
+        avatar: user
+      };
     }
-  
+     
+    var room = {
+        id : a.rid + "",
+        name : a.rid + ""
+    };
+      that.chatRoomService = getApp().globalData.im
+    console.log(room,currentUser)
+    //构造chatRoomService
+    that.chatRoomService.subscribeRoomMessage(room,currentUser)
+    //获取当前聊天室数据
+    that.room = that.chatRoomService.room;
+    that.chatRoomService.initialWhenOnlineUserChange(that.newpeople)
+    that.chatRoomService.initialWhenNewMessage(that.whenNewMessage);
+    this.$forceUpdate();
+    console.log(that.room)
      
   },
   	onBackPress () {//返回取消订阅

From 05aa790d32fb5eaf61b6dfae0e1f8cd3dc922ce4 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Sat, 15 Aug 2020 15:42:00 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=A4=B4=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/api/user.js    | 4 ++++
 pages/index/index.vue | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/common/api/user.js b/common/api/user.js
index f45dc6f..72184b6 100644
--- a/common/api/user.js
+++ b/common/api/user.js
@@ -437,6 +437,10 @@ export default {
 					friend_tomid:id
 				});
 			},
+			//获取默认头像
+			getDefaultAvatar(){
+				return vm.$u.post("member/getDefaultAvatar")
+			}
 		}
 		
     }
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 598b997..c7d616c 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -222,6 +222,7 @@
 	import zhiboItem from "@/components/index/zhibo-item/index"
 	import indexad from "@/components/index/ad/index"
 	import darenItem from "@/components/index/daren-item/index"
+import chatVue from '../../pageD/chat/chat.vue'
 
 	export default {
 		name: "index",
@@ -290,6 +291,11 @@
 					// console.log("lianjie")
 					that.imService.connectIM()
 				},2000)
+			}else{
+				this.$u.api.getDefaultAvatar().then((res)=>{
+					console.log(res)
+					uni.setStorageSync("morenimg",res.data.avatar)
+				})
 			}
 		},
 		onPullDownRefresh() {

From 27470faee1d1d9b81cdb7740b028b0acd8958be8 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Sat, 15 Aug 2020 15:47:29 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.vue | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index c7d616c..5f13f56 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -282,7 +282,16 @@ import chatVue from '../../pageD/chat/chat.vue'
 				// console.log(user)
 				this.imService.login(user.member.member_id,user.member.member_nickname,user.member.member_avatar)
 				this.imService.connectIM()
-				let that = this
+				
+			}else{
+				this.$u.api.getDefaultAvatar().then((res)=>{
+					console.log(res)
+					uni.setStorageSync("morenimg",res.data.avatar)
+					this.imService.login(new Date().getTime(),"123",res.data.avatar)
+					this.imService.connectIM()
+				})
+			}
+			let that = this
 				setTimeout(function(){
 					that.imService.disconnect()
 					// console.log("guanbi")
@@ -290,13 +299,7 @@ import chatVue from '../../pageD/chat/chat.vue'
 				setTimeout(function(){
 					// console.log("lianjie")
 					that.imService.connectIM()
-				},2000)
-			}else{
-				this.$u.api.getDefaultAvatar().then((res)=>{
-					console.log(res)
-					uni.setStorageSync("morenimg",res.data.avatar)
-				})
-			}
+			},2000)
 		},
 		onPullDownRefresh() {
             this.page = 1;