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

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

dist/index.html

@@ -61,11 +61,11 @@
             left: 0;
             z-index: 1001;
             display: none;
-        }</style><link href="/css/chunk-04e3a2fa.08ef3a2d.css" rel="prefetch"><link href="/css/chunk-05d3c41a.55076a31.css" rel="prefetch"><link href="/css/chunk-06828374.8e285ce3.css" rel="prefetch"><link href="/css/chunk-07015098.03da786d.css" rel="prefetch"><link href="/css/chunk-14e6a7cb.9cba31b5.css" rel="prefetch"><link href="/css/chunk-16964057.37c6c246.css" rel="prefetch"><link href="/css/chunk-1abac668.206f270b.css" rel="prefetch"><link href="/css/chunk-21d6a1b9.85832ac1.css" rel="prefetch"><link href="/css/chunk-27236dd2.3992b5d2.css" rel="prefetch"><link href="/css/chunk-2a197f09.b2772b24.css" rel="prefetch"><link href="/css/chunk-34d93bb8.4cba2bdb.css" rel="prefetch"><link href="/css/chunk-371ee143.78141e1e.css" rel="prefetch"><link href="/css/chunk-3c703972.0e433876.css" rel="prefetch"><link href="/css/chunk-3c7641ed.f87c4e8b.css" rel="prefetch"><link href="/css/chunk-46e3b07d.9259aefd.css" rel="prefetch"><link href="/css/chunk-4cbe0c82.f0a6b24e.css" rel="prefetch"><link href="/css/chunk-4e0b884c.48d44d85.css" rel="prefetch"><link href="/css/chunk-520d8a08.dd761c06.css" rel="prefetch"><link href="/css/chunk-623eb100.c75b32b7.css" rel="prefetch"><link href="/css/chunk-650d0cb1.47d38586.css" rel="prefetch"><link href="/css/chunk-68091c98.14c0db2d.css" rel="prefetch"><link href="/css/chunk-737c53fe.6caedc04.css" rel="prefetch"><link href="/css/chunk-74d6e86d.85aed290.css" rel="prefetch"><link href="/css/chunk-74d7e8d4.4686069f.css" rel="prefetch"><link href="/css/chunk-977f0f52.6081abf8.css" rel="prefetch"><link href="/css/chunk-cc7ac8b2.cf93d877.css" rel="prefetch"><link href="/css/chunk-da7e1532.17a6e0e0.css" rel="prefetch"><link href="/css/chunk-ebdb96a0.d22f743d.css" rel="prefetch"><link href="/css/chunk-ef207110.a20941ed.css" rel="prefetch"><link href="/js/chunk-04e3a2fa.2e9d9876.js" rel="prefetch"><link href="/js/chunk-05d3c41a.1d8c01a8.js" rel="prefetch"><link href="/js/chunk-06828374.0a34c841.js" rel="prefetch"><link href="/js/chunk-07015098.cd94af61.js" rel="prefetch"><link href="/js/chunk-14e6a7cb.22c48f45.js" rel="prefetch"><link href="/js/chunk-16964057.53d9997e.js" rel="prefetch"><link href="/js/chunk-1abac668.d554bb92.js" rel="prefetch"><link href="/js/chunk-21d6a1b9.7239c69b.js" rel="prefetch"><link href="/js/chunk-27236dd2.6a20330a.js" rel="prefetch"><link href="/js/chunk-2a197f09.a639ef81.js" rel="prefetch"><link href="/js/chunk-34d93bb8.1720a2ff.js" rel="prefetch"><link href="/js/chunk-371ee143.14edd599.js" rel="prefetch"><link href="/js/chunk-3c703972.d65780ed.js" rel="prefetch"><link href="/js/chunk-3c7641ed.5518a539.js" rel="prefetch"><link href="/js/chunk-46e3b07d.9e8798de.js" rel="prefetch"><link href="/js/chunk-4cbe0c82.55bdb95d.js" rel="prefetch"><link href="/js/chunk-4e0b884c.eac26ffe.js" rel="prefetch"><link href="/js/chunk-520d8a08.76e69e99.js" rel="prefetch"><link href="/js/chunk-623eb100.0a0ebf4c.js" rel="prefetch"><link href="/js/chunk-650d0cb1.7932c010.js" rel="prefetch"><link href="/js/chunk-68091c98.6bc9c5f0.js" rel="prefetch"><link href="/js/chunk-737c53fe.358c23d9.js" rel="prefetch"><link href="/js/chunk-74d6e86d.b8bbfde0.js" rel="prefetch"><link href="/js/chunk-74d7e8d4.68462b66.js" rel="prefetch"><link href="/js/chunk-977f0f52.0d90c33e.js" rel="prefetch"><link href="/js/chunk-cc7ac8b2.e162bb81.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.1f12e190.js" rel="prefetch"><link href="/css/app.f67b4e1f.css" rel="preload" as="style"><link href="/css/chunk-vendors.d0a33139.css" rel="preload" as="style"><link href="/js/app.b2649306.js" rel="preload" as="script"><link href="/js/chunk-vendors.5e652f88.js" rel="preload" as="script"><link href="/css/chunk-vendors.d0a33139.css" rel="stylesheet"><link href="/css/app.f67b4e1f.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but beelink doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><div id="make"></div><script>window.fbAsyncInit = function () {
+        }</style><link href="/css/chunk-04e3a2fa.08ef3a2d.css" rel="prefetch"><link href="/css/chunk-05d3c41a.55076a31.css" rel="prefetch"><link href="/css/chunk-06828374.8e285ce3.css" rel="prefetch"><link href="/css/chunk-07015098.03da786d.css" rel="prefetch"><link href="/css/chunk-14e6a7cb.9cba31b5.css" rel="prefetch"><link href="/css/chunk-16964057.37c6c246.css" rel="prefetch"><link href="/css/chunk-1abac668.206f270b.css" rel="prefetch"><link href="/css/chunk-21d6a1b9.85832ac1.css" rel="prefetch"><link href="/css/chunk-27236dd2.3992b5d2.css" rel="prefetch"><link href="/css/chunk-2a197f09.b2772b24.css" rel="prefetch"><link href="/css/chunk-34d93bb8.4cba2bdb.css" rel="prefetch"><link href="/css/chunk-371ee143.78141e1e.css" rel="prefetch"><link href="/css/chunk-3c703972.0e433876.css" rel="prefetch"><link href="/css/chunk-3c7641ed.f87c4e8b.css" rel="prefetch"><link href="/css/chunk-46e3b07d.9259aefd.css" rel="prefetch"><link href="/css/chunk-4cbe0c82.f0a6b24e.css" rel="prefetch"><link href="/css/chunk-4e0b884c.48d44d85.css" rel="prefetch"><link href="/css/chunk-520d8a08.dd761c06.css" rel="prefetch"><link href="/css/chunk-623eb100.c75b32b7.css" rel="prefetch"><link href="/css/chunk-650d0cb1.47d38586.css" rel="prefetch"><link href="/css/chunk-68091c98.14c0db2d.css" rel="prefetch"><link href="/css/chunk-737c53fe.6caedc04.css" rel="prefetch"><link href="/css/chunk-74d6e86d.85aed290.css" rel="prefetch"><link href="/css/chunk-74d7e8d4.4686069f.css" rel="prefetch"><link href="/css/chunk-977f0f52.6081abf8.css" rel="prefetch"><link href="/css/chunk-cc7ac8b2.cf93d877.css" rel="prefetch"><link href="/css/chunk-da7e1532.17a6e0e0.css" rel="prefetch"><link href="/css/chunk-ebdb96a0.d22f743d.css" rel="prefetch"><link href="/css/chunk-ef207110.a20941ed.css" rel="prefetch"><link href="/js/chunk-04e3a2fa.2e9d9876.js" rel="prefetch"><link href="/js/chunk-05d3c41a.1d8c01a8.js" rel="prefetch"><link href="/js/chunk-06828374.0a34c841.js" rel="prefetch"><link href="/js/chunk-07015098.cd94af61.js" rel="prefetch"><link href="/js/chunk-14e6a7cb.22c48f45.js" rel="prefetch"><link href="/js/chunk-16964057.53d9997e.js" rel="prefetch"><link href="/js/chunk-1abac668.d554bb92.js" rel="prefetch"><link href="/js/chunk-21d6a1b9.7239c69b.js" rel="prefetch"><link href="/js/chunk-27236dd2.6a20330a.js" rel="prefetch"><link href="/js/chunk-2a197f09.a639ef81.js" rel="prefetch"><link href="/js/chunk-34d93bb8.1720a2ff.js" rel="prefetch"><link href="/js/chunk-371ee143.14edd599.js" rel="prefetch"><link href="/js/chunk-3c703972.d65780ed.js" rel="prefetch"><link href="/js/chunk-3c7641ed.5518a539.js" rel="prefetch"><link href="/js/chunk-46e3b07d.9e8798de.js" rel="prefetch"><link href="/js/chunk-4cbe0c82.55bdb95d.js" rel="prefetch"><link href="/js/chunk-4e0b884c.eac26ffe.js" rel="prefetch"><link href="/js/chunk-520d8a08.76e69e99.js" rel="prefetch"><link href="/js/chunk-623eb100.0a0ebf4c.js" rel="prefetch"><link href="/js/chunk-650d0cb1.7932c010.js" rel="prefetch"><link href="/js/chunk-68091c98.6bc9c5f0.js" rel="prefetch"><link href="/js/chunk-737c53fe.358c23d9.js" rel="prefetch"><link href="/js/chunk-74d6e86d.b8bbfde0.js" rel="prefetch"><link href="/js/chunk-74d7e8d4.68462b66.js" rel="prefetch"><link href="/js/chunk-977f0f52.0d90c33e.js" rel="prefetch"><link href="/js/chunk-cc7ac8b2.e162bb81.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.1f12e190.js" rel="prefetch"><link href="/css/app.b83ff0a4.css" rel="preload" as="style"><link href="/css/chunk-vendors.d0a33139.css" rel="preload" as="style"><link href="/js/app.af3625eb.js" rel="preload" as="script"><link href="/js/chunk-vendors.5e652f88.js" rel="preload" as="script"><link href="/css/chunk-vendors.d0a33139.css" rel="stylesheet"><link href="/css/app.b83ff0a4.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but beelink doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><div id="make"></div><script>window.fbAsyncInit = function () {
             FB.init({
                 appId: '277826133389999',
                 autoLogAppEvents: true,
                 xfbml: true,
                 version: 'v8.0'
             });
-        };</script><script async defer crossorigin="anonymous" src="https://connect.facebook.net/en_US/sdk.js"></script><script src="/js/cropper.min.js"></script><script src="/js/chunk-vendors.5e652f88.js"></script><script src="/js/app.b2649306.js"></script></body></html>
+        };</script><script async defer crossorigin="anonymous" src="https://connect.facebook.net/en_US/sdk.js"></script><script src="/js/cropper.min.js"></script><script src="/js/chunk-vendors.5e652f88.js"></script><script src="/js/app.af3625eb.js"></script></body></html>

src/api/index.ts

@@ -913,7 +913,8 @@ export async function register(data: any){
         mtongue: data.muyu,
         tlanguage: data.jiaoshou,
         language: getValue("Lanvuage") || 'zh',
-        zoneid: days.tz.guess()
+        zoneid: days.tz.guess(),
+        memberid: sessionStorage.getItem('mid')
 
     })
     if(res.code == 0){

src/views/login/Login.vue

@@ -271,7 +271,12 @@ export default defineComponent({
         window.FB.login(function(response: any){
           console.log(response, 121212)
           // handle the response 
-          authLogin(response.authResponse.userID, index)
+          authLogin(response.authResponse.userID, index).then((res: any)=>{
+            if(res.redirect == 1){
+              sessionStorage.setItem('mid',res.memberid);
+              router.push("/sign")
+            }
+          })
         });
 
       }