From d8a108c6c957f881e0ddebd39411390fdbbc40d7 Mon Sep 17 00:00:00 2001
From: liuqimichale <123456lq>
Date: Thu, 15 Apr 2021 15:34:40 +0800
Subject: [PATCH] 本次订单与欠费补缴订单页面合成一个

---
 .babelrc                       |  14 +++++++++++++-
 package.json                   |   5 ++++-
 src/api/orderPay/orderPay.js   |  11 +++++++++++
 src/components/orderPay.vue    | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 src/components/parkRecord.vue  |  12 +++++++-----
 src/components/plateNumber.vue |   1 +
 src/main.js                    |   5 +++++
 7 files changed, 143 insertions(+), 10 deletions(-)

diff --git a/.babelrc b/.babelrc
index 3a280ba..e4b6de4 100644
--- a/.babelrc
+++ b/.babelrc
@@ -8,5 +8,17 @@
     }],
     "stage-2"
   ],
-  "plugins": ["transform-vue-jsx", "transform-runtime"]
+  "plugins": ["transform-vue-jsx", "transform-runtime", [
+    "component",
+    {
+      "libraryName": "element-ui",
+      "styleLibraryName": "theme-chalk"
+    }
+  ]],
+  "env": {
+    "test": {
+      "presets": ["env", "stage-2"],
+      "plugins": ["transform-vue-jsx", "transform-es2015-modules-commonjs", "dynamic-import-node"]
+    }
+  }
 }
diff --git a/package.json b/package.json
index ded9088..5665f27 100644
--- a/package.json
+++ b/package.json
@@ -12,8 +12,10 @@
   "dependencies": {
     "axios": "^0.21.1",
     "css-loader": "^3.6.0",
+    "element-ui": "^2.15.1",
     "js-base64": "^3.6.0",
     "less-loader": "^4.1.0",
+    "mint-ui": "^2.2.13",
     "sass-loader": "^7.3.1",
     "vue": "^2.5.2",
     "vue-h5-popup": "^1.0.2",
@@ -57,7 +59,8 @@
     "webpack": "^3.6.0",
     "webpack-bundle-analyzer": "^2.9.0",
     "webpack-dev-server": "^2.9.1",
-    "webpack-merge": "^4.1.0"
+    "webpack-merge": "^4.1.0",
+    "babel-plugin-component": "^1.1.1"
   },
   "engines": {
     "node": ">= 5.0.0",
diff --git a/src/api/orderPay/orderPay.js b/src/api/orderPay/orderPay.js
index c24de4b..0a9d574 100644
--- a/src/api/orderPay/orderPay.js
+++ b/src/api/orderPay/orderPay.js
@@ -34,6 +34,17 @@ export function bankH5Pay(params) {  // 农行
   })
 }
 
+export function queryParkingRecordPageByCarNumbers(params) {  // 支付完成后查询记录
+  return request({
+    url: 'queryParkOrder/queryParkingRecordPageByCarNumbers',
+    method: 'post',
+    data: params
+  })
+}
+
+
+
+
 
 
 
diff --git a/src/components/orderPay.vue b/src/components/orderPay.vue
index 81fd1c1..04af29b 100644
--- a/src/components/orderPay.vue
+++ b/src/components/orderPay.vue
@@ -42,8 +42,8 @@
 <script>
 // import CryptoJS from '../utils/AES.js'
 // let Base64 = require('js-base64').Base64
-
-import { aliPay, getOpenId, vxPayQuery, bankH5Pay } from '@/api/orderPay/orderPay'
+import {  MessageBox } from 'mint-ui';
+import { aliPay, getOpenId, vxPayQuery, bankH5Pay, queryParkingRecordPageByCarNumbers } from '@/api/orderPay/orderPay'
 
 export default {
   name: 'orderPay',
@@ -54,6 +54,8 @@ export default {
       arrearageActFee: 0,
       arrearageDiscFee: 0,
       arrearageActFee: 0,
+      parkingData: [], //  在停数据
+      historyList: [], // 历史欠费数据
       clientBrowser: '', // 客户端
       paySrcType: '', //支付的类型   101 是本次   103是历史欠费
       orderId: '',  //支付的订单
@@ -76,6 +78,11 @@ export default {
       this.webAppCode = this.getCode();
     }
 
+
+
+  },
+  mounted(){
+
   },
   methods: {
     getCode() {
@@ -276,7 +283,99 @@ export default {
           // 使用以上方式判断前端返回,微信团队郑重提示：res.err_msg将在用户支付成功后返回ok，但并不保证它绝对可靠。
           if (res.err_msg === 'get_brand_wcpay_request:ok') {
             console.log('成功')
-            alert('支付成功')
+            var salt = me.$utils.myCommonSalt(32);
+            let params = {
+              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:'',
+            }
+            params.sign = me.$utils.signObject(params)
+            queryParkingRecordPageByCarNumbers(params).then(response => {
+              console.log(response)
+              me.parkList = response.data.dataList
+
+              if(me.parkList.length == 0){
+                me.$router.push({
+                  path:'parkRecord',
+                  query:{
+                    carNumber: me.carNumber,
+                    carNumberColor: me.carWrapBG,
+                    parkFlag: 0 //  0表示在停    1表示历史
+                  }
+                })
+              }
+
+              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.parkingData.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: 0 //  0表示在停    1表示历史
+                      }
+                    })
+                  }
+                }).catch(err => {
+                  if (err == 'cancel') {     //取消的回调
+                    console.log('取消');
+                  }
+                });
+              }
+
+              if(me.parkingData.length==0&&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 {
             console.log('失败')
             alert('支付失败')
diff --git a/src/components/parkRecord.vue b/src/components/parkRecord.vue
index a86b767..86fde42 100644
--- a/src/components/parkRecord.vue
+++ b/src/components/parkRecord.vue
@@ -126,7 +126,7 @@
     <modal-alert ref="zeroAlert">
       <div class="trave-tip-content txt-l" slot="content">
         <div class="confirm-text">
-          <p>停车15分钟内无需缴费，请申请离场。</p>
+          <p>停车15分钟内无需缴费，申请成功。</p>
         </div>
       </div>
       <span slot="button">知道了</span>
@@ -149,7 +149,7 @@ export default {
         { text: '离场待缴', id: 2 },
       ],
       carColor: 1,// 车牌颜色
-      currentTabActive: 1, // 显示当前哪个
+      currentTabActive: 0, // 显示当前哪个
       carNumber: '', //  车牌号码
       parkingData: [], //  在停数据
       parkList: [], // 停车记录数据
@@ -168,6 +168,8 @@ export default {
   created() {
     this.carNumber = this.$route.query.carNumber  // 获取车牌号
     this.carColor = this.$route.query.carNumberColor  // 获取颜色   0:蓝牌;1:黄牌;2:白牌;3:黑牌;4:绿色
+    this.currentTabActive = this.$route.query.parkFlag ? this.$route.query.parkFlag : 0
+    console.log(this.currentTabActive)
     console.log(this.carNumber)
     this.parkRecordList(this.carNumber)
   },
@@ -198,9 +200,9 @@ export default {
         this.parkingData = this.parkList.filter(item => {
           return item.parkState == '10'
         })
-        if (this.parkingData.length > 0) {
-          this.currentTabActive = 0
-        }
+        // if (this.parkingData.length > 0) {
+        //   this.currentTabActive = 0
+        // }
         console.log(this.parkingData)
         this.historyList = this.parkList.filter(item => {
           return item.parkState == '20'
diff --git a/src/components/plateNumber.vue b/src/components/plateNumber.vue
index 9b2d4cc..677f85d 100644
--- a/src/components/plateNumber.vue
+++ b/src/components/plateNumber.vue
@@ -327,6 +327,7 @@ export default {
     }
   },
   mounted () {
+
     if (this.$utils.clientBrowser() == "微信") {
       var appID = this.$utils.myVxAppId;
       var code = this.getUrlParam('code');
diff --git a/src/main.js b/src/main.js
index f825b23..67168e5 100644
--- a/src/main.js
+++ b/src/main.js
@@ -11,6 +11,11 @@ Vue.use(h5Popup)
 
 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' // 轮播
--
libgit2 0.21.4