Merge pull request 'dist' (#264) from xbx into master

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

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-1ac4f1f4.7a9cfd91.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-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-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-77e7ddf0.4c3c344c.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="/css/chunk-fe0963e2.87f3e66d.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-1ac4f1f4.d8f4e8da.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-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-4663db36.dfc5ef3c.js" rel="prefetch"><link href="/js/chunk-520d8a08.fa8b550a.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-77e7ddf0.03393538.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="/js/chunk-fe0963e2.c59d4951.js" rel="prefetch"><link href="/css/app.b1831ef3.css" rel="preload" as="style"><link href="/css/chunk-vendors.d0a33139.css" rel="preload" as="style"><link href="/js/app.39eaf8fb.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.b1831ef3.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-1ac4f1f4.7a9cfd91.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-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-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-77e7ddf0.4c3c344c.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="/css/chunk-fe0963e2.87f3e66d.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-1ac4f1f4.d8f4e8da.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-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-4663db36.dfc5ef3c.js" rel="prefetch"><link href="/js/chunk-520d8a08.fa8b550a.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-77e7ddf0.03393538.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="/js/chunk-fe0963e2.c59d4951.js" rel="prefetch"><link href="/css/app.54243bbb.css" rel="preload" as="style"><link href="/css/chunk-vendors.d0a33139.css" rel="preload" as="style"><link href="/js/app.66f3e32d.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.54243bbb.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.39eaf8fb.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.66f3e32d.js"></script></body></html>

src/utils/common.ts

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

src/views/login/Login.vue

@@ -90,7 +90,7 @@
         
         </div>
         <div class="icons">
-          <img src="@/static/images/weixin.png" alt="" class="icon" />
+          <img src="@/static/images/weixin.png" alt="" class="icon" @click="slogin(1)" />
           <img src="@/static/images/weibo.png" alt="" class="icon" @click="slogin(2)" />
           <img src="@/static/images/facebook.png" alt="" class="icon" @click="slogin(3)" />
         </div>
@@ -296,6 +296,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"
       }
+      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`
+
+      }
     }
     const text = computed(()=> store.state.infotext)
     return {

src/views/login/wxlogin.vue

@@ -0,0 +1,46 @@
+<template>
+    <div></div>
+</template>
+<style lang="scss" scoped>
+
+</style>
+<script lang="ts">
+import { accessToken, authLogin } from "@/api";
+import { setToken } from "@/api/base";
+import router from "@/router";
+import store from "@/store";
+import { saveValue } from "@/utils/common";
+import { message } from "ant-design-vue";
+import axios from "axios";
+import { defineComponent } from "vue";
+import { useRoute } from "vue-router";
+
+
+export default defineComponent(({
+    setup(){
+       const code: any =  useRoute().query.code;
+       console.log(code)
+    //    accessToken(code).then((res: any)=>{
+    //        console.log(res)
+    //        authLogin(res.uid, 2).then((res: any)=>{
+    //         if(res.redirect == 1){
+    //           sessionStorage.setItem('mid',res.memberid);
+    //           router.push("/sign")
+              
+    //         }else{
+    //           if(!saveValue("token", res.api_token) && !saveValue("memberid", res.memberid) ){
+    //               message.error("存储错误, 请允许网页使用本地存储！")
+    //               return false;
+    //           }else{
+    //               setToken();
+    //               store.commit("login", true);
+    //               store.dispatch("setUserInfo");
+    //               router.push("/mine/archives")
+    //     }
+    //         }
+    //       })
+    //    })
+    //    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}`
+    }
+}))
+</script>