Merge pull request 'login' (#265) from xbx into master

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

dist/css/chunk-18d6ebc2.07c0f4a4.css

@@ -1 +0,0 @@
-.login[data-v-1f55cca4] .ant-input,.login[data-v-1f55cca4] .ant-select-selection{border:none}.ant-input[data-v-1f55cca4]:focus{border:none;border-bottom:.01rem solid #fff!important;box-shadow:none}.login[data-v-1f55cca4] .ant-form-item-label{line-height:.14rem}.login[data-v-1f55cca4] .ant-form-item ::v-deep(label){color:#0dbba4;font-size:.11rem;left:.01rem}.login[data-v-1f55cca4]{min-width:100%;height:100vh;background:url(../img/loginbg.90cb5eef.png);background-size:100% 130%;background-repeat:no-repeat}.login .box[data-v-1f55cca4]{padding-top:1.45rem;display:flex;justify-content:space-around}.login .box .left1[data-v-1f55cca4]{width:7.1rem!important}.login .box .left[data-v-1f55cca4]{width:3.14rem}.login .box .left .title[data-v-1f55cca4]{font-size:.17rem;font-weight:700}.login .box .left .orgname[data-v-1f55cca4]{font-size:.29rem;color:#0dbba4;cursor:pointer}.login .box .left .nosign[data-v-1f55cca4]{font-size:.12rem;color:#666;margin-top:.17rem;margin-bottom:.35rem}.login .box .left .tosign[data-v-1f55cca4]{color:#0dbba4;cursor:pointer}.login .box .left .tab[data-v-1f55cca4]{margin-bottom:.3rem}.login .box .left .form-item[data-v-1f55cca4]{border-bottom:.01rem solid #e5e5e5;font-size:.15rem;margin-right:.4rem}.login .box .left .line[data-v-1f55cca4]{width:.01rem;height:.14rem;background:#e5e5e5;margin-top:.1rem;position:relative;z-index:999}.login .box .left[data-v-1f55cca4] .getcode{font-size:.15rem;color:#08ae98;width:3.13rem;line-height:.3rem;cursor:pointer}.login .box .left[data-v-1f55cca4] .ant-select-selection{background-color:unset}.login .box .left .orginfo[data-v-1f55cca4]{margin-top:1.78rem}.login .box .left .submit[data-v-1f55cca4]{width:1.43rem;height:.35rem;background:linear-gradient(90deg,#00dac2,#42de9e,#88e062,#d0eb3e,#fffa18);border-radius:.18rem;font-size:.15rem;color:#fff;font-weight:800;text-align:center;line-height:.35rem;margin-top:.45rem}.login .box .left .agreement[data-v-1f55cca4]{font-size:.12rem;display:flex;margin-top:.23rem;cursor:default}.login .box .left .agreement .ifagree[data-v-1f55cca4]{width:.12rem;height:.12rem;border-radius:.03rem;border:.01rem solid #0ebca4;margin:auto 0;margin-right:.07rem}.login .box .left .agreement .ifagree .agree[data-v-1f55cca4]{width:.08rem;height:.06rem;position:relative;top:-.04rem;left:.025rem}.login .box .right1[data-v-1f55cca4]{width:2.3rem!important}.login .box .right[data-v-1f55cca4]{width:6.9rem}.login .box .right .steps[data-v-1f55cca4]{padding-top:1.12rem}.login .box .right .steps .stepline[data-v-1f55cca4]{width:.01rem;height:.5rem;border:.01rem dashed #eee;position:relative;left:.13rem}.login .box .right .steps .step[data-v-1f55cca4]{display:flex;color:#999;font-size:.11rem;line-height:.28rem;font-weight:700}.login .box .right .steps .step .back[data-v-1f55cca4]{color:#0dbba4;margin-left:.23rem}.login .box .right .steps .step .circle[data-v-1f55cca4]{width:.29rem;height:.29rem;border-radius:.15rem;background:#eee;font-size:.12rem;color:#999;text-align:center;line-height:.29rem;font-weight:800;margin-right:.17rem}.login .box .right .steps .step1[data-v-1f55cca4]{background:#08ae98!important;color:#fff!important}.login .box .right .steps .stepnow[data-v-1f55cca4]{color:#111}.login .signform[data-v-1f55cca4]{display:flex;flex-wrap:wrap}.login .signform .shuru[data-v-1f55cca4]{width:3.13rem}.login .icons[data-v-1f55cca4]{margin-right:.41rem;margin-top:2.27rem}.login .icons .icon[data-v-1f55cca4]{width:.28rem;height:.28rem;margin-right:.18rem;float:right}.login .success[data-v-1f55cca4]{width:2.5rem;height:2.33rem}.login .ale[data-v-1f55cca4]{color:#08ae98;font-size:.14rem;font-weight:800;margin-top:.34rem;cursor:pointer}

dist/css/chunk-50a3cdf8.f57189fa.css

@@ -0,0 +1 @@
+.login[data-v-76c311ba] .ant-input,.login[data-v-76c311ba] .ant-select-selection{border:none}.ant-input[data-v-76c311ba]:focus{border:none;border-bottom:.01rem solid #fff!important;box-shadow:none}.login[data-v-76c311ba] .ant-form-item-label{line-height:.14rem}.login[data-v-76c311ba] .ant-form-item ::v-deep(label){color:#0dbba4;font-size:.11rem;left:.01rem}.login[data-v-76c311ba]{min-width:100%;height:100vh;background:url(../img/loginbg.90cb5eef.png);background-size:100% 130%;background-repeat:no-repeat}.login .box[data-v-76c311ba]{padding-top:1.45rem;display:flex;justify-content:space-around}.login .box .left1[data-v-76c311ba]{width:7.1rem!important}.login .box .left[data-v-76c311ba]{width:3.14rem}.login .box .left .title[data-v-76c311ba]{font-size:.17rem;font-weight:700}.login .box .left .orgname[data-v-76c311ba]{font-size:.29rem;color:#0dbba4;cursor:pointer}.login .box .left .nosign[data-v-76c311ba]{font-size:.12rem;color:#666;margin-top:.17rem;margin-bottom:.35rem}.login .box .left .tosign[data-v-76c311ba]{color:#0dbba4;cursor:pointer}.login .box .left .tab[data-v-76c311ba]{margin-bottom:.3rem}.login .box .left .form-item[data-v-76c311ba]{border-bottom:.01rem solid #e5e5e5;font-size:.15rem;margin-right:.4rem}.login .box .left .line[data-v-76c311ba]{width:.01rem;height:.14rem;background:#e5e5e5;margin-top:.1rem;position:relative;z-index:999}.login .box .left[data-v-76c311ba] .getcode{font-size:.15rem;color:#08ae98;width:3.13rem;line-height:.3rem;cursor:pointer}.login .box .left[data-v-76c311ba] .ant-select-selection{background-color:unset}.login .box .left .orginfo[data-v-76c311ba]{margin-top:1.78rem}.login .box .left .submit[data-v-76c311ba]{width:1.43rem;height:.35rem;background:linear-gradient(90deg,#00dac2,#42de9e,#88e062,#d0eb3e,#fffa18);border-radius:.18rem;font-size:.15rem;color:#fff;font-weight:800;text-align:center;line-height:.35rem;margin-top:.45rem}.login .box .left .agreement[data-v-76c311ba]{font-size:.12rem;display:flex;margin-top:.23rem;cursor:default}.login .box .left .agreement .ifagree[data-v-76c311ba]{width:.12rem;height:.12rem;border-radius:.03rem;border:.01rem solid #0ebca4;margin:auto 0;margin-right:.07rem}.login .box .left .agreement .ifagree .agree[data-v-76c311ba]{width:.08rem;height:.06rem;position:relative;top:-.04rem;left:.025rem}.login .box .right1[data-v-76c311ba]{width:2.3rem!important}.login .box .right[data-v-76c311ba]{width:6.9rem}.login .box .right .steps[data-v-76c311ba]{padding-top:1.12rem}.login .box .right .steps .stepline[data-v-76c311ba]{width:.01rem;height:.5rem;border:.01rem dashed #eee;position:relative;left:.13rem}.login .box .right .steps .step[data-v-76c311ba]{display:flex;color:#999;font-size:.11rem;line-height:.28rem;font-weight:700}.login .box .right .steps .step .back[data-v-76c311ba]{color:#0dbba4;margin-left:.23rem}.login .box .right .steps .step .circle[data-v-76c311ba]{width:.29rem;height:.29rem;border-radius:.15rem;background:#eee;font-size:.12rem;color:#999;text-align:center;line-height:.29rem;font-weight:800;margin-right:.17rem}.login .box .right .steps .step1[data-v-76c311ba]{background:#08ae98!important;color:#fff!important}.login .box .right .steps .stepnow[data-v-76c311ba]{color:#111}.login .signform[data-v-76c311ba]{display:flex;flex-wrap:wrap}.login .signform .shuru[data-v-76c311ba]{width:3.13rem}.login .icons[data-v-76c311ba]{margin-right:.41rem;margin-top:2.27rem}.login .icons .icon[data-v-76c311ba]{width:.28rem;height:.28rem;margin-right:.18rem;float:right}.login .success[data-v-76c311ba]{width:2.5rem;height:2.33rem}.login .ale[data-v-76c311ba]{color:#08ae98;font-size:.14rem;font-weight:800;margin-top:.34rem;cursor:pointer}

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.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 () {
+        }</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-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-50a3cdf8.f57189fa.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-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-50a3cdf8.e06e6c48.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.bd38aa41.css" rel="preload" as="style"><link href="/css/chunk-vendors.d0a33139.css" rel="preload" as="style"><link href="/js/app.ce895de5.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.bd38aa41.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.66f3e32d.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.ce895de5.js"></script></body></html>

src/views/login/Login.vue

@@ -198,8 +198,8 @@ export default defineComponent({
         if(iszc.data){
             if(iszc.data.type == 0){
               message.error(lan.$t("yizhucexuesheng"))
+              return ;
             }
-            return ;
         }
         lock = true;
         console.log(myquhao.value,"quhao")

src/views/login/Sign.vue

@@ -139,7 +139,7 @@
                                     v-model:value="userinfo.muyu"
                                 />
                             </a-form-item>
-                            <a-form-item label="教授" class="form-item">
+                            <a-form-item label="lan.$t('jiaoshou')" class="form-item">
                                 <a-select
                                     v-model:value="userinfo.jiaoshou"
                                     class="getcode"