diff --git a/dist 2.zip b/dist 2.zip index a1338bc..77b471f 100644 --- a/dist 2.zip +++ b/dist 2.zip diff --git a/dist.zip b/dist.zip index fcf827b..90f4a42 100644 --- a/dist.zip +++ b/dist.zip diff --git a/index.html b/index.html index 5deafcd..6000cd5 100644 --- a/index.html +++ b/index.html @@ -4,7 +4,7 @@ - 黄石微信公众号 + 微信公众号
diff --git a/package.json b/package.json index dee7ea4..0292579 100644 --- a/package.json +++ b/package.json @@ -15,9 +15,11 @@ "js-base64": "^3.6.0", "less-loader": "^4.1.0", "mint-ui": "^2.2.13", + "moment": "^2.29.1", "node-sass": "^5.0.0", "sass-loader": "^7.3.1", "vue": "^2.5.2", + "mint-ui": "^2.2.13", "vue-h5-popup": "^1.0.2", "vue-router": "^3.0.1" }, @@ -62,9 +64,9 @@ "vue-loader": "^13.3.0", "vue-style-loader": "^3.0.1", "vue-template-compiler": "^2.5.2", - "webpack": "^3.6.0", + "webpack": "^3.4.1", "webpack-bundle-analyzer": "^2.9.0", - "webpack-dev-server": "^2.9.1", + "webpack-dev-server": "^2.9.7", "webpack-merge": "^4.1.0" }, "engines": { diff --git a/src/api/orderPay/orderPay.js b/src/api/orderPay/orderPay.js index dc2a28e..0a9d574 100644 --- a/src/api/orderPay/orderPay.js +++ b/src/api/orderPay/orderPay.js @@ -17,7 +17,6 @@ export function getOpenId(params) { // 获取OpenId }) } - export function vxPayQuery(params) { // 微信 return request({ url: 'weixinpay/publicUnifiedOrder', @@ -26,22 +25,18 @@ export function vxPayQuery(params) { // 微信 }) } -// 新接口银联 -export function doPay(params) { // 微信 +export function bankH5Pay(params) { // 农行 return request({ - url: 'unionpay/doPay', + url: 'abcBankPay/bankPayForH5', method: 'post', data: params }) } - -// 创建订单 - -export function doOrderCreate(params) { // 创建订单 +export function queryParkingRecordPageByCarNumbers(params) { // 支付完成后查询记录 return request({ - url: 'unionpay/doOrderCreate', + url: 'queryParkOrder/queryParkingRecordPageByCarNumbers', method: 'post', data: params }) @@ -50,3 +45,8 @@ export function doOrderCreate(params) { // 创建订单 + + + + + diff --git a/src/api/parkRecord/parkRecord.js b/src/api/parkRecord/parkRecord.js index c3baac8..c70b4fd 100644 --- a/src/api/parkRecord/parkRecord.js +++ b/src/api/parkRecord/parkRecord.js @@ -24,4 +24,13 @@ export function parkingQuery(params) { }) } +export function appApplyParkOut(params) { // 0元出场 + return request({ + url: 'appAccountPay/appApplyParkOut', + method: 'post', + data: params + }) +} + + diff --git a/src/api/plateNumber/plateNumber.js b/src/api/plateNumber/plateNumber.js new file mode 100644 index 0000000..52dba6f --- /dev/null +++ b/src/api/plateNumber/plateNumber.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/blackBG.png b/src/assets/images/blackBG.png new file mode 100644 index 0000000..fa94812 --- /dev/null +++ b/src/assets/images/blackBG.png diff --git a/src/assets/images/blueBG.png b/src/assets/images/blueBG.png new file mode 100644 index 0000000..69f76a8 --- /dev/null +++ b/src/assets/images/blueBG.png diff --git a/src/assets/images/carBlack.png b/src/assets/images/carBlack.png new file mode 100644 index 0000000..2698b70 --- /dev/null +++ b/src/assets/images/carBlack.png diff --git a/src/assets/images/carBlue.png b/src/assets/images/carBlue.png new file mode 100644 index 0000000..7923127 --- /dev/null +++ b/src/assets/images/carBlue.png diff --git a/src/assets/images/carGreen.png b/src/assets/images/carGreen.png new file mode 100644 index 0000000..bfa1ded --- /dev/null +++ b/src/assets/images/carGreen.png diff --git a/src/assets/images/carWhite.png b/src/assets/images/carWhite.png new file mode 100644 index 0000000..560df08 --- /dev/null +++ b/src/assets/images/carWhite.png diff --git a/src/assets/images/carYellow.png b/src/assets/images/carYellow.png new file mode 100644 index 0000000..561a94f --- /dev/null +++ b/src/assets/images/carYellow.png diff --git a/src/assets/images/cards/carBg.png b/src/assets/images/cards/carBg.png new file mode 100644 index 0000000..afc5771 --- /dev/null +++ b/src/assets/images/cards/carBg.png diff --git a/src/assets/images/cards/cardPointBg.png b/src/assets/images/cards/cardPointBg.png new file mode 100644 index 0000000..0ed91ab --- /dev/null +++ b/src/assets/images/cards/cardPointBg.png diff --git a/src/assets/images/greenBG.png b/src/assets/images/greenBG.png new file mode 100644 index 0000000..d3abb0a --- /dev/null +++ b/src/assets/images/greenBG.png diff --git a/src/assets/images/sweet.png b/src/assets/images/sweet.png new file mode 100644 index 0000000..c03ba29 --- /dev/null +++ b/src/assets/images/sweet.png diff --git a/src/assets/images/tip.png b/src/assets/images/tip.png new file mode 100644 index 0000000..49253c6 --- /dev/null +++ b/src/assets/images/tip.png diff --git a/src/assets/images/whiteBG.png b/src/assets/images/whiteBG.png new file mode 100644 index 0000000..7c89e6f --- /dev/null +++ b/src/assets/images/whiteBG.png diff --git a/src/assets/images/yellowBG.png b/src/assets/images/yellowBG.png new file mode 100644 index 0000000..34e26b0 --- /dev/null +++ b/src/assets/images/yellowBG.png diff --git a/src/main.js b/src/main.js index 466e18b..ebb25e9 100644 --- a/src/main.js +++ b/src/main.js @@ -10,18 +10,33 @@ 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 MintUI from 'mint-ui' +// import 'mint-ui/lib/style.css' +// Vue.use(MintUI) // 引入MintUI + +import 'mint-ui/lib/style.css' +import { MessageBox } from 'mint-ui' +// Vue.use(MessageBox) +Vue.prototype.$msgbox = MessageBox //全局设置的基本样式 import './assets/css/base.scss' +import moment from 'moment' +// 设置本地时区 +moment.locale('zh-cn') +Vue.prototype.$moment = moment + + import utils from './utils/utils' // 工具类 Vue.prototype.$utils = utils +import Mint from 'mint-ui'; +import 'mint-ui/lib/style.css' +Vue.use(Mint); + import 'swiper/dist/css/swiper.min.css' // 轮播 import 'swiper/dist/js/swiper.min' diff --git a/src/router/index.js b/src/router/index.js index 6d3fcbe..987e8af 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2,7 +2,7 @@ import Vue from 'vue' import Router from 'vue-router' import plateNumber from '@/views/parkPay/plateNumber' import parkRecord from '@/views/parkPay/parkRecord' -import selfNav from '@/views/mySelf/selfNav' +// import selfNav from '@/views/mySelf/selfNav' Vue.use(Router) @@ -11,7 +11,7 @@ export default new Router({ { path: '/', redirect: { - name: 'selfNav' + name: 'plateNumber' } }, // { @@ -37,36 +37,50 @@ export default new Router({ 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") - }, - - + // //---------------- 个人页面导航 + // { + // 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") + // }, + // + // + // // ------------------------购买会员卡提示 + // { + // path: '/cardPoint', + // name: 'cardPoint', + // component: () => import("@/views/cards/cardPoint.vue") + // }, + // + // + // // ------------------------购买会员卡 + // { + // path: '/buyCard', + // name: 'buyCard', + // component: () => import("@/views/cards/buyCard.vue") + // }, diff --git a/src/utils/request.js b/src/utils/request.js index d40bb2e..59aa91b 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -7,7 +7,7 @@ const service = axios.create({ // http://pay.service.renniting.cn/ 赤峰 // http://pay.service.huangshiparking.com/ 黄石正式环境 // http://39.98.54.240:8090/ 黄石测试环境 - baseURL: 'http://pay.service.huangshiparking.com/', // url = base url + request url + baseURL: 'http://pay.service.renniting.cn/v1', // 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 08abba3..78918f6 100644 --- a/src/utils/utils.js +++ b/src/utils/utils.js @@ -12,6 +12,34 @@ export default { return pwd; }, + formatDate: function(secs, type=0){ //type是可选参数，因为json中时间的格式是year-month-date,不能识别XX年XX月XX日 + var t = new Date(secs) + var year = t.getFullYear() + var month = t.getMonth() + 1 + if(month < 10){ month = '0' + month } + var date = t.getDate() + if(date < 10){ date = '0' + date } + var hour = t.getHours() + if(hour < 10){ hour = '0' + hour } + var minute = t.getMinutes() + if(minute < 10){ minute = '0' + minute } + var second = t.getSeconds() + if(second < 10){ second = '0' + second } + if(type==0){ + return year + '年' + month + '月' + date + '日' + }else{ + return year + '-'+month+'-'+date + }}, + + timestampToTime: function (timestamp) { + var d = new Date(timestamp);//时间戳为10位需*1000，时间戳为13位的话不需乘1000 + var youWant=d.getFullYear() + '-' + this.completedString(d.getMonth() + 1) + '-' + this.completedString(d.getDate()) ; + return youWant + }, + completedString:function(s) { + return s < 10 ? '0' + s : s + }, + dateFormat: function (msd) { // 时间转换 @@ -80,27 +108,53 @@ export default { } else if (/AlipayClient/.test(window.navigator.userAgent)) { console.log("支付宝客户端"); return '支付宝' - } else { + } else if (/BankabciPhone/.test(window.navigator.userAgent)) { + console.log("农行客户端"); + return '立即' + }else if (/BankabcAndroid/.test(window.navigator.userAgent)) { + console.log("农行客户端"); + return '立即' + }else { console.log("其他浏览器"); return '支付宝' } }, + + // 1:支付宝 2：微信 3：银联 10:H5 4微信公众号 34 农行 + clientBrowsePayType: function () { // 判断客户端 + if (/MicroMessenger/.test(window.navigator.userAgent)) { + console.log("微信客户端"); + return '4' + } else if (/AlipayClient/.test(window.navigator.userAgent)) { + console.log("支付宝客户端"); + return '1' + } else if (/BankabciPhone/.test(window.navigator.userAgent)) { + console.log("农行客户端"); + return '34' + }else if (/BankabcAndroid/.test(window.navigator.userAgent)) { + console.log("农行客户端"); + return '34' + }else { + console.log("其他浏览器"); + return '1' + } + }, // 0eca8f5373ca4866aec2f8e9d9367104 老的id // 14318527b13840c2a4af63fef52c2d6e 老的签名 // ud8yq5tv0inxupc05xfeau39jywlqoj2 新的id // ny1u72b6k374sg379z0kqjgfxe2ycnpw 新的签名 - myVarAppid:'0eca8f5373ca4866aec2f8e9d9367104',// 公共请求Appid + myVarAppid:'ud8yq5tv0inxupc05xfeau39jywlqoj2',// 公共请求Appid myDeviceInfo: 'BC0703A4-AFB0-4B51-9089-9B7487C0CC6E', // 公共请求设备信息 - myVxAppId: 'wxa1a66cc7d263afe6', + myVxAppId: 'wx2af2bab90d433c86', // 测试环境 微信赤峰 appid wxff4cebaedbf4f886 // 微信赤峰 appid wx2af2bab90d433c86 // 黄石 appid wxa1a66cc7d263afe6 - myOrgId: '10079', // 归属地 赤峰id 10003 黄石 10079 + myOrgId: '10003', // 归属地 赤峰id 10003 黄石 10079 myGetSign: function (objb) { // 获取签名 var compare = function (obj1, obj2) { @@ -115,13 +169,13 @@ export default { } } objb.sort(compare); - var strmd5 = '14318527b13840c2a4af63fef52c2d6e'; + var strmd5 = 'ny1u72b6k374sg379z0kqjgfxe2ycnpw'; for(var i=0;i'+strmd5); strmd5 = md5(strmd5); strmd5=strmd5.toUpperCase(); diff --git a/src/views/cards/buyCard.vue b/src/views/cards/buyCard.vue new file mode 100644 index 0000000..050e48a --- /dev/null +++ b/src/views/cards/buyCard.vue @@ -0,0 +1,266 @@ + + + + + diff --git a/src/views/cards/cardPoint.vue b/src/views/cards/cardPoint.vue new file mode 100644 index 0000000..eff1108 --- /dev/null +++ b/src/views/cards/cardPoint.vue @@ -0,0 +1,89 @@ + + + + + diff --git a/src/views/parkPay/orderPay.vue b/src/views/parkPay/orderPay.vue index b900383..b0656ee 100644 --- a/src/views/parkPay/orderPay.vue +++ b/src/views/parkPay/orderPay.vue @@ -22,10 +22,10 @@
-
微信支付
+
{{clientBrowser}}支付
-
+

温馨提示：

@@ -40,22 +40,27 @@ @@ -247,27 +402,27 @@ export default { } .carBlue { - background: url("../../assets/images/parkPay/blueBG.png") no-repeat; + background: url("../../assets/images/blueBG.png") no-repeat; background-size: 100% 100%; } .carYellow { - background: url("../../assets/images/parkPay/yellowBG.png") no-repeat; + background: url("../../assets/images/yellowBG.png") no-repeat; background-size: 100% 100%; } .carGreen { - background: url("../../assets/images/parkPay/greenBG.png") no-repeat; + background: url("../../assets/images/greenBG.png") no-repeat; background-size: 100% 100%; } .carWhite { - background: url("../../assets/images/parkPay/whiteBG.png") no-repeat; + background: url("../../assets/images/whiteBG.png") no-repeat; background-size: 100% 100%; } .carBlack { - background: url("../../assets/images/parkPay/blackBG.png") no-repeat; + background: url("../../assets/images/blackBG.png") no-repeat; background-size: 100% 100%; } @@ -316,7 +471,7 @@ export default { .tip { padding-left: 40px; - background: url("../../assets/images/parkPay/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/views/parkPay/parkRecord.vue b/src/views/parkPay/parkRecord.vue index 5d8d183..6f93328 100644 --- a/src/views/parkPay/parkRecord.vue +++ b/src/views/parkPay/parkRecord.vue @@ -10,12 +10,11 @@ -
-

停车30分钟内无需缴费，请直接离场。

+

停车15分钟内无需缴费，请申请离场。

    @@ -34,7 +33,8 @@

    停车时长：{{ $utils.dateFormat(i.parkDuration)}}

    ￥{{(i.unPayFee/100).toFixed(2)}}

    -

    出场缴费

    +

    申请离场

    +

    出场缴费

@@ -66,7 +66,7 @@
-

车辆类型：临停车

+

车场名称：{{i.parkName}}

@@ -112,19 +112,13 @@ 暂无记录
- -
-
-

请至少选择一笔记录

-
-
- 知道了 - +