diff --git a/build/utils.js b/build/utils.js index 4b117ed..8220903 100644 --- a/build/utils.js +++ b/build/utils.js @@ -61,7 +61,14 @@ exports.cssLoaders = function (options) { postcss: generateLoaders(), less: generateLoaders('less'), sass: generateLoaders('sass', { indentedSyntax: true }), - scss: generateLoaders('sass'), + scss: generateLoaders('sass').concat( + { + loader: 'sass-resources-loader', + options: { + resources: path.resolve(__dirname, '../src/assets/css/base.scss') + } + } + ), stylus: generateLoaders('stylus'), styl: generateLoaders('stylus') } diff --git a/package-lock.json b/package-lock.json index a0157ec..2d3ca99 100644 --- a/package-lock.json +++ b/package-lock.json @@ -149,8 +149,7 @@ "array-find-index": { "version": "1.0.2", "resolved": "https://registry.npm.taobao.org/array-find-index/download/array-find-index-1.0.2.tgz", - "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=", - "dev": true + "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=" }, "array-flatten": { "version": "1.1.1", @@ -5453,6 +5452,15 @@ "resolved": "https://registry.npm.taobao.org/minimist/download/minimist-1.2.5.tgz", "integrity": "sha1-Z9ZgFLZqaoqqDAg8X9WN9OTpdgI=" }, + "mint-ui": { + "version": "2.2.13", + "resolved": "https://registry.npm.taobao.org/mint-ui/download/mint-ui-2.2.13.tgz", + "requires": { + "array-find-index": "^1.0.2", + "raf.js": "0.0.4", + "vue-lazyload": "^1.0.1" + } + }, "mississippi": { "version": "2.0.0", "resolved": "https://registry.npm.taobao.org/mississippi/download/mississippi-2.0.0.tgz", @@ -6914,6 +6922,11 @@ "integrity": "sha1-M0WUG0FTy50ILY7uTNogFqmu9/Y=", "dev": true }, + "raf.js": { + "version": "0.0.4", + "resolved": "https://registry.npm.taobao.org/raf.js/download/raf.js-0.0.4.tgz", + "integrity": "sha1-8Vr0RdJBsn+nExpXRQtn75xAL+w=" + }, "randombytes": { "version": "2.1.0", "resolved": "https://registry.npm.taobao.org/randombytes/download/randombytes-2.1.0.tgz", @@ -8691,6 +8704,11 @@ "integrity": "sha1-UylVzB6yCKPZkLOp+acFdGV+CPI=", "dev": true }, + "vue-lazyload": { + "version": "1.3.3", + "resolved": "https://registry.npm.taobao.org/vue-lazyload/download/vue-lazyload-1.3.3.tgz?cache=0&sync_timestamp=1613791698648&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-lazyload%2Fdownload%2Fvue-lazyload-1.3.3.tgz", + "integrity": "sha1-TfUKJxvem3TDyveiKNbgr1DVaC8=" + }, "vue-loader": { "version": "13.7.3", "resolved": "https://registry.npm.taobao.org/vue-loader/download/vue-loader-13.7.3.tgz?cache=0&sync_timestamp=1608188050165&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-loader%2Fdownload%2Fvue-loader-13.7.3.tgz", diff --git a/package.json b/package.json index ded9088..dee7ea4 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,8 @@ "css-loader": "^3.6.0", "js-base64": "^3.6.0", "less-loader": "^4.1.0", + "mint-ui": "^2.2.13", + "node-sass": "^5.0.0", "sass-loader": "^7.3.1", "vue": "^2.5.2", "vue-h5-popup": "^1.0.2", @@ -32,12 +34,13 @@ "chalk": "^2.0.1", "copy-webpack-plugin": "^4.0.1", "crypto-js": "^4.0.0", - "css-loader": "^0.28.0", + "css-loader": "^3.6.0", "extract-text-webpack-plugin": "^3.0.0", "file-loader": "^1.1.4", "friendly-errors-webpack-plugin": "^1.6.1", "html-webpack-plugin": "^2.30.1", "node-notifier": "^5.1.2", + "node-sass": "^5.0.0", "optimize-css-assets-webpack-plugin": "^3.2.0", "ora": "^1.2.0", "portfinder": "^1.0.13", @@ -46,8 +49,13 @@ "postcss-url": "^7.2.1", "prettier": "^2.2.1", "rimraf": "^2.6.0", + "sass-loader": "^7.3.1", + "sass-resources-loader": "^2.1.1", "semver": "^5.3.0", "shelljs": "^0.7.6", + "style-loader": "^2.0.0", + "stylus": "^0.54.8", + "stylus-loader": "^5.0.0", "swiper": "^3.4.2", "uglifyjs-webpack-plugin": "^1.1.1", "url-loader": "^0.5.8", diff --git a/src/assets/css/base.scss b/src/assets/css/base.scss new file mode 100644 index 0000000..0bd703f --- /dev/null +++ b/src/assets/css/base.scss @@ -0,0 +1 @@ +$commonLeftRightPadding:0 10px; diff --git a/src/assets/css/reset.css b/src/assets/css/reset.css index 88d535c..1ad44a8 100644 --- a/src/assets/css/reset.css +++ b/src/assets/css/reset.css @@ -57,3 +57,7 @@ body,html,#app height: 100%; background: #FCFCFC; } + +.leftRightPadding{ + padding: 0 10px; +} diff --git a/src/assets/images/mySelf/photoBG.png b/src/assets/images/mySelf/photoBG.png new file mode 100644 index 0000000..7dea754 --- /dev/null +++ b/src/assets/images/mySelf/photoBG.png diff --git a/src/assets/images/mySelf/selfNavBg.png b/src/assets/images/mySelf/selfNavBg.png new file mode 100644 index 0000000..c1f0d1d --- /dev/null +++ b/src/assets/images/mySelf/selfNavBg.png diff --git a/src/assets/images/parkPay/addCarNum.png b/src/assets/images/parkPay/addCarNum.png new file mode 100644 index 0000000..67fac55 --- /dev/null +++ b/src/assets/images/parkPay/addCarNum.png diff --git a/src/assets/images/blackBG.png b/src/assets/images/parkPay/blackBG.png index fa94812..fa94812 100644 --- a/src/assets/images/blackBG.png +++ b/src/assets/images/parkPay/blackBG.png diff --git a/src/assets/images/blueBG.png b/src/assets/images/parkPay/blueBG.png index 69f76a8..69f76a8 100644 --- a/src/assets/images/blueBG.png +++ b/src/assets/images/parkPay/blueBG.png diff --git a/src/assets/images/carBlack.png b/src/assets/images/parkPay/carBlack.png index 2698b70..2698b70 100644 --- a/src/assets/images/carBlack.png +++ b/src/assets/images/parkPay/carBlack.png diff --git a/src/assets/images/carBlue.png b/src/assets/images/parkPay/carBlue.png index 7923127..7923127 100644 --- a/src/assets/images/carBlue.png +++ b/src/assets/images/parkPay/carBlue.png diff --git a/src/assets/images/carGreen.png b/src/assets/images/parkPay/carGreen.png index bfa1ded..bfa1ded 100644 --- a/src/assets/images/carGreen.png +++ b/src/assets/images/parkPay/carGreen.png diff --git a/src/assets/images/carWhite.png b/src/assets/images/parkPay/carWhite.png index 560df08..560df08 100644 --- a/src/assets/images/carWhite.png +++ b/src/assets/images/parkPay/carWhite.png diff --git a/src/assets/images/carYellow.png b/src/assets/images/parkPay/carYellow.png index 561a94f..561a94f 100644 --- a/src/assets/images/carYellow.png +++ b/src/assets/images/parkPay/carYellow.png diff --git a/src/assets/images/choose.png b/src/assets/images/parkPay/choose.png index 6093f8e..6093f8e 100644 --- a/src/assets/images/choose.png +++ b/src/assets/images/parkPay/choose.png diff --git a/src/assets/images/choosed.png b/src/assets/images/parkPay/choosed.png index b261da8..b261da8 100644 --- a/src/assets/images/choosed.png +++ b/src/assets/images/parkPay/choosed.png diff --git a/src/assets/images/greenBG.png b/src/assets/images/parkPay/greenBG.png index d3abb0a..d3abb0a 100644 --- a/src/assets/images/greenBG.png +++ b/src/assets/images/parkPay/greenBG.png diff --git a/src/assets/images/icon-delete.png b/src/assets/images/parkPay/icon-delete.png index ae5d28e..ae5d28e 100755 --- a/src/assets/images/icon-delete.png +++ b/src/assets/images/parkPay/icon-delete.png diff --git a/src/assets/images/icon_chose_n@2x.png b/src/assets/images/parkPay/icon_chose_n@2x.png index a766823..a766823 100755 --- a/src/assets/images/icon_chose_n@2x.png +++ b/src/assets/images/parkPay/icon_chose_n@2x.png diff --git a/src/assets/images/icon_chose_s@2x.png b/src/assets/images/parkPay/icon_chose_s@2x.png index 9cadd84..9cadd84 100755 --- a/src/assets/images/icon_chose_s@2x.png +++ b/src/assets/images/parkPay/icon_chose_s@2x.png diff --git a/src/assets/images/noRecord.png b/src/assets/images/parkPay/noRecord.png index 5680be0..5680be0 100644 --- a/src/assets/images/noRecord.png +++ b/src/assets/images/parkPay/noRecord.png diff --git a/src/assets/images/tip.png b/src/assets/images/parkPay/tip.png index 49253c6..49253c6 100644 --- a/src/assets/images/tip.png +++ b/src/assets/images/parkPay/tip.png diff --git a/src/assets/images/toParkRecord.png b/src/assets/images/parkPay/toParkRecord.png index e6b1694..e6b1694 100644 --- a/src/assets/images/toParkRecord.png +++ b/src/assets/images/parkPay/toParkRecord.png diff --git a/src/assets/images/whiteBG.png b/src/assets/images/parkPay/whiteBG.png index 7c89e6f..7c89e6f 100644 --- a/src/assets/images/whiteBG.png +++ b/src/assets/images/parkPay/whiteBG.png diff --git a/src/assets/images/yellowBG.png b/src/assets/images/parkPay/yellowBG.png index 34e26b0..34e26b0 100644 --- a/src/assets/images/yellowBG.png +++ b/src/assets/images/parkPay/yellowBG.png diff --git a/src/main.js b/src/main.js index f825b23..466e18b 100644 --- a/src/main.js +++ b/src/main.js @@ -6,9 +6,19 @@ import router from './router' import './assets/css/reset.css' // 引入公共样式 -import h5Popup from 'vue-h5-popup'; // 引入弹窗 +import h5Popup from 'vue-h5-popup' // 引入弹窗 Vue.use(h5Popup) + +import MintUI from 'mint-ui' +import 'mint-ui/lib/style.css' +Vue.use(MintUI) // 引入MintUI + + +//全局设置的基本样式 +import './assets/css/base.scss' + + import utils from './utils/utils' // 工具类 Vue.prototype.$utils = utils diff --git a/src/router/index.js b/src/router/index.js index 2b86f01..6d3fcbe 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,8 +1,8 @@ import Vue from 'vue' import Router from 'vue-router' -// import plateNumber from '@/components/plateNumber' -import parkRecord from '@/components/parkRecord' -import navigation from '@/components/navigation' +import plateNumber from '@/views/parkPay/plateNumber' +import parkRecord from '@/views/parkPay/parkRecord' +import selfNav from '@/views/mySelf/selfNav' Vue.use(Router) @@ -11,14 +11,14 @@ export default new Router({ { path: '/', redirect: { - name: 'parkRecord' + name: 'selfNav' } }, - { - path: '/navigation', - name: 'navigation', - component: navigation - }, + // { + // path: '/navigation', + // name: 'navigation', + // component: navigation + // }, { path: '/parkRecord', @@ -28,15 +28,53 @@ export default new Router({ { path: '/plateNumber', name: 'plateNumber', - component: () => import("@/components/plateNumber.vue") + component: plateNumber }, { path: '/orderPay', name: 'orderPay', - component: () => import("@/components/orderPay.vue") + component: () => import("@/views/parkPay/orderPay.vue") + }, + + //---------------- 个人页面导航 + { + path: '/selfNav', + name: 'selfNav', + component: () => import("@/views/mySelf/selfNav.vue") + }, + + // ------------------------建议反馈 + { + path: '/suggestionBack', + name: 'suggestionBack', + component: () => import("@/views/mySelf/feedback/suggestionBack.vue") + }, + + // ------------------------停车记录 + { + path: '/parkNotes', + name: 'parkNotes', + component: () => import("@/views/mySelf/parkNotes/parkNotes.vue") + }, + + + // ------------------------停车记录 + { + path: '/binDing', + name: 'binDing', + component: () => import("@/views/binding/binDing.vue") }, + + + + + + + + + ] }) diff --git a/src/views/binding/binDing.vue b/src/views/binding/binDing.vue new file mode 100644 index 0000000..a7fe640 --- /dev/null +++ b/src/views/binding/binDing.vue @@ -0,0 +1,56 @@ + + + + + diff --git a/src/views/mySelf/feedback/suggestionBack.vue b/src/views/mySelf/feedback/suggestionBack.vue new file mode 100644 index 0000000..ab6b4c0 --- /dev/null +++ b/src/views/mySelf/feedback/suggestionBack.vue @@ -0,0 +1,79 @@ + + + + + diff --git a/src/views/mySelf/parkNotes/parkNotes.vue b/src/views/mySelf/parkNotes/parkNotes.vue new file mode 100644 index 0000000..b8bddb3 --- /dev/null +++ b/src/views/mySelf/parkNotes/parkNotes.vue @@ -0,0 +1,32 @@ + + + + + diff --git a/src/views/mySelf/selfNav.vue b/src/views/mySelf/selfNav.vue new file mode 100644 index 0000000..607589c --- /dev/null +++ b/src/views/mySelf/selfNav.vue @@ -0,0 +1,64 @@ + + + + + diff --git a/src/components/navigation.vue b/src/views/parkPay/navigation.vue index 89aa038..4881a65 100644 --- a/src/components/navigation.vue +++ b/src/views/parkPay/navigation.vue @@ -39,7 +39,7 @@