diff --git a/README.md b/README.md index 6e9718857a0b2fdf6a07068714992f01f9015b5a..2e4e6fb7b4e9bd03873eda87528eeb67ffb43fc4 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 8340bfe60d35193f66e162c4dd72c33403d5acf1..38d0bae4b726f525885504aa1e5fad71dbb07451 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 9e54226ecf779b75f936856c25b4d2fe441643fc..db75f0f76c0bdea29c92af97f0463c9b20b76c72 100644 --- a/index.html +++ b/index.html @@ -123,6 +123,8 @@ + + diff --git a/package.json b/package.json index c96abed5009f1dfd8d4b78c6ec24d239a1ad0bcd..fb1cf3d20d7227f2374f90b547807079ec812d37 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 5529a5c5f861981eab82bf5980868ed152b30e30..297c330e1af65e45963fd6c742de4db619a1b430 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 Binary files /dev/null and b/src/images/elmlogo.jpeg differ diff --git a/src/page/checkout/checkout.vue b/src/page/checkout/checkout.vue deleted file mode 100644 index 9250c43c218798c4c71a0f38ff15834982fa075c..0000000000000000000000000000000000000000 --- 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 0000000000000000000000000000000000000000..842b4435fd86dd3f727ba8299bd0be84a5e22025 --- /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 8854bf8b852cb01912dba9d571b884606cc68f88..0000000000000000000000000000000000000000 --- 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 973eb410c55904325a776000baa486b99b418543..c2875b184631e575957d697a164df0507215b25b 100644 --- a/src/page/profile/profile.vue +++ b/src/page/profile/profile.vue @@ -95,7 +95,7 @@
- +