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

Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/167

dist/index.html

@@ -61,11 +61,11 @@
             left: 0;
             z-index: 1001;
             display: none;
-        }</style><link href="/css/chunk-04e3a2fa.08ef3a2d.css" rel="prefetch"><link href="/css/chunk-05d3c41a.55076a31.css" rel="prefetch"><link href="/css/chunk-06828374.8e285ce3.css" rel="prefetch"><link href="/css/chunk-07015098.03da786d.css" rel="prefetch"><link href="/css/chunk-14e6a7cb.9cba31b5.css" rel="prefetch"><link href="/css/chunk-16964057.37c6c246.css" rel="prefetch"><link href="/css/chunk-21d6a1b9.85832ac1.css" rel="prefetch"><link href="/css/chunk-27236dd2.3992b5d2.css" rel="prefetch"><link href="/css/chunk-2a197f09.b2772b24.css" rel="prefetch"><link href="/css/chunk-34d93bb8.4cba2bdb.css" rel="prefetch"><link href="/css/chunk-371ee143.78141e1e.css" rel="prefetch"><link href="/css/chunk-3c7641ed.f87c4e8b.css" rel="prefetch"><link href="/css/chunk-46e3b07d.9259aefd.css" rel="prefetch"><link href="/css/chunk-4cbe0c82.f0a6b24e.css" rel="prefetch"><link href="/css/chunk-4e0b884c.48d44d85.css" rel="prefetch"><link href="/css/chunk-520d8a08.dd761c06.css" rel="prefetch"><link href="/css/chunk-56d58d74.9f239fcf.css" rel="prefetch"><link href="/css/chunk-623eb100.c75b32b7.css" rel="prefetch"><link href="/css/chunk-650d0cb1.47d38586.css" rel="prefetch"><link href="/css/chunk-68091c98.14c0db2d.css" rel="prefetch"><link href="/css/chunk-737c53fe.6caedc04.css" rel="prefetch"><link href="/css/chunk-74d6e86d.85aed290.css" rel="prefetch"><link href="/css/chunk-74d7e8d4.4686069f.css" rel="prefetch"><link href="/css/chunk-7efb667a.0e433876.css" rel="prefetch"><link href="/css/chunk-977f0f52.6081abf8.css" rel="prefetch"><link href="/css/chunk-cc7ac8b2.cf93d877.css" rel="prefetch"><link href="/css/chunk-da7e1532.17a6e0e0.css" rel="prefetch"><link href="/css/chunk-ebdb96a0.d22f743d.css" rel="prefetch"><link href="/css/chunk-ef207110.a20941ed.css" rel="prefetch"><link href="/js/chunk-04e3a2fa.9e6a7256.js" rel="prefetch"><link href="/js/chunk-05d3c41a.91415477.js" rel="prefetch"><link href="/js/chunk-06828374.d411ceff.js" rel="prefetch"><link href="/js/chunk-07015098.22f8b33a.js" rel="prefetch"><link href="/js/chunk-14e6a7cb.24505999.js" rel="prefetch"><link href="/js/chunk-16964057.b8852d7c.js" rel="prefetch"><link href="/js/chunk-21d6a1b9.ecc97c3b.js" rel="prefetch"><link href="/js/chunk-27236dd2.6a20330a.js" rel="prefetch"><link href="/js/chunk-2a197f09.31e80702.js" rel="prefetch"><link href="/js/chunk-34d93bb8.99541265.js" rel="prefetch"><link href="/js/chunk-371ee143.db48ebbc.js" rel="prefetch"><link href="/js/chunk-3c7641ed.47b122a8.js" rel="prefetch"><link href="/js/chunk-46e3b07d.d6873afe.js" rel="prefetch"><link href="/js/chunk-4cbe0c82.4f446d66.js" rel="prefetch"><link href="/js/chunk-4e0b884c.9c3a81c9.js" rel="prefetch"><link href="/js/chunk-520d8a08.2b87a45a.js" rel="prefetch"><link href="/js/chunk-56d58d74.4596e993.js" rel="prefetch"><link href="/js/chunk-623eb100.0d77f748.js" rel="prefetch"><link href="/js/chunk-650d0cb1.7cc3b70b.js" rel="prefetch"><link href="/js/chunk-68091c98.6bc9c5f0.js" rel="prefetch"><link href="/js/chunk-737c53fe.f61ff849.js" rel="prefetch"><link href="/js/chunk-74d6e86d.2c5f5b23.js" rel="prefetch"><link href="/js/chunk-74d7e8d4.02cdd824.js" rel="prefetch"><link href="/js/chunk-7efb667a.74a02cd6.js" rel="prefetch"><link href="/js/chunk-977f0f52.4ec7ef7e.js" rel="prefetch"><link href="/js/chunk-cc7ac8b2.279475fe.js" rel="prefetch"><link href="/js/chunk-da7e1532.4b71bb2c.js" rel="prefetch"><link href="/js/chunk-ebdb96a0.cbefff6f.js" rel="prefetch"><link href="/js/chunk-ef207110.3414d58c.js" rel="prefetch"><link href="/css/app.54811137.css" rel="preload" as="style"><link href="/css/chunk-vendors.d0a33139.css" rel="preload" as="style"><link href="/js/app.b89705bd.js" rel="preload" as="script"><link href="/js/chunk-vendors.5e652f88.js" rel="preload" as="script"><link href="/css/chunk-vendors.d0a33139.css" rel="stylesheet"><link href="/css/app.54811137.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but beelink doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><div id="make"></div><script>window.fbAsyncInit = function () {
+        }</style><link href="/css/chunk-04e3a2fa.08ef3a2d.css" rel="prefetch"><link href="/css/chunk-05d3c41a.55076a31.css" rel="prefetch"><link href="/css/chunk-06828374.8e285ce3.css" rel="prefetch"><link href="/css/chunk-07015098.03da786d.css" rel="prefetch"><link href="/css/chunk-0806cc42.0e433876.css" rel="prefetch"><link href="/css/chunk-14e6a7cb.9cba31b5.css" rel="prefetch"><link href="/css/chunk-16964057.37c6c246.css" rel="prefetch"><link href="/css/chunk-21d6a1b9.85832ac1.css" rel="prefetch"><link href="/css/chunk-27236dd2.3992b5d2.css" rel="prefetch"><link href="/css/chunk-2a197f09.b2772b24.css" rel="prefetch"><link href="/css/chunk-34d93bb8.4cba2bdb.css" rel="prefetch"><link href="/css/chunk-371ee143.78141e1e.css" rel="prefetch"><link href="/css/chunk-3c7641ed.f87c4e8b.css" rel="prefetch"><link href="/css/chunk-46e3b07d.9259aefd.css" rel="prefetch"><link href="/css/chunk-4cbe0c82.f0a6b24e.css" rel="prefetch"><link href="/css/chunk-4e0b884c.48d44d85.css" rel="prefetch"><link href="/css/chunk-520d8a08.dd761c06.css" rel="prefetch"><link href="/css/chunk-56d58d74.9f239fcf.css" rel="prefetch"><link href="/css/chunk-623eb100.c75b32b7.css" rel="prefetch"><link href="/css/chunk-650d0cb1.47d38586.css" rel="prefetch"><link href="/css/chunk-68091c98.14c0db2d.css" rel="prefetch"><link href="/css/chunk-737c53fe.6caedc04.css" rel="prefetch"><link href="/css/chunk-74d6e86d.85aed290.css" rel="prefetch"><link href="/css/chunk-74d7e8d4.4686069f.css" rel="prefetch"><link href="/css/chunk-977f0f52.6081abf8.css" rel="prefetch"><link href="/css/chunk-cc7ac8b2.cf93d877.css" rel="prefetch"><link href="/css/chunk-da7e1532.17a6e0e0.css" rel="prefetch"><link href="/css/chunk-ebdb96a0.d22f743d.css" rel="prefetch"><link href="/css/chunk-ef207110.a20941ed.css" rel="prefetch"><link href="/js/chunk-04e3a2fa.9e6a7256.js" rel="prefetch"><link href="/js/chunk-05d3c41a.91415477.js" rel="prefetch"><link href="/js/chunk-06828374.d411ceff.js" rel="prefetch"><link href="/js/chunk-07015098.22f8b33a.js" rel="prefetch"><link href="/js/chunk-0806cc42.52e56086.js" rel="prefetch"><link href="/js/chunk-14e6a7cb.24505999.js" rel="prefetch"><link href="/js/chunk-16964057.b8852d7c.js" rel="prefetch"><link href="/js/chunk-21d6a1b9.ecc97c3b.js" rel="prefetch"><link href="/js/chunk-27236dd2.6a20330a.js" rel="prefetch"><link href="/js/chunk-2a197f09.31e80702.js" rel="prefetch"><link href="/js/chunk-34d93bb8.99541265.js" rel="prefetch"><link href="/js/chunk-371ee143.db48ebbc.js" rel="prefetch"><link href="/js/chunk-3c7641ed.47b122a8.js" rel="prefetch"><link href="/js/chunk-46e3b07d.d6873afe.js" rel="prefetch"><link href="/js/chunk-4cbe0c82.4f446d66.js" rel="prefetch"><link href="/js/chunk-4e0b884c.9c3a81c9.js" rel="prefetch"><link href="/js/chunk-520d8a08.2b87a45a.js" rel="prefetch"><link href="/js/chunk-56d58d74.4596e993.js" rel="prefetch"><link href="/js/chunk-623eb100.0d77f748.js" rel="prefetch"><link href="/js/chunk-650d0cb1.7cc3b70b.js" rel="prefetch"><link href="/js/chunk-68091c98.6bc9c5f0.js" rel="prefetch"><link href="/js/chunk-737c53fe.f61ff849.js" rel="prefetch"><link href="/js/chunk-74d6e86d.2c5f5b23.js" rel="prefetch"><link href="/js/chunk-74d7e8d4.02cdd824.js" rel="prefetch"><link href="/js/chunk-977f0f52.4ec7ef7e.js" rel="prefetch"><link href="/js/chunk-cc7ac8b2.279475fe.js" rel="prefetch"><link href="/js/chunk-da7e1532.4b71bb2c.js" rel="prefetch"><link href="/js/chunk-ebdb96a0.cbefff6f.js" rel="prefetch"><link href="/js/chunk-ef207110.3414d58c.js" rel="prefetch"><link href="/css/app.54811137.css" rel="preload" as="style"><link href="/css/chunk-vendors.d0a33139.css" rel="preload" as="style"><link href="/js/app.04998842.js" rel="preload" as="script"><link href="/js/chunk-vendors.5e652f88.js" rel="preload" as="script"><link href="/css/chunk-vendors.d0a33139.css" rel="stylesheet"><link href="/css/app.54811137.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but beelink doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><div id="make"></div><script>window.fbAsyncInit = function () {
             FB.init({
                 appId: '277826133389999',
                 autoLogAppEvents: true,
                 xfbml: true,
                 version: 'v8.0'
             });
-        };</script><script async defer crossorigin="anonymous" src="https://connect.facebook.net/en_US/sdk.js"></script><script src="/js/cropper.min.js"></script><script src="/js/chunk-vendors.5e652f88.js"></script><script src="/js/app.b89705bd.js"></script></body></html>
+        };</script><script async defer crossorigin="anonymous" src="https://connect.facebook.net/en_US/sdk.js"></script><script src="/js/cropper.min.js"></script><script src="/js/chunk-vendors.5e652f88.js"></script><script src="/js/app.04998842.js"></script></body></html>

dist/js/chunk-0806cc42.52e56086.js

@@ -0,0 +1,2 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-0806cc42"],{"0a81":function(e,c,t){"use strict";t("3c5a")},"3c5a":function(e,c,t){},"77fb":function(e,c,t){"use strict";t.r(c);var n=t("7a23"),r=Object(n["withScopeId"])("data-v-cc552500"),a=r((function(e,c,t,r,a,o){return Object(n["openBlock"])(),Object(n["createBlock"])("iframe",{id:"iframe",style:{width:"100%",height:"100%"},src:e.url,frameborder:"0"},null,8,["src"])})),o=(t("99af"),t("b0c0"),t("79f6")),i=t("0613"),u=t("6c02"),d=Object(n["defineComponent"])({setup:function(){var e=Object(u["d"])().query.id,c=Object(n["ref"])();return e&&"string"==typeof e&&Object(o["u"])(parseInt(e)).then((function(e){c.value="/zhibo.html?roomid=".concat(e.roomid,"&memberid=").concat(e.memberid,"&name=").concat(escape(i["a"].state.userinfo.name))})),{url:c}}});t("0a81");d.render=a,d.__scopeId="data-v-cc552500";c["default"]=d}}]);
+//# sourceMappingURL=chunk-0806cc42.52e56086.js.map

dist/js/chunk-0806cc42.52e56086.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["webpack:///./src/views/regime/Liveing.vue?31f8","webpack:///./src/views/regime/Liveing.vue","webpack:///./src/views/regime/Liveing.vue?771a","webpack:///./src/views/regime/Liveing.vue?9755"],"names":["id","style","src","url","frameborder","setup","query","parseInt","then","res","value","roomid","memberid","escape","store","state","userinfo","name","render","__scopeId"],"mappings":"kHAAA,W,6LCCI,yBAAwF,UAAhFA,GAAG,SAASC,MAAA,6BAAiCC,IAAK,EAAAC,IAAKC,YAAY,K,6ECMhE,+BAAgB,CAC3BC,MAD2B,WAEvB,IAAML,EAAK,iBAAWM,MAAMN,GACtBG,EAAM,mBAQZ,OAPGH,GAAmB,iBAANA,GACZ,eAAYO,SAASP,IAAKQ,MAAK,SAACC,GAC5BN,EAAIO,MAAJ,6BAAkCD,EAAIE,OAAtC,qBAAyDF,EAAIG,SAA7D,iBAA8EC,OAAOC,EAAA,KAAMC,MAAMC,SAASC,UAK3G,CACHd,U,UCdZ,EAAOe,OAAS,EAChB,EAAOC,UAAY,kBAEJ","file":"js/chunk-0806cc42.52e56086.js","sourcesContent":["export * from \"-!../../../node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!../../../node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!../../../node_modules/vue-loader-v16/dist/stylePostLoader.js!../../../node_modules/postcss-loader/src/index.js??ref--8-oneOf-1-2!../../../node_modules/sass-loader/dist/cjs.js??ref--8-oneOf-1-3!../../../node_modules/cache-loader/dist/cjs.js??ref--0-0!../../../node_modules/vue-loader-v16/dist/index.js??ref--0-1!./Liveing.vue?vue&type=style&index=0&id=cc552500&lang=scss&scoped=true\"","<template>\n    <iframe id=\"iframe\" style=\"width:100%;height: 100%\" :src=\"url\" frameborder=\"0\"></iframe>\n</template>\n<style lang=\"scss\" scoped>\n\n</style>\n<script lang=\"ts\">\nimport { getliveinfo } from '@/api';\nimport store from '@/store';\nimport { defineComponent, onMounted, ref, watch } from 'vue';\nimport { useRoute } from 'vue-router';\n\n\nexport default defineComponent({\n    setup(){\n        const id = useRoute().query.id;\n        const url = ref<string>()\n        if(id && typeof id == 'string'){\n            getliveinfo(parseInt(id)).then((res: any)=>{\n                url.value = `/zhibo.html?roomid=${res.roomid}&memberid=${res.memberid}&name=${escape(store.state.userinfo.name)}`\n            })\n\n        }\n     \n        return {\n            url\n        }\n    }\n})\n\n</script>","\nimport { getliveinfo } from '@/api';\nimport store from '@/store';\nimport { defineComponent, onMounted, ref, watch } from 'vue';\nimport { useRoute } from 'vue-router';\n\n\nexport default defineComponent({\n    setup(){\n        const id = useRoute().query.id;\n        const url = ref<string>()\n        if(id && typeof id == 'string'){\n            getliveinfo(parseInt(id)).then((res: any)=>{\n                url.value = `/zhibo.html?roomid=${res.roomid}&memberid=${res.memberid}&name=${escape(store.state.userinfo.name)}`\n            })\n\n        }\n     \n        return {\n            url\n        }\n    }\n})\n\n","import { render } from \"./Liveing.vue?vue&type=template&id=cc552500&scoped=true&bindings={}\"\nimport script from \"./Liveing.vue?vue&type=script&lang=ts\"\nexport * from \"./Liveing.vue?vue&type=script&lang=ts\"\n\nimport \"./Liveing.vue?vue&type=style&index=0&id=cc552500&lang=scss&scoped=true\"\nscript.render = render\nscript.__scopeId = \"data-v-cc552500\"\n\nexport default script"],"sourceRoot":""}

dist/js/chunk-7efb667a.74a02cd6.js

@@ -1,2 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-7efb667a"],{"395e":function(e,t,c){},"77fb":function(e,t,c){"use strict";c.r(t);var n=c("7a23"),r=Object(n["withScopeId"])("data-v-cd8f97d0"),o=r((function(e,t,c,r,o,a){return Object(n["openBlock"])(),Object(n["createBlock"])("iframe",{style:{width:"100%",height:"100%"},src:e.url,frameborder:"0"},null,8,["src"])})),a=(c("99af"),c("b0c0"),c("79f6")),i=c("0613"),d=c("6c02"),f=Object(n["defineComponent"])({setup:function(){var e=Object(d["d"])().query.id,t=Object(n["ref"])();return e&&"string"==typeof e&&Object(a["u"])(parseInt(e)).then((function(e){t.value="/zhibo.html?roomid=".concat(e.roomid,"&memberid=").concat(e.memberid,"&name=").concat(escape(i["a"].state.userinfo.name))})),{url:t}}});c("a7f9");f.render=o,f.__scopeId="data-v-cd8f97d0";t["default"]=f},a7f9:function(e,t,c){"use strict";c("395e")}}]);
-//# sourceMappingURL=chunk-7efb667a.74a02cd6.js.map

dist/js/chunk-7efb667a.74a02cd6.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["webpack:///./src/views/regime/Liveing.vue","webpack:///./src/views/regime/Liveing.vue?771a","webpack:///./src/views/regime/Liveing.vue?9755","webpack:///./src/views/regime/Liveing.vue?20bc"],"names":["style","src","url","frameborder","setup","id","query","parseInt","then","res","value","roomid","memberid","escape","store","state","userinfo","name","render","__scopeId"],"mappings":"2QACI,yBAA4E,UAApEA,MAAA,6BAAiCC,IAAK,EAAAC,IAAKC,YAAY,K,6ECMpD,+BAAgB,CAC3BC,MAD2B,WAEvB,IAAMC,EAAK,iBAAWC,MAAMD,GACtBH,EAAM,mBAQZ,OAPGG,GAAmB,iBAANA,GACZ,eAAYE,SAASF,IAAKG,MAAK,SAACC,GAC5BP,EAAIQ,MAAJ,6BAAkCD,EAAIE,OAAtC,qBAAyDF,EAAIG,SAA7D,iBAA8EC,OAAOC,EAAA,KAAMC,MAAMC,SAASC,UAK3G,CACHf,U,UCdZ,EAAOgB,OAAS,EAChB,EAAOC,UAAY,kBAEJ,gB,kCCRf","file":"js/chunk-7efb667a.74a02cd6.js","sourcesContent":["<template>\n    <iframe style=\"width:100%;height: 100%\" :src=\"url\" frameborder=\"0\"></iframe>\n</template>\n<style lang=\"scss\" scoped>\n\n</style>\n<script lang=\"ts\">\nimport { getliveinfo } from '@/api';\nimport store from '@/store';\nimport { defineComponent, ref } from 'vue';\nimport { useRoute } from 'vue-router';\n\n\nexport default defineComponent({\n    setup(){\n        const id = useRoute().query.id;\n        const url = ref<string>()\n        if(id && typeof id == 'string'){\n            getliveinfo(parseInt(id)).then((res: any)=>{\n                url.value = `/zhibo.html?roomid=${res.roomid}&memberid=${res.memberid}&name=${escape(store.state.userinfo.name)}`\n            })\n\n        }\n\n        return {\n            url\n        }\n    }\n})\n\n</script>","\nimport { getliveinfo } from '@/api';\nimport store from '@/store';\nimport { defineComponent, ref } from 'vue';\nimport { useRoute } from 'vue-router';\n\n\nexport default defineComponent({\n    setup(){\n        const id = useRoute().query.id;\n        const url = ref<string>()\n        if(id && typeof id == 'string'){\n            getliveinfo(parseInt(id)).then((res: any)=>{\n                url.value = `/zhibo.html?roomid=${res.roomid}&memberid=${res.memberid}&name=${escape(store.state.userinfo.name)}`\n            })\n\n        }\n\n        return {\n            url\n        }\n    }\n})\n\n","import { render } from \"./Liveing.vue?vue&type=template&id=cd8f97d0&scoped=true&bindings={}\"\nimport script from \"./Liveing.vue?vue&type=script&lang=ts\"\nexport * from \"./Liveing.vue?vue&type=script&lang=ts\"\n\nimport \"./Liveing.vue?vue&type=style&index=0&id=cd8f97d0&lang=scss&scoped=true\"\nscript.render = render\nscript.__scopeId = \"data-v-cd8f97d0\"\n\nexport default script","export * from \"-!../../../node_modules/mini-css-extract-plugin/dist/loader.js??ref--8-oneOf-1-0!../../../node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!../../../node_modules/vue-loader-v16/dist/stylePostLoader.js!../../../node_modules/postcss-loader/src/index.js??ref--8-oneOf-1-2!../../../node_modules/sass-loader/dist/cjs.js??ref--8-oneOf-1-3!../../../node_modules/cache-loader/dist/cjs.js??ref--0-0!../../../node_modules/vue-loader-v16/dist/index.js??ref--0-1!./Liveing.vue?vue&type=style&index=0&id=cd8f97d0&lang=scss&scoped=true\""],"sourceRoot":""}

dist/js/common.js

@@ -155,9 +155,21 @@ function setBtnClickFuc() {
   );
   //logout
   $('#logout-btn').on('click', () => {
+    // window.location.hash='edit'
+    // console.log(window.location.hash)
+    var x;
+    var r=confirm("您确认关闭吗？");
+    if (r==true){
        leave();
         $('#room-root').hide();
         $('#login-root').show();
+    }
+    else{
+      x="你按下了\"取消\"按钮!";
+    }
+    // leave();
+    // $('#room-root').hide();
+    // $('#login-root').show();
   });
   //switch main video
   $('#main-video').on('click', () => {

public/js/common.js

@@ -155,9 +155,21 @@ function setBtnClickFuc() {
   );
   //logout
   $('#logout-btn').on('click', () => {
+    // window.location.hash='edit'
+    // console.log(window.location.hash)
+    var x;
+    var r=confirm("您确认关闭吗？");
+    if (r==true){
        leave();
         $('#room-root').hide();
         $('#login-root').show();
+    }
+    else{
+      x="你按下了\"取消\"按钮!";
+    }
+    // leave();
+    // $('#room-root').hide();
+    // $('#login-root').show();
   });
   //switch main video
   $('#main-video').on('click', () => {

src/views/regime/Liveing.vue

@@ -1,5 +1,5 @@
 <template>
-    <iframe style="width:100%;height: 100%" :src="url" frameborder="0"></iframe>
+    <iframe id="iframe" style="width:100%;height: 100%" :src="url" frameborder="0"></iframe>
 </template>
 <style lang="scss" scoped>
 
@@ -7,7 +7,7 @@
 <script lang="ts">
 import { getliveinfo } from '@/api';
 import store from '@/store';
-import { defineComponent, ref } from 'vue';
+import { defineComponent, onMounted, ref, watch } from 'vue';
 import { useRoute } from 'vue-router';