From ae1ba85e2cbcd95c3181444d1c95e9d820d22810 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Fri, 27 Nov 2020 14:53:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/js/common.js          | 2 +-
 public/js/iminit.js          | 5 +++--
 public/zhibo.html            | 1 +
 src/views/regime/Liveing.vue | 3 ++-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/public/js/common.js b/public/js/common.js
index 9d2578a..2105534 100644
--- a/public/js/common.js
+++ b/public/js/common.js
@@ -33,7 +33,7 @@ function join() {
   $('#header-roomId').html('房间号: ' + $('#roomId').val());
   $('#member-me')
     .find('.member-id')
-    .html($('#userId').val() + '(我)');
+    .html(window.uname + '(我)');
 }
 
 function leave() {
diff --git a/public/js/iminit.js b/public/js/iminit.js
index 00bb585..31a4f9a 100644
--- a/public/js/iminit.js
+++ b/public/js/iminit.js
@@ -82,6 +82,7 @@ function formatDateTime (inputTime) {
   });
   
   tim.on(TIM.EVENT.GROUP_LIST_UPDATED, function(event) {
+    console.log(event.data)
     // 收到群组列表更新通知，可通过遍历 event.data 获取群组列表数据并渲染到页面
     // event.name - TIM.EVENT.GROUP_LIST_UPDATED
     // event.data - 存储 Group 对象的数组 - [Group]
@@ -142,7 +143,7 @@ function formatDateTime (inputTime) {
   })
   tim.on(TIM.EVENT.SDK_READY, function (){
     tim.updateMyProfile({
-      nick: '我的昵称'
+      nick: window.uname
     });
     const promise = tim.createGroup({
         type: TIM.TYPES.GRP_AVCHATROOM,
@@ -207,7 +208,7 @@ function formatDateTime (inputTime) {
             const list = $("#liaotianliebiao")
             const html = ` <div>
             <p>${formatDateTime(imResponse.data.message.time)}</p>
-                <p><span>${imResponse.data.message.nick}:</span>${imResponse.data.message.payload.text}</p>
+                <p><span>${window.uname}:</span>${imResponse.data.message.payload.text}</p>
             </div>`
             console.log(html)
             list.append(html)
diff --git a/public/zhibo.html b/public/zhibo.html
index fb0f534..592ca4b 100644
--- a/public/zhibo.html
+++ b/public/zhibo.html
@@ -411,6 +411,7 @@
         const urldata = GetRequest('roomid')
         window.roomid = urldata.roomid
         window.mid = urldata.memberid
+        window.uname = urldata.name
     </script>
     
     
diff --git a/src/views/regime/Liveing.vue b/src/views/regime/Liveing.vue
index e7e5c22..ecb21e8 100644
--- a/src/views/regime/Liveing.vue
+++ b/src/views/regime/Liveing.vue
@@ -6,6 +6,7 @@
 </style>
 <script lang="ts">
 import { getliveinfo } from '@/api';
+import store from '@/store';
 import { defineComponent, ref } from 'vue';
 import { useRoute } from 'vue-router';
 
@@ -16,7 +17,7 @@ export default defineComponent({
         const url = ref<string>()
         if(id && typeof id == 'string'){
             getliveinfo(parseInt(id)).then((res: any)=>{
-                url.value = `/zhibo.html?roomid=${res.roomid}&memberid=${res.memberid}`
+                url.value = `/zhibo.html?roomid=${res.roomid}&memberid=${res.memberid}&name=${escape(store.state.userinfo.name)}`
             })
 
         }