开发环境鉴权修复

config/dev.env.js

@@ -5,10 +5,10 @@ const prodEnv = require('./prod.env');
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   API_URL: '"http://localhost:8085/"',
-  // API_URL: '"https://wechat-test.changchangenglish.com/"',
   MAX_FILESIZE:'1024*1024*10',
   IMAGE_URL_HEAD:'"http://cdn.singsingenglish.com/"',
   BUY_URL:'"http://wechat-test.changchangenglish.com/#/buyDetail?"',
-  AUTHOR_UEL:'"http://wechat-test.changchangenglish.com/api/client/login?redirect_url=http://localhost:8085/#/"',
+  AUTHOR_UEL:'"https://wechat-test.changchangenglish.com/api/client/login?redirect_url=http://localhost:8085/#/"',
   REDIRECT_URL:'"http://localhost:8085/"',
 });
+

src/components/buy/index.vue

@@ -142,7 +142,7 @@
       return {
         refBg:refBg,
         bindMobile:{
-          show:false,
+          show:true,
           mobile:'',
           img_code:'',
           verify_code:'',

src/router/index.js

@@ -223,15 +223,6 @@ const router =new Router({
         noNew:true,
       }
     },
-    {
-      path: '/shareTime',
-      name: 'shareTime',
-      component: e=>require(['@/components/shareTime'],e),
-      meta:{
-        skip_login:true,
-        noNew:true,
-      }
-    },
     {
       path:'*',
       component: e=>require(['@/components/error'],e),
@@ -264,11 +255,11 @@ router.beforeEach((to,from,next)=> {
   document.title = '唱唱启蒙英语';
   let goOn=function(){
     if(localStorage.getItem('retUrl') && localStorage.getItem('retUrl') !== null && localStorage.getItem('retUrl') !== ''){
+      console.log(localStorage.getItem('retUrl'))
       let retUrl = localStorage.getItem('retUrl').toString();
       localStorage.removeItem('retUrl');
       next(retUrl);
     }else{
-      debugger
       next()
     }
   };
@@ -276,13 +267,18 @@ router.beforeEach((to,from,next)=> {
     next()
   }else if(window.location.href.indexOf('token')>-1 && to.name === 'index'){
     let token = common.getUrlParam().token || to.query.token;
+    console.log(common.getUrlParam())
+    console.log(to.name)
+    // debugger
     store.dispatch('setToken',token);
     getUserDetailApi().then(res=>{
+      // debugger
       localStorage.setItem('userDesc',JSON.stringify(res));
       sa.login(res.user_id);
-      debugger
       goOn()
-    }).catch(()=>{
+    }).catch((res)=>{
+      console.log(res)
+      // debugger
       if(localStorage.getItem('userDesc')){
         goOn()
       }
@@ -304,17 +300,11 @@ router.beforeEach((to,from,next)=> {
       });
     }
   }else{
-    debugger
-    let fullPath = to.fullPath;
-    if(window.location.href.indexOf('gdt_vid')>-1){
-      if (fullPath.indexOf('?')>-1){
-        fullPath += "&" + common.getUrlParam().gdt_vid
-      } else{
-        fullPath += "?" + common.getUrlParam().gdt_vid
-      }
-    }
-    localStorage.setItem('retUrl',fullPath);
+    let query = {retUrl:to.fullPath};
+    localStorage.setItem('retUrl',to.fullPath);
+    console.log(process.env.AUTHOR_UEL)
     if(to.meta.noNew){
+      query.is_new_user_url = 1;
       window.location.href = `${process.env.AUTHOR_UEL}`
     }else{
       window.location.href = `${process.env.AUTHOR_UEL}&is_new_user_url=1`

src/service/index.js

@@ -41,7 +41,8 @@ axios.interceptors.request.use(
       }
       json.sing = "singsingenglish21000";
       if(process.env.NODE_ENV === 'development' ){
-        config.params.special_token="uncle.cyan.cyan";
+        config.params.special_token="changchangenglish";
+        // config.params.special_token="uncle.cyan.cyan";
       }
       config.params.param_token = md5(JSON.stringify(json));
     }else if(config.url !== '/api/admin/login'){
@@ -62,7 +63,8 @@ axios.interceptors.request.use(
       }
       json2.sing = "singsingenglish21000";
       if(process.env.NODE_ENV === 'development' ){
-        config.data.special_token="uncle.cyan.cyan";
+        config.params.special_token="changchangenglish";
+        // config.data.special_token="uncle.cyan.cyan";
       }
       config.data.param_token = md5(JSON.stringify(json2));
     }
@@ -79,8 +81,13 @@ axios.interceptors.response.use(
   response => {
     if(response.data.code === 501){
       // 登录验证
-      localStorage.setItem('retUrl',window.location.href.split('#')[1]);
-      window.location.href = `${process.env.AUTHOR_UEL}`
+      router.push({
+        name:'author',//从哪个页面跳转
+        query:{
+          retUrl:window.location.href.split('#')[1] || '',
+          is_new_user_url:1
+        }
+      })
     }
     return response;
   },
@@ -155,8 +162,11 @@ export function fetch(url,params={}){
         if(response.data.code === 200){
           resolve(response.data.data);
         }else if(response.data.code === 501){
+          console.log(process.env.AUTHOR_UEL)
           reject(response.data);
+          let query = {retUrl:window.location.href.split('#')[1]};
           localStorage.setItem('retUrl',window.location.href.split('#')[1]);
+            query.is_new_user_url = 1;
             window.location.href = `${process.env.AUTHOR_UEL}`
         }else if(response.data.code === 503){
           reject(response.data);
@@ -197,8 +207,13 @@ export function post(url,data = {}){
           resolve(response.data.data);
         }else if(response.data.code === 501){
           reject(response.data);
-          localStorage.setItem('retUrl',window.location.href.split('#')[1]);
-          window.location.href = `${process.env.AUTHOR_UEL}`
+          router.push({
+            name:'author',//从哪个页面跳转
+            query:{
+              retUrl:window.location.href.split('#')[1] || '',
+              is_new_user_url:1
+            }
+          })
         }else if(response.data.code === 503){
           reject(response.data);
         }else{
@@ -226,8 +241,13 @@ export function patch(url,data = {}){
           resolve(response.data.data);
         }else if(response.data.code === 501){
           reject(response.data);
-          localStorage.setItem('retUrl',window.location.href.split('#')[1]);
-          window.location.href = `${process.env.AUTHOR_UEL}`
+          router.push({
+            name:'author',//从哪个页面跳转
+            query:{
+              retUrl:window.location.href.split('#')[1] || '',
+              is_new_user_url:1
+            }
+          })
         }else if(response.data.code === 503){
           reject(response.data);
         }else{
@@ -255,8 +275,13 @@ export function put(url,data = {}){
           resolve(response.data.data);
         }else if(response.data.code === 501){
           reject(response.data);
-          localStorage.setItem('retUrl',window.location.href.split('#')[1]);
-          window.location.href = `${process.env.AUTHOR_UEL}`
+          router.push({
+            name:'author',//从哪个页面跳转
+            query:{
+              retUrl:window.location.href.split('#')[1] || '',
+              is_new_user_url:1
+            }
+          })
         }else if(response.data.code === 503){
           reject(response.data);
         }else{
@@ -277,8 +302,13 @@ export function del(url,data = {}){
           resolve(response.data.data);
         }else if(response.data.code === 501){
           reject(response.data);
-          localStorage.setItem('retUrl',window.location.href.split('#')[1]);
-          window.location.href = `${process.env.AUTHOR_UEL}`
+          router.push({
+            name:'author',//从哪个页面跳转
+            query:{
+              retUrl:window.location.href.split('#')[1] || '',
+              is_new_user_url:1
+            }
+          })
         }else if(response.data.code === 503){
           reject(response.data);
         }else{