Skip to content

H
h5-base
Commit cc46894e authored by chenyishuai@singsingenglish.com's avatar chenyishuai@singsingenglish.com
Browse files
Options

3.14群发

parent b4475eb6
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 8 deletions
config/dev.env.js
View file @ cc46894e
...@@ -4,11 +4,11 @@ const prodEnv = require('./prod.env'); ...@@ -4,11 +4,11 @@ const prodEnv = require('./prod.env');
module.exports = merge(prodEnv, { module.exports = merge(prodEnv, {
NODE_ENV: '"development"', NODE_ENV: '"development"',
API_URL: '"http://10.1.23.97:8085/"', API_URL: '"http://localhost:8085/"',
// API_URL: '"https://wechat-test.changchangenglish.com/"', // API_URL: '"https://wechat-test.changchangenglish.com/"',
MAX_FILESIZE:'1024*1024*10', MAX_FILESIZE:'1024*1024*10',
IMAGE_URL_HEAD:'"http://cdn.singsingenglish.com/"', IMAGE_URL_HEAD:'"http://cdn.singsingenglish.com/"',
BUY_URL:'"https://wechat-test.changchangenglish.com/#/buyDetail?"', BUY_URL:'"http://wechat-test.changchangenglish.com/#/buyDetail?"',
AUTHOR_UEL:'"https://wechat-test.changchangenglish.com/api/client/login?redirect_url=http://10.1.23.97:8085"', AUTHOR_UEL:'"http://wechat-test.changchangenglish.com/api/client/login?redirect_url=http://localhost:8085/#/"',
REDIRECT_URL:'"http://10.1.23.97:8085/"', REDIRECT_URL:'"http://localhost:8085/"',
}); });
config/index.js
View file @ cc46894e
...@@ -19,8 +19,8 @@ module.exports = { ...@@ -19,8 +19,8 @@ module.exports = {
}, },
// Various Dev Server settings // Various Dev Server settings
// host: '192.168.31.242', // can be overwritten by process.env.HOST // 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: '10.1.23.97', // can be overwritten by process.env.HOST
// host: 'localhost', // 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 port: 8085, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: false, autoOpenBrowser: false,
errorOverlay: true, errorOverlay: true,
......
dev/index.html
View file @ cc46894e
...@@ -3,4 +3,4 @@ ...@@ -3,4 +3,4 @@
} }
*{ *{
-webkit-overflow-scrolling: touch -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> }</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 \ No newline at end of file
dist/index.html
View file @ cc46894e
...@@ -3,4 +3,4 @@ ...@@ -3,4 +3,4 @@
} }
.mint-toast{ .mint-toast{
z-index: 10001 !important; 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> }</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 \ No newline at end of file
src/router/index.js
View file @ cc46894e
...@@ -268,6 +268,7 @@ router.beforeEach((to,from,next)=> { ...@@ -268,6 +268,7 @@ router.beforeEach((to,from,next)=> {
localStorage.removeItem('retUrl'); localStorage.removeItem('retUrl');
next(retUrl); next(retUrl);
}else{ }else{
debugger
next() next()
} }
}; };
...@@ -279,6 +280,7 @@ router.beforeEach((to,from,next)=> { ...@@ -279,6 +280,7 @@ router.beforeEach((to,from,next)=> {
getUserDetailApi().then(res=>{ getUserDetailApi().then(res=>{
localStorage.setItem('userDesc',JSON.stringify(res)); localStorage.setItem('userDesc',JSON.stringify(res));
sa.login(res.user_id); sa.login(res.user_id);
debugger
goOn() goOn()
}).catch(()=>{ }).catch(()=>{
if(localStorage.getItem('userDesc')){ if(localStorage.getItem('userDesc')){
...@@ -302,6 +304,7 @@ router.beforeEach((to,from,next)=> { ...@@ -302,6 +304,7 @@ router.beforeEach((to,from,next)=> {
}); });
} }
}else{ }else{
debugger
let fullPath = to.fullPath; let fullPath = to.fullPath;
if(window.location.href.indexOf('gdt_vid')>-1){ if(window.location.href.indexOf('gdt_vid')>-1){
if (fullPath.indexOf('?')>-1){ if (fullPath.indexOf('?')>-1){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment