Skip to content

H
h5-base
Commit 7459d96f authored by IvyXia123's avatar IvyXia123
Browse files
Options

Merge branch 'dev' of http://git.singsingenglish.com/new-sing/wechat into dev

parents 7d4a1f0a 0334c37e
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 19 deletions
config/index.js
View file @ 7459d96f
......@@ -56,9 +56,9 @@ module.exports = {
},
build: {
// Template for index.html
index: process.env.NODE_ENV === 'production' ? path.resolve(__dirname, '../dist/index.html') : path.resolve(__dirname, '../dev/index.html'),
index: process.env.NODE_ENV === 'production' ? path.resolve(__dirname, '../dist/index.html') : path.resolve(__dirname, '../pre/index.html'),
// Paths
assetsRoot: process.env.NODE_ENV === 'production' ? path.resolve(__dirname, '../dist') : path.resolve(__dirname, '../dev'),
assetsRoot: process.env.NODE_ENV === 'production' ? path.resolve(__dirname, '../dist') : path.resolve(__dirname, '../pre'),
// assetsSubDirectory:process.env.NODE_ENV === 'production' ? 'static/2019061017':'static',
assetsSubDirectory:'static',
assetsPublicPath: process.env.NODE_ENV === 'production' ? 'https://static-cdn.changchangenglish.com/new-sing/' : '',
......
config/test.env.js
View file @ 7459d96f
......@@ -2,10 +2,10 @@
module.exports = {
NODE_ENV: '"testing"',
IMAGE_URL_HEAD:'"https://cdn.singsingenglish.com/"',
API_URL: '"https://wechat-test.changchangenglish.com/"',
API_URL: '"https://wechat-pre.changchangenglish.com/"',
MAX_FILESIZE:'1024*1024*10',
BUY_URL:'"https://wechat-test.changchangenglish.com/#/buyDetail?"',
AUTHOR_UEL:'"https://wechat-test.changchangenglish.com/api/client/login?redirect_url=https://wechat-test.changchangenglish.com"',
BUY_URL:'"https://wechat-pre.changchangenglish.com/#/buyDetail?"',
AUTHOR_UEL:'"https://wechat-pre.changchangenglish.com/api/client/login?redirect_url=https://wechat-test.changchangenglish.com"',
versionTime: '2019061315',
YB_URL:'"https://sit.tohours.com/salesplus/goodstart/goodStartIndex.action"'
};
dev/index.html deleted 100644 → 0
View file @ 7d4a1f0a
<!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><script>// setSize();
// addEventListener('resize',setSize);
// function setSize() {
// document.documentElement.style.fontSize = document.documentElement.clientWidth/375*10+'px';
// }</script><link rel=stylesheet href=https://at.alicdn.com/t/font_822651_g9r2j7kybxu.css><style>*{
-webkit-overflow-scrolling: touch
}
.wrapper {
height: 100vh;
overflow: hidden;
position: fixed;
background: #f4f4f4;
}
/* html{font-size: 1px;} */</style><link href=static/css/app.f983055a19b69eb54137ee36031e8a72.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=static/js/manifest.85cb88a68d16607546f2.js></script><script type=text/javascript src=static/js/vendor.19fbc79f608887e9859d.js></script><script type=text/javascript src=static/js/app.c4aca87c8ef51694e1e8.js></script></body></html>
\ No newline at end of file
dev/static/images/2@3x.png → pre/static/images/2@3x.png
View file @ 7459d96f
File moved
dev/static/images/img@3x.png → pre/static/images/img@3x.png
View file @ 7459d96f
File moved
dev/static/images/map.png → pre/static/images/map.png
View file @ 7459d96f
File moved
dev/static/img/1.45ed649.png → pre/static/img/1.45ed649.png
View file @ 7459d96f
File moved
dev/static/img/1.7e9d372.png → pre/static/img/1.7e9d372.png
View file @ 7459d96f
File moved
dev/static/img/2.35e2204.png → pre/static/img/2.35e2204.png
View file @ 7459d96f
File moved
dev/static/img/2.3a3a85e.png → pre/static/img/2.3a3a85e.png
View file @ 7459d96f
File moved
dev/static/img/3.2707f7b.png → pre/static/img/3.2707f7b.png
View file @ 7459d96f
File moved
dev/static/img/3.449819e.png → pre/static/img/3.449819e.png
View file @ 7459d96f
File moved
dev/static/img/4.0597407.png → pre/static/img/4.0597407.png
View file @ 7459d96f
File moved
dev/static/img/4.2ecd94a.png → pre/static/img/4.2ecd94a.png
View file @ 7459d96f
File moved
dev/static/img/4.65b6cb5.png → pre/static/img/4.65b6cb5.png
View file @ 7459d96f
File moved
dev/static/img/5.0e4a0a1.png → pre/static/img/5.0e4a0a1.png
View file @ 7459d96f
File moved
dev/static/img/6.f89794c.png → pre/static/img/6.f89794c.png
View file @ 7459d96f
File moved
dev/static/img/7.9ab9d04.png → pre/static/img/7.9ab9d04.png
View file @ 7459d96f
File moved
dev/static/img/8.bc958b4.gif → pre/static/img/8.bc958b4.gif
View file @ 7459d96f
File moved
dev/static/img/9.e278efa.png → pre/static/img/9.e278efa.png
View file @ 7459d96f
File moved
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