Merge pull request 'rid' (#107 ) from xbx into master

Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/107
Merge branch 'master' into xbx
2020-08-04 10:42:49 +08:00 · 2020-08-04 10:42:38 +08:00 · 2020-08-04 10:41:54 +08:00
2 changed files with 4 additions and 3 deletions
--- a/pages/information/information.vue
+++ b/pages/information/information.vue
@ -59,7 +59,8 @@

 				],
 				// 通知消息
-				information_dl: [{
+				information_dl: [
+					{
 						id: 0,
 						url: '../../static/pageD/info(11).png',
 						text: '通知消息',
--- a/pages/zhibo/index.nvue
+++ b/pages/zhibo/index.nvue
@ -423,8 +423,8 @@ export default {
          };

          var room = {
-              id : a.id + "",
-              name : a.id + ""
+              id : a.rid + "",
+              name : a.rid + ""
          };
          console.log(room,currentUser)
          //构造chatRoomService
Author	SHA1	Message	Date
luyuan	f83048e5c6	Merge pull request 'rid' (#107 ) from xbx into master Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/107	2020-08-04 10:42:49 +08:00
luyuan	20b1c0da43	Merge branch 'master' into xbx	2020-08-04 10:42:38 +08:00
luyuan	35e0c39d1d	rid	2020-08-04 10:41:54 +08:00