theluyuan/beelink
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xbx #284

Merged
theluyuan merged 6 commits from xbx into master 2021-01-28 09:24:48 +00:00
Conversation 0 Commits 6 Files Changed 67 +39 -38
26 changed files with 39 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a4efc36634 - Show all commits

2
dist/css/app.88800de3.css → dist/css/app.aebac281.css vendored
View File

File diff suppressed because one or more lines are too long

0
dist/css/chunk-39b973ba.0e433876.css → dist/css/chunk-4eb8937d.0e433876.css vendored
View File

8
dist/index.html vendored
View File

File diff suppressed because one or more lines are too long

2
dist/js/app.09d88eaf.js vendored
View File

File diff suppressed because one or more lines are too long

1
dist/js/app.09d88eaf.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/js/app.f5a6534f.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
dist/js/app.f5a6534f.js.map vendored Normal file
View File

File diff suppressed because one or more lines are too long

2
dist/js/chunk-39b973ba.334f229f.js vendored
View File

@ -1,2 +0,0 @@
(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

1
dist/js/chunk-39b973ba.334f229f.js.map vendored
View File

@ -1 +0,0 @@
{"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":""}

2
dist/js/chunk-4eb8937d.ac36668f.js vendored Normal file
View File

@ -0,0 +1,2 @@
(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

1
dist/js/chunk-4eb8937d.ac36668f.js.map vendored Normal file
View File

@ -0,0 +1 @@
{"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":""}

6
dist/js/chunk-vendors.60dc9ef4.js → dist/js/chunk-vendors.78efa6d8.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/js/chunk-vendors.60dc9ef4.js.map → dist/js/chunk-vendors.78efa6d8.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/js/common.js vendored
View File

@ -204,7 +204,7 @@ function setBtnClickFuc() {
// })
// })
Promise.allSettled([promise,jieshu]).then(()=>{
window.parent.location.href="/regime/livedetail?id=" + window.liveid;
window.parent.location.href="/teacher/regime/livedetail?id=" + window.liveid;
})
// }

2
dist/js/commonen.js vendored
View File

@ -204,7 +204,7 @@ function setBtnClickFuc() {
// })
// })
Promise.allSettled([promise,jieshu]).then(()=>{
window.parent.location.href="/regime/livedetail?id=" + window.liveid;
window.parent.location.href="/teacher/regime/livedetail?id=" + window.liveid;
})
// }

4
dist/zhibo.html vendored
View File

@ -528,7 +528,7 @@
}
return theRequest;
};
window.url = 'https://case.sy-my.net/beelink/public/home/'
window.url = 'https://www.beelinkco.com/home/'
const urldata = GetRequest('roomid')
window.roomid = urldata.roomid
window.mid = urldata.memberid
@ -557,7 +557,7 @@
<script src="./js/presetting.js"></script>
<script src="./js/device-testing.js"></script>
<script src="./js/index.js"></script>
<a href="/regime/video" target="_top" id="navto"></a>
<a href="teacher/regime/video" target="_top" id="navto"></a>
<script>
setInterval(()=>{

4
dist/zhiboen.html vendored
View File

@ -528,7 +528,7 @@
}
return theRequest;
};
window.url = 'https://case.sy-my.net/beelink/public/home/'
window.url = 'https://www.beelinkco.com/home/'
const urldata = GetRequest('roomid')
window.roomid = urldata.roomid
window.mid = urldata.memberid
@ -557,7 +557,7 @@
<script src="./js/presetting.js"></script>
<script src="./js/device-testing.js"></script>
<script src="./js/index.js"></script>
<a href="/regime/video" target="_top" id="navto"></a>
<a href="teacher/regime/video" target="_top" id="navto"></a>
<script>
setInterval(()=>{

8
public/index.html
View File

@ -71,7 +71,7 @@
}
})(1366, 1024);
</script>
<link href="/css/cropper.min.css" rel="stylesheet">
<link href="/teacher/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://beelink.theluyuan.com/">
<meta property="og:url" content="https://www.beelinkco.com/teacher/">
</head>
@ -112,8 +112,8 @@
};
</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/jquery-3.2.1.min.js"></script>
<script src="/teacher/js/cropper.min.js"></script>
<script src="/teacher/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>

2
public/js/common.js
View File

@ -204,7 +204,7 @@ function setBtnClickFuc() {
// })
// })
Promise.allSettled([promise,jieshu]).then(()=>{
window.parent.location.href="/regime/livedetail?id=" + window.liveid;
window.parent.location.href="/teacher/regime/livedetail?id=" + window.liveid;
})
// }

2
public/js/commonen.js
View File

@ -204,7 +204,7 @@ function setBtnClickFuc() {
// })
// })
Promise.allSettled([promise,jieshu]).then(()=>{
window.parent.location.href="/regime/livedetail?id=" + window.liveid;
window.parent.location.href="/teacher/regime/livedetail?id=" + window.liveid;
})
// }

4
public/zhibo.html
View File

@ -528,7 +528,7 @@
}
return theRequest;
};
window.url = 'https://case.sy-my.net/beelink/public/home/'
window.url = 'https://www.beelinkco.com/home/'
const urldata = GetRequest('roomid')
window.roomid = urldata.roomid
window.mid = urldata.memberid
@ -557,7 +557,7 @@
<script src="./js/presetting.js"></script>
<script src="./js/device-testing.js"></script>
<script src="./js/index.js"></script>
<a href="/regime/video" target="_top" id="navto"></a>
<a href="teacher/regime/video" target="_top" id="navto"></a>
<script>
setInterval(()=>{

4
public/zhiboen.html
View File

@ -528,7 +528,7 @@
}
return theRequest;
};
window.url = 'https://case.sy-my.net/beelink/public/home/'
window.url = 'https://www.beelinkco.com/home/'
const urldata = GetRequest('roomid')
window.roomid = urldata.roomid
window.mid = urldata.memberid
@ -557,7 +557,7 @@
<script src="./js/presetting.js"></script>
<script src="./js/device-testing.js"></script>
<script src="./js/index.js"></script>
<a href="/regime/video" target="_top" id="navto"></a>
<a href="teacher/regime/video" target="_top" id="navto"></a>
<script>
setInterval(()=>{

2
src/utils/common.ts
View File

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

8
src/views/login/Login.vue
View File

@ -148,8 +148,8 @@ export default defineComponent({
const code =ref("")
const userinfo = reactive({
phone: '13152639856',
password: '123456'
phone: '',
password: ''
})
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://beelink.theluyuan.com/wblogin"
window.location.href="https://api.weibo.com/oauth2/authorize?client_id=2754574056&response_type=code&redirect_uri=https://www.beelinkco.com/teacher/wblogin"
}
if(index == 1){
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`
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`
}
}

2
src/views/regime/Liveing.vue
View File

@ -21,7 +21,7 @@ export default defineComponent({
getliveinfo(parseInt(id)).then((res: any)=>{
// luzhi(res.roomid)
const yuyan = lan.$s();
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}`
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}`
})
}

3
vue.config.js
View File

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