Skip to content

Commit 5ed67ce

Browse files
raoenhuiraoenhui
authored
Merge pull request bailicangdu#1 from bailicangdu/master
merge new
2 parents c7162dc + f5d2cc0 commit 5ed67ce

File tree

119 files changed

+1070
-10589
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+1070
-10589
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
.DS_Store
22
node_modules/
33
npm-debug.log
4+
package-lock.json
45
# 忽略使用WebStorm开发时，生成的缓存文件夹
56
.idea
67
# 忽略使用VSCode开发时，生成的缓存文件夹

‎README-en.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[README in Chinese](README.md)
44

5-
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.
5+
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.
66

77
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.
88

@@ -75,7 +75,7 @@ For some reason，previous interfaces could not be used, it made the project fai
7575

7676
# Demo
7777

78-
[click it](http://elm.cangdu.org/)（Preview with chroe phone mode please）
78+
[click it](http://cangdu.org/elm/)（Preview with chrome phone mode please）
7979

8080
### The mobile can scan the qr code in the below
8181

‎README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,20 @@ vue2 + vuex + vue-router + webpack + ES6/7 + fetch + sass + flex + svg
2424

2525
## 项目运行
2626

27-
#### 注意：由于涉及大量的 ES6/7 等新属性，node 需要 6.0 以上版本
27+
#### 注意：由于涉及大量的 ES6/7 等新属性，node 需要 6.0 以上版本
2828

2929
```
3030
git clone https://github.com/bailicangdu/vue2-elm.git  
3131
3232
cd vue2-elm
3333
34-
npm install
34+
npm install 或 yarn(推荐)
3535
3636
npm run dev
3737
3838
```
3939
## 另外
40-
此项目有配套的后台系统，如果想前后台同时开发，可以下载对应的后台系统：[后台项目传送地址](https://github.com/bailicangdu/node-elm)。
40+
此项目有配套的后台系统，如果想体验前后台同时开发，可以下载对应的后台系统：[后台项目传送地址](https://github.com/bailicangdu/node-elm)。
4141

4242
此时启动项目使用：npm run local 而不是 npm run dev。
4343

@@ -56,7 +56,7 @@ npm run dev
5656
5757
> 如有问题请直接在 Issues 中提，或者您发现问题并有非常好的解决方案，欢迎 PR 👍
5858
59-
> 项目交流群：528447162(QQ)
59+
> 项目交流群：528447162(QQ)，微信群：<img src="https://elm.cangdu.org/img/wxq.jpg" width="50" height="50"/>
6060
6161
> 推荐一个 react + redux 开源项目，对react感兴趣的朋友赶紧去看看。[地址在这里](https://github.com/bailicangdu/react-pxq)
6262
@@ -73,7 +73,7 @@ npm run dev
7373

7474
# 效果演示
7575

76-
[查看demo请戳这里](http://elm.cangdu.org/)（请用chrome手机模式预览）
76+
[查看demo请戳这里](http://cangdu.org/elm/)（请用chrome手机模式预览）
7777

7878
### 移动端扫描下方二维码
7979

@@ -223,7 +223,7 @@ npm run dev
223223
│   │   │   ├── exchange.vue // 兑换红包
224224
│   │   │   ├── hbDescription.vue // 红包说明
225225
│   │   │   └── hbHistory.vue // 历史红包
226-
│   │   ├── city
226+
│   │   ├── city
227227
│   │   │   └── city.vue // 当前城市页
228228
│   │   ├── confirmOrder
229229
│   │   │   ├── children
@@ -234,7 +234,7 @@ npm run dev
234234
│   │   │   │   ├── chooseAddress.vue // 选择地址页
235235
│   │   │   │   ├── invoice.vue // 选择发票页
236236
│   │   │   │   ├── payment.vue // 付款页
237-
│   │   │   │   ├── remark.vue // 订单备注页
237+
│   │   │   │   ├── remark.vue // 订单备注页
238238
│   │   │   │   └── userValidation.vue // 用户验证页
239239
│   │   │   └── confirmOrder.vue // 确认订单页
240240
│   │   ├── download

‎build/dev-server.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ var context = config.dev.context
3838

3939
switch(process.env.NODE_ENV){
4040
case 'local': var proxypath = 'http://localhost:8001'; break;
41-
case 'online': var proxypath = 'http://cangdu.org:8001'; break;
42-
default: var proxypath = config.dev.proxypath;
41+
case 'online': var proxypath = 'http://elm.cangdu.org'; break;
42+
default: var proxypath = config.dev.proxypath;
4343
}
4444
var options = {
4545
target: proxypath,
@@ -75,4 +75,4 @@ module.exports = server.listen(port, function(err) {
7575
if (process.env.NODE_ENV !== 'testing') {
7676
opn(uri)
7777
}
78-
})
78+
})

‎config/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ module.exports = {
99
index: path.resolve(__dirname, '../elm/index.html'),
1010
assetsRoot: path.resolve(__dirname, '../elm'),
1111
assetsSubDirectory: 'static',
12-
assetsPublicPath: '/',
12+
assetsPublicPath: '/elm/',
1313
productionSourceMap: true,
1414
// Surge or Netlify already gzip all static assets for you.
1515
// Before setting to `true`, make sure to:

0 commit comments

Comments
 (0)