diff --git a/.postcssrc.js b/.postcssrc.js index 1b534ef..ef44ed8 100644 --- a/.postcssrc.js +++ b/.postcssrc.js @@ -5,9 +5,9 @@ module.exports = { overrideBrowserslist: ['Android 4.1', 'iOS 7.1', 'Chrome > 31', 'ff > 31', 'ie >= 8'] }, 'postcss-pxtorem': { - rootValue: 37.5, + rootValue: 75, propList: ['*'], - //selectorBlackList: ['van-'] + selectorBlackList: ['van-toast'] } } } diff --git a/package-lock.json b/package-lock.json index 65e892c..7bb9fa9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1906,9 +1906,9 @@ } }, "chalk": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", - "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "version": "4.1.1", + "resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.1.tgz?cache=0&sync_timestamp=1618995297666&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchalk%2Fdownload%2Fchalk-4.1.1.tgz", + "integrity": "sha1-yAs/qyi/Y3HmhjMl7uZ+YYt35q0=", "dev": true, "optional": true, "requires": { @@ -1965,8 +1965,8 @@ }, "has-flag": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "resolved": "https://registry.npm.taobao.org/has-flag/download/has-flag-4.0.0.tgz", + "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=", "dev": true, "optional": true }, @@ -1978,8 +1978,8 @@ }, "loader-utils": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", - "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", + "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz", + "integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=", "dev": true, "optional": true, "requires": { @@ -2083,8 +2083,8 @@ }, "supports-color": { "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-7.2.0.tgz?cache=0&sync_timestamp=1618561027869&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-7.2.0.tgz", + "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=", "dev": true, "optional": true, "requires": { @@ -2109,9 +2109,9 @@ } }, "vue-loader-v16": { - "version": "npm:vue-loader@16.0.0-beta.8", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.0.0-beta.8.tgz", - "integrity": "sha512-oouKUQWWHbSihqSD7mhymGPX1OQ4hedzAHyvm8RdyHh6m3oIvoRF+NM45i/bhNOlo8jCnuJhaSUf/6oDjv978g==", + "version": "npm:vue-loader@16.2.0", + "resolved": "https://registry.nlark.com/vue-loader/download/vue-loader-16.2.0.tgz", + "integrity": "sha1-BGpTMI3Ufljv4g3ewe3sAnzjtG4=", "dev": true, "optional": true, "requires": { @@ -4517,58 +4517,6 @@ "sha.js": "^2.4.8" } }, - "cross-env": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.2.tgz", - "integrity": "sha512-KZP/bMEOJEDCkDQAyRhu3RL2ZO/SUVrxQVI0G3YEQ+OLbRA3c6zgixe8Mq8a/z7+HKlNEjo8oiLUs8iRijY2Rw==", - "dev": true, - "requires": { - "cross-spawn": "^7.0.1" - }, - "dependencies": { - "cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "dev": true, - "requires": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" - } - }, - "path-key": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "dev": true - }, - "shebang-command": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dev": true, - "requires": { - "shebang-regex": "^3.0.0" - } - }, - "shebang-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "dev": true - }, - "which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, - "requires": { - "isexe": "^2.0.0" - } - } - } - }, "cross-spawn": { "version": "6.0.5", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", diff --git a/public/favicon.ico b/public/favicon.ico index 29f8606..d8032aa 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/src/api/home.js b/src/api/home.js index c6ddc7a..af80ac4 100644 --- a/src/api/home.js +++ b/src/api/home.js @@ -1,5 +1,10 @@ // import qs from 'qs' // axios // import request from '@/utils/request' -// home api +// home homeApi +const homeApi = { + registerForWalkingFestival: '/ebapi/public_api/register_for_walking_festival' +} + +export default homeApi diff --git a/src/api/user.js b/src/api/user.js index 7a0ebff..eb21d4c 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -1,32 +1,14 @@ -import api from './index' +import homeApi from './home' // axios import request from '@/utils/request' -// 登录 -export function login(data) { +// 用户提交图片 & 手机号 +export function registerForWalkingFestival(data) { return request({ - url: api.Login, + headers: { 'Content-Type': 'multipart/form-data' }, + url: homeApi.registerForWalkingFestival, method: 'post', data - }) -} - -// 用户信息 post 方法 -export function getUserInfo(data) { - return request({ - url: api.UserInfo, - method: 'post', - data, - hideloading: true - }) -} - -// 用户名称 get 方法 -export function getUserName(params) { - return request({ - url: api.UserName, - method: 'get', - params, - hideloading: true + // hideloading: true }) } diff --git a/src/assets/css/index.scss b/src/assets/css/index.scss index b10fc34..121e1ff 100644 --- a/src/assets/css/index.scss +++ b/src/assets/css/index.scss @@ -8,6 +8,13 @@ body .app { background-color: $background-color; } -.app-container { - padding-bottom: 50px; +// .app-container { +// padding-bottom: 50px; +// } + +img { + max-width: 100%; +} +* { + box-sizing: border-box; } diff --git a/src/assets/images/home/guize.png b/src/assets/images/home/guize.png new file mode 100644 index 0000000..344a6f7 Binary files /dev/null and b/src/assets/images/home/guize.png differ diff --git a/src/assets/images/home/guize_bg.png b/src/assets/images/home/guize_bg.png new file mode 100644 index 0000000..9822a6e Binary files /dev/null and b/src/assets/images/home/guize_bg.png differ diff --git a/src/assets/images/home/img.png b/src/assets/images/home/img.png new file mode 100644 index 0000000..69a04f3 Binary files /dev/null and b/src/assets/images/home/img.png differ diff --git a/src/assets/images/home/img_tianjia.png b/src/assets/images/home/img_tianjia.png new file mode 100644 index 0000000..3567755 Binary files /dev/null and b/src/assets/images/home/img_tianjia.png differ diff --git a/src/assets/images/home/shangchuan_bukedian.png b/src/assets/images/home/shangchuan_bukedian.png new file mode 100644 index 0000000..46dbb59 Binary files /dev/null and b/src/assets/images/home/shangchuan_bukedian.png differ diff --git a/src/assets/images/home/shumu.png b/src/assets/images/home/shumu.png new file mode 100644 index 0000000..1e92e8c Binary files /dev/null and b/src/assets/images/home/shumu.png differ diff --git a/src/assets/images/home/title_bg(1).png b/src/assets/images/home/title_bg(1).png new file mode 100644 index 0000000..a510d5b Binary files /dev/null and b/src/assets/images/home/title_bg(1).png differ diff --git a/src/assets/images/home/title_bg.png b/src/assets/images/home/title_bg.png new file mode 100644 index 0000000..a510d5b Binary files /dev/null and b/src/assets/images/home/title_bg.png differ diff --git a/src/assets/images/home/title_bg_01.png b/src/assets/images/home/title_bg_01.png new file mode 100644 index 0000000..6cbb0b5 Binary files /dev/null and b/src/assets/images/home/title_bg_01.png differ diff --git a/src/assets/images/home/xiazai.png b/src/assets/images/home/xiazai.png new file mode 100644 index 0000000..2b4d452 Binary files /dev/null and b/src/assets/images/home/xiazai.png differ diff --git a/src/assets/images/home/xiazai_button.png b/src/assets/images/home/xiazai_button.png new file mode 100644 index 0000000..855dbe5 Binary files /dev/null and b/src/assets/images/home/xiazai_button.png differ diff --git a/src/assets/images/home/zhutu.png b/src/assets/images/home/zhutu.png new file mode 100644 index 0000000..aa87831 Binary files /dev/null and b/src/assets/images/home/zhutu.png differ diff --git a/src/config/env.development.js b/src/config/env.development.js index e312cb8..55ff717 100644 --- a/src/config/env.development.js +++ b/src/config/env.development.js @@ -1,9 +1,9 @@ -// 本地环境配置 -module.exports = { - title: 'vue-h5-template', - baseUrl: 'http://localhost:9018', // 项目地址 - baseApi: 'https://test.xxx.com/api', // 本地api请求地址,注意：如果你使用了代理，请设置成'/' - APPID: 'xxx', - APPSECRET: 'xxx', - $cdn: 'https://www.sunniejs.cn/static' -} +// 本地环境配置 +module.exports = { + title: '徒步大会活动', + baseUrl: 'http://localhost:9018', // 项目地址 + baseApi: '/api', // 本地api请求地址,注意：如果你使用了代理，请设置成'/' + APPID: 'xxx', + APPSECRET: 'xxx', + $cdn: 'https://www.sunniejs.cn/static' +} diff --git a/src/config/env.production.js b/src/config/env.production.js index ab2d373..60f3c64 100644 --- a/src/config/env.production.js +++ b/src/config/env.production.js @@ -1,9 +1,9 @@ -// 正式 -module.exports = { - title: 'vue-h5-template', - baseUrl: 'https://www.xxx.com/', // 正式项目地址 - baseApi: 'https://www.xxx.com/api', // 正式api请求地址 - APPID: 'xxx', - APPSECRET: 'xxx', - $cdn: 'https://www.sunniejs.cn/static' -} +// 正式 +module.exports = { + title: '徒步大会活动', + baseUrl: 'https://mall.xiangleba.com.cn', // 正式项目地址 + baseApi: 'https://mall.xiangleba.com.cn', // 正式api请求地址 + APPID: 'xxx', + APPSECRET: 'xxx', + $cdn: 'https://www.sunniejs.cn/static' +} diff --git a/src/config/env.staging.js b/src/config/env.staging.js index 2256d24..448980f 100644 --- a/src/config/env.staging.js +++ b/src/config/env.staging.js @@ -1,8 +1,8 @@ -module.exports = { - title: 'vue-h5-template', - baseUrl: 'https://test.xxx.com', // 测试项目地址 - baseApi: 'https://test.xxx.com/api', // 测试api请求地址 - APPID: 'xxx', - APPSECRET: 'xxx', - $cdn: 'https://www.sunniejs.cn/static' -} +module.exports = { + title: '徒步大会活动', + baseUrl: 'https://test.xxx.com', // 测试项目地址 + baseApi: 'https://test.xxx.com/api', // 测试api请求地址 + APPID: 'xxx', + APPSECRET: 'xxx', + $cdn: 'https://www.sunniejs.cn/static' +} diff --git a/src/plugins/vant.js b/src/plugins/vant.js index 0723dfa..6def304 100644 --- a/src/plugins/vant.js +++ b/src/plugins/vant.js @@ -1,7 +1,9 @@ // 按需全局引入 vant组件 import Vue from 'vue' -import { Button, List, Cell, Tabbar, TabbarItem } from 'vant' +import { Button, List, Cell, ImagePreview, Toast, Tabbar, TabbarItem } from 'vant' Vue.use(Button) Vue.use(Cell) Vue.use(List) +Vue.use(ImagePreview) +Vue.use(Toast) Vue.use(Tabbar).use(TabbarItem) diff --git a/src/router/router.config.js b/src/router/router.config.js index 8123140..fb2089f 100644 --- a/src/router/router.config.js +++ b/src/router/router.config.js @@ -17,12 +17,6 @@ export const constantRouterMap = [ name: 'Home', component: () => import('@/views/home/index'), meta: { title: '首页', keepAlive: false } - }, - { - path: '/about', - name: 'About', - component: () => import('@/views/home/about'), - meta: { title: '关于我', keepAlive: false } } ] } diff --git a/src/views/home/about.vue b/src/views/home/about.vue deleted file mode 100644 index 6a5c02c..0000000 --- a/src/views/home/about.vue +++ /dev/null @@ -1,113 +0,0 @@ - - - - - diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 850615b..54e237c 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -2,74 +2,361 @@ diff --git a/src/views/layouts/index.vue b/src/views/layouts/index.vue index 9a1441b..7452d9a 100644 --- a/src/views/layouts/index.vue +++ b/src/views/layouts/index.vue @@ -6,14 +6,14 @@ -
+