Compare commits

...

3 Commits

Author SHA1 Message Date
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
20b1c0da43 Merge branch 'master' into xbx 2020-08-04 10:42:38 +08:00
35e0c39d1d
rid 2020-08-04 10:41:54 +08:00
2 changed files with 4 additions and 3 deletions

View File

@ -59,7 +59,8 @@
], ],
// //
information_dl: [{ information_dl: [
{
id: 0, id: 0,
url: '../../static/pageD/info(11).png', url: '../../static/pageD/info(11).png',
text: '通知消息', text: '通知消息',

View File

@ -423,8 +423,8 @@ export default {
}; };
var room = { var room = {
id : a.id + "", id : a.rid + "",
name : a.id + "" name : a.rid + ""
}; };
console.log(room,currentUser) console.log(room,currentUser)
//构造chatRoomService //构造chatRoomService