From 92e91fa63d8292d5d92323e421bff74b427b0e31 Mon Sep 17 00:00:00 2001
From: liuqi <290219706@qq.com>
Date: Fri, 27 May 2022 10:30:31 +0800
Subject: [PATCH] 江阴领取优惠券调接口

---
 config/index.js                   |  26 +++++++++++++++++---------
 src/api/couponPay/couponPay.js    |  52 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 src/api/orderPay/orderPay.js      |  16 ++++++++--------
 src/router/index.js               |   2 +-
 src/utils/request.js              |  25 ++++++++++---------------
 src/views/parkPay/coupon.vue      | 139 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------
 src/views/parkPay/couponPay.vue   | 443 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/parkPay/plateNumber.vue | 698 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 vue.config.js                     |  28 +++++++++++++---------------
 9 files changed, 765 insertions(+), 664 deletions(-)

diff --git a/config/index.js b/config/index.js
index b323e82..44e1caf 100644
--- a/config/index.js
+++ b/config/index.js
@@ -10,15 +10,23 @@ module.exports = {
     // Paths
     assetsSubDirectory: 'static',
     assetsPublicPath: '/',
-    // proxyTable: {
-    //   '/api':{
-    //     target:"http://39.98.58.92:8090/",//这里设置你要访问的域名（或IP+端口）
-    //     changeOrigin:true,
-    //     pathRewrite:{
-    //       '^/api':''//base_api是自定义用来代替http://pay.service.huangshiparking.com/的
-    //     }
-    //   }
-    // },
+    open: true,//vue项目启动时自动打开浏览器
+    proxyTable: {
+      '/api':{
+        target:"https://bus.jycrtc.com",//这里设置你要访问的域名（或IP+端口）
+        changeOrigin:true,
+        pathRewrite:{
+          '^/api':''//base_api是自定义用来代替
+        }
+      },
+      '/payapi':{
+        target:"https://pay.jycrtc.com",//这里设置你要访问的域名（或IP+端口）
+        changeOrigin:true,
+        pathRewrite:{
+          '^/payapi':''//base_api是自定义用来代替
+        }
+      }
+    },
 
 
     // Various Dev Server settings
diff --git a/src/api/couponPay/couponPay.js b/src/api/couponPay/couponPay.js
index a0bbcd1..8cd4a56 100644
--- a/src/api/couponPay/couponPay.js
+++ b/src/api/couponPay/couponPay.js
@@ -3,12 +3,62 @@ import request from '@/utils/request'
 export function scanCouponQR(params) {
   return request({
     requestBase:'VUE_APP_URL',
-    url: 'business/h5/qr/scanCouponQR',
+    url: '/api/business/h5/qr/scanCouponQR',
     method: 'post',
     data: params
   })
 }
 
 
+export function queryParkingRecordPageByCarNumbers(params) {
+  return request({
+    requestBase:'VUE_APP_URL_TWO',
+    url: '/payapi/queryParkOrder/queryParkingRecordPageByCarNumbers',
+    method: 'post',
+    data: params
+  })
+}
+
+
+export function appApplyParkOut(params) {  // 0元出场
+  return request({
+    url: '/payapi/appAccountPay/appApplyParkOut',
+    method: 'post',
+    data: params
+  })
+}
+
+
+export function parkingQuery(params) {
+  return request({
+    url: '/payapi/queryParkOrder/billQuery',
+    method: 'post',
+    data: params
+  })
+}
 
+export function aliPay(params) {  // 支付宝
+  return request({
+    url: '/payapi/alipay/aliH5Pay',
+    method: 'post',
+    data: params
+  })
+}
+
+
+export function getOpenId(params) {  // 获取OpenId
+  return request({
+    url: '/payapi/weixinPublicPay/getOpenIdByCode',
+    method: 'post',
+    data: params
+  })
+}
+
+export function vxPayQuery(params) {  // 微信
+  return request({
+    url: '/payapi/weixinpay/publicUnifiedOrder',
+    method: 'post',
+    data: params
+  })
+}
 
diff --git a/src/api/orderPay/orderPay.js b/src/api/orderPay/orderPay.js
index 328a642..5d2180a 100644
--- a/src/api/orderPay/orderPay.js
+++ b/src/api/orderPay/orderPay.js
@@ -34,20 +34,20 @@ export function bankH5Pay(params) {  // 农行
   })
 }
 
-export function queryParkingRecordPageByCarNumbers(params) {  // 支付完成后查询记录
-  return request({
-    requestBase:'VUE_APP_URL_TWO',
-    url: 'queryParkOrder/queryParkingRecordPageByCarNumbers',
-    method: 'post',
-    data: params
-  })
-}
 
 
 
 
 
 
+export function queryParkingRecordPageByCarNumbers(params) {
+  return request({
+    requestBase:'VUE_APP_URL_TWO',
+    url: '/payapi/queryParkOrder/queryParkingRecordPageByCarNumbers',
+    method: 'post',
+    data: params
+  })
+}
 
 
 
diff --git a/src/router/index.js b/src/router/index.js
index 0683922..e0a0e9a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -11,7 +11,7 @@ export default new Router({
     {
       path: '/',
       redirect: {
-        name: 'coupon'
+        name: 'plateNumber'
       }
     },
     // {
diff --git a/src/utils/request.js b/src/utils/request.js
index ade28e1..59c3c2d 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -4,31 +4,26 @@ import axios from 'axios'
 // axios.defaults.baseURL = process.env.API_ROOT
 
 const service = axios.create({
-  // baseURL:'https://bus.jycrtc.com/',
-  baseURL:process.env.VUE_APP_URL,
+ // baseURL:'https://bus.jycrtc.com/',
+  // baseURL:process.env.VUE_APP_URL,
   // withCredentials: true, // send cookies when cross-domain requests
   timeout: 6000, // request timeout
   withCredentials: false,
   headers:{
-    'Access-Control-Allow-Origin':'*',
-    'Content-Type':'application/x-www-form-urlencoded'
+    'Access-Control-Allow-Origin':'*'
+   //'Content-Type':'application/x-www-form-urlencoded'
   }
 })
 
 service.interceptors.request.use(
 
   config => {
-    if(config.requestBase=='VUE_APP_URL'){
-      // config.headers['Content-Type']="application/x-www-form-urlencoded";
-      config.baseURL='https://bus.jycrtc.com/';
-      config.data=JSON.stringify(config.data);
-
-    }else if(config.requestBase=='VUE_APP_URL_TWO'){
-      // config.headers['Content-Type']="application/x-www-form-urlencoded";
-      config.baseURL='https://pay.jycrtc.com/';
-      config.data=JSON.stringify(config.data);
-
-    }
+    // if(config.requestBase=='VUE_APP_URL'){
+    //   config.baseURL='https://bus.jycrtc.com/';
+    //
+    // }else if(config.requestBase=='VUE_APP_URL_TWO'){
+    //   config.baseURL='https://pay.jycrtc.com/';
+    // }
 
     return config
   },
diff --git a/src/views/parkPay/coupon.vue b/src/views/parkPay/coupon.vue
index 5dbdb6a..62db3a8 100644
--- a/src/views/parkPay/coupon.vue
+++ b/src/views/parkPay/coupon.vue
@@ -1,13 +1,11 @@
 <template>
   <div>
-    <img :src="successiconUrl" alt="" style="margin: 10px auto;width: 64px;height: 64px;">
+    <img :src="imgurl" alt="" style="margin: 10px auto;width: 64px;height: 64px;">
     <div style="padding: 10px 30px 50px">
-      <p>尊敬的车主您好：</p>
-      <p>尊敬的车主您好：</p>
-      <p>尊敬的车主您好：</p>
+      <p>尊敬的车主您好：{{tipText}}</p>
     </div>
     <div style="padding: 0 20px">
-      <mt-button size="large" type="primary" @click="toPay" style="margin-bottom: 20px;">去支付</mt-button>
+      <mt-button size="large" type="primary" @click="toPay" style="margin-bottom: 20px;" v-show="payFlag">去支付</mt-button>
       <mt-button size="large" type="danger" @click="toBackPage">返回</mt-button>
     </div>
 
@@ -17,19 +15,28 @@
 <script>
 
 
-import { scanCouponQR } from '@/api/couponPay/couponPay.js'
+import { scanCouponQR, queryParkingRecordPageByCarNumbers, appApplyParkOut, parkingQuery } from '@/api/couponPay/couponPay.js'
 
 export default {
   name: "coupon",
   data() {
     return {
+      imgurl:'',
       successiconUrl: require('../../assets/images/successIcon.png'),
       loseiconUrl: require('../../assets/images/loseIcon.png'),
-      carNum: '苏BB210V',
-      carNumberColor: ''
+      carNum: '',
+      carNumberColor: '',
+      parkingData:[],
+      carType:'',
+      codeType:'',
+      tipText:'',
+      payFlag:false,
     }
   },
   created() {
+    this.carNum = this.$route.query.carNumber
+    this.carType = this.$route.query.carType
+    this.codeType = this.$route.query.codeType
 
     // this.carNum = this.$route.query.carNumber  // 获取车牌号
     // this.carNumberColor = this.$route.query.carNumberColor  // 获取颜色   0:蓝牌;1:黄牌;2:白牌;3:黑牌;4:绿色
@@ -46,8 +53,8 @@ export default {
         deviceInfo: this.$utils.myDeviceInfo,
         salt: salt,
         sign_type: "md5",
-        carType:'02',
-        codeType:'2',
+        carType:this.carType,
+        codeType:this.codeType,
         cardRelParkNo:'123qwe',
         key:'1',
         carNum: this.carNum,
@@ -57,19 +64,121 @@ export default {
         // token:'e2c1e43722dd43a5b7e268001b39e6f0'
       }
       jsondata.sign = this.$utils.signObject(jsondata)
-      console.log(jsondata)
       scanCouponQR(jsondata).then(response => {
         console.log(response)
+        this.tipText = response.data.message
+        if(response.data.code==0){
+          this.payFlag = true
+          this.imgurl = this.successiconUrl
+        }else{
+          this.payFlag = false
+          this.imgurl = this.loseiconUrl
+        }
       })
     },
     toPay() {
-      this.$router.push({
-        path: 'couponPay'
-      })
+      this.parkRecordList()
+      // this.$router.push({
+      //   path: 'couponPay'
+      // })
     },
     toBackPage() {
       this.$router.back()
-    }
+    },
+    parkRecordList() {  // 获取停车记录数据
+      var salt = this.$utils.myCommonSalt(32);
+      var jsondata = {
+        app_id: this.$utils.myVarAppid,
+        deviceInfo: this.$utils.myDeviceInfo,
+        salt: salt,
+        sign_type: "md5",
+        pageNum: '1',
+        pageSize: '1000',
+        parkState: '10',
+        terminalSource: '3',
+        // parkState:'10',
+        carNumber: this.carNum,
+        // carNumberColor: '1',
+        orgId: this.$utils.myOrgId,
+
+      }
+      jsondata.sign = this.$utils.signObject(jsondata)
+
+      // jsondata.sign = md5sign
+      console.log('停车记录传参  ' + JSON.stringify(jsondata));
+      queryParkingRecordPageByCarNumbers(jsondata).then(response => {
+        console.log(response)
+        // this.parkList = response.data.dataList
+
+        this.parkingData = response.data.dataList.filter(item => {
+          return item.parkState == '10'
+        })
+        console.log(this.parkingData)
+        this.toPayCurrent(this.parkingData)
+
+      })
+    },
+    toPayCurrent(i) { // 缴纳本次在停费用
+      var salt = this.$utils.myCommonSalt(32);
+      var params = {
+        app_id: this.$utils.myVarAppid,
+        deviceInfo: this.$utils.myDeviceInfo,
+        salt: salt,
+        sign_type: "md5",
+        orderId: i[0].orderId,
+        payOrderType: '101',
+        terminalSource: '3',
+      }
+      params.sign = this.$utils.signObject(params)
+      appApplyParkOut(params).then(response => {
+        console.log(response)
+
+        if (response.code == '5005') {
+          var salt = this.$utils.myCommonSalt(32);
+          var jsondata = {
+            app_id: this.$utils.myVarAppid,
+            deviceInfo: this.$utils.myDeviceInfo,
+            salt: salt,
+            sign_type: "md5",
+            payType: this.$utils.clientBrowsePayType(),
+            appId: this.$utils.myVxAppId,
+            orderId: i[0].orderId,
+            terminalSource: '7',
+            parkCode: i[0].parkCode,
+            carNumber: this.carNum,
+          }
+          jsondata.sign = this.$utils.signObject(jsondata)
+          parkingQuery(jsondata).then(result => {
+            console.log(result)
+            let res = result.data
+            let _dis = res.discountFee
+            let discountFee = _dis.slice(1, _dis.length - 1)
+            sessionStorage.setItem('couponPark',JSON.stringify(result.data))
+              this.$router.push(
+                {
+                  path: 'couponPay',
+                  query: {
+                    carColor: this.carColor,// 车牌颜色
+                    arrearageTotalFee: res.orderTotalFee,// 应收
+                    arrearageDiscFee: discountFee * 100,// 优惠
+                    arrearageActFee: res.orderFee,// 实收
+                    carNumber: this.carNumber, // 车牌
+                    paySrcType: 101, //支付的类型   101 是本次   103是历史欠费
+                    ordeID: i.orderId, //支付的订单号
+                    appOrderTimeout: res.appOrderTimeout, // 超时描述
+                  }
+                }
+              )
+          })
+
+          } else {
+            //$('.dialog-out').show()
+            this.$msgbox('提示', '停车15分钟内无需缴费，申请成功。')
+          }
+
+      })
+
+    },
   }
 };
 </script>
diff --git a/src/views/parkPay/couponPay.vue b/src/views/parkPay/couponPay.vue
index ad0fbd1..22506bc 100644
--- a/src/views/parkPay/couponPay.vue
+++ b/src/views/parkPay/couponPay.vue
@@ -2,48 +2,58 @@
   <div>
     <div class="car-wrap">
       <div class="carBG" :class="carWrapBG | formateColor">
-        <p class="carNumber">{{carNumber}}</p>
-        <p class="payFee">{{(arrearageActFee/100).toFixed(2)}}元</p>
+        <p class="carNumber">{{ carNumber }}</p>
+        <p class="payFee">{{ (orderFee / 100).toFixed(2) }}元</p>
       </div>
     </div>
 
     <ul class="fee-wrap">
       <li>
         <span>停放车场</span>
-        <span>{{parkName}}</span>
+        <span>{{ parkName }}</span>
       </li>
       <li>
         <span>入场时间</span>
-        <span>{{parkInTime}}</span>
+        <span>{{ parkInTime }}</span>
       </li>
       <li>
         <span>出场时间</span>
-        <span>{{parkOutTime}}</span>
+        <span>{{ parkOutTime }}</span>
       </li>
       <li>
         <span>停车时长</span>
-        <span>{{$utils.dateFormat(parkDuration)}}</span>
+        <span>{{ $utils.dateFormat(parkDuration) }}</span>
       </li>
       <li>
         <span>应付金额</span>
-        <span> ¥{{(totalFee/100).toFixed(2)}}元</span>
+        <span> ¥{{ (orderTotalFee / 100).toFixed(2) }}元</span>
       </li>
       <li>
         <span>停车优惠</span>
         <p>
-          ({{cardTypeFormat(carType)}})   <span style="color: #3cc51f">-20.00元</span>
+          ({{ cardTypeFormat(carType) }}) <span style="color: #3cc51f">{{ discountFee }}</span>
         </p>
       </li>
+
+      <li>
+        <span>商户券优惠</span>
+        <span> ¥{{ (busDiscValue / 100).toFixed(2) }}元</span>
+      </li>
+
+      <li>
+        <span>信用优惠</span>
+        <span> ¥{{ (creDitDisValue / 100).toFixed(2) }}元</span>
+      </li>
+
       <li>
         <span>实际支付</span>
-        <span style="color: red"> ¥{{(unPayFee/100).toFixed(2)}}元</span>
+        <span style="color: red"> ¥{{ (orderFee / 100).toFixed(2) }}元</span>
       </li>
     </ul>
 
 
-
     <div style="padding: 20px 18px">
-      <div class="toPay" @click="toPay">{{clientBrowser}}支付</div>
+      <div class="toPay" @click="toPay">{{ clientBrowser }}支付</div>
     </div>
 
     <div v-if="appOrderTimeout.length>0">
@@ -51,37 +61,36 @@
         温馨提示：
       </p>
       <p style="color: #666;padding: 0 18px;">
-        {{appOrderTimeout}}
+        {{ appOrderTimeout }}
       </p>
     </div>
 
 
-
   </div>
 </template>
 
 <script>
-// import CryptoJS from '../utils/AES.js'
-// let Base64 = require('js-base64').Base64
-import {  MessageBox } from 'mint-ui';
-import { aliPay, getOpenId, vxPayQuery, bankH5Pay, queryParkingRecordPageByCarNumbers } from '@/api/orderPay/orderPay'
+import {MessageBox} from 'mint-ui';
+import {aliPay, getOpenId, vxPayQuery, bankH5Pay,} from '@/api/couponPay/couponPay.js'
 
 export default {
   name: 'orderPay',
   data() {
     return {
       carWrapBG: 0,
-      carNumber: '苏BB210V',
-      parkName:'',
-      parkInTime:'',
-      parkOutTime:'',
-      parkDuration:'',
-      carType:1,
-      arrearageActFee: 0,
-      arrearageDiscFee: 0,
-      arrearageActFee: 0,
-      totalFee:0,// 应付
-      unPayFee:0,// 实付
+      carNumber: '',
+      parkName: '',
+      parkInTime: '',
+      parkOutTime: '',
+      parkDuration: '',
+      discountFee: 0,// 停车优惠
+      carType: 1,
+
+      orderTotalFee: 0,// 应付
+      orderFee: 0,// 实付
+      busDiscValue: 0,// 优惠券优惠金额
+      creDitDisValue: 0, // 信用优惠
+
       parkingData: [], //  在停数据
       historyList: [], // 历史欠费数据
       clientBrowser: '', // 客户端
@@ -92,63 +101,35 @@ export default {
     }
   },
   created() {
-    // this.carWrapBG = this.$route.query.carColor //车牌颜色
-    // this.carNumber = this.$route.query.carNumber
-    // this.arrearageTotalFee = this.$route.query.arrearageTotalFee // 应收
-    // this.arrearageDiscFee = this.$route.query.arrearageDiscFee // 优惠
-    // this.arrearageActFee = this.$route.query.arrearageActFee // 实收
+    let couponPark = JSON.parse(sessionStorage.getItem('couponPark'))
+    console.log(couponPark)
+    this.carWrapBG = couponPark.carNumberColor //车牌颜色
+    this.carNumber = couponPark.plateno
+    this.parkName = couponPark.parkName
+    this.parkInTime = couponPark.inparktime
+    this.parkOutTime = couponPark.outtime
+    this.parkDuration = couponPark.staytime
+    this.discountFee = couponPark.discountFee
+    this.orderTotalFee = couponPark.orderTotalFee
+    this.orderFee = couponPark.orderFee
+    this.busDiscValue = couponPark.busDiscValue
+    this.creDitDisValue = couponPark.creDitDisValue
+
+    this.appOrderTimeout = couponPark.appOrderTimeout
     this.clientBrowser = this.$utils.clientBrowser() //支付方式
     // this.paySrcType = this.$route.query.paySrcType // 实收
-    // this.orderId = this.$route.query.ordeID
-    // console.log(this.orderId)
-    // this.appOrderTimeout = this.$route.query.appOrderTimeout
+    this.orderId = couponPark.orderId
     if (this.clientBrowser == "微信") {
       this.webAppCode = this.getCode();
     }
 
-    this.parkRecordList()
 
   },
-  mounted(){
+  mounted() {
 
   },
   methods: {
-    parkRecordList() {  // 获取停车记录数据
-      var salt = this.$utils.myCommonSalt(32);
-      var jsondata = {
-        app_id: this.$utils.myVarAppid,
-        deviceInfo: this.$utils.myDeviceInfo,
-        salt: salt,
-        sign_type: "md5",
-        pageNum: '1',
-        pageSize: '1000',
-        parkState: '10',
-        terminalSource: '3',
-        parkState:'10',
-        carNumber: this.carNumber,
-        carNumberColor: '0',
-        orgId: this.$utils.myOrgId,
-
-      }
-      jsondata.sign = this.$utils.signObject(jsondata)
-
-      // jsondata.sign = md5sign
-      console.log('停车记录传参  ' + JSON.stringify(jsondata));
-      queryParkingRecordPageByCarNumbers(jsondata).then(response => {
-        console.log(response)
-        let res = response.data.dataList[0]
-        this.parkName = res.parkName
-
-        this.parkInTime = res.parkInTime
-        this.parkOutTime = res.parkOutTime
-        this.parkDuration = res.parkDuration
-        this.carType = res.carType
 
-        this.totalFee = res.totalFee
-        this.unPayFee = res.unPayFee
-
-      })
-    },
     getCode() {
       var appID = this.$utils.myVxAppId;
       var code = this.getUrlParam('code');
@@ -188,7 +169,7 @@ export default {
         aliParams.orderId = this.orderId;
         aliParams.carNumber = this.carNumber;
         aliParams.payType = 1;// 1:支付宝 2：微信 3：银联 10:H5   4微信公众号
-        aliParams.terminalSource = 7;//请求端来源 1： 任你停 2：pda 3：微信公共号 7:H5扫码 10页面支付
+        aliParams.terminalSource = 3;//请求端来源 1： 任你停 2：pda 3：微信公共号 7:H5扫码 10页面支付
         aliParams.paySrcType = this.paySrcType;//101停车支付
         aliParams.orgId = this.$utils.myOrgId
         aliParams.backType = 2
@@ -198,12 +179,12 @@ export default {
           console.log(response)
           if (response.code == 0) {//进场
             document.write(response.data);//打开支付表单
-          } else if(response.code == 1002){//其他情况如【该卡号场内已存在】
+          } else if (response.code == 1002) {//其他情况如【该卡号场内已存在】
             console.log(response.message);
             MessageBox.confirm('', {
               message: response.message,
               title: '温馨提示',
-              showCancelButton:false,
+              showCancelButton: false,
               confirmButtonText: '确定',
             }).then(action => {
               if (action == 'confirm') {     //确认的回调
@@ -215,7 +196,7 @@ export default {
                 console.log('取消');
               }
             });
-          }else{
+          } else {
             alert(response.message)
           }
 
@@ -225,9 +206,9 @@ export default {
 
       if (this.clientBrowser == '微信') { // 微信支付
         let _openId = sessionStorage.getItem('openIdData')
-        if(_openId){
+        if (_openId) {
           me.vxPay(_openId, this.orderId)
-        }else{
+        } else {
           //第一步获取openid
           var codeParams = {
             code: this.webAppCode,
@@ -236,7 +217,7 @@ export default {
           getOpenId(codeParams).then(res => {
             if (res.code == 0) {
               me.vxPay(res.data, this.orderId)
-              sessionStorage.setItem('openIdData',res.data)
+              sessionStorage.setItem('openIdData', res.data)
             } else if (res.code == 40163) { //code been used, hints[重复code问题]
               alert('请重新支付！重复code问题')
               console.log(res.message);
@@ -251,15 +232,15 @@ export default {
       let vm = this
       var wxParams = {};
       wxParams.orderId = orderIdData;
-      wxParams.backType = 2,
-        wxParams.orgId = this.$utils.myOrgId,
-        wxParams.payType = 4;// 1:支付宝 2：微信 3：银联 10:H5   4微信公众号
-      wxParams.terminalSource = 7;//请求端来源 1： 任你停 2：pda 3：微信公共号 7:H5扫码 10页面支付
+      wxParams.backType = 2
+      wxParams.orgId = this.$utils.myOrgId
+      wxParams.payType = 4;// 1:支付宝 2：微信 3：银联 10:H5   4微信公众号
+      wxParams.terminalSource = 3;//请求端来源 1： 任你停 2：pda 3：微信公共号 7:H5扫码 10页面支付
       wxParams.carNumber = this.carNumber;
       wxParams.paySrcType = this.paySrcType;//101停车支付
       wxParams.recordArreaInfos = JSON.stringify(orderIdData);
       wxParams.openId = openIdData;
-        wxParams.appId = this.$utils.myVxAppId;
+      wxParams.appId = this.$utils.myVxAppId;
       vxPayQuery(wxParams).then(res => {
         if (res.code == 0) { //
           if (res.data) {
@@ -279,12 +260,12 @@ export default {
           } else {
             alert("没有找到返回值");
           }
-        } else if(res.code == 1002){//其他情况如【该卡号场内已存在】
+        } else if (res.code == 1002) {//其他情况如【该卡号场内已存在】
           console.log(res.message);
           MessageBox.confirm('', {
             message: res.message,
             title: '温馨提示',
-            showCancelButton:false,
+            showCancelButton: false,
             confirmButtonText: '确定',
           }).then(action => {
             if (action == 'confirm') {     //确认的回调
@@ -296,7 +277,7 @@ export default {
               console.log('取消');
             }
           });
-        }else{
+        } else {
           alert(res.message)
         }
       })
@@ -319,112 +300,6 @@ export default {
           // 使用以上方式判断前端返回,微信团队郑重提示：res.err_msg将在用户支付成功后返回ok，但并不保证它绝对可靠。
           if (res.err_msg === 'get_brand_wcpay_request:ok') {
             console.log('成功')
-            var salt = me.$utils.myCommonSalt(32);
-            let wxparams = {
-              pageNum: 1,
-              pageSize: 10000,
-              parkState: 10,
-              terminalSource: 7,
-              carNumber: me.carNumber,
-              app_id: me.$utils.myVarAppid,
-              deviceInfo: me.$utils.myDeviceInfo,
-              salt: salt,
-              sign_type: "md5",
-              token:'',
-            }
-            wxparams.sign = me.$utils.signObject(wxparams)
-            queryParkingRecordPageByCarNumbers(wxparams).then(response => {
-              console.log(response)
-              me.parkList = response.data.dataList
-
-              // alert(JSON.stringify(me.parkList))
-              // alert(me.parkList.length)
-              if(me.parkList.length == 0){
-                me.$router.push({
-                  path:'parkRecord',
-                  query:{
-                    carNumber: me.carNumber,
-                    carNumberColor: me.carWrapBG,
-                    parkFlag: 0 //  0表示在停    1表示历史
-                  }
-                })
-
-              }else{
-                me.parkingData = me.parkList.filter(item => {
-                  return item.parkState == '10'
-                })
-                console.log(me.parkingData)
-                me.historyList = me.parkList.filter(item => {
-                  return item.parkState == '20'
-                })
-                console.log(me.historyList)
-
-                if(me.historyList.length>0){
-                  MessageBox.confirm('', {
-                    message: '您当前有历史欠费 是否立即补缴?',
-                    title: '温馨提示',
-                    confirmButtonText: '去补缴',
-                    cancelButtonText: '取消'
-                  }).then(action => {
-                    if (action == 'confirm') {     //确认的回调
-                      console.log('确定');
-                      me.$router.push({
-                        path:'parkRecord',
-                        query:{
-                          carNumber: me.carNumber,
-                          carNumberColor: me.carWrapBG,
-                          parkFlag: 1 //  0表示在停    1表示历史
-                        }
-                      })
-                    }
-                  }).catch(err => {
-                    if (err == 'cancel') {     //取消的回调
-                      console.log('取消');
-                    }
-                  });
-                }else{
-
-                  if(me.paySrcType==101){  //缴费了本次
-                    me.$router.push({
-                      path:'parkRecord',
-                      query:{
-                        carNumber: me.carNumber,
-                        carNumberColor: me.carWrapBG,
-                        parkFlag: 0 //  0表示在停    1表示历史
-                      }
-                    })
-                  }else{
-                    MessageBox.confirm('', {
-                      message: '您当前有在停订单 是否立即支付?',
-                      title: '温馨提示',
-                      confirmButtonText: '去支付',
-                      cancelButtonText: '取消'
-                    }).then(action => {
-                      if (action == 'confirm') {     //确认的回调
-                        console.log('确定');
-                        me.$router.push({
-                          path:'parkRecord',
-                          query:{
-                            carNumber: me.carNumber,
-                            carNumberColor: me.carWrapBG,
-                            parkFlag: 0 //  0表示在停    1表示历史
-                          }
-                        })
-                      }
-                    }).catch(err => {
-                      if (err == 'cancel') {     //取消的回调
-                        console.log('取消');
-                      }
-                    });
-                  }
-
-                }
-              }
-
-
-
-            })
-
 
 
           } else {
@@ -435,115 +310,139 @@ export default {
         }
       )
     },
-    cardTypeFormat :  function(num){
-      if(num == '1'){
+    cardTypeFormat: function (num) {
+      if (num == '1') {
         return '单次券'
       }
-      if(num == 2){
+      if (num == 2) {
         return '时长券'
       }
-      if(num == 3){
+      if (num == 3) {
         return '满减券'
       }
-      if(num == 4){
+      if (num == 4) {
         return '金额券'
       }
-      if(num == 5){
+      if (num == 5) {
         return '包天券'
       }
-      if(num == 6){
+      if (num == 6) {
         return '折扣券'
       }
     }
   },
   filters: {
+    formateColor: function (val) {  // 0:蓝牌;1:黄牌;2:白牌;3:黑牌;4:绿色
+      console.log('1111111111')
+      console.log(val)
+      switch (val) {
+        case 0:
+          return 'carBlue'
+          break;
+        case 1:
+          return 'carYellow'
+          break;
+        case 2:
+          return 'carWhite'
+          break;
+        case 3:
+          return 'carBlack'
+          break;
+        case 4:
+          return 'carGreen'
+          break;
+
+      }
+    }
   }
 }
 </script>
 
 <style scoped lang="scss">
-  .car-wrap {
-    padding: 7px 7px;
-    background: #FFF;
-  }
+.car-wrap {
+  padding: 7px 7px;
+  background: #FFF;
+}
 
-  .carBG {
-    width: 100%;
-    height: 130px;
-  }
+.carBG {
+  width: 100%;
+  height: 130px;
+}
 
-  .carBlue {
-    background: url("../../assets/images/blueBG.png") no-repeat;
-    background-size: 100% 100%;
-  }
+.carBlue {
+  background: url("../../assets/images/blueBG.png") no-repeat;
+  background-size: 100% 100%;
+}
 
-  .carYellow {
-    background: url("../../assets/images/yellowBG.png") no-repeat;
-    background-size: 100% 100%;
-  }
+.carYellow {
+  background: url("../../assets/images/yellowBG.png") no-repeat;
+  background-size: 100% 100%;
+}
 
-  .carGreen {
-    background: url("../../assets/images/greenBG.png") no-repeat;
-    background-size: 100% 100%;
-  }
+.carGreen {
+  background: url("../../assets/images/greenBG.png") no-repeat;
+  background-size: 100% 100%;
+}
 
-  .carWhite {
-    background: url("../../assets/images/whiteBG.png") no-repeat;
-    background-size: 100% 100%;
-  }
+.carWhite {
+  background: url("../../assets/images/whiteBG.png") no-repeat;
+  background-size: 100% 100%;
+}
 
-  .carBlack {
-    background: url("../../assets/images/blackBG.png") no-repeat;
-    background-size: 100% 100%;
-  }
+.carBlack {
+  background: url("../../assets/images/blackBG.png") no-repeat;
+  background-size: 100% 100%;
+}
 
-  .carNumber {
-    padding: 20px 0 10px;
-    font-size: 30px;
-    color: #fff;
-    text-align: center;
-  }
+.carNumber {
+  padding: 20px 0 10px;
+  font-size: 30px;
+  color: #fff;
+  text-align: center;
+}
 
-  .payFee {
-    font-size: 24px;
-    color: #FF7B7B;
-    text-align: center;
-  }
+.payFee {
+  font-size: 24px;
+  color: #FF7B7B;
+  text-align: center;
+}
 
-  .fee-wrap {
-    background: #FFF;
-    padding: 0 18px;
-    > li {
-      display: flex;
-      justify-content: space-between;
-      height: 30px;
-      line-height: 30px;
-      border-bottom: 1px solid #EAEAEA;
-      &:last-child {
-        border-bottom: 0;
-      }
-    }
+.fee-wrap {
+  background: #FFF;
+  padding: 0 18px;
 
-  }
+  > li {
+    display: flex;
+    justify-content: space-between;
+    height: 30px;
+    line-height: 30px;
+    border-bottom: 1px solid #EAEAEA;
 
-  .toPay {
-    width: 100%;
-    height: 44px;
-    margin: 0 auto;
-    line-height: 44px;
-    text-align: center;
-    background: linear-gradient(180deg, #3885D9 0%, #4194EF 100%);
-    border-radius: 4px;
-    border: 1px solid #0D72E2;
-    font-size: 20px;
-    color: #FFF;
-    cursor: pointer;
+    &:last-child {
+      border-bottom: 0;
+    }
   }
 
-  .tip {
-    padding-left: 40px;
-    background: url("../../assets/images/tip.png") no-repeat 18px center;
-    background-size: 16px 16px;
-    color: #666;
-  }
+}
+
+.toPay {
+  width: 100%;
+  height: 44px;
+  margin: 0 auto;
+  line-height: 44px;
+  text-align: center;
+  background: linear-gradient(180deg, #3885D9 0%, #4194EF 100%);
+  border-radius: 4px;
+  border: 1px solid #0D72E2;
+  font-size: 20px;
+  color: #FFF;
+  cursor: pointer;
+}
+
+.tip {
+  padding-left: 40px;
+  background: url("../../assets/images/tip.png") no-repeat 18px center;
+  background-size: 16px 16px;
+  color: #666;
+}
 </style>
diff --git a/src/views/parkPay/plateNumber.vue b/src/views/parkPay/plateNumber.vue
index 06184d2..6b3bc2a 100644
--- a/src/views/parkPay/plateNumber.vue
+++ b/src/views/parkPay/plateNumber.vue
@@ -2,62 +2,60 @@
   <div id="page">
 
 
-
     <div class="wrap">
       <p style="margin-bottom: 18px;margin-top: 18px;">请选择车牌颜色</p>
 
       <ul class="color-choose">
         <li v-for="(i,index) in colorList" :key="i.name" @click="chooseColor(index)"
-        :style="{color:currentColor==index?'#FFF':'',background:  currentColor==index?activeBG:'' }"
+            :style="{color:currentColor==index?'#FFF':'',background:  currentColor==index?activeBG:'' }"
         >
-          {{i.name}}
+          {{ i.name }}
         </li>
 
       </ul>
 
 
-
-
       <p style="margin-bottom: 18px;margin-top: 18px;"></p>
       <p style="margin-bottom: 18px;margin-top: 18px;">请输入车牌号码</p>
       <div class="num-box">
         <div class="num0" @click="clickFirstWrap()">
-          <span>{{formData.num0}}</span>
+          <span>{{ formData.num0 }}</span>
         </div>
-        <div class="num1" @click="clickKeyWordWrap(1)"><span>{{formData.num1}}</span></div>
+        <div class="num1" @click="clickKeyWordWrap(1)"><span>{{ formData.num1 }}</span></div>
         <!--<em class="spot"></em>-->
-        <div class="num1" @click="clickKeyWordWrap(2)"><span>{{formData.num2}}</span></div>
-        <div class="num1" @click="clickKeyWordWrap(3)"><span>{{formData.num3}}</span></div>
-        <div class="num1" @click="clickKeyWordWrap(4)"><span>{{formData.num4}}</span></div>
-        <div class="num1" @click="clickKeyWordWrap(5)"><span>{{formData.num5}}</span></div>
-        <div class="num1" @click="clickKeyWordWrap(6)"><span>{{formData.num6}}</span></div>
-        <div v-if="formData.commonCard == '2'" class="num1" @click="clickKeyWordWrap(7)"><span>{{formData.num7}}</span></div>
+        <div class="num1" @click="clickKeyWordWrap(2)"><span>{{ formData.num2 }}</span></div>
+        <div class="num1" @click="clickKeyWordWrap(3)"><span>{{ formData.num3 }}</span></div>
+        <div class="num1" @click="clickKeyWordWrap(4)"><span>{{ formData.num4 }}</span></div>
+        <div class="num1" @click="clickKeyWordWrap(5)"><span>{{ formData.num5 }}</span></div>
+        <div class="num1" @click="clickKeyWordWrap(6)"><span>{{ formData.num6 }}</span></div>
+        <div v-if="formData.commonCard == '2'" class="num1" @click="clickKeyWordWrap(7)">
+          <span>{{ formData.num7 }}</span></div>
       </div>
 
 
       <!--<div class="radio-box">-->
-        <!--<label class="flex-items-center">-->
-          <!--<img v-if="formData.commonCard == 1"-->
-               <!--src="../../assets/images/parkPay/icon_chose_s@2x.png"-->
-               <!--alt="">-->
-          <!--<img v-else-->
-               <!--src="../../assets/images/parkPay/icon_chose_n@2x.png"-->
-               <!--alt="">-->
-          <!--<input type="radio"-->
-                 <!--v-model="formData.commonCard"-->
-                 <!--value="1" />普通车牌-->
-        <!--</label>-->
-        <!--<label class="flex-items-center">-->
-          <!--<img v-if="formData.commonCard == 2"-->
-               <!--src="../../assets/images/parkPay/icon_chose_s@2x.png"-->
-               <!--alt="">-->
-          <!--<img v-else-->
-               <!--src="../../assets/images/parkPay/icon_chose_n@2x.png"-->
-               <!--alt="">-->
-          <!--<input type="radio"-->
-                 <!--v-model="formData.commonCard"-->
-                 <!--value="2" />新能源车牌-->
-        <!--</label>-->
+      <!--<label class="flex-items-center">-->
+      <!--<img v-if="formData.commonCard == 1"-->
+      <!--src="../../assets/images/parkPay/icon_chose_s@2x.png"-->
+      <!--alt="">-->
+      <!--<img v-else-->
+      <!--src="../../assets/images/parkPay/icon_chose_n@2x.png"-->
+      <!--alt="">-->
+      <!--<input type="radio"-->
+      <!--v-model="formData.commonCard"-->
+      <!--value="1" />普通车牌-->
+      <!--</label>-->
+      <!--<label class="flex-items-center">-->
+      <!--<img v-if="formData.commonCard == 2"-->
+      <!--src="../../assets/images/parkPay/icon_chose_s@2x.png"-->
+      <!--alt="">-->
+      <!--<img v-else-->
+      <!--src="../../assets/images/parkPay/icon_chose_n@2x.png"-->
+      <!--alt="">-->
+      <!--<input type="radio"-->
+      <!--v-model="formData.commonCard"-->
+      <!--value="2" />新能源车牌-->
+      <!--</label>-->
       <!--</div>-->
 
 
@@ -66,8 +64,6 @@
       </div>
 
 
-
-
     </div>
     <div class="first-word-wrap"
          v-if="firstWrapStatus">
@@ -176,38 +172,38 @@
           <span>新</span>
         </div>
         <!--<div class="word">-->
-          <!--<span>学</span>-->
+        <!--<span>学</span>-->
         <!--</div>-->
         <div class="word bordernone">
-        <!-- <img src="../assets/images/icon-switch.png" alt=""> -->
+          <!-- <img src="../assets/images/icon-switch.png" alt=""> -->
         </div>
       </div>
 
       <!--<div class="first-word"-->
-           <!--@click="selectFirstWord($event)">-->
-        <!--<div class="word">-->
-          <!--<span>港</span>-->
-        <!--</div>-->
-        <!--<div class="word">-->
-          <!--<span>澳</span>-->
-        <!--</div>-->
-        <!--<div class="word">-->
-          <!--<span>领</span>-->
-        <!--</div>-->
+      <!--@click="selectFirstWord($event)">-->
+      <!--<div class="word">-->
+      <!--<span>港</span>-->
+      <!--</div>-->
+      <!--<div class="word">-->
+      <!--<span>澳</span>-->
+      <!--</div>-->
+      <!--<div class="word">-->
+      <!--<span>领</span>-->
+      <!--</div>-->
 
-        <!--<div class="word">-->
-          <!--<span>警</span>-->
-        <!--</div>-->
+      <!--<div class="word">-->
+      <!--<span>警</span>-->
+      <!--</div>-->
 
 
-        <!--<div class="word bordernone">-->
-        <!--</div>-->
-        <!--<div class="word bordernone">-->
-        <!--</div>-->
-        <!--<div class="word bordernone">-->
-        <!--</div>-->
-        <!--<div class="word bordernone">-->
-        <!--</div>-->
+      <!--<div class="word bordernone">-->
+      <!--</div>-->
+      <!--<div class="word bordernone">-->
+      <!--</div>-->
+      <!--<div class="word bordernone">-->
+      <!--</div>-->
+      <!--<div class="word bordernone">-->
+      <!--</div>-->
       <!--</div>-->
     </div>
     <div class="keyboard-wrap" v-if="keyBoardStatus === true">
@@ -217,12 +213,12 @@
       <div class="keyboard" v-if="activeKeyWordIndex !== 1">
         <span v-for="(item,index) in allKeyWord._1"
               :key="index"
-              @click="clickKeyBoard(item)">{{item}}</span>
+              @click="clickKeyBoard(item)">{{ item }}</span>
       </div>
       <div class="keyboard" v-if="activeKeyWordIndex !== 1">
         <span v-for="(item,index) in allKeyWord._2"
               :key="index"
-              @click="clickKeyBoard(item)">{{item}}</span>
+              @click="clickKeyBoard(item)">{{ item }}</span>
         <span class="bordernone"></span>
         <span class="bordernone"></span>
         <span class="bordernone"></span>
@@ -231,22 +227,22 @@
       <div class="keyboard">
         <span v-for="(item,index) in allKeyWord._3"
               :key="index"
-              @click="clickKeyBoard(item)">{{item}}</span>
+              @click="clickKeyBoard(item)">{{ item }}</span>
       </div>
       <div class="keyboard">
         <span v-for="(item,index) in allKeyWord._4"
               :key="index"
-              @click="clickKeyBoard(item)">{{item}}</span>
+              @click="clickKeyBoard(item)">{{ item }}</span>
       </div>
       <div class="keyboard">
         <span v-for="(item,index) in allKeyWord._5"
               :key="index"
-              @click="clickKeyBoard(item)">{{item}}</span>
+              @click="clickKeyBoard(item)">{{ item }}</span>
       </div>
       <div class="keyboard">
         <span v-for="(item,index) in allKeyWord._6"
               :key="index"
-              @click="clickKeyBoard(item)">{{item}}</span>
+              @click="clickKeyBoard(item)">{{ item }}</span>
         <span class="bordernone"></span>
         <span class="bordernone"></span>
         <span class="bordernone"></span>
@@ -257,7 +253,7 @@
       <div class="keyboard" v-if="activeKeyWordIndex !== 1">
         <span v-for="(item,index) in allKeyWord._7"
               :key="index"
-              @click="clickKeyBoard(item)">{{item}}</span>
+              @click="clickKeyBoard(item)">{{ item }}</span>
         <span class="bordernone"></span>
         <span class="delete" @click="deleteWord"><img src="../../assets/images/parkPay/icon-delete.png" alt=""></span>
       </div>
@@ -267,7 +263,6 @@
     </div>
 
 
-
   </div>
 </template>
 <script>
@@ -276,35 +271,35 @@ import Swiper from 'swiper' //  应入swiper
 import {swiperQuery} from '../../api/plateNumber/plateNumber'
 
 export default {
-  data () {
+  data() {
     return {
 
       //  0:蓝牌;1:黄牌;2:白牌;3:黑牌;4:绿色
-      colorList:[
+      colorList: [
         {
-          name:'蓝牌',
-          id:'1'
+          name: '蓝牌',
+          id: '1'
         },
         {
-          name:'黄牌',
-          id:'2'
+          name: '黄牌',
+          id: '2'
         },
 
         {
-          name:'白牌',
-          id:'3'
+          name: '白牌',
+          id: '3'
         },
         {
-          name:'黑牌',
-          id:'4'
+          name: '黑牌',
+          id: '4'
         },
         {
-          name:'绿牌',
-          id:'5'
+          name: '绿牌',
+          id: '5'
         },
       ],
-      currentColor:0,
-      activeBG:'#0054C0',
+      currentColor: 0,
+      activeBG: '#0054C0',
       formData: {
         commonCard: '1',
         num0: '苏',
@@ -332,12 +327,15 @@ export default {
       submitConfirm: false,
       submitConfirmFalse: false,
       submitConfirmText: '',
+      carType: '',
+      codeType: '',
     }
   },
-  created(){
-
+  created() {
+    this.carType = this.$route.query.carType
+    this.codeType = this.$route.query.codeType
   },
-  mounted () {
+  mounted() {
     //
     // if (this.$utils.clientBrowser() == "微信") {
     //   var appID = this.$utils.myVxAppId;
@@ -353,7 +351,7 @@ export default {
   },
   methods: {
 
-    chooseColor (index){ // 颜色选择    0:蓝牌;1:黄牌;2:白牌;3:黑牌;4:绿色
+    chooseColor(index) { // 颜色选择    0:蓝牌;1:黄牌;2:白牌;3:黑牌;4:绿色
       this.currentColor = index
       switch (this.currentColor) {
         case 0 :
@@ -378,14 +376,14 @@ export default {
           break;
       }
     },
-    clickFirstWrap () {
+    clickFirstWrap() {
       // 点击第一个输入框
       this.firstClickStatus = true
       this.firstWrapStatus = true
       this.keyBoardStatus = false
       this.formData.num0 = ''
     },
-    selectFirstWord (event) {
+    selectFirstWord(event) {
       // 选择省份
       if (event.target.localName !== 'span') {
         return
@@ -399,7 +397,7 @@ export default {
       // this.$refs.num1.focus()
       // document.getElementById('num1').focus()
     },
-    clickKeyBoard (item) { // 点击自定义键盘
+    clickKeyBoard(item) { // 点击自定义键盘
       console.log(item)
       this.formData['num' + this.activeKeyWordIndex] = item
 
@@ -415,7 +413,7 @@ export default {
         }
       }
     },
-    deleteWord () { // 退格
+    deleteWord() { // 退格
       // console.log(this.activeKeyWordIndex)
       // console.log(this.formData['num' + (this.activeKeyWordIndex - 1)])
       if (this.activeKeyWordIndex > 1) {
@@ -423,12 +421,12 @@ export default {
         this.activeKeyWordIndex--
       }
     },
-    clickKeyWordWrap (activeKeyWordIndex) {
+    clickKeyWordWrap(activeKeyWordIndex) {
       this.keyBoardStatus = true
       this.activeKeyWordIndex = activeKeyWordIndex
       this.formData['num' + this.activeKeyWordIndex] = ''
     },
-    submitFn () {
+    submitFn() {
       let plateLicense
       if (this.formData.commonCard === '1') {
         plateLicense = this.plate_license_1
@@ -442,24 +440,26 @@ export default {
         plateLicense = this.plate_license_2
         plateLicense = this.palindrome(plateLicense)
         if (plateLicense.length < 8) {
-           this.$msgbox('提示', '请输入正确的车牌号')
+          this.$msgbox('提示', '请输入正确的车牌号')
           return
         }
       }
-      this.$emit('getPlateLicense',plateLicense)
+      this.$emit('getPlateLicense', plateLicense)
       console.log(plateLicense);
 
 
-
       this.$router.push({
-        path:'coupon',
-        query:{
-          carNumber:plateLicense,
-          carNumberColor: this.currentColor
+        path: 'coupon',
+        query: {
+          carNumber: plateLicense,
+          carNumberColor: this.currentColor,
+          carType: this.carType,
+          codeType: this.codeType
+
         }
       })
     },
-    palindrome (str) {
+    palindrome(str) {
       var arr = str.split('')
       arr = arr.filter(function (val) {
         return (
@@ -482,7 +482,7 @@ export default {
       })
       return arr.join('')
     },
-    checkIsHasSpecialStr (str) {
+    checkIsHasSpecialStr(str) {
       var flag = false
       var arr = str.split('')
       arr.forEach(val => {
@@ -516,7 +516,7 @@ export default {
       })
       return flag
     },
-    checkIsHasChineseStr (str) {
+    checkIsHasChineseStr(str) {
       var Reg = /.*[\u4e00-\u9fa5]+.*/
       if (Reg.test(str)) {
         return true
@@ -525,7 +525,7 @@ export default {
     }
   },
   computed: {
-    plate_license_1 () {
+    plate_license_1() {
       return (
         this.formData.num0 +
         this.formData.num1 +
@@ -536,7 +536,7 @@ export default {
         this.formData.num6
       )
     },
-    plate_license_2 () {
+    plate_license_2() {
       return (
         this.formData.num0 +
         this.formData.num1 +
@@ -554,271 +554,313 @@ export default {
 <style lang="scss" scoped>
 
 
-  .flex-items-center {
+.flex-items-center {
+  display: flex;
+  align-items: center;
+}
+
+.wrap {
+  padding: 0 18px;
+
+  .radio-box {
     display: flex;
     align-items: center;
-  }
-  .wrap {
-    padding:0 18px;
-    .radio-box {
-      display: flex;
-      align-items: center;
-      justify-content: flex-end;
-      margin-top: 18px;
-      text-align: right;
-      input[type="radio"] {
-        display: none;
-      }
-      label {
-        padding-left: 0.6rem;
-        cursor: pointer;
-        img {
-          width: 0.8rem;
-          margin-right: 0.1rem;
-        }
+    justify-content: flex-end;
+    margin-top: 18px;
+    text-align: right;
+
+    input[type="radio"] {
+      display: none;
+    }
+
+    label {
+      padding-left: 0.6rem;
+      cursor: pointer;
+
+      img {
+        width: 0.8rem;
+        margin-right: 0.1rem;
       }
     }
+  }
+
+  .color-choose {
+    width: 265px;
+    height: 34px;
+    margin: 0 auto;
+    background: #F3F3F3;
+    border-radius: 6px;
+    display: flex;
 
-    .color-choose{
-      width: 265px;
-      height: 34px;
-      margin: 0 auto;
-      background: #F3F3F3;
+    li {
+      flex: 1;
+      text-align: center;
+      line-height: 34px;
       border-radius: 6px;
-      display: flex;
-      li{
-        flex: 1;
-        text-align: center;
-        line-height: 34px;
-        border-radius: 6px;
-      }
     }
-    .card-header {
-      font-size: 0.75rem;
-      margin: 0.2rem 0 0.5rem;
-      color: #4a4a4a;
+  }
+
+  .card-header {
+    font-size: 0.75rem;
+    margin: 0.2rem 0 0.5rem;
+    color: #4a4a4a;
+  }
+
+  // input输入框
+  .num-box {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    .spot {
+      width: 0.2rem;
+      height: 0.2rem;
+      border-radius: 50%;
+      background-color: #d8d8d8;
     }
-    // input输入框
-    .num-box {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      .spot {
-        width: 0.2rem;
-        height: 0.2rem;
-        border-radius: 50%;
-        background-color: #d8d8d8;
-      }
-      & > div {
-        width: 1.8rem;
-        height: 1.8rem;
-        border: 1px solid #e4e4e4;
-        &.first {
-          position: relative;
-          text-align: center;
-          line-height: 1.7rem;
-          font-weight: 200;
-          .input-wrap {
-            position: absolute;
-            top: 0;
-            left: 0;
-            right: 0;
-            bottom: 0;
-            &.active {
-              z-index: 100;
-            }
-          }
-          em {
-            color: #979797;
-            font-size: 1.6rem;
-            line-height: 1.7rem;
-          }
-          span {
-            display: inline-block;
-            width: 100%;
-            height: 100%;
-            // background-color: #9cbce2;
-            color: #828282;
-            line-height: 1.8rem;
+
+    & > div {
+      width: 1.8rem;
+      height: 1.8rem;
+      border: 1px solid #e4e4e4;
+
+      &.first {
+        position: relative;
+        text-align: center;
+        line-height: 1.7rem;
+        font-weight: 200;
+
+        .input-wrap {
+          position: absolute;
+          top: 0;
+          left: 0;
+          right: 0;
+          bottom: 0;
+
+          &.active {
+            z-index: 100;
           }
         }
-        &.active {
-          border: 1px solid #4a90e2;
-          &:after {
-            border-bottom: 0.5rem solid #4a90e2;
-          }
+
+        em {
+          color: #979797;
+          font-size: 1.6rem;
+          line-height: 1.7rem;
         }
+
         span {
-          display: flex;
-          align-items: center;
-          justify-content: center;
+          display: inline-block;
           width: 100%;
           height: 100%;
-          font-size: 1rem;
+          // background-color: #9cbce2;
           color: #828282;
-          &.first {
-            background-color: #9cbce2;
-            color: #fff;
-            text-indent: 0.4rem;
-            border-radius: 0;
-          }
+          line-height: 1.8rem;
         }
       }
-    }
-    .submit-box {
-      width: 100%;
-      height: 44px;
-      line-height: 44px;
-      border-radius: 4px;
-      font-size: 20px;
-      margin-top: 18px;
-      background: linear-gradient(180deg, #3885D9 0%, #4194EF 100%);
-      color: #fff;
-      text-align: center;
-    }
-    .info {
-      font-size: 0.5rem;
-      margin-top: 0.9rem;
-      color: #828282;
-      text-align: left;
-      img {
-        width: 0.6rem;
-        vertical-align: middle;
-      }
-    }
-  }
-  .first-word-wrap {
-    // height: 9.4rem;
-    background-color: #D2D5DB;
-    padding: 0.6rem 0.8rem 1.1rem;
-    position: fixed;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    .first-word {
-      display: flex;
-      justify-content: space-between;
-      margin-bottom: 0.45rem;
-      .word {
-        box-sizing: border-box;
-        width: 1.8rem;
-        height: 1.8rem;
-        // border: 1px solid #9cbce2;
-        box-shadow: 0px 1px 4px  rgba(0, 0, 0, 0.35);
-        border-radius: 0.16rem;
-        text-align: center;
-        &.bordernone {
-          border: none;
-          box-shadow:none
-        }
-        span {
-          box-sizing: border-box;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          text-align: center;
-          width: 100%;
-          height: 100%;
-          background-color: #fff;
-          color: #000;
-          // border: 1px solid #fff;
-          border-radius: 0.125rem;
-        }
-        img {
-          width: 1.6rem;
+
+      &.active {
+        border: 1px solid #4a90e2;
+
+        &:after {
+          border-bottom: 0.5rem solid #4a90e2;
         }
       }
-      &:nth-last-of-type(1){
-        margin-bottom: 0rem;
+
+      span {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: 100%;
+        height: 100%;
+        font-size: 1rem;
+        color: #828282;
+
+        &.first {
+          background-color: #9cbce2;
+          color: #fff;
+          text-indent: 0.4rem;
+          border-radius: 0;
+        }
       }
     }
   }
-  .keyboard-wrap {
-    background-color: #D2D5DB;
-    position: fixed;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    padding: 0.6rem 0.6rem 0.4rem;
-    .keyboard {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      height: 2rem;
-      margin-bottom: 0.3rem;
+
+  .submit-box {
+    width: 100%;
+    height: 44px;
+    line-height: 44px;
+    border-radius: 4px;
+    font-size: 20px;
+    margin-top: 18px;
+    background: linear-gradient(180deg, #3885D9 0%, #4194EF 100%);
+    color: #fff;
+    text-align: center;
+  }
+
+  .info {
+    font-size: 0.5rem;
+    margin-top: 0.9rem;
+    color: #828282;
+    text-align: left;
+
+    img {
+      width: 0.6rem;
+      vertical-align: middle;
+    }
+  }
+}
+
+.first-word-wrap {
+  // height: 9.4rem;
+  background-color: #D2D5DB;
+  padding: 0.6rem 0.8rem 1.1rem;
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+
+  .first-word {
+    display: flex;
+    justify-content: space-between;
+    margin-bottom: 0.45rem;
+
+    .word {
+      box-sizing: border-box;
+      width: 1.8rem;
+      height: 1.8rem;
+      // border: 1px solid #9cbce2;
+      box-shadow: 0px 1px 4px rgba(0, 0, 0, 0.35);
+      border-radius: 0.16rem;
+      text-align: center;
+
+      &.bordernone {
+        border: none;
+        box-shadow: none
+      }
+
       span {
-        text-align: center;
+        box-sizing: border-box;
         display: flex;
-        width: 1.8rem;
         align-items: center;
         justify-content: center;
-        height: 1.8rem;
-        margin: 0 0.3rem;
-        box-shadow: 0px 1px 4px  rgba(0, 0, 0, 0.35);
+        text-align: center;
+        width: 100%;
+        height: 100%;
         background-color: #fff;
+        color: #000;
+        // border: 1px solid #fff;
         border-radius: 0.125rem;
-        &:active {
-          background-color: #e4e4e4;
-        }
-        &.bordernone{
-          border: none;
-          box-shadow: none;
-          background-color: #D2D5DB;
-          &:active{
-            background-color:#D2D5DB;
-          }
-        }
-        &.delete{
-          background-color: #465266;
-          img{
-            width: 1.15rem;
-          }
-        }
       }
+
+      img {
+        width: 1.6rem;
+      }
+    }
+
+    &:nth-last-of-type(1) {
+      margin-bottom: 0rem;
     }
-    .cancel{
+  }
+}
+
+.keyboard-wrap {
+  background-color: #D2D5DB;
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  padding: 0.6rem 0.6rem 0.4rem;
+
+  .keyboard {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    height: 2rem;
+    margin-bottom: 0.3rem;
+
+    span {
+      text-align: center;
       display: flex;
-      justify-content: flex-end;
+      width: 1.8rem;
       align-items: center;
-      span{
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        width: 3.6rem;
-        height: 1.8rem;
+      justify-content: center;
+      height: 1.8rem;
+      margin: 0 0.3rem;
+      box-shadow: 0px 1px 4px rgba(0, 0, 0, 0.35);
+      background-color: #fff;
+      border-radius: 0.125rem;
+
+      &:active {
+        background-color: #e4e4e4;
+      }
+
+      &.bordernone {
+        border: none;
+        box-shadow: none;
+        background-color: #D2D5DB;
+
+        &:active {
+          background-color: #D2D5DB;
+        }
+      }
+
+      &.delete {
         background-color: #465266;
-        color: #fff;
-        border-radius: 0.125rem;
+
+        img {
+          width: 1.15rem;
+        }
       }
     }
   }
-  .bound-list{
-    li{
-      padding: 0 10px;
-      height: 34px;
-      margin-bottom: 12px;
-      line-height: 34px;
-      background: #F2F1F1;
-      border-radius: 2px;
+
+  .cancel {
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+
+    span {
       display: flex;
-      justify-content: space-between;
+      align-items: center;
+      justify-content: center;
+      width: 3.6rem;
+      height: 1.8rem;
+      background-color: #465266;
+      color: #fff;
+      border-radius: 0.125rem;
     }
   }
-  .addCarNum{
+}
+
+.bound-list {
+  li {
+    padding: 0 10px;
     height: 34px;
+    margin-bottom: 12px;
     line-height: 34px;
-    background: #FFFFFF;
+    background: #F2F1F1;
     border-radius: 2px;
-    border: 1px solid #F2F1F1;
-    text-align: center;
-    span{
-      width: 16px;
-      height: 16px;
-      display: inline-block;
-      background: url("../../assets/images/parkPay/addCarNum.png") no-repeat;
-      margin-right: 10px;
-      vertical-align: sub;
-      cursor: pointer;
-    }
+    display: flex;
+    justify-content: space-between;
   }
+}
+
+.addCarNum {
+  height: 34px;
+  line-height: 34px;
+  background: #FFFFFF;
+  border-radius: 2px;
+  border: 1px solid #F2F1F1;
+  text-align: center;
+
+  span {
+    width: 16px;
+    height: 16px;
+    display: inline-block;
+    background: url("../../assets/images/parkPay/addCarNum.png") no-repeat;
+    margin-right: 10px;
+    vertical-align: sub;
+    cursor: pointer;
+  }
+}
 </style>
diff --git a/vue.config.js b/vue.config.js
index 80a0f46..8e0fbc6 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,18 +1,16 @@
-//
-// module.exports = {
-//   dev: {
-//
-//     // Paths
-//     assetsSubDirectory: 'static',
-//     assetsPublicPath: '/',
-//     proxyTable: {
-//       '/api': {
-//         target: 'https://bus.jycrtc.com/', //后期可以改
+// module.exports={
+//   devServer: {
+//     open: true,//vue项目启动时自动打开浏览器
+//     port: 8092,
+//     host: 'localhost',
+//     proxy: {
+//       "": {
+//         target: "https://bus.jycrtc.com",
 //         changeOrigin: true,
+//         ws: true,
 //         pathRewrite: {
-//           '^/api': ''
-//         }
-//       }
-//     }, //配置跨域支持
-//   }
+//         },
+//       },
+//     },
+//   },
 // }
--
libgit2 0.21.4