神策登录接口调整

4d968412 · wangwei · 70949e9f · 4d968412 · 4d968412 · 4d968412
Commit 4d968412 authored Jan 09, 2019 by wangwei
13 changed files
--- a/dev/index.html
+++ b/dev/index.html
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no"><meta name=screen-orientation content=portrait><meta name=x5-orientation content=portrait><title>唱唱启蒙英语</title><link rel=stylesheet href=https://at.alicdn.com/t/font_822651_g9r2j7kybxu.css><style></style><link href=static/css/app.9f631d4069047acf4ee994f5d9f958c3.css rel=stylesheet></head><body><div id=app></div><script src=https://res.wx.qq.com/open/js/jweixin-1.3.2.js></script><script type=text/javascript src=static/js/manifest.90f68f233dfd1ffe0e31.js></script><script type=text/javascript src=static/js/vendor.ff5f56de29138d85e7fa.js></script><script type=text/javascript src=static/js/app.2c2b15a27c0c66bced24.js></script></body></html>
\ No newline at end of file
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no"><meta name=screen-orientation content=portrait><meta name=x5-orientation content=portrait><title>唱唱启蒙英语</title><link rel=stylesheet href=https://at.alicdn.com/t/font_822651_g9r2j7kybxu.css><style></style><link href=static/css/app.9f631d4069047acf4ee994f5d9f958c3.css rel=stylesheet></head><body><div id=app></div><script src=https://res.wx.qq.com/open/js/jweixin-1.3.2.js></script><script type=text/javascript src=static/js/manifest.90f68f233dfd1ffe0e31.js></script><script type=text/javascript src=static/js/vendor.ff5f56de29138d85e7fa.js></script><script type=text/javascript src=static/js/app.ecc887e9b76293b1b1d5.js></script></body></html>
\ No newline at end of file
--- a/dev/static/js/app.9b61b5733553efbaca98.js
+++ b/dev/static/js/app.9b61b5733553efbaca98.js
--- a/dev/static/js/app.9b61b5733553efbaca98.js.map
+++ b/dev/static/js/app.9b61b5733553efbaca98.js.map
--- a/dev/static/js/app.ecc887e9b76293b1b1d5.js
+++ b/dev/static/js/app.ecc887e9b76293b1b1d5.js
--- a/dev/static/js/app.ecc887e9b76293b1b1d5.js.map
+++ b/dev/static/js/app.ecc887e9b76293b1b1d5.js.map
--- a/dev/static/js/manifest.90f68f233dfd1ffe0e31.js.map
+++ b/dev/static/js/manifest.90f68f233dfd1ffe0e31.js.map
--- a/dist/index.html
+++ b/dist/index.html
 <!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no"><meta name=screen-orientation content=portrait><meta name=x5-orientation content=portrait><title>唱唱启蒙英语</title><link rel=stylesheet href=https://at.alicdn.com/t/font_822651_g9r2j7kybxu.css><style>*{
      -webkit-overflow-scrolling:touch;
-    }</style><link href=https://static-cdn.changchangenglish.com/new-sing/static/css/app.caed9089fec4bf31cab754e8b2c6c1e4.css rel=stylesheet></head><body><div id=app></div><script src=https://res.wx.qq.com/open/js/jweixin-1.3.2.js></script><script></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/manifest.f4600380ffe15e4cd476.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/vendor.3e2e8e2da14aa2f2a52f.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/app.a3b0a6aef3cd6a8b3b70.js></script></body></html>
\ No newline at end of file
+    }</style><link href=https://static-cdn.changchangenglish.com/new-sing/static/css/app.caed9089fec4bf31cab754e8b2c6c1e4.css rel=stylesheet></head><body><div id=app></div><script src=https://res.wx.qq.com/open/js/jweixin-1.3.2.js></script><script></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/manifest.f4600380ffe15e4cd476.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/vendor.3e2e8e2da14aa2f2a52f.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/app.360f32d4c0bd7f81169d.js></script></body></html>
\ No newline at end of file
--- a/dist/static/js/app.360f32d4c0bd7f81169d.js
+++ b/dist/static/js/app.360f32d4c0bd7f81169d.js
--- a/dist/static/js/app.360f32d4c0bd7f81169d.js.map
+++ b/dist/static/js/app.360f32d4c0bd7f81169d.js.map
--- a/dist/static/js/app.4547f952b3e0d0ebf08f.js
+++ b/dist/static/js/app.4547f952b3e0d0ebf08f.js
--- a/dist/static/js/app.4547f952b3e0d0ebf08f.js.map
+++ b/dist/static/js/app.4547f952b3e0d0ebf08f.js.map
--- a/dist/static/js/manifest.f4600380ffe15e4cd476.js.map
+++ b/dist/static/js/manifest.f4600380ffe15e4cd476.js.map
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -214,13 +214,17 @@ router.beforeEach((to,from,next)=> {
  };
  if(to.name === 'author' || to.name === 'bindMobile' || to.name === 'noWechat'){
    next()
-  }else if(window.location.href.indexOf('token')>-1){
+  }else if(window.location.href.indexOf('token')>-1 && to.name === 'index'){
    let token = common.getUrlParam().token || to.query.token;
    store.dispatch('setToken',token);
    getUserDetailApi().then(res=>{
      localStorage.setItem('userDesc',JSON.stringify(res));
      sa.login(res.user_id);
      goOn()
+    }).catch(()=>{
+      if(localStorage.getItem('userDesc')){
+        goOn()
+      }
    });
  }else if(localStorage.getItem('cc_token')) {
    store.dispatch('setToken', localStorage.getItem('cc_token'));
@@ -232,11 +236,13 @@ router.beforeEach((to,from,next)=> {
        localStorage.setItem('userDesc',JSON.stringify(res));
        sa.login(res.user_id);
        goOn()
+      }).catch(()=>{
+        if(localStorage.getItem('userDesc')){
+          goOn()
+        }
      });
    }
    // 无需token登录页面
-  }else if(to.meta.skip_login){
-    goOn()
  }else{
    let query = {retUrl:to.fullPath};
    if(to.meta.noNew){