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

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

dist/index.html

@@ -61,11 +61,11 @@
             left: 0;
             z-index: 1001;
             display: none;
-        }</style><meta property="og:type" content="website"><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/"><link href="/css/chunk-04e3a2fa.08ef3a2d.css" rel="prefetch"><link href="/css/chunk-06828374.8e285ce3.css" rel="prefetch"><link href="/css/chunk-0d9de69e.0e433876.css" rel="prefetch"><link href="/css/chunk-18d6ebc2.07c0f4a4.css" rel="prefetch"><link href="/css/chunk-1908dacf.4661450c.css" rel="prefetch"><link href="/css/chunk-1f21263e.b9051f93.css" rel="prefetch"><link href="/css/chunk-21b42480.6808bbcc.css" rel="prefetch"><link href="/css/chunk-27236dd2.3992b5d2.css" rel="prefetch"><link href="/css/chunk-2b71f1e5.182b1bb8.css" rel="prefetch"><link href="/css/chunk-2d97bb7f.2d22ae68.css" rel="prefetch"><link href="/css/chunk-3326ceee.61cdda7f.css" rel="prefetch"><link href="/css/chunk-39b973ba.0e433876.css" rel="prefetch"><link href="/css/chunk-3c7641ed.f87c4e8b.css" rel="prefetch"><link href="/css/chunk-4663db36.3eaba60f.css" rel="prefetch"><link href="/css/chunk-520d8a08.dd761c06.css" rel="prefetch"><link href="/css/chunk-526e71c4.4c3c344c.css" rel="prefetch"><link href="/css/chunk-52aea4a8.16692c13.css" rel="prefetch"><link href="/css/chunk-6427918c.8cf7411a.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-6e7aa5b1.9851e10f.css" rel="prefetch"><link href="/css/chunk-74d6e86d.85aed290.css" rel="prefetch"><link href="/css/chunk-7582a703.b7f6c0c7.css" rel="prefetch"><link href="/css/chunk-7da0eb18.409b8eb7.css" rel="prefetch"><link href="/css/chunk-922d780a.e11df9e0.css" rel="prefetch"><link href="/css/chunk-977f0f52.6081abf8.css" rel="prefetch"><link href="/css/chunk-a4a29886.aa3c0949.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.644947cf.js" rel="prefetch"><link href="/js/chunk-06828374.396a639e.js" rel="prefetch"><link href="/js/chunk-0d9de69e.9b497785.js" rel="prefetch"><link href="/js/chunk-18d6ebc2.705d439f.js" rel="prefetch"><link href="/js/chunk-1908dacf.5a77bef7.js" rel="prefetch"><link href="/js/chunk-1f21263e.93577762.js" rel="prefetch"><link href="/js/chunk-21b42480.bd68920f.js" rel="prefetch"><link href="/js/chunk-27236dd2.6a20330a.js" rel="prefetch"><link href="/js/chunk-2b71f1e5.1586a6db.js" rel="prefetch"><link href="/js/chunk-2d97bb7f.d3a4fc8c.js" rel="prefetch"><link href="/js/chunk-3326ceee.c535d5c4.js" rel="prefetch"><link href="/js/chunk-39b973ba.b9a3c15b.js" rel="prefetch"><link href="/js/chunk-3c7641ed.98a67f5d.js" rel="prefetch"><link href="/js/chunk-4663db36.8cb98f8c.js" rel="prefetch"><link href="/js/chunk-520d8a08.fa8b550a.js" rel="prefetch"><link href="/js/chunk-526e71c4.d1313361.js" rel="prefetch"><link href="/js/chunk-52aea4a8.2a1568db.js" rel="prefetch"><link href="/js/chunk-6427918c.f50fc203.js" rel="prefetch"><link href="/js/chunk-650d0cb1.35a1fd6a.js" rel="prefetch"><link href="/js/chunk-68091c98.6bc9c5f0.js" rel="prefetch"><link href="/js/chunk-6e7aa5b1.3223b150.js" rel="prefetch"><link href="/js/chunk-74d6e86d.014b0140.js" rel="prefetch"><link href="/js/chunk-7582a703.6d0001bc.js" rel="prefetch"><link href="/js/chunk-7da0eb18.889148b0.js" rel="prefetch"><link href="/js/chunk-922d780a.54ca79a7.js" rel="prefetch"><link href="/js/chunk-977f0f52.162b9d9d.js" rel="prefetch"><link href="/js/chunk-a4a29886.574f1892.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.58ca6790.js" rel="prefetch"><link href="/css/app.75493212.css" rel="preload" as="style"><link href="/css/chunk-vendors.d0a33139.css" rel="preload" as="style"><link href="/js/app.688462d0.js" rel="preload" as="script"><link href="/js/chunk-vendors.60dc9ef4.js" rel="preload" as="script"><link href="/css/chunk-vendors.d0a33139.css" rel="stylesheet"><link href="/css/app.75493212.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><meta property="og:type" content="website"><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/"><link href="/css/chunk-04e3a2fa.08ef3a2d.css" rel="prefetch"><link href="/css/chunk-06828374.8e285ce3.css" rel="prefetch"><link href="/css/chunk-0d9de69e.0e433876.css" rel="prefetch"><link href="/css/chunk-18d6ebc2.07c0f4a4.css" rel="prefetch"><link href="/css/chunk-1908dacf.4661450c.css" rel="prefetch"><link href="/css/chunk-1f21263e.b9051f93.css" rel="prefetch"><link href="/css/chunk-21b42480.6808bbcc.css" rel="prefetch"><link href="/css/chunk-27236dd2.3992b5d2.css" rel="prefetch"><link href="/css/chunk-2b71f1e5.182b1bb8.css" rel="prefetch"><link href="/css/chunk-2d97bb7f.2d22ae68.css" rel="prefetch"><link href="/css/chunk-3326ceee.61cdda7f.css" rel="prefetch"><link href="/css/chunk-39b973ba.0e433876.css" rel="prefetch"><link href="/css/chunk-3c7641ed.f87c4e8b.css" rel="prefetch"><link href="/css/chunk-45d52ec1.daad43a3.css" rel="prefetch"><link href="/css/chunk-4663db36.3eaba60f.css" rel="prefetch"><link href="/css/chunk-520d8a08.dd761c06.css" rel="prefetch"><link href="/css/chunk-526e71c4.4c3c344c.css" rel="prefetch"><link href="/css/chunk-52aea4a8.16692c13.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-6e7aa5b1.9851e10f.css" rel="prefetch"><link href="/css/chunk-74d6e86d.85aed290.css" rel="prefetch"><link href="/css/chunk-7582a703.b7f6c0c7.css" rel="prefetch"><link href="/css/chunk-7da0eb18.409b8eb7.css" rel="prefetch"><link href="/css/chunk-922d780a.e11df9e0.css" rel="prefetch"><link href="/css/chunk-977f0f52.6081abf8.css" rel="prefetch"><link href="/css/chunk-a4a29886.aa3c0949.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.8f93da5c.js" rel="prefetch"><link href="/js/chunk-06828374.6edfa940.js" rel="prefetch"><link href="/js/chunk-0d9de69e.8d8c86fa.js" rel="prefetch"><link href="/js/chunk-18d6ebc2.ce304764.js" rel="prefetch"><link href="/js/chunk-1908dacf.31375e9d.js" rel="prefetch"><link href="/js/chunk-1f21263e.2f3dfdf3.js" rel="prefetch"><link href="/js/chunk-21b42480.34ae0e36.js" rel="prefetch"><link href="/js/chunk-27236dd2.6a20330a.js" rel="prefetch"><link href="/js/chunk-2b71f1e5.583c97ef.js" rel="prefetch"><link href="/js/chunk-2d97bb7f.894a880c.js" rel="prefetch"><link href="/js/chunk-3326ceee.bb6377f9.js" rel="prefetch"><link href="/js/chunk-39b973ba.334f229f.js" rel="prefetch"><link href="/js/chunk-3c7641ed.3b9d36e0.js" rel="prefetch"><link href="/js/chunk-45d52ec1.0c8f737e.js" rel="prefetch"><link href="/js/chunk-4663db36.dfc5ef3c.js" rel="prefetch"><link href="/js/chunk-520d8a08.fa8b550a.js" rel="prefetch"><link href="/js/chunk-526e71c4.14c5bc92.js" rel="prefetch"><link href="/js/chunk-52aea4a8.de5c0bb7.js" rel="prefetch"><link href="/js/chunk-650d0cb1.9ee9866a.js" rel="prefetch"><link href="/js/chunk-68091c98.6bc9c5f0.js" rel="prefetch"><link href="/js/chunk-6e7aa5b1.4b143e99.js" rel="prefetch"><link href="/js/chunk-74d6e86d.65740bb4.js" rel="prefetch"><link href="/js/chunk-7582a703.b57d58c8.js" rel="prefetch"><link href="/js/chunk-7da0eb18.b6282824.js" rel="prefetch"><link href="/js/chunk-922d780a.7aff86dc.js" rel="prefetch"><link href="/js/chunk-977f0f52.b19a2b8d.js" rel="prefetch"><link href="/js/chunk-a4a29886.a960f3b2.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.e4632726.js" rel="prefetch"><link href="/css/app.75493212.css" rel="preload" as="style"><link href="/css/chunk-vendors.d0a33139.css" rel="preload" as="style"><link href="/js/app.49c0b725.js" rel="preload" as="script"><link href="/js/chunk-vendors.60dc9ef4.js" rel="preload" as="script"><link href="/css/chunk-vendors.d0a33139.css" rel="stylesheet"><link href="/css/app.75493212.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/jquery-3.2.1.min.js"></script><div id="xiangqingdivadsensedisplaynone" style="display:none;"><script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script><ins class="adsbygoogle" style="display:inline-block;width:728px;height:90px" data-ad-client="ca-pub-7145171713084445" data-ad-slot="9189068072"></ins><script>(adsbygoogle = window.adsbygoogle || []).push({});</script></div><div id="guanlidivadsensedisplaynone" style="display:none;"><ins class="adsbygoogle" style="display:inline-block;width:450px;height:380px" data-ad-client="ca-pub-7145171713084445" data-ad-slot="4213570423"></ins><script>(adsbygoogle = window.adsbygoogle || []).push({});</script></div><script>$("meta[property='og:title']")[0].content = "测试动态"</script><script src="/js/chunk-vendors.60dc9ef4.js"></script><script src="/js/app.688462d0.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/jquery-3.2.1.min.js"></script><div id="xiangqingdivadsensedisplaynone" style="display:none;"><script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script><ins class="adsbygoogle" style="display:inline-block;width:728px;height:90px" data-ad-client="ca-pub-7145171713084445" data-ad-slot="9189068072"></ins><script>(adsbygoogle = window.adsbygoogle || []).push({});</script></div><div id="guanlidivadsensedisplaynone" style="display:none;"><ins class="adsbygoogle" style="display:inline-block;width:450px;height:380px" data-ad-client="ca-pub-7145171713084445" data-ad-slot="4213570423"></ins><script>(adsbygoogle = window.adsbygoogle || []).push({});</script></div><script>$("meta[property='og:title']")[0].content = "测试动态"</script><script src="/js/chunk-vendors.60dc9ef4.js"></script><script src="/js/app.49c0b725.js"></script></body></html>

dist/js/chunk-0d9de69e.8d8c86fa.js

@@ -1,2 +1,2 @@
 (window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-0d9de69e"],{4083:function(e,c,t){"use strict";t("65de")},"65de":function(e,c,t){},c10c:function(e,c,t){"use strict";t.r(c);var n=t("7a23"),i=Object(n["withScopeId"])("data-v-5fc93bec"),o=i((function(e,c,t,i,o,d){return Object(n["openBlock"])(),Object(n["createBlock"])("div")})),d=t("79f6"),r=t("89df"),a=t("afbc"),s=t("0613"),b=t("48b8"),u=t("f64c"),f=t("6c02"),p=Object(n["defineComponent"])({setup:function(){var e=Object(f["d"])().query.code;Object(d["a"])(e).then((function(e){Object(d["e"])(e.uid,2).then((function(e){if(1==e.redirect)sessionStorage.setItem("mid",e.memberid),a["a"].push("/sign");else{if(!Object(b["e"])("token",e.api_token)&&!Object(b["e"])("memberid",e.memberid))return u["a"].error("存储错误, 请允许网页使用本地存储！"),!1;Object(r["g"])(),s["a"].commit("login",!0),s["a"].dispatch("setUserInfo"),a["a"].push("/mine/archives")}}))}))}});t("4083");p.render=o,p.__scopeId="data-v-5fc93bec";c["default"]=p}}]);
-//# sourceMappingURL=chunk-0d9de69e.9b497785.js.map
+//# sourceMappingURL=chunk-0d9de69e.8d8c86fa.js.map

dist/js/chunk-0d9de69e.8d8c86fa.js.map

@@ -1 +1 @@
-{"version":3,"sources":["webpack:///./src/views/login/wblogin.vue?2122","webpack:///./src/views/login/wblogin.vue","webpack:///./src/views/login/wblogin.vue?0d29","webpack:///./src/views/login/wblogin.vue?668d"],"names":["setup","code","query","then","res","uid","redirect","sessionStorage","setItem","memberid","router","push","api_token","message","error","store","commit","dispatch","render","__scopeId"],"mappings":"gHAAA,W,2LCCI,yBAAW,U,oFCWA,+BAAiB,CAC5BA,MAD4B,WAEzB,IAAMC,EAAa,iBAAWC,MAAMD,KACpC,eAAYA,GAAME,MAAK,SAACC,GAEpB,eAAUA,EAAIC,IAAK,GAAGF,MAAK,SAACC,GAC3B,GAAmB,GAAhBA,EAAIE,SACLC,eAAeC,QAAQ,MAAMJ,EAAIK,UACjCC,EAAA,KAAOC,KAAK,aAET,CACH,IAAI,eAAU,QAASP,EAAIQ,aAAe,eAAU,WAAYR,EAAIK,UAEhE,OADAI,EAAA,KAAQC,MAAM,uBACP,EAEP,iBACAC,EAAA,KAAMC,OAAO,SAAS,GACtBD,EAAA,KAAME,SAAS,eACfP,EAAA,KAAOC,KAAK,4B,UCzB9B,EAAOO,OAAS,EAChB,EAAOC,UAAY,kBAEJ","file":"js/chunk-0d9de69e.9b497785.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!./wblogin.vue?vue&type=style&index=0&id=5fc93bec&lang=scss&scoped=true\"","<template>\n    <div></div>\n</template>\n<style lang=\"scss\" scoped>\n\n</style>\n<script lang=\"ts\">\nimport { accessToken, authLogin } from \"@/api\";\nimport { setToken } from \"@/api/base\";\nimport router from \"@/router\";\nimport store from \"@/store\";\nimport { saveValue } from \"@/utils/common\";\nimport { message } from \"ant-design-vue\";\nimport axios from \"axios\";\nimport { defineComponent } from \"vue\";\nimport { useRoute } from \"vue-router\";\n\n\nexport default defineComponent(({\n    setup(){\n       const code: any =  useRoute().query.code;\n       accessToken(code).then((res: any)=>{\n           console.log(res)\n           authLogin(res.uid, 2).then((res: any)=>{\n            if(res.redirect == 1){\n              sessionStorage.setItem('mid',res.memberid);\n              router.push(\"/sign\")\n              \n            }else{\n              if(!saveValue(\"token\", res.api_token) && !saveValue(\"memberid\", res.memberid) ){\n                  message.error(\"存储错误, 请允许网页使用本地存储！\")\n                  return false;\n              }else{\n                  setToken();\n                  store.commit(\"login\", true);\n                  store.dispatch(\"setUserInfo\");\n                  router.push(\"/mine/archives\")\n        }\n            }\n          })\n       })\n    //    window.location.href=`https://api.weibo.com/oauth2/access_token?client_id=2754574056&client_secret=2f16267634db2de14cda7891c49aa54a&grant_type=authorization_code&redirect_uri=https://beelink.theluyuan.com/wblogin&code=${code}`\n    }\n}))\n</script>","\nimport { accessToken, authLogin } from \"@/api\";\nimport { setToken } from \"@/api/base\";\nimport router from \"@/router\";\nimport store from \"@/store\";\nimport { saveValue } from \"@/utils/common\";\nimport { message } from \"ant-design-vue\";\nimport axios from \"axios\";\nimport { defineComponent } from \"vue\";\nimport { useRoute } from \"vue-router\";\n\n\nexport default defineComponent(({\n    setup(){\n       const code: any =  useRoute().query.code;\n       accessToken(code).then((res: any)=>{\n           console.log(res)\n           authLogin(res.uid, 2).then((res: any)=>{\n            if(res.redirect == 1){\n              sessionStorage.setItem('mid',res.memberid);\n              router.push(\"/sign\")\n              \n            }else{\n              if(!saveValue(\"token\", res.api_token) && !saveValue(\"memberid\", res.memberid) ){\n                  message.error(\"存储错误, 请允许网页使用本地存储！\")\n                  return false;\n              }else{\n                  setToken();\n                  store.commit(\"login\", true);\n                  store.dispatch(\"setUserInfo\");\n                  router.push(\"/mine/archives\")\n        }\n            }\n          })\n       })\n    //    window.location.href=`https://api.weibo.com/oauth2/access_token?client_id=2754574056&client_secret=2f16267634db2de14cda7891c49aa54a&grant_type=authorization_code&redirect_uri=https://beelink.theluyuan.com/wblogin&code=${code}`\n    }\n}))\n","import { render } from \"./wblogin.vue?vue&type=template&id=5fc93bec&scoped=true&bindings={}\"\nimport script from \"./wblogin.vue?vue&type=script&lang=ts\"\nexport * from \"./wblogin.vue?vue&type=script&lang=ts\"\n\nimport \"./wblogin.vue?vue&type=style&index=0&id=5fc93bec&lang=scss&scoped=true\"\nscript.render = render\nscript.__scopeId = \"data-v-5fc93bec\"\n\nexport default script"],"sourceRoot":""}
+{"version":3,"sources":["webpack:///./src/views/login/wblogin.vue?2122","webpack:///./src/views/login/wblogin.vue","webpack:///./src/views/login/wblogin.vue?0d29","webpack:///./src/views/login/wblogin.vue?668d"],"names":["setup","code","query","then","res","uid","redirect","sessionStorage","setItem","memberid","router","push","api_token","message","error","store","commit","dispatch","render","__scopeId"],"mappings":"gHAAA,W,2LCCI,yBAAW,U,oFCWA,+BAAiB,CAC5BA,MAD4B,WAEzB,IAAMC,EAAa,iBAAWC,MAAMD,KACpC,eAAYA,GAAME,MAAK,SAACC,GAEpB,eAAUA,EAAIC,IAAK,GAAGF,MAAK,SAACC,GAC3B,GAAmB,GAAhBA,EAAIE,SACLC,eAAeC,QAAQ,MAAMJ,EAAIK,UACjCC,EAAA,KAAOC,KAAK,aAET,CACH,IAAI,eAAU,QAASP,EAAIQ,aAAe,eAAU,WAAYR,EAAIK,UAEhE,OADAI,EAAA,KAAQC,MAAM,uBACP,EAEP,iBACAC,EAAA,KAAMC,OAAO,SAAS,GACtBD,EAAA,KAAME,SAAS,eACfP,EAAA,KAAOC,KAAK,4B,UCzB9B,EAAOO,OAAS,EAChB,EAAOC,UAAY,kBAEJ","file":"js/chunk-0d9de69e.8d8c86fa.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!./wblogin.vue?vue&type=style&index=0&id=5fc93bec&lang=scss&scoped=true\"","<template>\n    <div></div>\n</template>\n<style lang=\"scss\" scoped>\n\n</style>\n<script lang=\"ts\">\nimport { accessToken, authLogin } from \"@/api\";\nimport { setToken } from \"@/api/base\";\nimport router from \"@/router\";\nimport store from \"@/store\";\nimport { saveValue } from \"@/utils/common\";\nimport { message } from \"ant-design-vue\";\nimport axios from \"axios\";\nimport { defineComponent } from \"vue\";\nimport { useRoute } from \"vue-router\";\n\n\nexport default defineComponent(({\n    setup(){\n       const code: any =  useRoute().query.code;\n       accessToken(code).then((res: any)=>{\n           console.log(res)\n           authLogin(res.uid, 2).then((res: any)=>{\n            if(res.redirect == 1){\n              sessionStorage.setItem('mid',res.memberid);\n              router.push(\"/sign\")\n              \n            }else{\n              if(!saveValue(\"token\", res.api_token) && !saveValue(\"memberid\", res.memberid) ){\n                  message.error(\"存储错误, 请允许网页使用本地存储！\")\n                  return false;\n              }else{\n                  setToken();\n                  store.commit(\"login\", true);\n                  store.dispatch(\"setUserInfo\");\n                  router.push(\"/mine/archives\")\n        }\n            }\n          })\n       })\n    //    window.location.href=`https://api.weibo.com/oauth2/access_token?client_id=2754574056&client_secret=2f16267634db2de14cda7891c49aa54a&grant_type=authorization_code&redirect_uri=https://beelink.theluyuan.com/wblogin&code=${code}`\n    }\n}))\n</script>","\nimport { accessToken, authLogin } from \"@/api\";\nimport { setToken } from \"@/api/base\";\nimport router from \"@/router\";\nimport store from \"@/store\";\nimport { saveValue } from \"@/utils/common\";\nimport { message } from \"ant-design-vue\";\nimport axios from \"axios\";\nimport { defineComponent } from \"vue\";\nimport { useRoute } from \"vue-router\";\n\n\nexport default defineComponent(({\n    setup(){\n       const code: any =  useRoute().query.code;\n       accessToken(code).then((res: any)=>{\n           console.log(res)\n           authLogin(res.uid, 2).then((res: any)=>{\n            if(res.redirect == 1){\n              sessionStorage.setItem('mid',res.memberid);\n              router.push(\"/sign\")\n              \n            }else{\n              if(!saveValue(\"token\", res.api_token) && !saveValue(\"memberid\", res.memberid) ){\n                  message.error(\"存储错误, 请允许网页使用本地存储！\")\n                  return false;\n              }else{\n                  setToken();\n                  store.commit(\"login\", true);\n                  store.dispatch(\"setUserInfo\");\n                  router.push(\"/mine/archives\")\n        }\n            }\n          })\n       })\n    //    window.location.href=`https://api.weibo.com/oauth2/access_token?client_id=2754574056&client_secret=2f16267634db2de14cda7891c49aa54a&grant_type=authorization_code&redirect_uri=https://beelink.theluyuan.com/wblogin&code=${code}`\n    }\n}))\n","import { render } from \"./wblogin.vue?vue&type=template&id=5fc93bec&scoped=true&bindings={}\"\nimport script from \"./wblogin.vue?vue&type=script&lang=ts\"\nexport * from \"./wblogin.vue?vue&type=script&lang=ts\"\n\nimport \"./wblogin.vue?vue&type=style&index=0&id=5fc93bec&lang=scss&scoped=true\"\nscript.render = render\nscript.__scopeId = \"data-v-5fc93bec\"\n\nexport default script"],"sourceRoot":""}

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

@@ -1,2 +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.b9a3c15b.js.map
+//# sourceMappingURL=chunk-39b973ba.334f229f.js.map

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

@@ -1 +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.b9a3c15b.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":""}
+{"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-526e71c4.14c5bc92.js

@@ -1,2 +1,2 @@
 (window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-526e71c4"],{1009:function(e,t,n){"use strict";n("b0c0");var c=n("7a23"),a=Object(c["withScopeId"])("data-v-6dd528d6");Object(c["pushScopeId"])("data-v-6dd528d6");var o={class:"nav-bottom"};Object(c["popScopeId"])();var r=a((function(e,t,n,a,r,i){return Object(c["openBlock"])(),Object(c["createBlock"])("div",o,[Object(c["createVNode"])("div",{class:"nav-container",style:e.color},[(Object(c["openBlock"])(!0),Object(c["createBlock"])(c["Fragment"],null,Object(c["renderList"])(e.navArray,(function(t,n){return Object(c["openBlock"])(),Object(c["createBlock"])("div",{key:n,class:"nav-item",onClick:function(n){return e.navto(t.route)}},[Object(c["createVNode"])("div",{class:t.route==e.nowroute?"active":""},Object(c["toDisplayString"])(e.lan.$t(t.name)),3)],8,["onClick"])})),128))],4),Object(c["createVNode"])("div",{class:"copyright",style:e.color},Object(c["toDisplayString"])(e.lan.$t("banquan")),5)])})),i=n("afbc"),u=n("5699"),l=n("6c02"),s=Object(c["defineComponent"])({props:{color:Object},setup:function(){var e=Object(u["c"])(),t=Object(l["d"])(),n=Object(c["ref"])(t.path),a=[{name:"zhiboguanli",route:"/regime/live"},{name:"shipinguanli",route:"/regime/video"},{name:"dingyuezheguanli",route:"/regime/subscriber"},{name:"gerenzhongxin",route:"/mine/archives"}];function o(e){n.value=e,i["a"].push(e)}return{navArray:a,navto:o,nowroute:n,lan:e}}});n("9af0");s.render=r,s.__scopeId="data-v-6dd528d6";t["a"]=s},"4c53":function(e,t,n){"use strict";var c=n("23e7"),a=n("857a"),o=n("af03");c({target:"String",proto:!0,forced:o("sub")},{sub:function(){return a(this,"sub","","")}})},"4f44":function(e,t,n){"use strict";n("cf3f")},"857a":function(e,t,n){var c=n("1d80"),a=/"/g;e.exports=function(e,t,n,o){var r=String(c(e)),i="<"+t;return""!==n&&(i+=" "+n+'="'+String(o).replace(a,"&quot;")+'"'),i+">"+r+"</"+t+">"}},"9af0":function(e,t,n){"use strict";n("ac9a")},ac9a:function(e,t,n){},af03:function(e,t,n){var c=n("d039");e.exports=function(e){return c((function(){var t=""[e]('"');return t!==t.toLowerCase()||t.split('"').length>3}))}},cf3f:function(e,t,n){},e678:function(e,t,n){"use strict";n.r(t);n("4c53");var c=n("7a23"),a=Object(c["withScopeId"])("data-v-4e03e93a");Object(c["pushScopeId"])("data-v-4e03e93a");var o={class:"aboutus"},r={class:"tabs"},i=Object(c["createVNode"])("div",{class:"line"},null,-1),u={key:0,class:"content"},l={key:1,class:"content"},s={key:2},b={class:"fankui"},d={class:"label"};Object(c["popScopeId"])();var v=a((function(e,t,n,a,v,j){var O=Object(c["resolveComponent"])("a-textarea"),p=Object(c["resolveComponent"])("NavBottom");return Object(c["openBlock"])(),Object(c["createBlock"])("div",o,[Object(c["createVNode"])("div",r,[Object(c["createVNode"])("div",{class:1==e.tabindex?"on":"",onClick:t[1]||(t[1]=function(t){return e.tabchange(1)})},Object(c["toDisplayString"])(e.lan.$t("fuwutiaokuan")),3),Object(c["createVNode"])("div",{class:2==e.tabindex?"on":"",onClick:t[2]||(t[2]=function(t){return e.tabchange(2)})},Object(c["toDisplayString"])(e.lan.$t("yinsizhengce")),3),Object(c["createVNode"])("div",{class:3==e.tabindex?"on":"",onClick:t[3]||(t[3]=function(t){return e.tabchange(3)})},Object(c["toDisplayString"])(e.lan.$t("yijianfankui")),3)]),i,1==e.tabindex?(Object(c["openBlock"])(),Object(c["createBlock"])("div",u,[Object(c["createVNode"])("div",{innerHTML:e.text[0].content},null,8,["innerHTML"])])):2==e.tabindex?(Object(c["openBlock"])(),Object(c["createBlock"])("div",l,[Object(c["createVNode"])("div",{innerHTML:e.text[1].content},null,8,["innerHTML"])])):(Object(c["openBlock"])(),Object(c["createBlock"])("div",s,[Object(c["createVNode"])("div",b,[Object(c["createVNode"])("div",d,Object(c["toDisplayString"])(e.lan.$t("yijianfankui")),1),Object(c["createVNode"])("div",null,[Object(c["createVNode"])(O,{value:e.value,"onUpdate:value":t[4]||(t[4]=function(t){return e.value=t}),placeholder:e.lan.$t("shurufankui"),rows:10},null,8,["value","placeholder"])])]),Object(c["createVNode"])("div",{class:"sub",onClick:t[5]||(t[5]=function(){return e.sub.apply(e,arguments)})},Object(c["toDisplayString"])(e.lan.$t("tijiaofankui")),1)])),Object(c["createVNode"])(p,{class:"navbottom"})])})),j=(n("a9e3"),n("1009")),O=n("79f6"),p=n("6c02"),f=n("5699"),k=n("0613"),g=Object(c["defineComponent"])({name:"Aboutus",components:{NavBottom:j["a"]},setup:function(){var e=Object(f["c"])(),t=Object(c["ref"])(1),n=Object(c["ref"])(""),a=Object(p["d"])().query.selected,o=Object(c["computed"])((function(){return k["a"].state.infotext}));Object(p["d"])().query.selected&&(t.value=Number(a));var r=function(e){t.value=e};function i(){Object(O["p"])(n.value)}return{tabchange:r,tabindex:t,sub:i,value:n,lan:e,text:o}}});n("4f44");g.render=v,g.__scopeId="data-v-4e03e93a";t["default"]=g}}]);
-//# sourceMappingURL=chunk-526e71c4.d1313361.js.map
+//# sourceMappingURL=chunk-526e71c4.14c5bc92.js.map

src/App.vue

@@ -57,6 +57,7 @@ export default defineComponent({
             toindex()
         }
         store.dispatch("getinfotext");
+        store.dispatch("getindexarr");
         const zh = zhCN;
         const en = enUS;
 

src/api/index.ts

@@ -631,19 +631,36 @@ export async function checkuser(data?: any){
 /**
  * 获取区号列表
  */
-export async function getquhaolist() {
+export function getquhaolist() {
-    const res=await get("phonecodes")
+    // const res=await get("phonecodes")
     // console.log(res)
-    return res.data
+    // return res.data
+    return new Promise((res)=>{
+        const time = setInterval(()=>{
+            if(store.state.indexarr.phonecodes){
+                res(store.state.indexarr.phonecodes)
+                clearInterval(time)
+            }
+        }, 500)
+    })
 }
 
 /**
  * 获取时区列表
  */
-export async function getzonelist(): Promise<any>{
+export function getzonelist(): Promise<any>{
-    const res=await get("timezones")
     // console.log(res)
-    return res.data
+    // const res=await get("timezones")
+    // console.log(res)
+    // return res.data
+    return new Promise((res)=>{
+        const time = setInterval(()=>{
+            if(store.state.indexarr.timezones){
+                res(store.state.indexarr.timezones)
+                clearInterval(time)
+            }
+        }, 500)
+    })
 }
 
 /**
@@ -668,9 +685,17 @@ export async function editsystemsetting(e?: any): Promise<boolean> {
 /**
  * 货币列表
  */
-export async function getcurrencys(){
+export function getcurrencys(){
-    const res=await get("currencys")
+    // const res=await get("currencys")
-    return res.data
+    // return res.data
+    return new Promise((res)=>{
+        const time = setInterval(()=>{
+            if(store.state.indexarr.currencys){
+                res(store.state.indexarr.currencys)
+                clearInterval(time)
+            }
+        }, 500)
+    })
 }
 
 /**
@@ -720,8 +745,16 @@ interface Willsay{
     name: string;
 }
 
-export async function getarchives(): Promise<[Countries[],Willsay[]]>{
+export function getarchives(): Promise<[any,any]>{
-    return [(await get<Countries[]>("countries")).data, (await get<Willsay[]>("willsay")).data];
+    // return [(await get<Countries[]>("countries")).data, (await get<Willsay[]>("willsay")).data];
+    return new Promise((res)=>{
+        const time = setInterval(()=>{
+            if(store.state.indexarr.countries && store.state.indexarr.willsay){
+                res([store.state.indexarr.countries, store.state.indexarr.willsay])
+                clearInterval(time)
+            }
+        }, 500)
+    })
 }
 
 export async function getwillsay(): Promise<Willsay[]>{
@@ -745,9 +778,17 @@ interface Language {
     updated_at: string;
 }
 
-export async function getlanguages(): Promise<Language[]>{
+export function getlanguages(): Promise<any>{
 
-    return (await get<Language[]>("languages")).data;
+    // return (await get<Language[]>("languages")).data;
+    return new Promise((res)=>{
+        const time = setInterval(()=>{
+            if(store.state.indexarr.language){
+                res(store.state.indexarr.language)
+                clearInterval(time)
+            }
+        }, 500)
+    })
 }
 
 /**
@@ -1174,9 +1215,17 @@ export function getaddr() {
 //     console.log(res)
 // }
 
-export async function interests() {
+export function interests() {
-    const res = await get('interests');
+    // const res = await get('interests');
-    return res.data;
+    // return res.data;
+    return new Promise((res)=>{
+        const time = setInterval(()=>{
+            if(store.state.indexarr.interests){
+                res(store.state.indexarr.interests)
+                clearInterval(time)
+            }
+        }, 500)
+    })
 }
 
 export async function getset() {
@@ -1253,3 +1302,7 @@ export async function share() {
 export async function addshareClick(videoid:number) {
     await get("addshareClick",{videoid})
 }
+
+export async function personalCenterData() {
+    return (await get<any>('personalCenterData')).data
+}

src/i18n/en.ts

@@ -48,6 +48,7 @@ export default {
     wangjimima: "Forget the password?",
     yiwanxinlai: "Trust and witness of hundreds of millions of people",
     kaiqishenghuo: "Beelink Open your wonderful learning life",
+    kaiqishenghuo1: "Open your wonderful learning life",
     guanyubeelink: "About Beelink",
     guanyuneirong: "Beelink platform has thousands of excellent teachers, rich education experience and interesting classroom environment. The one-to-one tutoring platform has many teaching functions, such as educational administration management, online classroom, offline classroom, student interaction, course playback and so on, so that you can learn various languages easily with fragmented time.",
     liaojiegengduo: "Learn more",

src/i18n/zh.ts

@@ -48,6 +48,7 @@ export default {
     wangjimima:"忘记密码?",
     yiwanxinlai:"亿万人的信赖和见证",
     kaiqishenghuo:"Beelink 开启您的美好学习生活",
+    kaiqishenghuo1:"开启您的美好学习生活",
     guanyubeelink:"关于 Beelink",
     guanyuneirong:" Beelink平台拥有数千名优秀老师，丰富的教育经验和有趣的课堂环境，一对一辅导平台的教务管理、线上课堂、线下课堂、助学互动，课程回放等多项教学功能，让您利用碎片时间，轻轻松松学会各种语言。",
     liaojiegengduo:"了解更多",

src/store/index.ts

@@ -1,4 +1,4 @@
-import { getaddr, getarticle, userinfo } from '@/api';
+import { getaddr, getarticle, personalCenterData, userinfo } from '@/api';
 import { setLanvuage } from '@/api/base';
 import { getValue, saveValue } from '@/utils/common';
 import { geti18n } from '@/utils/i18n';
@@ -73,7 +73,8 @@ export default createStore({
       ename: "",
       name: "",
     },
-    infotext:[{title:"",content:""},{title:"",content:""}]
+    infotext:[{title:"",content:""},{title:"",content:""}],
+    indexarr:{countries:{},willsay:{},timezones:{},phonecodes:{},currencys:{},interests:{},language:{}}
   },
   mutations: {
     setseting(state, info){
@@ -124,6 +125,9 @@ export default createStore({
     },
     setinfotext(state, data){
       state.infotext = data;
+    },
+    setindexarr(state, data){
+      state.indexarr = data
     }
   },
   actions: {
@@ -152,6 +156,10 @@ export default createStore({
       const info = await getarticle();
       commit("setinfotext", info)
       
+    },
+    async getindexarr({ commit }){
+      const info = await personalCenterData();
+      commit("setindexarr", info)
     }
   },
   modules: {

src/views/login/About.vue

@@ -44,25 +44,23 @@
     </div>
     <div class="top">
       <div class="titlebox">
-        <div class="title">beelink</div>
+        <div class="title">Beelink</div>
-        <div class="title">亿万人的信赖和见证</div>
+        <div class="title">{{lan.$t("yiwanxinlai")}}</div>
-        <div class="desc">开启您的美好学习生活</div>
+        <div class="desc">{{lan.$t("kaiqishenghuo1")}}</div>
       </div>
     </div>
     <div class="mid">
       <div class="midcontent">
-        <div class="midtopic">关于Beelink</div>
+        <div class="midtopic">{{lan.$t("guanyu")}}</div>
         <div class="midline"></div>
-        <div class="texts">
+        <div class="texts" v-html="text[0].content">
+  
+        </div>
+        <!-- <div class="texts">
           Beelink—专致于外语学习的在线互动学习平台。Beelink汇聚各国名师资源，在线直播辅导，提、供中文、英语、西班牙语、俄罗斯语、法语等多种外语讲课，为学生提供优质学习课
           程。一对一，一对多，不同教学形式符合您的多项不同需求。课程支持直播视频回放、视频评论等功能，让学生可以充分利用碎片时间，讲知识难点、语言技巧等完整、系统化地呈现，
           随时随地想学就学，做自己的学霸。
-        </div>
+        </div> -->
-        <div class="texts">
-          Beelink—专致于外语学习的在线互动学习平台。Beelink汇聚各国名师资源，在线直播辅导，提、供中文、英语、西班牙语、俄罗斯语、法语等多种外语讲课，为学生提供优质学习课
-          程。一对一，一对多，不同教学形式符合您的多项不同需求。课程支持直播视频回放、视频评论等功能，让学生可以充分利用碎片时间，讲知识难点、语言技巧等完整、系统化地呈现，
-          随时随地想学就学，做自己的学霸。
-        </div>
       </div>
       <div class="other">
         <div class="relation">
@@ -146,6 +144,7 @@ export default defineComponent({
     onMounted(async ()=>{
       languagelist.value=await getlanguages()
     })
+    const text = computed(()=> store.state.infotext)
     const userinfo = computed(() => {
         return store.state.userinfo;
     })
@@ -167,7 +166,8 @@ export default defineComponent({
       userinfo,
       navto,
       lan,
-      setlanguage
+      setlanguage,
+      text
     };
   },
 });