diff --git a/.gitignore b/.gitignore
index 56588cad4458ebe1a24e7575fad4db582c71ad03..3610f730934a51742a1b430a0eb1c332f1145801 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
.DS_Store
node_modules/
npm-debug.log
+package-lock.json
# 忽略使用WebStorm开发时，生成的缓存文件夹
.idea
# 忽略使用VSCode开发时，生成的缓存文件夹
diff --git a/README-en.md b/README-en.md
index cd60bd2a92f86d756b043b26101f1dcc3f30de2f..4e4230bcd37997f9b36fe5b81af94c4c7243fc48 100644
--- a/README-en.md
+++ b/README-en.md
@@ -2,7 +2,7 @@
[README in Chinese](README.md)
-When I began to learn to vue, search of some practical source code about vue, but most of them are simple demo and didn't help to explore the vue. The most of demo are front-end page, such as music player interaction not as complicated as expected.But in actual work, we often meet some project involving money, such as shopping cart page. This kind of project is complex, accompany by login, register ,user information and so on. It's difficult, no one has ever written a project like this in vue and commit to github. So I write it, hope I can hope you.
+When I began to learn to vue, search of some practical source code about vue, but most of them are simple demo and didn't help to explore the vue. The most of demo are front-end page, such as music player interaction not as complicated as expected.But in actual work, we often meet some project involving money, such as shopping cart page. This kind of project is complex, accompany by login, register ,user information and so on. It's difficult, no one has ever written a project like this in vue and commit to github. So I write it, hope I can help you.
This functional project is practical but often boring, with no music player so gorgeous. For a long time, I think that Elm APP is a good material. First, it is complex that the open delivery platform is more complicated than the typical project. Second, you won't get bored seeing so much beautiful food.
@@ -75,7 +75,7 @@ For some reason，previous interfaces could not be used, it made the project fai
# Demo
-[click it](http://elm.cangdu.org/)（Preview with chroe phone mode please）
+[click it](http://cangdu.org/elm/)（Preview with chrome phone mode please）
### The mobile can scan the qr code in the below
diff --git a/README.md b/README.md
index 57894b5121ecd6777fa2ff9d2b9f1b34a41804b7..b49072b0e0394ab5f4fc627230bbd8f65179411a 100644
--- a/README.md
+++ b/README.md
@@ -24,20 +24,20 @@ vue2 + vuex + vue-router + webpack + ES6/7 + fetch + sass + flex + svg
## 项目运行
-#### 注意：由于涉及大量的 ES6/7 等新属性，node 需要 6.0 以上版本
+#### 注意：由于涉及大量的 ES6/7 等新属性，node 需要 6.0 以上版本
```
git clone https://github.com/bailicangdu/vue2-elm.git
cd vue2-elm
-npm install
+npm install 或 yarn(推荐)
npm run dev
```
## 另外
-此项目有配套的后台系统，如果想前后台同时开发，可以下载对应的后台系统：[后台项目传送地址](https://github.com/bailicangdu/node-elm)。
+此项目有配套的后台系统，如果想体验前后台同时开发，可以下载对应的后台系统：[后台项目传送地址](https://github.com/bailicangdu/node-elm)。
此时启动项目使用：npm run local 而不是 npm run dev。
@@ -56,7 +56,7 @@ npm run dev
> 如有问题请直接在 Issues 中提，或者您发现问题并有非常好的解决方案，欢迎 PR 👍
-> 项目交流群：528447162(QQ)
+> 项目交流群：528447162(QQ)，微信群：
> 推荐一个 react + redux 开源项目，对react感兴趣的朋友赶紧去看看。[地址在这里](https://github.com/bailicangdu/react-pxq)
@@ -73,7 +73,7 @@ npm run dev
# 效果演示
-[查看demo请戳这里](http://elm.cangdu.org/)（请用chrome手机模式预览）
+[查看demo请戳这里](http://cangdu.org/elm/)（请用chrome手机模式预览）
### 移动端扫描下方二维码
@@ -223,7 +223,7 @@ npm run dev
│ │ │ ├── exchange.vue // 兑换红包
│ │ │ ├── hbDescription.vue // 红包说明
│ │ │ └── hbHistory.vue // 历史红包
-│ │ ├── city
+│ │ ├── city
│ │ │ └── city.vue // 当前城市页
│ │ ├── confirmOrder
│ │ │ ├── children
@@ -234,7 +234,7 @@ npm run dev
│ │ │ │ ├── chooseAddress.vue // 选择地址页
│ │ │ │ ├── invoice.vue // 选择发票页
│ │ │ │ ├── payment.vue // 付款页
-│ │ │ │ ├── remark.vue // 订单备注页
+│ │ │ │ ├── remark.vue // 订单备注页
│ │ │ │ └── userValidation.vue // 用户验证页
│ │ │ └── confirmOrder.vue // 确认订单页
│ │ ├── download
diff --git a/build/dev-server.js b/build/dev-server.js
index fdbaed5e9aacacc99bc79ece93bcb2ce53baee9a..0d378def36b26d60dac8ec6c2a95503dbe360fb6 100644
--- a/build/dev-server.js
+++ b/build/dev-server.js
@@ -38,8 +38,8 @@ var context = config.dev.context
switch(process.env.NODE_ENV){
case 'local': var proxypath = 'http://localhost:8001'; break;
- case 'online': var proxypath = 'http://cangdu.org:8001'; break;
- default: var proxypath = config.dev.proxypath;
+ case 'online': var proxypath = 'http://elm.cangdu.org'; break;
+ default: var proxypath = config.dev.proxypath;
}
var options = {
target: proxypath,
@@ -75,4 +75,4 @@ module.exports = server.listen(port, function(err) {
if (process.env.NODE_ENV !== 'testing') {
opn(uri)
}
-})
\ No newline at end of file
+})
diff --git a/config/index.js b/config/index.js
index 1367a8b10025322a71167a25e294f6fc3b5b8b2c..faa28b4610fd3fd3b34f83d51ae9462d4a58749a 100644
--- a/config/index.js
+++ b/config/index.js
@@ -9,7 +9,7 @@ module.exports = {
index: path.resolve(__dirname, '../elm/index.html'),
assetsRoot: path.resolve(__dirname, '../elm'),
assetsSubDirectory: 'static',
- assetsPublicPath: '/',
+ assetsPublicPath: '/elm/',
productionSourceMap: true,
// Surge or Netlify already gzip all static assets for you.
// Before setting to `true`, make sure to:
diff --git a/elm/index.html b/elm/index.html
index 23793b95d9df7231be212aa7051ed738b2053051..1d7bc4306471589520f1d6d58b6b58bf1af50ced 100644
--- a/elm/index.html
+++ b/elm/index.html
@@ -9,125 +9,10 @@
elm
-
+
> 推荐一个 react + redux 开源项目，对react感兴趣的朋友赶紧去看看。[地址在这里](https://github.com/bailicangdu/react-pxq)
@@ -73,7 +73,7 @@ npm run dev
# 效果演示
-[查看demo请戳这里](http://elm.cangdu.org/)（请用chrome手机模式预览）
+[查看demo请戳这里](http://cangdu.org/elm/)（请用chrome手机模式预览）
### 移动端扫描下方二维码
@@ -223,7 +223,7 @@ npm run dev
│ │ │ ├── exchange.vue // 兑换红包
│ │ │ ├── hbDescription.vue // 红包说明
│ │ │ └── hbHistory.vue // 历史红包
-│ │ ├── city
+│ │ ├── city
│ │ │ └── city.vue // 当前城市页
│ │ ├── confirmOrder
│ │ │ ├── children
@@ -234,7 +234,7 @@ npm run dev
│ │ │ │ ├── chooseAddress.vue // 选择地址页
│ │ │ │ ├── invoice.vue // 选择发票页
│ │ │ │ ├── payment.vue // 付款页
-│ │ │ │ ├── remark.vue // 订单备注页
+│ │ │ │ ├── remark.vue // 订单备注页
│ │ │ │ └── userValidation.vue // 用户验证页
│ │ │ └── confirmOrder.vue // 确认订单页
│ │ ├── download
diff --git a/build/dev-server.js b/build/dev-server.js
index fdbaed5e9aacacc99bc79ece93bcb2ce53baee9a..0d378def36b26d60dac8ec6c2a95503dbe360fb6 100644
--- a/build/dev-server.js
+++ b/build/dev-server.js
@@ -38,8 +38,8 @@ var context = config.dev.context
switch(process.env.NODE_ENV){
case 'local': var proxypath = 'http://localhost:8001'; break;
- case 'online': var proxypath = 'http://cangdu.org:8001'; break;
- default: var proxypath = config.dev.proxypath;
+ case 'online': var proxypath = 'http://elm.cangdu.org'; break;
+ default: var proxypath = config.dev.proxypath;
}
var options = {
target: proxypath,
@@ -75,4 +75,4 @@ module.exports = server.listen(port, function(err) {
if (process.env.NODE_ENV !== 'testing') {
opn(uri)
}
-})
\ No newline at end of file
+})
diff --git a/config/index.js b/config/index.js
index 1367a8b10025322a71167a25e294f6fc3b5b8b2c..faa28b4610fd3fd3b34f83d51ae9462d4a58749a 100644
--- a/config/index.js
+++ b/config/index.js
@@ -9,7 +9,7 @@ module.exports = {
index: path.resolve(__dirname, '../elm/index.html'),
assetsRoot: path.resolve(__dirname, '../elm'),
assetsSubDirectory: 'static',
- assetsPublicPath: '/',
+ assetsPublicPath: '/elm/',
productionSourceMap: true,
// Surge or Netlify already gzip all static assets for you.
// Before setting to `true`, make sure to:
diff --git a/elm/index.html b/elm/index.html
index 23793b95d9df7231be212aa7051ed738b2053051..1d7bc4306471589520f1d6d58b6b58bf1af50ced 100644
--- a/elm/index.html
+++ b/elm/index.html
@@ -9,125 +9,10 @@