lsc 2 päivää sitten
vanhempi
commit
cc73c50963

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/index.html


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
dist/report.html


+ 0 - 1
dist/static/css/chunk-4c218bdc.36fc503b.css

@@ -1 +0,0 @@
-.loginBox[data-v-da11026c]{position:relative;width:100vw;height:100vh;overflow:hidden}.loginBox>iframe[data-v-da11026c]{width:100%;height:100%;border:0}

+ 1 - 0
dist/static/css/chunk-61c3a3df.dc571bfc.css

@@ -0,0 +1 @@
+.loginBox[data-v-c1960198]{position:relative;width:100vw;height:100vh;overflow:hidden}.loginBox>iframe[data-v-c1960198]{width:100%;height:100%;border:0}

+ 1 - 1
dist/static/css/chunk-12d2a0da.e2921508.css → dist/static/css/chunk-e5b22f78.e3f4b14e.css

@@ -1 +1 @@
-.wechat-auth-container[data-v-00732f2e]{min-height:100vh;background:-webkit-linear-gradient(315deg,#667eea,#764ba2);background:linear-gradient(135deg,#667eea,#764ba2);display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;padding:.53333rem}.wechat-auth-container .auth-content[data-v-00732f2e]{background:#fff;border-radius:.42667rem;padding:1.06667rem .8rem;text-align:center;box-shadow:0 .26667rem .8rem rgba(0,0,0,.1);max-width:10.66667rem;width:100%}.wechat-auth-container .auth-content .logo[data-v-00732f2e]{margin-bottom:.8rem}.wechat-auth-container .auth-content .logo img[data-v-00732f2e]{width:2.13333rem;height:2.13333rem;border-radius:50%}.wechat-auth-container .auth-content .auth-status .van-icon[data-v-00732f2e],.wechat-auth-container .auth-content .auth-status .van-loading[data-v-00732f2e]{margin-bottom:.53333rem}.wechat-auth-container .auth-content .auth-status p[data-v-00732f2e]{margin:.26667rem 0;font-size:.42667rem;color:#333}.wechat-auth-container .auth-content .auth-status p.user-info[data-v-00732f2e]{font-size:.37333rem;color:#666;margin-top:.26667rem}.wechat-auth-container .auth-content .auth-status p.auth-desc[data-v-00732f2e]{font-size:.37333rem;color:#999;margin:.4rem 0 .66667rem}.wechat-auth-container .auth-content .auth-status p.error-message[data-v-00732f2e]{font-size:.37333rem;color:#ee0a24;margin:.4rem 0 .66667rem}.wechat-auth-container .auth-content .auth-status .van-button[data-v-00732f2e]{margin-top:.53333rem;width:5.33333rem;height:1.17333rem;border-radius:.58667rem}@media (max-width:480px){.wechat-auth-container[data-v-00732f2e]{padding:.26667rem}.wechat-auth-container .auth-content[data-v-00732f2e]{padding:.8rem .53333rem}.wechat-auth-container .auth-content .auth-status .van-button[data-v-00732f2e]{width:100%}}
+.wechat-auth-container[data-v-2cd4b779]{min-height:100vh;background:-webkit-linear-gradient(315deg,#667eea,#764ba2);background:linear-gradient(135deg,#667eea,#764ba2);display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;padding:.53333rem}.wechat-auth-container .auth-content[data-v-2cd4b779]{background:#fff;border-radius:.42667rem;padding:1.06667rem .8rem;text-align:center;box-shadow:0 .26667rem .8rem rgba(0,0,0,.1);max-width:10.66667rem;width:100%}.wechat-auth-container .auth-content .logo[data-v-2cd4b779]{margin-bottom:.8rem}.wechat-auth-container .auth-content .logo img[data-v-2cd4b779]{width:2.13333rem;height:2.13333rem;border-radius:50%}.wechat-auth-container .auth-content .auth-status .van-icon[data-v-2cd4b779],.wechat-auth-container .auth-content .auth-status .van-loading[data-v-2cd4b779]{margin-bottom:.53333rem}.wechat-auth-container .auth-content .auth-status p[data-v-2cd4b779]{margin:.26667rem 0;font-size:.42667rem;color:#333}.wechat-auth-container .auth-content .auth-status p.user-info[data-v-2cd4b779]{font-size:.37333rem;color:#666;margin-top:.26667rem}.wechat-auth-container .auth-content .auth-status p.auth-desc[data-v-2cd4b779]{font-size:.37333rem;color:#999;margin:.4rem 0 .66667rem}.wechat-auth-container .auth-content .auth-status p.error-message[data-v-2cd4b779]{font-size:.37333rem;color:#ee0a24;margin:.4rem 0 .66667rem}.wechat-auth-container .auth-content .auth-status .van-button[data-v-2cd4b779]{margin-top:.53333rem;width:5.33333rem;height:1.17333rem;border-radius:.58667rem}@media (max-width:480px){.wechat-auth-container[data-v-2cd4b779]{padding:.26667rem}.wechat-auth-container .auth-content[data-v-2cd4b779]{padding:.8rem .53333rem}.wechat-auth-container .auth-content .auth-status .van-button[data-v-2cd4b779]{width:100%}}

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/static/js/app.83f6cb35.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/static/js/chunk-12d2a0da.74e5c22e.js


+ 0 - 1
dist/static/js/chunk-4c218bdc.e91a2443.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-4c218bdc"],{"8dfd":function(e,t,r){"use strict";r("f326")},"9ed6":function(e,t,r){"use strict";r.r(t);var n=function(){var e=this;e._self._c;return e._m(0)},i=[function(){var e=this,t=e._self._c;return t("div",{staticClass:"loginBox"},[t("iframe",{attrs:{src:"//edu.cocorobo.cn/course/login?type=2",frameborder:"0"}})])}],c=r("c7eb"),o=r("1da1"),a=r("5530"),u=(r("14d9"),r("2f62")),s=r("852e"),d=r.n(s),f={data:function(){return{redirect:void 0,timer:null}},watch:{$route:{handler:function(e){this.redirect=e.query&&e.query.redirect},immediate:!0}},methods:Object(a["a"])(Object(a["a"])({},Object(u["b"])({login:"user/login"})),{},{handleLogin:function(){this.$router.push({path:this.redirect||"/"})},getLogin:function(){var e=this;return Object(o["a"])(Object(c["a"])().mark((function t(){var r,n;return Object(c["a"])().wrap((function(t){while(1)switch(t.prev=t.next){case 0:return t.next=2,e.login();case 2:r=t.sent,n=d.a.get("redirectUri"),n&&"undefined"!==n||(n=""),console.log(n),r&&(n?(d.a.remove("redirectUri"),window.location.href=n):e.$router.push({path:e.redirect||"/"}));case 7:case"end":return t.stop()}}),t)})))()}}),beforeDestroy:function(){clearInterval(this.timer),this.timer=null},mounted:function(){var e=this;this.getLogin(),this.timer=setInterval((function(){e.getLogin()}),2e3)}},l=f,h=(r("8dfd"),r("2877")),b=Object(h["a"])(l,n,i,!1,null,"da11026c",null);t["default"]=b.exports},f326:function(e,t,r){}}]);

+ 1 - 0
dist/static/js/chunk-61c3a3df.63c998ae.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-61c3a3df"],{"7b0a":function(e,t,n){"use strict";n("b4ca")},"9ed6":function(e,t,n){"use strict";n.r(t);var r=function(){var e=this;e._self._c;return e._m(0)},i=[function(){var e=this,t=e._self._c;return t("div",{staticClass:"loginBox"},[t("iframe",{attrs:{src:"//edu.cocorobo.cn/course/login?type=2",frameborder:"0"}})])}],c=n("c7eb"),o=n("1da1"),a=n("5530"),u=(n("14d9"),n("2f62")),s=n("852e"),d=n.n(s),l={data:function(){return{redirect:void 0,timer:null}},watch:{$route:{handler:function(e){this.redirect=e.query&&e.query.redirect},immediate:!0}},methods:Object(a["a"])(Object(a["a"])({},Object(u["b"])({login:"user/login"})),{},{handleLogin:function(){this.$router.push({path:this.redirect||"/"})},getLogin:function(){var e=this;return Object(o["a"])(Object(c["a"])().mark((function t(){var n,r;return Object(c["a"])().wrap((function(t){while(1)switch(t.prev=t.next){case 0:return t.next=2,e.login();case 2:n=t.sent,r=d.a.get("redirectUri"),r&&"undefined"!==r||(r=""),console.log(r),n&&(r?window.location.href=r:e.$router.push({path:e.redirect||"/"}));case 7:case"end":return t.stop()}}),t)})))()}}),beforeDestroy:function(){clearInterval(this.timer),this.timer=null},mounted:function(){var e=this;this.getLogin(),this.timer=setInterval((function(){e.getLogin()}),2e3)}},f=l,h=(n("7b0a"),n("2877")),b=Object(h["a"])(f,r,i,!1,null,"c1960198",null);t["default"]=b.exports},b4ca:function(e,t,n){}}]);

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/static/js/chunk-e5b22f78.27527c3c.js


+ 1 - 1
src/views/login/index.vue

@@ -40,7 +40,7 @@ export default {
       console.log(redirect_uri)
       if (userid) {
         if (redirect_uri) {
-          Cookies.remove('redirectUri')
+          // Cookies.remove('redirectUri')
           window.location.href = redirect_uri
         } else {
           this.$router.push({ path: this.redirect || '/' })

+ 19 - 1
src/views/wechatAuth/index.vue

@@ -164,7 +164,7 @@ export default {
               this.Loading = false
               console.log(redirect_uri)
               if (redirect_uri) {
-                Cookies.remove('redirectUri')
+                // Cookies.remove('redirectUri')
                 window.location.href = redirect_uri
               } else {
                 this.$router.replace('/appStoreCopy')
@@ -259,6 +259,23 @@ export default {
         }
       }
       return null
+    },
+    async getLogin() {
+      const userid = await this.login()
+      let redirect_uri = Cookies.get('redirectUri')
+      if (!redirect_uri || redirect_uri === 'undefined') {
+        redirect_uri = ''
+      }
+      console.log(redirect_uri)
+      if (userid) {
+        if (redirect_uri) {
+          // Cookies.remove('redirectUri')
+          window.location.href = redirect_uri
+        } else {
+          this.$router.replace('/appStoreCopy')
+        }
+      }
+      // eduGet().then(res => {})
     }
   },
 
@@ -270,6 +287,7 @@ export default {
       this.$router.replace('/login2')
       return
     }
+    this.getLogin();
 
     // 如果有code参数,说明是从微信授权回调过来的
     if (this.code) {

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä