Merge pull request 'yuming' (#283) from xbx into master

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

dist/css/chunk-6842bb28.f0939db8.css

@@ -1 +0,0 @@
-.mine .body[data-v-881b2f3e],.mine[data-v-881b2f3e]{display:flex;flex-direction:column;height:100vh}.mine .body[data-v-881b2f3e]{width:100%;min-height:calc(100% - .57rem);background-color:#f5f5f5}

dist/css/chunk-7da0eb18.409b8eb7.css

@@ -0,0 +1 @@
+.upload1[data-v-3f353a0a],.upload[data-v-3f353a0a]{width:1.71rem;height:.96rem}.upload[data-v-3f353a0a]{display:none}.upload-video[data-v-3f353a0a]{width:100%;min-width:7rem;background-color:#fff;padding:.46rem;border-radius:.17rem;position:relative}.upload-video[data-v-3f353a0a] .ant-form .title{font-size:.12rem;font-weight:700;color:#111;margin-bottom:.28rem}.upload-video[data-v-3f353a0a] .ant-form .ant-row .ant-form-item-label{width:1.3rem;margin:0 .3rem 0 .17rem;text-align:left}.upload-video[data-v-3f353a0a] .ant-form .ant-row .ant-form-item-label>label{font-size:.12rem;font-weight:500;color:grey}.upload-video[data-v-3f353a0a] .ant-form .ant-row .ant-form-item-label>label:after{content:""}.upload-video[data-v-3f353a0a] .ant-form .ant-row .upload-image{width:1.71rem;height:.96rem;border:.01rem solid #dcdfe0;border-radius:.03rem;display:flex;align-items:center;justify-content:center;margin-right:.17rem}.upload-video[data-v-3f353a0a] .ant-form .ant-row .ant-input{width:1.71rem;padding:.06rem .11rem;border-radius:.03rem;border:.01rem solid #dcdfe0;font-size:.11rem;color:#3f3f3f}.upload-video[data-v-3f353a0a] .ant-form .ant-row .ant-input::-webkit-input-placeholder{font-size:.12rem;color:grey}.upload-video[data-v-3f353a0a] .ant-form .ant-row .ant-select{font-size:.12rem;color:#3f3f3f}.upload-video[data-v-3f353a0a] .ant-form .ant-row .ant-select-dropdown{font-size:.12rem}.upload-video[data-v-3f353a0a] .ant-form .ant-row .ant-upload-list{display:none}.upload-video[data-v-3f353a0a] .ant-form .ant-row .ant-btn{padding:0;width:.63rem;height:.23rem;background:#08ae98;border-radius:.03rem;font-size:.1rem;font-weight:500;color:#fff}.upload-video[data-v-3f353a0a] .ant-form .video-cover .preview-image{width:1.71rem;height:.96rem}.upload-video[data-v-3f353a0a] .ant-form .demand{height:.94rem;font-size:.1rem;font-weight:500;color:grey;display:flex;flex-direction:column;justify-content:center}.upload-video[data-v-3f353a0a] .ant-form .demand>p{line-height:.17rem;margin:0}.upload-video[data-v-3f353a0a] .ant-form .video-introduction .ant-form-item-control-wrapper .ant-form-item-children{display:flex}.upload-video[data-v-3f353a0a] .ant-form .video-introduction .video-list{display:flex;align-items:center}.upload-video[data-v-3f353a0a] .ant-form .video-introduction .video-list .link{width:.11rem;height:.11rem;margin-right:.04rem}.upload-video[data-v-3f353a0a] .ant-form .video-introduction .video-list>span{font-size:.09rem;font-weight:500;color:#07ad97;max-width:1.5rem}.upload-video[data-v-3f353a0a] .ant-form .video-introduction .video-list .del{width:.11rem;height:.11rem;margin-left:auto;cursor:pointer}.upload-video[data-v-3f353a0a] .ant-form .duration .unit{margin-left:.18rem;font-size:.12rem;font-weight:500;color:grey}.upload-video[data-v-3f353a0a] .ant-form .brief{position:relative}.upload-video[data-v-3f353a0a] .ant-form .brief .ant-input{width:3.59rem}.upload-video[data-v-3f353a0a] .ant-form .brief .brief-textarea{min-height:.85rem;padding-bottom:.3rem}.upload-video[data-v-3f353a0a] .ant-form .brief .words-number{position:absolute;right:.11rem;bottom:-.11rem;font-size:.11rem;font-weight:500;color:#7f7f7f;user-select:none}

dist/css/chunk-92984918.033f698a.css

@@ -1 +0,0 @@
-.upload1[data-v-0088a462],.upload[data-v-0088a462]{width:1.71rem;height:.96rem}.upload[data-v-0088a462]{display:none}.upload-video[data-v-0088a462]{width:100%;min-width:7rem;background-color:#fff;padding:.46rem;border-radius:.17rem;position:relative}.upload-video[data-v-0088a462] .ant-form .title{font-size:.12rem;font-weight:700;color:#111;margin-bottom:.28rem}.upload-video[data-v-0088a462] .ant-form .ant-row .ant-form-item-label{width:1.3rem;margin:0 .3rem 0 .17rem;text-align:left}.upload-video[data-v-0088a462] .ant-form .ant-row .ant-form-item-label>label{font-size:.12rem;font-weight:500;color:grey}.upload-video[data-v-0088a462] .ant-form .ant-row .ant-form-item-label>label:after{content:""}.upload-video[data-v-0088a462] .ant-form .ant-row .upload-image{width:1.71rem;height:.96rem;border:.01rem solid #dcdfe0;border-radius:.03rem;display:flex;align-items:center;justify-content:center;margin-right:.17rem}.upload-video[data-v-0088a462] .ant-form .ant-row .ant-input{width:1.71rem;padding:.06rem .11rem;border-radius:.03rem;border:.01rem solid #dcdfe0;font-size:.11rem;color:#3f3f3f}.upload-video[data-v-0088a462] .ant-form .ant-row .ant-input::-webkit-input-placeholder{font-size:.12rem;color:grey}.upload-video[data-v-0088a462] .ant-form .ant-row .ant-select{font-size:.12rem;color:#3f3f3f}.upload-video[data-v-0088a462] .ant-form .ant-row .ant-select-dropdown{font-size:.12rem}.upload-video[data-v-0088a462] .ant-form .ant-row .ant-upload-list{display:none}.upload-video[data-v-0088a462] .ant-form .ant-row .ant-btn{padding:0;width:.63rem;height:.23rem;background:#08ae98;border-radius:.03rem;font-size:.1rem;font-weight:500;color:#fff}.upload-video[data-v-0088a462] .ant-form .video-cover .preview-image{width:1.71rem;height:.96rem}.upload-video[data-v-0088a462] .ant-form .demand{height:.94rem;font-size:.1rem;font-weight:500;color:grey;display:flex;flex-direction:column;justify-content:center}.upload-video[data-v-0088a462] .ant-form .demand>p{line-height:.17rem;margin:0}.upload-video[data-v-0088a462] .ant-form .video-introduction .ant-form-item-control-wrapper .ant-form-item-children{display:flex}.upload-video[data-v-0088a462] .ant-form .video-introduction .video-list{display:flex;align-items:center}.upload-video[data-v-0088a462] .ant-form .video-introduction .video-list .link{width:.11rem;height:.11rem;margin-right:.04rem}.upload-video[data-v-0088a462] .ant-form .video-introduction .video-list>span{font-size:.09rem;font-weight:500;color:#07ad97;max-width:1.5rem}.upload-video[data-v-0088a462] .ant-form .video-introduction .video-list .del{width:.11rem;height:.11rem;margin-left:auto;cursor:pointer}.upload-video[data-v-0088a462] .ant-form .duration .unit{margin-left:.18rem;font-size:.12rem;font-weight:500;color:grey}.upload-video[data-v-0088a462] .ant-form .brief{position:relative}.upload-video[data-v-0088a462] .ant-form .brief .ant-input{width:3.59rem}.upload-video[data-v-0088a462] .ant-form .brief .brief-textarea{min-height:.85rem;padding-bottom:.3rem}.upload-video[data-v-0088a462] .ant-form .brief .words-number{position:absolute;right:.11rem;bottom:-.11rem;font-size:.11rem;font-weight:500;color:#7f7f7f;user-select:none}.upload-video .submit-btn[data-v-0088a462]{width:.7rem;height:.28rem;background:#08ae98;border-radius:.03rem;font-size:.1rem;font-weight:500;color:#fff;text-align:center;line-height:.28rem;cursor:pointer;user-select:none;position:fixed;top:1.3rem;right:1rem}

dist/css/chunk-ebdb96a0.d22f743d.css

@@ -0,0 +1 @@
+.mine[data-v-e6e249bc]{display:flex;flex-direction:column}.mine .body[data-v-e6e249bc]{width:100%;min-height:calc(100% - .57rem);background-color:#f5f5f5}

dist/js/chunk-39b973ba.334f229f.js

@@ -0,0 +1,2 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-39b973ba"],{"6c28":function(e,c,t){"use strict";t("c7b7")},"77fb":function(e,c,t){"use strict";t.r(c);var n=t("7a23"),i=Object(n["withScopeId"])("data-v-058c5483"),o=i((function(e,c,t,i,o,a){return Object(n["openBlock"])(),Object(n["createBlock"])("iframe",{id:"iframe",style:{width:"100%",height:"100%"},src:e.url,frameborder:"0"},null,8,["src"])})),a=(t("99af"),t("b0c0"),t("79f6")),r=t("0613"),d=t("5699"),b=t("6c02"),m=Object(n["defineComponent"])({setup:function(){var e=Object(b["d"])().query.id,c=Object(n["ref"])(),t=Object(d["c"])();return e&&"string"==typeof e&&Object(a["y"])(parseInt(e)).then((function(e){var n=t.$s();c.value="zh"==n?"/zhibo.html?roomid=".concat(e.roomid,"&memberid=").concat(e.memberid,"&name=").concat(escape(r["a"].state.userinfo.name),"&liveid=").concat(e.liveid):"/zhiboen.html?roomid=".concat(e.roomid,"&memberid=").concat(e.memberid,"&name=").concat(escape(r["a"].state.userinfo.name),"&liveid=").concat(e.liveid)})),{url:c}}});t("6c28");m.render=o,m.__scopeId="data-v-058c5483";c["default"]=m},c7b7:function(e,c,t){}}]);
+//# sourceMappingURL=chunk-39b973ba.334f229f.js.map

dist/js/chunk-39b973ba.334f229f.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["webpack:///./src/views/regime/Liveing.vue?25f2","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","lan","parseInt","then","res","yuyan","$s","value","roomid","memberid","escape","store","state","userinfo","name","liveid","render","__scopeId"],"mappings":"kHAAA,W,oKCCI,yBAAwF,UAAhFA,GAAG,SAASC,MAAA,6BAAiCC,IAAK,EAAAC,IAAKC,YAAY,K,yFCOhE,+BAAgB,CAC3BC,MAD2B,WAEvB,IAAML,EAAK,iBAAWM,MAAMN,GACtBG,EAAM,mBACNI,EAAW,iBAUjB,OATGP,GAAmB,iBAANA,GACZ,eAAYQ,SAASR,IAAKS,MAAK,SAACC,GAE5B,IAAMC,EAAQJ,EAAIK,KAClBT,EAAIU,MAAiB,MAATF,EAAA,6BAAsCD,EAAII,OAA1C,qBAA6DJ,EAAIK,SAAjE,iBAAkFC,OAAOC,EAAA,KAAMC,MAAMC,SAASC,MAA9G,mBAA8HV,EAAIW,QAAlI,+BAAqKX,EAAII,OAAzK,qBAA4LJ,EAAIK,SAAhM,iBAAiNC,OAAOC,EAAA,KAAMC,MAAMC,SAASC,MAA7O,mBAA6PV,EAAIW,WAK9Q,CACHlB,U,UClBZ,EAAOmB,OAAS,EAChB,EAAOC,UAAY,kBAEJ,gB","file":"js/chunk-39b973ba.334f229f.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=058c5483&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, luzhi } from '@/api';\nimport store from '@/store';\nimport { useI18n } from '@/utils/i18n';\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        const lan: any = useI18n()\n        if(id && typeof id == 'string'){\n            getliveinfo(parseInt(id)).then((res: any)=>{\n                // luzhi(res.roomid)\n                const yuyan = lan.$s();\n                url.value = yuyan == \"zh\" ? `/zhibo.html?roomid=${res.roomid}&memberid=${res.memberid}&name=${escape(store.state.userinfo.name)}&liveid=${res.liveid}` : `/zhiboen.html?roomid=${res.roomid}&memberid=${res.memberid}&name=${escape(store.state.userinfo.name)}&liveid=${res.liveid}`\n            })\n\n        }\n     \n        return {\n            url\n        }\n    }\n})\n\n</script>","\nimport { getliveinfo, luzhi } from '@/api';\nimport store from '@/store';\nimport { useI18n } from '@/utils/i18n';\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        const lan: any = useI18n()\n        if(id && typeof id == 'string'){\n            getliveinfo(parseInt(id)).then((res: any)=>{\n                // luzhi(res.roomid)\n                const yuyan = lan.$s();\n                url.value = yuyan == \"zh\" ? `/zhibo.html?roomid=${res.roomid}&memberid=${res.memberid}&name=${escape(store.state.userinfo.name)}&liveid=${res.liveid}` : `/zhiboen.html?roomid=${res.roomid}&memberid=${res.memberid}&name=${escape(store.state.userinfo.name)}&liveid=${res.liveid}`\n            })\n\n        }\n     \n        return {\n            url\n        }\n    }\n})\n\n","import { render } from \"./Liveing.vue?vue&type=template&id=058c5483&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=058c5483&lang=scss&scoped=true\"\nscript.render = render\nscript.__scopeId = \"data-v-058c5483\"\n\nexport default script"],"sourceRoot":""}

dist/js/chunk-4eb8937d.ac36668f.js

@@ -1,2 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-4eb8937d"],{"402b":function(e,c,t){"use strict";t("ff84")},"77fb":function(e,c,t){"use strict";t.r(c);var n=t("7a23"),a=Object(n["withScopeId"])("data-v-5a75cc63"),i=a((function(e,c,t,a,i,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")),r=t("0613"),d=t("5699"),b=t("6c02"),f=Object(n["defineComponent"])({setup:function(){var e=Object(b["d"])().query.id,c=Object(n["ref"])(),t=Object(d["c"])();return e&&"string"==typeof e&&Object(o["y"])(parseInt(e)).then((function(e){var n=t.$s();c.value="zh"==n?"/teacher/zhibo.html?roomid=".concat(e.roomid,"&memberid=").concat(e.memberid,"&name=").concat(escape(r["a"].state.userinfo.name),"&liveid=").concat(e.liveid):"/teacher/zhiboen.html?roomid=".concat(e.roomid,"&memberid=").concat(e.memberid,"&name=").concat(escape(r["a"].state.userinfo.name),"&liveid=").concat(e.liveid)})),{url:c}}});t("402b");f.render=i,f.__scopeId="data-v-5a75cc63";c["default"]=f},ff84:function(e,c,t){}}]);
-//# sourceMappingURL=chunk-4eb8937d.ac36668f.js.map

dist/js/chunk-4eb8937d.ac36668f.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["webpack:///./src/views/regime/Liveing.vue?de38","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","lan","parseInt","then","res","yuyan","$s","value","roomid","memberid","escape","store","state","userinfo","name","liveid","render","__scopeId"],"mappings":"kHAAA,W,oKCCI,yBAAwF,UAAhFA,GAAG,SAASC,MAAA,6BAAiCC,IAAK,EAAAC,IAAKC,YAAY,K,yFCOhE,+BAAgB,CAC3BC,MAD2B,WAEvB,IAAML,EAAK,iBAAWM,MAAMN,GACtBG,EAAM,mBACNI,EAAW,iBAUjB,OATGP,GAAmB,iBAANA,GACZ,eAAYQ,SAASR,IAAKS,MAAK,SAACC,GAE5B,IAAMC,EAAQJ,EAAIK,KAClBT,EAAIU,MAAiB,MAATF,EAAA,qCAA8CD,EAAII,OAAlD,qBAAqEJ,EAAIK,SAAzE,iBAA0FC,OAAOC,EAAA,KAAMC,MAAMC,SAASC,MAAtH,mBAAsIV,EAAIW,QAA1I,uCAAqLX,EAAII,OAAzL,qBAA4MJ,EAAIK,SAAhN,iBAAiOC,OAAOC,EAAA,KAAMC,MAAMC,SAASC,MAA7P,mBAA6QV,EAAIW,WAK9R,CACHlB,U,UClBZ,EAAOmB,OAAS,EAChB,EAAOC,UAAY,kBAEJ,gB","file":"js/chunk-4eb8937d.ac36668f.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=5a75cc63&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, luzhi } from '@/api';\nimport store from '@/store';\nimport { useI18n } from '@/utils/i18n';\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        const lan: any = useI18n()\n        if(id && typeof id == 'string'){\n            getliveinfo(parseInt(id)).then((res: any)=>{\n                // luzhi(res.roomid)\n                const yuyan = lan.$s();\n                url.value = yuyan == \"zh\" ? `/teacher/zhibo.html?roomid=${res.roomid}&memberid=${res.memberid}&name=${escape(store.state.userinfo.name)}&liveid=${res.liveid}` : `/teacher/zhiboen.html?roomid=${res.roomid}&memberid=${res.memberid}&name=${escape(store.state.userinfo.name)}&liveid=${res.liveid}`\n            })\n\n        }\n     \n        return {\n            url\n        }\n    }\n})\n\n</script>","\nimport { getliveinfo, luzhi } from '@/api';\nimport store from '@/store';\nimport { useI18n } from '@/utils/i18n';\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        const lan: any = useI18n()\n        if(id && typeof id == 'string'){\n            getliveinfo(parseInt(id)).then((res: any)=>{\n                // luzhi(res.roomid)\n                const yuyan = lan.$s();\n                url.value = yuyan == \"zh\" ? `/teacher/zhibo.html?roomid=${res.roomid}&memberid=${res.memberid}&name=${escape(store.state.userinfo.name)}&liveid=${res.liveid}` : `/teacher/zhiboen.html?roomid=${res.roomid}&memberid=${res.memberid}&name=${escape(store.state.userinfo.name)}&liveid=${res.liveid}`\n            })\n\n        }\n     \n        return {\n            url\n        }\n    }\n})\n\n","import { render } from \"./Liveing.vue?vue&type=template&id=5a75cc63&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=5a75cc63&lang=scss&scoped=true\"\nscript.render = render\nscript.__scopeId = \"data-v-5a75cc63\"\n\nexport default script"],"sourceRoot":""}

dist/js/chunk-6842bb28.934af575.js

@@ -1,2 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-6842bb28"],{"52bc":function(e,t,c){},6413:function(e,t,c){"use strict";c.r(t);var o=c("7a23"),n=Object(o["withScopeId"])("data-v-881b2f3e");Object(o["pushScopeId"])("data-v-881b2f3e");var a={class:"mine"},r={class:"body",id:"rbody"};Object(o["popScopeId"])();var b=n((function(e,t,c,n,b,p){var d=Object(o["resolveComponent"])("NavTop"),s=Object(o["resolveComponent"])("router-view");return Object(o["openBlock"])(),Object(o["createBlock"])("div",a,[Object(o["createVNode"])(d,{type:1,style:{"flex-shrink":"0"}}),Object(o["createVNode"])("div",r,[Object(o["createVNode"])(s)])])})),p=c("c022"),d=Object(o["defineComponent"])({components:{NavTop:p["a"]},setup:function(){return{}}});c("a39f");d.render=b,d.__scopeId="data-v-881b2f3e";t["default"]=d},a39f:function(e,t,c){"use strict";c("52bc")}}]);
-//# sourceMappingURL=chunk-6842bb28.934af575.js.map

dist/js/chunk-6842bb28.934af575.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["webpack:///./src/layout/Live.vue","webpack:///./src/layout/Live.vue?cdce","webpack:///./src/layout/Live.vue?b857","webpack:///./src/layout/Live.vue?d2b0"],"names":["class","id","type","style","components","NavTop","setup","render","__scopeId"],"mappings":"iQACSA,MAAM,Q,GAEFA,MAAM,OAAOC,GAAG,S,sLAFzB,yBAKM,MALN,EAKM,CAJF,yBAAiD,GAAxCC,KAAM,EAAGC,MAAA,sBAClB,yBAEM,MAFN,EAEM,CADF,yBAAc,U,YCAX,+BAAgB,CAC3BC,WAAW,CACPC,SAAA,MAEJC,MAJ2B,WAavB,MAAO,M,UCZf,EAAOC,OAAS,EAChB,EAAOC,UAAY,kBAEJ,gB,kCCRf","file":"js/chunk-6842bb28.934af575.js","sourcesContent":["<template>\n    <div class=\"mine\">\n        <NavTop :type=\"1\" style=\"flex-shrink:0\"></NavTop>\n        <div class=\"body\" id=\"rbody\">\n            <router-view/>\n        </div>\n    </div>\n</template>\n<style lang=\"scss\" scoped>\n.mine{\n    display: flex;\n    flex-direction: column;\n        height: 100vh;\n    .body{\n        display: flex;\n        flex-direction: column;\n        width: 100%;\n        min-height:  calc(100% - 57px);\n        background-color: #F5F5F5;\n        height: 100vh;\n        // padding: 23px;\n    }\n}\n</style>\n<script lang=\"ts\">\nimport { defineComponent, onMounted, ref } from 'vue';\nimport NavTop from \"@/components/NavTop.vue\"\n\nexport default defineComponent({\n    components:{\n        NavTop\n    },\n    setup(){\n        console.log(1)\n        // const height = ref(0);\n        // onMounted(() => {\n        //     height.value = document.documentElement.clientHeight;\n        // })\n        // window.onresize=function(){  \n        //     height.value = document.documentElement.clientHeight;\n        // }\n        return {\n            // height\n        }\n    }\n})\n</script>","\nimport { defineComponent, onMounted, ref } from 'vue';\nimport NavTop from \"@/components/NavTop.vue\"\n\nexport default defineComponent({\n    components:{\n        NavTop\n    },\n    setup(){\n        console.log(1)\n        // const height = ref(0);\n        // onMounted(() => {\n        //     height.value = document.documentElement.clientHeight;\n        // })\n        // window.onresize=function(){  \n        //     height.value = document.documentElement.clientHeight;\n        // }\n        return {\n            // height\n        }\n    }\n})\n","import { render } from \"./Live.vue?vue&type=template&id=881b2f3e&scoped=true&bindings={}\"\nimport script from \"./Live.vue?vue&type=script&lang=ts\"\nexport * from \"./Live.vue?vue&type=script&lang=ts\"\n\nimport \"./Live.vue?vue&type=style&index=0&id=881b2f3e&lang=scss&scoped=true\"\nscript.render = render\nscript.__scopeId = \"data-v-881b2f3e\"\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!./Live.vue?vue&type=style&index=0&id=881b2f3e&lang=scss&scoped=true\""],"sourceRoot":""}

dist/js/chunk-ebdb96a0.cbefff6f.js

@@ -0,0 +1,2 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-ebdb96a0"],{"27ad":function(e,t,c){"use strict";c("dd4c")},6413:function(e,t,c){"use strict";c.r(t);var n=c("7a23"),o=Object(n["withScopeId"])("data-v-e6e249bc");Object(n["pushScopeId"])("data-v-e6e249bc");var d={class:"body",id:"rbody"};Object(n["popScopeId"])();var a=o((function(e,t,c,o,a,i){var r=Object(n["resolveComponent"])("NavTop"),u=Object(n["resolveComponent"])("router-view");return Object(n["openBlock"])(),Object(n["createBlock"])("div",{class:"mine",style:{height:e.height+"px"}},[Object(n["createVNode"])(r,{type:1,style:{"flex-shrink":"0"}}),Object(n["createVNode"])("div",d,[Object(n["createVNode"])(u)])],4)})),i=c("c022"),r=Object(n["defineComponent"])({components:{NavTop:i["a"]},setup:function(){var e=Object(n["ref"])(0);return Object(n["onMounted"])((function(){e.value=document.documentElement.clientHeight})),window.onresize=function(){e.value=document.documentElement.clientHeight},{height:e}}});c("27ad");r.render=a,r.__scopeId="data-v-e6e249bc";t["default"]=r},dd4c:function(e,t,c){}}]);
+//# sourceMappingURL=chunk-ebdb96a0.cbefff6f.js.map

dist/js/chunk-ebdb96a0.cbefff6f.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["webpack:///./src/layout/Live.vue?d282","webpack:///./src/layout/Live.vue","webpack:///./src/layout/Live.vue?cdce","webpack:///./src/layout/Live.vue?b857"],"names":["class","id","style","height","type","components","NavTop","setup","value","document","documentElement","clientHeight","window","onresize","render","__scopeId"],"mappings":"kHAAA,W,0JCGaA,MAAM,OAAOC,GAAG,S,sLAFzB,yBAKM,OALDD,MAAM,OAAQE,MAAK,QAAU,EAAAC,OAAM,O,CACpC,yBAAiD,GAAxCC,KAAM,EAAGF,MAAA,sBAClB,yBAEM,MAFN,EAEM,CADF,yBAAc,M,kBCAX,+BAAgB,CAC3BG,WAAW,CACPC,SAAA,MAEJC,MAJ2B,WAMvB,IAAMJ,EAAS,iBAAI,GAOnB,OANA,wBAAU,WACNA,EAAOK,MAAQC,SAASC,gBAAgBC,gBAE5CC,OAAOC,SAAS,WACZV,EAAOK,MAAQC,SAASC,gBAAgBC,cAErC,CACHR,a,UCbZ,EAAOW,OAAS,EAChB,EAAOC,UAAY,kBAEJ,gB","file":"js/chunk-ebdb96a0.cbefff6f.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!./Live.vue?vue&type=style&index=0&id=e6e249bc&lang=scss&scoped=true\"","<template>\n    <div class=\"mine\" :style=\"{height:height + 'px'}\">\n        <NavTop :type=\"1\" style=\"flex-shrink:0\"></NavTop>\n        <div class=\"body\" id=\"rbody\">\n            <router-view/>\n        </div>\n    </div>\n</template>\n<style lang=\"scss\" scoped>\n.mine{\n    display: flex;\n    flex-direction: column;\n    .body{\n        // display: flex;\n        width: 100%;\n        min-height:  calc(100% - 57px);\n        background-color: #F5F5F5;\n        // padding: 23px;\n    }\n}\n</style>\n<script lang=\"ts\">\nimport { defineComponent, onMounted, ref } from 'vue';\nimport NavTop from \"@/components/NavTop.vue\"\n\nexport default defineComponent({\n    components:{\n        NavTop\n    },\n    setup(){\n        console.log(1)\n        const height = ref(0);\n        onMounted(() => {\n            height.value = document.documentElement.clientHeight;\n        })\n        window.onresize=function(){  \n            height.value = document.documentElement.clientHeight;\n        }\n        return {\n            height\n        }\n    }\n})\n</script>","\nimport { defineComponent, onMounted, ref } from 'vue';\nimport NavTop from \"@/components/NavTop.vue\"\n\nexport default defineComponent({\n    components:{\n        NavTop\n    },\n    setup(){\n        console.log(1)\n        const height = ref(0);\n        onMounted(() => {\n            height.value = document.documentElement.clientHeight;\n        })\n        window.onresize=function(){  \n            height.value = document.documentElement.clientHeight;\n        }\n        return {\n            height\n        }\n    }\n})\n","import { render } from \"./Live.vue?vue&type=template&id=e6e249bc&scoped=true&bindings={}\"\nimport script from \"./Live.vue?vue&type=script&lang=ts\"\nexport * from \"./Live.vue?vue&type=script&lang=ts\"\n\nimport \"./Live.vue?vue&type=style&index=0&id=e6e249bc&lang=scss&scoped=true\"\nscript.render = render\nscript.__scopeId = \"data-v-e6e249bc\"\n\nexport default script"],"sourceRoot":""}

dist/js/common.js

@@ -13,11 +13,11 @@ let micId = '';
 
 function login() {
  
-  presetting.login(0, options => {
+  presetting.login(false, options => {
     rtc = new RtcClient(options);
     join();
   });
-  presetting.login(1, options => {
+  presetting.login(true, options => {
     shareUserId = options.userId;
     share = new ShareClient(options);
   });
@@ -204,7 +204,7 @@ function setBtnClickFuc() {
         //   })
         // })
         Promise.allSettled([promise,jieshu]).then(()=>{
-          window.parent.location.href="/teacher/regime/livedetail?id=" + window.liveid;
+          window.parent.location.href="/regime/livedetail?id=" + window.liveid;
         })
        
     // }
@@ -330,11 +330,6 @@ function addMemberView(id) {
   if($("#" + id)[0]){
     return ;
   }
-  let sid = id;
-  sid = sid.split("_")[0]
-  if(sid == "ceshi"){
-    return ;
-  }
   let memberElm = $('#member-me').clone();
   memberElm.attr('id', id);
   // memberElm.attr('class', id);

dist/js/commonen.js

@@ -13,11 +13,11 @@ let micId = '';
 
 function login() {
  
-  presetting.login(0, options => {
+  presetting.login(false, options => {
     rtc = new RtcClient(options);
     join();
   });
-  presetting.login(1, options => {
+  presetting.login(true, options => {
     shareUserId = options.userId;
     share = new ShareClient(options);
   });
@@ -204,7 +204,7 @@ function setBtnClickFuc() {
         //   })
         // })
         Promise.allSettled([promise,jieshu]).then(()=>{
-          window.parent.location.href="/teacher/regime/livedetail?id=" + window.liveid;
+          window.parent.location.href="/regime/livedetail?id=" + window.liveid;
         })
        
     // }

dist/js/debug/GenerateTestUserSig.js

@@ -16,15 +16,6 @@
  *
  * Reference：https://cloud.tencent.com/document/product/647/17275#Server
  */
-function jiazai(){
-  document.getElementById("make").style.display = "block"
-}
-function tingzhi(){
-  document.getElementById("make").style.display = "none"
-
-}
-jiazainum = 0;
-
 function genTestUserSig(userID) {
   /**
    * 腾讯云 SDKAppId，需要替换为您自己账号下的 SDKAppId。
@@ -70,15 +61,11 @@ function genTestUserSig(userID) {
   //   userSig:userSig
   // };
   return new Promise((res)=>{
-      jiazai()
-    jiazainum++;
     $.ajax({
       url: window.url + 'userSig?userid=' + userID,
       headers: { "Authorization": "Bearer " + localStorage.getItem("token")},
       success(data){
         res({data: data.data, id: 1400435767})
-          tingzhi()
-       
       }
     })
   })

dist/js/device-testing.js

@@ -662,7 +662,7 @@ async function startNetworkTesting() {
     .appendTo('#screen-share');
 
   // 上下行网络质量
-  presetting.login(2, async options => {
+  presetting.login(false, async options => {
     client = TRTC.createClient({ mode: 'rtc', ...options });
     client.on('network-quality', event => {
       networkQualityNum++;

dist/js/presetting.js

@@ -26,10 +26,8 @@ class Presetting {
 
   login(share, callback) {
     let userId = window.mid;
-    if (share == 1) {
+    if (share) {
       userId = 'share_' + userId;
-    }else if(share == 2){
-      userId = 'ceshi_' + userId;
     }
     console.log(userId)
     

dist/zhibo.html

@@ -11,19 +11,7 @@
     <!-- 引入样式 -->
     <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
     <!-- 引入组件库 -->
-    <style>
+    
-        #make{
-            background-color: #000;
-            opacity: 0.5;
-            width: 100%;
-            height: 100vh;
-            position: fixed;
-            top: 0;
-            left: 0;
-            z-index: 1001;
-            display: none;
-        }
-    </style>
     <script>
         (function (designWidth, maxWidth) {
             var doc = document,
@@ -540,7 +528,7 @@
 			}
 			return theRequest;
 		};
-        window.url = 'https://www.beelinkco.com/home/'
+        window.url = 'https://case.sy-my.net/beelink/public/home/'
         const urldata = GetRequest('roomid')
         window.roomid = urldata.roomid
         window.mid = urldata.memberid
@@ -569,7 +557,7 @@
     <script src="./js/presetting.js"></script>
     <script src="./js/device-testing.js"></script>
     <script src="./js/index.js"></script>
-    <a href="teacher/regime/video" target="_top" id="navto"></a>
+    <a href="/regime/video" target="_top" id="navto"></a>
     <script>
     
     setInterval(()=>{
@@ -614,8 +602,6 @@
 
 
     </script>
-    <div id="make"></div>
-
 </body>
 
 </html>

dist/zhiboen.html

@@ -11,19 +11,7 @@
     <!-- 引入样式 -->
     <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
     <!-- 引入组件库 -->
-    <style>
+    
-        #make{
-            background-color: #000;
-            opacity: 0.5;
-            width: 100%;
-            height: 100vh;
-            position: fixed;
-            top: 0;
-            left: 0;
-            z-index: 1001;
-            display: none;
-        }
-    </style>
     <script>
         (function (designWidth, maxWidth) {
             var doc = document,
@@ -520,8 +508,8 @@
                 Are you sure you want to turn off live streaming
             </div>
             <div class="buttons">
-                <div data-dismiss="modal">No</div>
+                <div data-dismiss="modal">countermand</div>
-                <div data-dismiss="modal" class="back" id="logout-btn">Yes</div>
+                <div data-dismiss="modal" class="back" id="logout-btn">uncertain</div>
             </div>
           </div>
         </div>
@@ -540,7 +528,7 @@
 			}
 			return theRequest;
 		};
-        window.url = 'https://www.beelinkco.com/home/'
+        window.url = 'https://case.sy-my.net/beelink/public/home/'
         const urldata = GetRequest('roomid')
         window.roomid = urldata.roomid
         window.mid = urldata.memberid
@@ -569,7 +557,7 @@
     <script src="./js/presetting.js"></script>
     <script src="./js/device-testing.js"></script>
     <script src="./js/index.js"></script>
-    <a href="teacher/regime/video" target="_top" id="navto"></a>
+    <a href="/regime/video" target="_top" id="navto"></a>
     <script>
     
     setInterval(()=>{
@@ -614,7 +602,6 @@
 
 
     </script>
-    <div id="make"></div>
 </body>
 
 </html>

public/index.html

@@ -71,7 +71,7 @@
             }
         })(1366, 1024);
     </script>
-    <link  href="/teacher/css/cropper.min.css" rel="stylesheet">
+    <link  href="/css/cropper.min.css" rel="stylesheet">
     <style>
         #make{
             background-color: #000;
@@ -89,7 +89,7 @@
    <meta property="og:title" content="分享测试测试">
    <meta property="og:description" content="分享描述">
    <meta property="og:image" content="http://1303872925.vod2.myqcloud.com/7db674eavodcq1303872925/a5d03b0c5285890810149245655/vrLgNu2JaBkA.png">
-   <meta property="og:url" content="https://www.beelinkco.com/teacher/">
+   <meta property="og:url" content="https://beelink.theluyuan.com/">
 
 </head>
 
@@ -112,8 +112,8 @@
         };
     </script>
     <script async defer crossorigin="anonymous" src="https://connect.facebook.net/en_US/sdk.js"></script>
-    <script src="/teacher/js/cropper.min.js"></script>
+    <script src="/js/cropper.min.js"></script>
-    <script src="/teacher/js/jquery-3.2.1.min.js"></script>
+    <script src="/js/jquery-3.2.1.min.js"></script>
     <div id="xiangqingdivadsensedisplaynone" style="display:none;">
         <!-- put here all adsense code -->
         <script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>

public/js/common.js

@@ -13,11 +13,11 @@ let micId = '';
 
 function login() {
  
-  presetting.login(0, options => {
+  presetting.login(false, options => {
     rtc = new RtcClient(options);
     join();
   });
-  presetting.login(1, options => {
+  presetting.login(true, options => {
     shareUserId = options.userId;
     share = new ShareClient(options);
   });
@@ -204,7 +204,7 @@ function setBtnClickFuc() {
         //   })
         // })
         Promise.allSettled([promise,jieshu]).then(()=>{
-          window.parent.location.href="/teacher/regime/livedetail?id=" + window.liveid;
+          window.parent.location.href="/regime/livedetail?id=" + window.liveid;
         })
        
     // }
@@ -330,11 +330,6 @@ function addMemberView(id) {
   if($("#" + id)[0]){
     return ;
   }
-  let sid = id;
-  sid = sid.split("_")[0]
-  if(sid == "ceshi"){
-    return ;
-  }
   let memberElm = $('#member-me').clone();
   memberElm.attr('id', id);
   // memberElm.attr('class', id);

public/js/commonen.js

@@ -13,11 +13,11 @@ let micId = '';
 
 function login() {
  
-  presetting.login(0, options => {
+  presetting.login(false, options => {
     rtc = new RtcClient(options);
     join();
   });
-  presetting.login(1, options => {
+  presetting.login(true, options => {
     shareUserId = options.userId;
     share = new ShareClient(options);
   });
@@ -204,7 +204,7 @@ function setBtnClickFuc() {
         //   })
         // })
         Promise.allSettled([promise,jieshu]).then(()=>{
-          window.parent.location.href="/teacher/regime/livedetail?id=" + window.liveid;
+          window.parent.location.href="/regime/livedetail?id=" + window.liveid;
         })
        
     // }

public/js/debug/GenerateTestUserSig.js

@@ -16,15 +16,6 @@
  *
  * Reference：https://cloud.tencent.com/document/product/647/17275#Server
  */
-function jiazai(){
-  document.getElementById("make").style.display = "block"
-}
-function tingzhi(){
-  document.getElementById("make").style.display = "none"
-
-}
-jiazainum = 0;
-
 function genTestUserSig(userID) {
   /**
    * 腾讯云 SDKAppId，需要替换为您自己账号下的 SDKAppId。
@@ -70,15 +61,11 @@ function genTestUserSig(userID) {
   //   userSig:userSig
   // };
   return new Promise((res)=>{
-      jiazai()
-    jiazainum++;
     $.ajax({
       url: window.url + 'userSig?userid=' + userID,
       headers: { "Authorization": "Bearer " + localStorage.getItem("token")},
       success(data){
         res({data: data.data, id: 1400435767})
-          tingzhi()
-       
       }
     })
   })

public/js/device-testing.js

@@ -662,7 +662,7 @@ async function startNetworkTesting() {
     .appendTo('#screen-share');
 
   // 上下行网络质量
-  presetting.login(2, async options => {
+  presetting.login(false, async options => {
     client = TRTC.createClient({ mode: 'rtc', ...options });
     client.on('network-quality', event => {
       networkQualityNum++;

public/js/presetting.js

@@ -26,10 +26,8 @@ class Presetting {
 
   login(share, callback) {
     let userId = window.mid;
-    if (share == 1) {
+    if (share) {
       userId = 'share_' + userId;
-    }else if(share == 2){
-      userId = 'ceshi_' + userId;
     }
     console.log(userId)
     

public/zhibo.html

@@ -11,19 +11,7 @@
     <!-- 引入样式 -->
     <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
     <!-- 引入组件库 -->
-    <style>
+    
-        #make{
-            background-color: #000;
-            opacity: 0.5;
-            width: 100%;
-            height: 100vh;
-            position: fixed;
-            top: 0;
-            left: 0;
-            z-index: 1001;
-            display: none;
-        }
-    </style>
     <script>
         (function (designWidth, maxWidth) {
             var doc = document,
@@ -540,7 +528,7 @@
 			}
 			return theRequest;
 		};
-        window.url = 'https://www.beelinkco.com/home/'
+        window.url = 'https://case.sy-my.net/beelink/public/home/'
         const urldata = GetRequest('roomid')
         window.roomid = urldata.roomid
         window.mid = urldata.memberid
@@ -569,7 +557,7 @@
     <script src="./js/presetting.js"></script>
     <script src="./js/device-testing.js"></script>
     <script src="./js/index.js"></script>
-    <a href="teacher/regime/video" target="_top" id="navto"></a>
+    <a href="/regime/video" target="_top" id="navto"></a>
     <script>
     
     setInterval(()=>{
@@ -614,8 +602,6 @@
 
 
     </script>
-    <div id="make"></div>
-
 </body>
 
 </html>

public/zhiboen.html

@@ -11,19 +11,7 @@
     <!-- 引入样式 -->
     <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
     <!-- 引入组件库 -->
-    <style>
+    
-        #make{
-            background-color: #000;
-            opacity: 0.5;
-            width: 100%;
-            height: 100vh;
-            position: fixed;
-            top: 0;
-            left: 0;
-            z-index: 1001;
-            display: none;
-        }
-    </style>
     <script>
         (function (designWidth, maxWidth) {
             var doc = document,
@@ -520,8 +508,8 @@
                 Are you sure you want to turn off live streaming
             </div>
             <div class="buttons">
-                <div data-dismiss="modal">No</div>
+                <div data-dismiss="modal">countermand</div>
-                <div data-dismiss="modal" class="back" id="logout-btn">Yes</div>
+                <div data-dismiss="modal" class="back" id="logout-btn">uncertain</div>
             </div>
           </div>
         </div>
@@ -540,7 +528,7 @@
 			}
 			return theRequest;
 		};
-        window.url = 'https://www.beelinkco.com/home/'
+        window.url = 'https://case.sy-my.net/beelink/public/home/'
         const urldata = GetRequest('roomid')
         window.roomid = urldata.roomid
         window.mid = urldata.memberid
@@ -569,7 +557,7 @@
     <script src="./js/presetting.js"></script>
     <script src="./js/device-testing.js"></script>
     <script src="./js/index.js"></script>
-    <a href="teacher/regime/video" target="_top" id="navto"></a>
+    <a href="/regime/video" target="_top" id="navto"></a>
     <script>
     
     setInterval(()=>{
@@ -614,7 +602,6 @@
 
 
     </script>
-    <div id="make"></div>
 </body>
 
 </html>

src/components/LivePlay.vue

@@ -27,7 +27,7 @@
             <div class="right" @click="bianji" v-if="info.livestatus == 0">
               {{lan.$t('bianjixinxi')}}
             </div>
-            <div class="right" @click="kaishi" v-if="info.livestatus == 0 && info.startlivebtn == 1">
+            <div class="right" @click="kaishi" v-if="info.livestatus == 0 && timestart">
               {{lan.$t('kaishizhibo')}}
             </div>
           </div>

src/i18n/en.ts

@@ -8,7 +8,7 @@ export default {
     weikaishi: "Planning",
     yijieshu: "Completed",
     zhibosousuo: "Please enter the live title you want to search",
-    haiweikaishi: "Planning",
+    haiweikaishi: "Not yet",
     jinruzhibo: "Enter live",
     chakanhuifang: "Replay",
     quanbushipin: "All",
@@ -355,8 +355,6 @@ export default {
     appxiazai:"Download Beelink app",
     shipinshangchuanchenggong:"Save correctly，waiting for review",
     jiazaizhong:"Loding.",
-    yulan:"preview",
-    dianjigenghuan: "Click on the video to change",
     shichangtishi:"",
     renshutishi: '',
     tixianzhu: "",

src/i18n/zh.ts

@@ -355,8 +355,6 @@ export default {
     appxiazai:"Beelink App下载",
     shipinshangchuanchenggong:"上传成功，等待审核",
     jiazaizhong:"加载中",
-    yulan:"预览",
-    dianjigenghuan: "点击视频区域更换",
     shichangtishi:"",
     renshutishi: '',
     tixianzhu:"",

src/layout/Live.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="mine">
+    <div class="mine" :style="{height:height + 'px'}">
         <NavTop :type="1" style="flex-shrink:0"></NavTop>
         <div class="body" id="rbody">
             <router-view/>
@@ -10,14 +10,11 @@
 .mine{
     display: flex;
     flex-direction: column;
-        height: 100vh;
     .body{
-        display: flex;
+        // display: flex;
-        flex-direction: column;
         width: 100%;
         min-height:  calc(100% - 57px);
         background-color: #F5F5F5;
-        height: 100vh;
         // padding: 23px;
     }
 }
@@ -32,15 +29,15 @@ export default defineComponent({
     },
     setup(){
         console.log(1)
-        // const height = ref(0);
+        const height = ref(0);
-        // onMounted(() => {
+        onMounted(() => {
-        //     height.value = document.documentElement.clientHeight;
+            height.value = document.documentElement.clientHeight;
-        // })
+        })
-        // window.onresize=function(){  
+        window.onresize=function(){  
-        //     height.value = document.documentElement.clientHeight;
+            height.value = document.documentElement.clientHeight;
-        // }
+        }
         return {
-            // height
+            height
         }
     }
 })

src/utils/common.ts

@@ -132,7 +132,7 @@ export function toindex(){
     }
     const url = GetUrlRelativePath()
     console.log(url)
-    const list = ['/teacher/wblogin','/teacher/wbloginerr','/teacher/fblogin','/teacher/fbloginerr', '/teacher/wxlogin']
+    const list = ['/wblogin','/wbloginerr','/fblogin','/fbloginerr', '/wxlogin']
     for(const i in list){
         if(list[i] == url){
             console.log("return")

src/views/login/Login.vue

@@ -148,8 +148,8 @@ export default defineComponent({
     const code =ref("")
     
     const userinfo = reactive({
-      phone: '',
+      phone: '13152639856',
-      password: ''
+      password: '123456'
     })
     const mrqh = computed(() => store.state.qh)
     const hqqh = computed(() => { console.log(mrqh.value.name  + '+' + mrqh.value.code); return (getValue("Lanvuage") == "en"  ?mrqh.value.ename : mrqh.value.name) + '+' + mrqh.value.code  })
@@ -297,10 +297,10 @@ export default defineComponent({
 
       }
       if(index == 2){
-        window.location.href="https://api.weibo.com/oauth2/authorize?client_id=2754574056&response_type=code&redirect_uri=https://www.beelinkco.com/teacher/wblogin"
+        window.location.href="https://api.weibo.com/oauth2/authorize?client_id=2754574056&response_type=code&redirect_uri=https://beelink.theluyuan.com/wblogin"
       }
       if(index == 1){
-        window.location.href=`https://open.weixin.qq.com/connect/qrconnect?appid=wx90b8841b63a86633&redirect_uri=${escape('https://www.beelinkco.com/teacher/wxlogin')}&response_type=code&scope=snsapi_login&state=STATE#wechat_redirect`
+        window.location.href=`https://open.weixin.qq.com/connect/qrconnect?appid=wx90b8841b63a86633&redirect_uri=${escape('https://beelink.theluyuan.com/wxlogin')}&response_type=code&scope=snsapi_login&state=STATE#wechat_redirect`
 
       }
     }

src/views/mine/Archives.vue

@@ -215,14 +215,8 @@
                             <p class="one-line-hide">
                                 3.{{ lan.$t("shipinyaoqiu3") }}
                             </p>
-                            <p class="one-line-hide">
-                                4.{{ lan.$t("dianjigenghuan") }}
-                            </p>
                         </div>
                     </div>
-                    <div class="submit-btn" style="position:unset;margin-left:1.2rem;margin-bottom:0.3rem" @click="showspjj">
-                        {{ lan.$t("yulan") }}
-                    </div>
                     <div class="input-box introduce">
                         <div class="label">{{ lan.$t("ziwojieshao") }}</div>
                         <a-textarea
@@ -519,11 +513,8 @@
             </div>
             
         </a-modal>
-        <a-modal v-model:visible="touxiang" width="6rem">
+        <a-modal v-model:visible="touxiang" width="6rem" :footer="null">
             <imghead @upload="imgupload" v-if="touxiang" :url="imgfire"></imghead>
-        </a-modal>
-         <a-modal v-model:visible="shipinjianjie" :footer="null" @cancel="spjjclone" style="htight: 2rem" :closable="false" >
-            <div v-html="videohtml"></div>
         </a-modal>
         <nav-bottom></nav-bottom>
     </div>
@@ -533,7 +524,6 @@
 import {
     computed,
     defineComponent,
-    nextTick,
     onMounted,
     reactive,
     Ref,
@@ -1064,25 +1054,7 @@ export default defineComponent({
         //     userinfo.value.countryValue = e;
         //     console.log(e)
         // }
-        const shipinjianjie = ref(false);
+
-        let play: any;
-        const videohtml = ref(`<video style="width:100%; height:5rem;" id="a${formData.value.videoid}" ></video>`)
-        function spjjclone(){
-            console.log(1067)
-            if(play){
-                 play.dispose()
-            }
-            videohtml.value = ""
-        }
-        async function showspjj(){
-            shipinjianjie.value = true;
-            videohtml.value = `<video style="width:100%; height:5rem;" id="a${formData.value.videoid}" ></video>`
-            await nextTick()
-            play = window.TCPlayer('a' + formData.value.videoid, { 
-                fileID: formData.value.videoid,
-                appID: '1303872925' 
-            });
-        }
         return {
             modalNode,
             formData,
@@ -1133,11 +1105,7 @@ export default defineComponent({
             huobi,
             touxiang,
             imgfire,
-            imgupload,
+            imgupload
-            shipinjianjie,
-            spjjclone,
-            showspjj,
-            videohtml
         };
     },
 });

src/views/mine/ReleaseVideo.vue

@@ -98,7 +98,6 @@
                     <p>1.{{ lan.$t("cshipinyaoqiu1") }}</p>
                     <p>2.{{ lan.$t("cshipinyaoqiu2") }}</p>
                     <p>3.{{ lan.$t("shipinyaoqiu3") }}</p>
-                    <p>4.{{ lan.$t("dianjigenghuan") }}</p>
                 </div>
                 <!-- <div class="demand">
                     <p class="one-line-hide">视频要求：</p>
@@ -109,9 +108,6 @@
                     </p>
                 </div> -->
             </a-form-item>
-            <div class="submit-btn" style="position:unset;margin-left:1.8rem;margin-bottom:0.3rem" @click="showspjj">
-                        {{ lan.$t("yulan") }}
-                </div>
             <a-form-item :label="lan.$t('shipinjianjie')" class="brief">
                 <a-textarea
                     v-model:value="form.desc"
@@ -129,13 +125,10 @@
             </a-form-item>
         </a-form>
         <nav-bottom></nav-bottom>
-        <a-modal v-model:visible="shipinjianjie" :footer="null" @cancel="spjjclone" style="htight: 2rem" :closable="false" >
-            <div v-html="videohtml"></div>
-        </a-modal>
     </div>
 </template>
 <script lang="ts">
-import { defineComponent, nextTick, onMounted, reactive, Ref, ref, toRaw } from "vue";
+import { defineComponent, onMounted, reactive, Ref, ref, toRaw } from "vue";
 import { PlaySquareOutlined, PlusOutlined } from "@ant-design/icons-vue";
 import NavBottom from "@/components/NavBottom.vue";
 import { previewCover, provenimg, provenvideo } from "@/utils/common";
@@ -346,28 +339,7 @@ export default defineComponent({
          function imgs(file: any){
             return provenimg(file)
         }
-         const shipinjianjie = ref(false);
+       
-        let play: any;
-        const videohtml = ref(`<video style="width:100%; height:5rem;" id="a${form.value.fileid}" ></video>`)
-        function spjjclone(){
-            console.log(1067)
-            if(play){
-                 play.dispose()
-            }
-            videohtml.value = ""
-        }
-        async function showspjj(){
-            if(!form.value.fileid){
-                return ;
-            }
-            shipinjianjie.value = true;
-            videohtml.value = `<video style="width:100%; height:5rem;" id="a${form.value.fileid}" ></video>`
-            await nextTick()
-            play = window.TCPlayer('a' + form.value.fileid, { 
-                fileID: form.value.fileid,
-                appID: '1303872925' 
-            });
-        }
 
         return {
             labelCol: { span: 4 },
@@ -393,11 +365,7 @@ export default defineComponent({
             lan,
             beforeUploadpic,
             video,
-            imgs,
+            imgs
-            spjjclone,
-            showspjj,
-            videohtml,
-            shipinjianjie
         };
     },
 });
@@ -563,22 +531,5 @@ export default defineComponent({
             }
         }
     }
-     .submit-btn {
-        width: 70px;
-        height: 28px;
-        background: #08ae98;
-        border-radius: 3px;
-        font-size: 10px;
-        font-weight: 500;
-        color: #ffffff;
-        text-align: center;
-        line-height: 28px;
-        cursor: pointer;
-        user-select: none;
-        position: fixed;
-        top: 1.3rem;
-        right: 1rem;
-
-    }
 }
 </style>

src/views/mine/ReleaseWebcast.vue

@@ -100,7 +100,6 @@
                     <p>1.{{ lan.$t("shipinyaoqiu1") }}</p>
                     <p>2.{{ lan.$t("shipinyaoqiu2") }}</p>
                     <p>3.{{ lan.$t("shipinyaoqiu3") }}</p>
-                    <p>4.{{ lan.$t("dianjigenghuan") }}</p>
                 </div>
                 <!-- <div class="demand">
                     <p class="one-line-hide">视频要求：</p>
@@ -111,9 +110,6 @@
                     </p>
                 </div> -->
             </a-form-item>
-            <div class="submit-btn" style="position:unset;margin-left:1.7rem;margin-bottom:0.3rem" @click="showspjj">
-                        {{ lan.$t("yulan") }}
-                    </div>
             <a-form-item :label="lan.$t('kaishishijian')" @click="isEntitled = jinzhi" :rules="{ required: true, message: 'Please input Activity name', trigger: 'blur'}">
                 
                 <!-- <a-input
@@ -233,16 +229,12 @@
             
             
         </div>
-        <a-modal v-model:visible="shipinjianjie" :footer="null" @cancel="spjjclone" style="htight: 2rem" :closable="false" >
-            <div v-html="videohtml"></div>
-        </a-modal>
     </div>
 </template>
 <script lang="ts">
 import {
     computed,
     defineComponent,
-    nextTick,
     onBeforeUpdate,
     onMounted,
     reactive,
@@ -465,25 +457,25 @@ export default defineComponent({
          * 开始时间设置
          */
 
-        function startchange(e: any): void {
+        function startchange(e: string): void {
             // const month = new Date(e).getMonth()+1
             // console.log(new Date(e).getFullYear()+"-"+month+'-'+new Date(e).getDate())
-            // console.log(e.format('YYYY-MM-DD HH:mm:ss'))
+            // console.log(e.toString())
-            // const time = dayjs(new Date(e));
+            const time = dayjs(new Date(e));
-            // const timestr =
+            const timestr =
-            //     time.year() +
+                time.year() +
-            //     "-" +
+                "-" +
-            //     (time.month() + 1) +
+                (time.month() + 1) +
-            //     "-" +
+                "-" +
-            //     time.date() +
+                time.date() +
-            //     " " +
+                " " +
-            //     time.hour() +
+                time.hour() +
-            //     ":" +
+                ":" +
-            //     time.minute() +
+                time.minute() +
-            //     ":" +
+                ":" +
-            //     time.second();
+                time.second();
-            // console.log(timestr);
+            console.log(timestr);
-            form.value.dateline = e.format('YYYY-MM-DD HH:mm:ss');
+            form.value.dateline = timestr;
         }
         /**
          *  上传文件
@@ -568,11 +560,11 @@ export default defineComponent({
         }
 
         function disabledDate(current: any){
-            // console.log(current + 0)
+            console.log(current + 0)
             const now = dayjs().date(dayjs().date() - 1);
             const enow = dayjs().date(dayjs().date() + parseInt(seting.value.releaseLiveDay) - 1);
 
-            return "1112" && (current < now || current > enow);
+            return current && (current < now || current > enow);
         }
 
         function onquxiao(){
@@ -600,28 +592,6 @@ export default defineComponent({
             return provenimg(file)
         }
         const view = computed(()=>store.state.seting.views)
-        const shipinjianjie = ref(false);
-        let play: any;
-        const videohtml = ref(`<video style="width:100%; height:5rem;" id="a${form.value.fileid}" ></video>`)
-        function spjjclone(){
-            console.log(1067)
-            if(play){
-                 play.dispose()
-            }
-            videohtml.value = ""
-        }
-        async function showspjj(){
-            if(!form.value.fileid){
-                return ;
-            }
-            shipinjianjie.value = true;
-            videohtml.value = `<video style="width:100%; height:5rem;" id="a${form.value.fileid}" ></video>`
-            await nextTick()
-            play = window.TCPlayer('a' + form.value.fileid, { 
-                fileID: form.value.fileid,
-                appID: '1303872925' 
-            });
-        }
         return {
             labelCol: { span: 4 },
             wrapperCol: { span: 14 },
@@ -659,11 +629,7 @@ export default defineComponent({
             video,
             imgs,
             jinzhi,
-            view,
+            view
-            spjjclone,
-            showspjj,
-            videohtml,
-            shipinjianjie
         };
     },
 });
@@ -878,22 +844,5 @@ export default defineComponent({
             }
         }
     }
-    .submit-btn {
-        width: 70px;
-        height: 28px;
-        background: #08ae98;
-        border-radius: 3px;
-        font-size: 10px;
-        font-weight: 500;
-        color: #ffffff;
-        text-align: center;
-        line-height: 28px;
-        cursor: pointer;
-        user-select: none;
-        position: fixed;
-        top: 1.3rem;
-        right: 1rem;
-
-    }
 }
 </style>

src/views/regime/Liveing.vue

@@ -21,7 +21,7 @@ export default defineComponent({
             getliveinfo(parseInt(id)).then((res: any)=>{
                 // luzhi(res.roomid)
                 const yuyan = lan.$s();
-                url.value = yuyan == "zh" ? `/teacher/zhibo.html?roomid=${res.roomid}&memberid=${res.memberid}&name=${escape(store.state.userinfo.name)}&liveid=${res.liveid}` : `/teacher/zhiboen.html?roomid=${res.roomid}&memberid=${res.memberid}&name=${escape(store.state.userinfo.name)}&liveid=${res.liveid}`
+                url.value = yuyan == "zh" ? `/zhibo.html?roomid=${res.roomid}&memberid=${res.memberid}&name=${escape(store.state.userinfo.name)}&liveid=${res.liveid}` : `/zhiboen.html?roomid=${res.roomid}&memberid=${res.memberid}&name=${escape(store.state.userinfo.name)}&liveid=${res.liveid}`
             })
 
         }

vue.config.js

@@ -23,6 +23,5 @@ module.exports = {
           disableHostCheck: true
         }
       }
-    },
+    }
-    publicPath: "/teacher"
   }