From 50b14896ff9f2d231bface848ea2292b9238b1ec Mon Sep 17 00:00:00 2001 From: maguohua <1264889788@qq.com> Date: Tue, 28 Feb 2017 00:12:11 +0800 Subject: [PATCH] update --- README.md | 5 +- build/dev-server.js | 5 + index.html | 2 + package.json | 1 + src/components/header/head.vue | 3 +- src/images/elmlogo.jpeg | Bin 0 -> 6160 bytes src/page/checkout/checkout.vue | 27 ---- src/page/download/download.vue | 99 +++++++++++++ src/page/profile/children/service.vue | 50 ------- src/page/profile/profile.vue | 6 +- src/page/service/children/questionDetail.vue | 68 +++++++++ src/page/service/service.vue | 144 +++++++++++++++++++ src/router/router.js | 19 ++- src/service/getData.js | 23 +++ src/service/tempdata/service.js | 1 + src/store/index.js | 35 ++--- src/store/mutation-types.js | 3 +- src/store/mutations.js | 5 + 18 files changed, 395 insertions(+), 101 deletions(-) create mode 100644 src/images/elmlogo.jpeg delete mode 100644 src/page/checkout/checkout.vue create mode 100644 src/page/download/download.vue delete mode 100644 src/page/profile/children/service.vue create mode 100644 src/page/service/children/questionDetail.vue create mode 100644 src/page/service/service.vue create mode 100644 src/service/tempdata/service.js diff --git a/README.md b/README.md index 6e97188..2e4e6fb 100644 --- a/README.md +++ b/README.md @@ -66,6 +66,7 @@ npm run build - [x] 下单功能 -- 完成 ✨✨🎉🎉 - [x] 订单列表 -- 完成 - [x] 订单详情 -- 完成 +- [x] 下载App -- 完成 - [ ] 帐户信息 - [ ] 上传头像，修改用户名 - [ ] 积分商城 @@ -111,6 +112,7 @@ npm run build | |--addAddress // 添加地址页 | |--children | |--searchAddress // 搜索地址页 +| |-- download // 下载App | |-- find // 发现页 | |-- forget // 忘记密码，修改密码页 | |-- home // 首页 @@ -125,8 +127,9 @@ npm run build | |--benefit // 我的优惠 | |--info // 帐户信息 | |--points // 我的积分 -| |--service // 服务中心 + | |-- search // 搜索页 +| |--service // 服务中心 |       |-- shop                     // 商铺筛选页 | |-- children | |-- foodDetail // 商铺信息页 diff --git a/build/dev-server.js b/build/dev-server.js index 8340bfe..38d0bae 100644 --- a/build/dev-server.js +++ b/build/dev-server.js @@ -49,6 +49,11 @@ server.use(proxyMiddleware('/payapi', { target: 'https://pay.ele.me', changeOrigin: true, })) +server.use(proxyMiddleware('/m.ele.me@json', { + target: 'https://crayfish.elemecdn.com', + changeOrigin: true, +})) + // handle fallback for HTML5 history API diff --git a/index.html b/index.html index 9e54226..db75f0f 100644 --- a/index.html +++ b/index.html @@ -123,6 +123,8 @@ + + diff --git a/package.json b/package.json index c96abed..fb1cf3d 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ }, "dependencies": { "fastclick": "^1.0.6", + "showdown": "^1.6.4", "vue": "^2.1.0", "vue-router": "^2.1.1", "vuex": "^2.0.0" diff --git a/src/components/header/head.vue b/src/components/header/head.vue index 5529a5c..297c330 100644 --- a/src/components/header/head.vue +++ b/src/components/header/head.vue @@ -69,7 +69,8 @@ .head_goback{ left: 0.4rem; @include wh(0.6rem, 0.8rem); - @include ct; + line-height: 2.2rem; + margin-left: .4rem; } .head_login{ right: 0.55rem; diff --git a/src/images/elmlogo.jpeg b/src/images/elmlogo.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..2225f66777132345b2df489b5508df3ff261bef1 GIT binary patch literal 6160 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 L{x3g)=lK5sSe!x+ literal 0 HcmV?d00001 diff --git a/src/page/checkout/checkout.vue b/src/page/checkout/checkout.vue deleted file mode 100644 index 9250c43..0000000 --- a/src/page/checkout/checkout.vue +++ /dev/null @@ -1,27 +0,0 @@ - - - - - diff --git a/src/page/download/download.vue b/src/page/download/download.vue new file mode 100644 index 0000000..842b443 --- /dev/null +++ b/src/page/download/download.vue @@ -0,0 +1,99 @@ + + + + + diff --git a/src/page/profile/children/service.vue b/src/page/profile/children/service.vue deleted file mode 100644 index 8854bf8..0000000 --- a/src/page/profile/children/service.vue +++ /dev/null @@ -1,50 +0,0 @@ - - - - - diff --git a/src/page/profile/profile.vue b/src/page/profile/profile.vue index 973eb41..c2875b1 100644 --- a/src/page/profile/profile.vue +++ b/src/page/profile/profile.vue @@ -95,7 +95,7 @@
- +