Merge pull request 'xbx' (#170) from xbx into master

Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/170
This commit is contained in:
luyuan 2020-11-30 10:14:42 +08:00
commit 0ac4ff69e9
4 changed files with 4 additions and 2 deletions

1
dist/js/common.js vendored
View File

@ -163,6 +163,7 @@ function setBtnClickFuc() {
leave(); leave();
$('#room-root').hide(); $('#room-root').hide();
$('#login-root').show(); $('#login-root').show();
window.parent.location.href="/regime/live";
} }
else{ else{
x="你按下了\"取消\"按钮!"; x="你按下了\"取消\"按钮!";

2
dist/zhibo.html vendored
View File

@ -435,7 +435,7 @@
<script src="./js/presetting.js"></script> <script src="./js/presetting.js"></script>
<script src="./js/device-testing.js"></script> <script src="./js/device-testing.js"></script>
<script src="./js/index.js"></script> <script src="./js/index.js"></script>
<a href="/regime/video" target="_top" id="navto"></a>
</body> </body>
</html> </html>

View File

@ -163,6 +163,7 @@ function setBtnClickFuc() {
leave(); leave();
$('#room-root').hide(); $('#room-root').hide();
$('#login-root').show(); $('#login-root').show();
window.parent.location.href="/regime/live";
} }
else{ else{
x="你按下了\"取消\"按钮!"; x="你按下了\"取消\"按钮!";

View File

@ -435,7 +435,7 @@
<script src="./js/presetting.js"></script> <script src="./js/presetting.js"></script>
<script src="./js/device-testing.js"></script> <script src="./js/device-testing.js"></script>
<script src="./js/index.js"></script> <script src="./js/index.js"></script>
<a href="/regime/video" target="_top" id="navto"></a>
</body> </body>
</html> </html>