diff --git a/config/dev.env.js b/config/dev.env.js
index 982bff6d678c022bee73544f1f8d1a3276b6713e..ab70402090e854252b87d4480bc839420876ce8a 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -4,11 +4,11 @@ const prodEnv = require('./prod.env');
module.exports = merge(prodEnv, {
NODE_ENV: '"development"',
- API_URL: '"http://10.1.23.97:8085/"',
+ 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:'"https://wechat-test.changchangenglish.com/#/buyDetail?"',
- AUTHOR_UEL:'"https://wechat-test.changchangenglish.com/api/client/login?redirect_url=http://10.1.23.97:8085"',
- REDIRECT_URL:'"http://10.1.23.97:8085/"',
+ BUY_URL:'"http://wechat-test.changchangenglish.com/#/buyDetail?"',
+ AUTHOR_UEL:'"http://wechat-test.changchangenglish.com/api/client/login?redirect_url=http://localhost:8085/#/"',
+ REDIRECT_URL:'"http://localhost:8085/"',
});
diff --git a/config/index.js b/config/index.js
index 358fc7b4caf74fdd2855471e2bc173f2febe0fa7..a6079e7eb6303a5ebce32781cf0cbb742044de7f 100644
--- a/config/index.js
+++ b/config/index.js
@@ -19,8 +19,8 @@ module.exports = {
},
// Various Dev Server settings
// host: '192.168.31.242', // can be overwritten by process.env.HOST
- host: '10.1.23.97', // can be overwritten by process.env.HOST
- // host: 'localhost', // can be overwritten by process.env.HOST
+ // host: '10.1.23.97', // can be overwritten by process.env.HOST
+ host: 'localhost', // can be overwritten by process.env.HOST
port: 8085, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: false,
errorOverlay: true,
diff --git a/dev/index.html b/dev/index.html
index d7b10997c9db6ddb9035ae079ba6c180b96431c1..13028898d653ffa04ddf367ef44c0e6e6296118b 100644
--- a/dev/index.html
+++ b/dev/index.html
@@ -3,4 +3,4 @@
}
*{
-webkit-overflow-scrolling: touch
- }</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.ce7ae7839e12096871d1.js></script><script type=text/javascript src=static/js/vendor.eb76410e672f11702f85.js></script><script type=text/javascript src=static/js/app.48f97873a4c748c0d0ea.js></script></body></html>
\ No newline at end of file
+ }</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.ce7ae7839e12096871d1.js></script><script type=text/javascript src=static/js/vendor.eb76410e672f11702f85.js></script><script type=text/javascript src=static/js/app.a64e1c22a524b96d3662.js></script></body></html>
\ No newline at end of file
diff --git a/dev/static/js/app.48f97873a4c748c0d0ea.js b/dev/static/js/app.a64e1c22a524b96d3662.js
similarity index 100%
rename from dev/static/js/app.48f97873a4c748c0d0ea.js
rename to dev/static/js/app.a64e1c22a524b96d3662.js
diff --git a/dist/index.html b/dist/index.html
index b260ffae328293624e12ff7a98e95c423c7b76c9..22f601194a06402313413c93473285a7133f9999 100644
--- a/dist/index.html
+++ b/dist/index.html
@@ -3,4 +3,4 @@
}
.mint-toast{
z-index: 10001 !important;
- }</style><link href=https://static-cdn.changchangenglish.com/new-sing/static/css/app.b9b71e79a1de3215780e16e811952e27.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.db14d425530dae21f699.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/vendor.587c5aa91e4fd6b4847f.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/app.835628dc4a21196895dd.js></script></body></html>
\ No newline at end of file
+ }</style><link href=https://static-cdn.changchangenglish.com/new-sing/static/css/app.b9b71e79a1de3215780e16e811952e27.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.db14d425530dae21f699.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/vendor.587c5aa91e4fd6b4847f.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/app.f53f2251a9fcddec8f76.js></script></body></html>
\ No newline at end of file
diff --git a/dist/static/js/app.835628dc4a21196895dd.js b/dist/static/js/app.f53f2251a9fcddec8f76.js
similarity index 100%
rename from dist/static/js/app.835628dc4a21196895dd.js
rename to dist/static/js/app.f53f2251a9fcddec8f76.js
diff --git a/src/router/index.js b/src/router/index.js
index 786ab82ae6c37b4899dfa791ddc9f394830b89ef..1fe18571768a1adb95c3e1b27aa8298e31b56311 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -268,6 +268,7 @@ router.beforeEach((to,from,next)=> {
localStorage.removeItem('retUrl');
next(retUrl);
}else{
+ debugger
next()
}
};
@@ -279,6 +280,7 @@ router.beforeEach((to,from,next)=> {
getUserDetailApi().then(res=>{
localStorage.setItem('userDesc',JSON.stringify(res));
sa.login(res.user_id);
+ debugger
goOn()
}).catch(()=>{
if(localStorage.getItem('userDesc')){
@@ -302,6 +304,7 @@ router.beforeEach((to,from,next)=> {
});
}
}else{
+ debugger
let fullPath = to.fullPath;
if(window.location.href.indexOf('gdt_vid')>-1){
if (fullPath.indexOf('?')>-1){