Merge branch 'master' of http://git.jihengcc.cn/liubaiyan/qjd-shell-uniapp

jhlive/jhlive.nvue

@@ -86,12 +86,6 @@
 				imInput: '',
 				userSig: '',
 				beautifyLevel: false,
-				collect:"./live-collect.png", // 已收藏图标
-				notCollect: "./live-notCollect.png", // 未收藏图标
-				inputIcon: "./live-chat.png", // 输入框图标
-				beautyIcon:"./live-beauty.png", // 美颜图标
-				switchIcon: "./live-switch.png", // 切换摄像头图标
-				likeIcon: "./live-support.png"
 			};
 		},
 

jhlive/live-wechat.vue

@@ -225,7 +225,7 @@ export default {
               userid: v.userid,
               streams: {},
             });
-            this.$emit('liveEvent', {detail:{eventName: 'onRemoteUserEnterRoom', eventData: {userId: v.userid}}});
+            this.$emit('onRemoteUserEnterRoom', {detail:v.userid});
           }
         })
       }
@@ -243,7 +243,7 @@ export default {
             }
           });
           user.streams = [];
-          this.$emit('liveEvent', {detail:{eventName: 'onRemoteUserLeaveRoom', eventData: {userId: v.userid}}});
+          this.$emit('onRemoteUserLeaveRoom', {detail:v.userid});
         })
         this.users = this.users.filter(v => (data.userlist||[]).find(vv=>vv.userid!=v.userid));
       }