From b137bb0e23de7324fc61e70e4a9f6c8d318c4479 Mon Sep 17 00:00:00 2001 From: liuqimichale <123456lq> Date: Wed, 20 Jan 2021 15:43:55 +0800 Subject: [PATCH] 扫码后 车牌是否 咨询页面 --- package-lock.json | 25 +++++++++++++++++++++++-- package.json | 1 + src/api/navigation/navigation.js | 14 ++++++++++++++ src/assets/images/free-tip.png | Bin 1185 -> 0 bytes src/assets/images/tip.png | Bin 0 -> 1185 bytes src/assets/images/toParkRecord.png | Bin 0 -> 2015 bytes src/components/navigation.vue | 172 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/components/orderPay.vue | 2 +- src/components/parkRecord.vue | 2 +- src/main.js | 6 +++++- src/router/index.js | 8 +++++++- src/utils/request.js | 6 +++--- src/utils/utils.js | 8 ++++---- 13 files changed, 231 insertions(+), 13 deletions(-) create mode 100644 src/api/navigation/navigation.js delete mode 100644 src/assets/images/free-tip.png create mode 100644 src/assets/images/tip.png create mode 100644 src/assets/images/toParkRecord.png create mode 100644 src/components/navigation.vue diff --git a/package-lock.json b/package-lock.json index 60ee4ca..88155c2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -286,6 +286,14 @@ "postcss-value-parser": "^3.2.3" } }, + "axios": { + "version": "0.21.1", + "resolved": "https://registry.npm.taobao.org/axios/download/axios-0.21.1.tgz?cache=0&sync_timestamp=1608609199258&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Faxios%2Fdownload%2Faxios-0.21.1.tgz", + "integrity": "sha1-IlY0gZYvTWvemnbVFu8OXTwJsrg=", + "requires": { + "follow-redirects": "^1.10.0" + } + }, "babel-code-frame": { "version": "6.26.0", "resolved": "https://registry.npm.taobao.org/babel-code-frame/download/babel-code-frame-6.26.0.tgz", @@ -3811,8 +3819,7 @@ "follow-redirects": { "version": "1.13.1", "resolved": "https://registry.npm.taobao.org/follow-redirects/download/follow-redirects-1.13.1.tgz?cache=0&sync_timestamp=1607916846877&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffollow-redirects%2Fdownload%2Ffollow-redirects-1.13.1.tgz", - "integrity": "sha1-X2m4Ezds7k/QR0o6uoNd8Eq3Y7c=", - "dev": true + "integrity": "sha1-X2m4Ezds7k/QR0o6uoNd8Eq3Y7c=" }, "for-in": { "version": "1.0.2", @@ -8139,6 +8146,12 @@ "has-flag": "^3.0.0" } }, + "swiper": { + "version": "3.4.2", + "resolved": "https://registry.npm.taobao.org/swiper/download/swiper-3.4.2.tgz?cache=0&sync_timestamp=1608315084925&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fswiper%2Fdownload%2Fswiper-3.4.2.tgz", + "integrity": "sha1-Oda0ELGjmDPh9y07cpmd9fXjg5I=", + "dev": true + }, "tapable": { "version": "0.2.9", "resolved": "https://registry.npm.taobao.org/tapable/download/tapable-0.2.9.tgz?cache=0&sync_timestamp=1607088824436&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftapable%2Fdownload%2Ftapable-0.2.9.tgz", @@ -8653,6 +8666,14 @@ "resolved": "https://registry.npm.taobao.org/vue/download/vue-2.6.12.tgz?cache=0&sync_timestamp=1609359858533&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue%2Fdownload%2Fvue-2.6.12.tgz", "integrity": "sha1-9evU+mvShpQD4pqJau1JBEVskSM=" }, + "vue-h5-popup": { + "version": "1.0.2", + "resolved": "https://registry.npm.taobao.org/vue-h5-popup/download/vue-h5-popup-1.0.2.tgz", + "integrity": "sha1-Y6nlTOOXJzuJ3umxAyOotmRlOuk=", + "requires": { + "vue": "^2.5.11" + } + }, "vue-hot-reload-api": { "version": "2.3.4", "resolved": "https://registry.npm.taobao.org/vue-hot-reload-api/download/vue-hot-reload-api-2.3.4.tgz", diff --git a/package.json b/package.json index 95236bf..b614491 100644 --- a/package.json +++ b/package.json @@ -46,6 +46,7 @@ "rimraf": "^2.6.0", "semver": "^5.3.0", "shelljs": "^0.7.6", + "swiper": "^3.4.2", "uglifyjs-webpack-plugin": "^1.1.1", "url-loader": "^0.5.8", "vue-loader": "^13.3.0", diff --git a/src/api/navigation/navigation.js b/src/api/navigation/navigation.js new file mode 100644 index 0000000..52dba6f --- /dev/null +++ b/src/api/navigation/navigation.js @@ -0,0 +1,14 @@ +import request from '@/utils/request' + +export function swiperQuery(params) { // 轮播图 + return request({ + url: 'activity/queryActivityListByJumpType', + method: 'post', + data: params + }) +} + + + + + diff --git a/src/assets/images/free-tip.png b/src/assets/images/free-tip.png deleted file mode 100644 index 49253c6..0000000 Binary files a/src/assets/images/free-tip.png and /dev/null differ diff --git a/src/assets/images/tip.png b/src/assets/images/tip.png new file mode 100644 index 0000000..49253c6 Binary files /dev/null and b/src/assets/images/tip.png differ diff --git a/src/assets/images/toParkRecord.png b/src/assets/images/toParkRecord.png new file mode 100644 index 0000000..e6b1694 Binary files /dev/null and b/src/assets/images/toParkRecord.png differ diff --git a/src/components/navigation.vue b/src/components/navigation.vue new file mode 100644 index 0000000..89aa038 --- /dev/null +++ b/src/components/navigation.vue @@ -0,0 +1,172 @@ + + + + + diff --git a/src/components/orderPay.vue b/src/components/orderPay.vue index c925bbd..8ba6a80 100644 --- a/src/components/orderPay.vue +++ b/src/components/orderPay.vue @@ -311,7 +311,7 @@ export default { .tip { padding-left: 40px; - background: url("../assets/images/free-tip.png") no-repeat 18px center; + background: url("../assets/images/tip.png") no-repeat 18px center; background-size: 16px 16px; color: #666; } diff --git a/src/components/parkRecord.vue b/src/components/parkRecord.vue index 9b61144..fcbf122 100644 --- a/src/components/parkRecord.vue +++ b/src/components/parkRecord.vue @@ -357,7 +357,7 @@ export default { height: 25px; line-height: 25px; padding-left: 45px; - background: #FEF8DB url("../assets/images/free-tip.png") no-repeat 18px center; + background: #FEF8DB url("../assets/images/tip.png") no-repeat 18px center; background-size: 18px 18px; } diff --git a/src/main.js b/src/main.js index ed9a24d..f825b23 100644 --- a/src/main.js +++ b/src/main.js @@ -9,9 +9,13 @@ import './assets/css/reset.css' // 引入公共样式 import h5Popup from 'vue-h5-popup'; // 引入弹窗 Vue.use(h5Popup) -import utils from './utils/utils' +import utils from './utils/utils' // 工具类 Vue.prototype.$utils = utils + +import 'swiper/dist/css/swiper.min.css' // 轮播 +import 'swiper/dist/js/swiper.min' + import vueFilter from './utils/filters' // 公共filter for (let key in vueFilter){ Vue.filter(key,vueFilter[key]) diff --git a/src/router/index.js b/src/router/index.js index 54601fe..1474bf5 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2,6 +2,7 @@ import Vue from 'vue' import Router from 'vue-router' import plateNumber from '@/components/plateNumber' import parkRecord from '@/components/parkRecord' +import navigation from '@/components/navigation' Vue.use(Router) @@ -10,10 +11,15 @@ export default new Router({ { path: '/', redirect: { - name: 'parkRecord' + name: 'navigation' } }, { + path: '/navigation', + name: 'navigation', + component: navigation + }, + { path: '/plateNumber', name: 'plateNumber', component: plateNumber diff --git a/src/utils/request.js b/src/utils/request.js index 3e422b6..ec511a0 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -4,10 +4,10 @@ import axios from 'axios' // let _url = process.env.API_ROOT // axios.defaults.baseURL = process.env.API_ROOT const service = axios.create({ - // baseURL: 'http://39.98.54.240:8090', // url = base url + request url - //baseURL: _url, // url = base url + request url - baseURL: 'http://pay.service.huangshiparking.com/', // url = base url + request url + // http://pay.service.renniting.cn/ 赤峰 + // http://pay.service.huangshiparking.com/ 黄石 + baseURL: 'http://pay.service.renniting.cn/', // url = base url + request url // withCredentials: true, // send cookies when cross-domain requests timeout: 6000 // request timeout }) diff --git a/src/utils/utils.js b/src/utils/utils.js index 22b05db..4410ded 100644 --- a/src/utils/utils.js +++ b/src/utils/utils.js @@ -25,13 +25,13 @@ export default { } } objb.sort(compare); - var strmd5 = '14318527b13840c2a4af63fef52c2d6e'; + var strmd5 = 'ny1u72b6k374sg379z0kqjgfxe2ycnpw'; for(var i=0;i'+strmd5); strmd5 = md5(strmd5); strmd5=strmd5.toUpperCase(); @@ -117,11 +117,11 @@ export default { // ny1u72b6k374sg379z0kqjgfxe2ycnpw 新的签名 - myVarAppid:'0eca8f5373ca4866aec2f8e9d9367104',// 公共请求Appid + myVarAppid:'ud8yq5tv0inxupc05xfeau39jywlqoj2',// 公共请求Appid myDeviceInfo: 'BC0703A4-AFB0-4B51-9089-9B7487C0CC6E', // 公共请求设备信息 - myVxAppId: 'wxa1a66cc7d263afe6' , // 微信赤峰 appid //黄石 appid wxa1a66cc7d263afe6 + myVxAppId: 'wx2af2bab90d433c86' , // 微信赤峰 appid wx2af2bab90d433c86 //黄石 appid wxa1a66cc7d263afe6 myOrgId: '10003' // 归属地 赤峰id -- libgit2 0.21.4