diff --git a/Web/assets/def.png b/Web/assets/def.png new file mode 100644 index 0000000..d15b636 Binary files /dev/null and b/Web/assets/def.png differ diff --git a/Web/html/body/data.html b/Web/html/body/data.html index d73273a..f51078a 100644 --- a/Web/html/body/data.html +++ b/Web/html/body/data.html @@ -9,6 +9,7 @@ + 不想做了,鸽 diff --git a/Web/html/body/live.html b/Web/html/body/live.html index 433c14e..8cfeb3e 100644 --- a/Web/html/body/live.html +++ b/Web/html/body/live.html @@ -89,6 +89,9 @@ ]], done: function () { done(); + if (getParam('type') === 'createRoom') { + createRoom('') + } }, error: function (res, msg) { console.log(res, msg) diff --git a/Web/html/body/user.html b/Web/html/body/user.html index d43cceb..8cc055f 100644 --- a/Web/html/body/user.html +++ b/Web/html/body/user.html @@ -23,7 +23,8 @@ @@ -105,20 +122,56 @@ { field: 'uid', title: 'UID', width: 150, sort: true, fixed: 'left', templet: '
{{= d.uid}}' }, { field: 'uname', title: '用户名', width: 150, fixed: 'left' }, { field: 'face', title: '头像', width: 80, templet: '
' }, - { field: 'status', title: '状态', width: 150, templet: '
{{= d.status}} ' }, + { field: 'status', title: '状态', width: 150, templet: '
{{= d.status}} ' }, { field: 'sql_time', title: '添加时间', width: 190 }, - { fixed: "right", title: "操作", width: 80, align: "center", toolbar: "#toolDemo" } + { fixed: "right", title: "操作", width: 180, align: "center", toolbar: "#toolDemo" } ]], done: function () { - + onDone(); }, error: function (res, msg) { console.log(res, msg) } }); + function onDone() { + table.on('tool(roomTable)', function (obj) { + var id = obj.config.id; + var data = obj.data; + var checkStatus = table.checkStatus(id); + var othis = lay(this); + switch (obj.event) { + case 'input': + onClickInput(data.uid) + break; + }; + }); + } + function onClickInput(uid) { + layer.open({ + type: 2, // page 层类型 + area: ['650px', '400px'], + title: '选择主播', + shade: 0.6, // 遮罩透明度 + shadeClose: false, // 点击遮罩区域,关闭弹层 + maxmin: true, // 允许全屏最小化 + anim: 1, // 0-6 的动画形式,-1 不开启 + // btn: ['确定', '取消'], + content: '/html/ui/userFollow.html?uid=' + uid, + yes: function (index, layero) { + var iframeWin = window[layero.find('iframe')[0]['name']]; + var anchorRoomId = iframeWin.$('#anchorRoomId')[0].value; + if (!hasString(anchorRoomId)) { + layer.msg("请选择") + return + } + let url = new URL(window.location.href); + url.searchParams.set('roomId', anchorRoomId); + window.location.href = url.toString(); + } + }); - + } }); diff --git a/Web/html/body/video.html b/Web/html/body/video.html index 4a4424e..8562841 100644 --- a/Web/html/body/video.html +++ b/Web/html/body/video.html @@ -46,8 +46,14 @@  
弹幕透明度
-
+
+
 
+
+ +
+
+
- + + + + + + + + + \ No newline at end of file diff --git a/Web/index.html b/Web/index.html index ba05a9d..93fc06b 100644 --- a/Web/index.html +++ b/Web/index.html @@ -11,12 +11,38 @@
+
+

+