diff --git a/src/views/parkPay/parkRecord.vue b/src/views/parkPay/parkRecord.vue
index f9ad91e..48031f7 100644
--- a/src/views/parkPay/parkRecord.vue
+++ b/src/views/parkPay/parkRecord.vue
@@ -10,11 +10,12 @@
         </li>
       </ul>
 
+
       <!--本次缴费-->
       <div v-show="currentTabActive==0">
 
         <div v-if="parkingData.length>0">
-          <p class="free-tip" v-if="parkingData[0].parkDuration<=2100">停车15分钟内无需缴费，请申请离场。</p>
+          <p class="free-tip" v-if="parkingData[0].parkDuration<=900">停车15分钟内(货车30分钟内)无需缴费！</p>
 
           <div class="cost-main" v-for="i in parkingData">
             <ul class="cost-header">
@@ -23,7 +24,7 @@
             </ul>
 
             <div class="cost-body">
-              <p>车辆类型：临停车</p>
+              <!--<p>车辆类型：临停车</p>-->
               <p>车场名称：{{i.parkName}}
               </p>
               <p> 进场时间：{{i.parkInTime}}
@@ -33,23 +34,25 @@
               <p>停车时长：{{ $utils.dateFormat(i.parkDuration)}}</p>
               <div class="out-wrap">
                 <p class="mon-wrap">￥{{(i.unPayFee/100).toFixed(2)}}</p>
-                <p class="out-btn" @click="toPayCurrent1(i,parkingData[0].parkDuration)" v-if="parkingData[0].parkDuration<=900">申请离场</p>
+                <p class="out-btn" @click="toPayCurrent(i,parkingData[0].parkDuration)" v-if="parkingData[0].parkDuration<=900">申请离场</p>
+                <p class="out-btn" @click="toPayCurrent(i,parkingData[0].parkDuration)" v-else-if="parkingData[0].parkDuration<=1800&parkingData[0].carType==7">申请离场</p>
+                <p class="out-btn" @click="toPayCurrent(i,parkingData[0].parkDuration)" v-else-if="parkingData[0].parkDuration<=1800&parkingData[0].carType==8">申请离场</p>
                 <p class="out-btn" @click="toPayCurrent(i,parkingData[0].parkDuration)" v-else>出场缴费</p>
               </div>
             </div>
           </div>
         </div>
         <!--没有在停费用-->
-        <div class="noRecord" v-else> 本次停车暂未产生费用，请及时离场</div>
+        <div class="noRecord" v-else>暂无记录</div>
 
 
       </div>
 
 
       <!--历史缴费-->
-      <div v-show="currentTabActive==1" class="history-con" >
+      <div v-show="currentTabActive==1" class="history-con">
         <div v-if="historyList.length>0" style="height: 100%;">
-          <div class="history-body" >
+          <div class="history-body">
             <p class="money-all">总欠费金额：
               <span>¥{{(allMoney/100).toFixed(2)}}</span>
             </p>
@@ -66,7 +69,7 @@
               </ul>
 
               <div class="cost-body">
-                <!--<p>车辆颜色：临停车</p>-->
+                <!--<p>车辆类型：临停车</p>-->
 
                 <p>车场名称：{{i.parkName}}
                 </p>
@@ -100,8 +103,8 @@
         </div>
 
 
-        <!--没有历史费用-->
-        <div class="noRecord" v-else> 暂无历史费用</div>
+        <!--没有在停费用-->
+        <div class="noRecord" v-else>暂无记录</div>
 
       </div>
 
@@ -109,17 +112,35 @@
 
 
     <div v-else class="noRecord">
-      本次停车暂未产生费用，请及时离场
+      暂无记录
     </div>
 
+    <!--<modal-alert ref="alert">-->
+    <!--<div class="trave-tip-content txt-l" slot="content">-->
+    <!--<div class="confirm-text">-->
+    <!--<p>请至少选择一笔记录</p>-->
+    <!--</div>-->
+    <!--</div>-->
+    <!--<span slot="button">知道了</span>-->
+    <!--</modal-alert>-->
+
+
+    <!--<modal-alert ref="zeroAlert">-->
+    <!--<div class="trave-tip-content txt-l" slot="content">-->
+    <!--<div class="confirm-text">-->
+    <!--<p>停车15分钟内无需缴费，申请成功。</p>-->
+    <!--</div>-->
+    <!--</div>-->
+    <!--<span slot="button">知道了</span>-->
+    <!--</modal-alert>-->
+
 
   </div>
 </template>
 
 <script>
-
-import { parkRecordList, historyQuery, parkingQuery, appApplyParkOut } from '@/api/parkRecord/parkRecord.js'
-
+import {parkRecordList, historyQuery, parkingQuery, appApplyParkOut} from '@/api/parkRecord/parkRecord.js'
+import axios from 'axios'
 
 export default {
   name: 'parkRecord',
@@ -127,40 +148,40 @@ export default {
     return {
       tabList: [  // 切换数据
         { text: '在停缴费', id: 1 },
-        { text: '欠费待缴', id: 2 },
+        { text: '离场待缴', id: 2 },
       ],
       carColor: 1,// 车牌颜色
       currentTabActive: 0, // 显示当前哪个
       carNumber: '', //  车牌号码
-      parkingData:[], //  在停数据
+      parkingData: [], //  在停数据
       parkList: [], // 停车记录数据
-      historyList:[  // 历史欠费数据
-        {money:100,checked:false, id: 1},
-      ] ,
-      allChecked:false, // 全部选择事件
-      allMoney:0, // 欠费所有的费用
-      historyCheckedLen:0, //选中了几笔交易
+      historyList: [  // 历史欠费数据
+        { money: 100, checked: false, id: 1 },
+      ],
+      allChecked: false, // 全部选择事件
+      allMoney: 0, // 欠费所有的费用
+      historyCheckedLen: 0, //选中了几笔交易
       historyCheckedMon: 0, //选中了待缴纳的金额
       orderIds: [] // 选中数据的订单 数组
     }
   },
-  mounted(){
-
+  mounted() {
 
   },
   created() {
+    // this.$Indicator.open({
+    //   text: '加载中...',
+    //   spinnerType: 'fading-circle'
+    // })
     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   // 0在停   1历史
+    this.currentTabActive = this.$route.query.parkFlag ? this.$route.query.parkFlag : 0
+    console.log(this.currentTabActive)
     console.log(this.carNumber)
     this.parkRecordList(this.carNumber)
-
-
-    //
-
   },
   methods: {
-    parkRecordList(){  // 获取停车记录数据
+    parkRecordList() {  // 获取停车记录数据
       var salt = this.$utils.myCommonSalt(32);
       var jsondata = {
         app_id: this.$utils.myVarAppid,
@@ -173,8 +194,8 @@ export default {
         terminalSource: 7,
         carNumber: this.carNumber,
         carNumberColor: this.carColor,
-        // sign: md5sign,
-        orgId: this.$utils.myOrgId
+        orgId: this.$utils.myOrgId,
+
       }
       jsondata.sign = this.$utils.signObject(jsondata)
 
@@ -187,14 +208,13 @@ export default {
         this.parkingData = this.parkList.filter(item => {
           return item.parkState == '10'
         })
-        // if(this.parkingData.length>0){
+        // if (this.parkingData.length > 0) {
         //   this.currentTabActive = 0
         // }
         console.log(this.parkingData)
         this.historyList = this.parkList.filter(item => {
           return item.parkState == '20'
         })
-
         this.historyList.forEach( i => {
           this.allMoney += Number(i.unPayFee)
         })
@@ -208,6 +228,9 @@ export default {
           this.checkedAll()
         }
         console.log(this.historyList)
+
+        this.$Indicator.close()
+
       })
     },
 
@@ -217,37 +240,36 @@ export default {
     chooseHandle(i, index) { // 历史欠费单个选择事件
       i.checked = !i.checked
       let me = this
-      if(i.checked ){ //单个选中
-        me.historyCheckedLen ++
-        if(me.historyCheckedLen == this.historyList.length){
+      if (i.checked) { //单个选中
+        me.historyCheckedLen++
+        if (me.historyCheckedLen == this.historyList.length) {
           this.allChecked = true
 
         }
         me.orderIds.push(i.orderId)
         me.historyCheckedMon += Number(i.unPayFee)
-      }else{ //单个不选中
+      } else { //单个不选中
         let _i = me.orderIds.indexOf(i.orderId)
-        me.orderIds.splice(_i,1)
+        me.orderIds.splice(_i, 1)
         this.allChecked = false
-        me.historyCheckedLen --
+        me.historyCheckedLen--
         me.historyCheckedMon -= Number(i.unPayFee)
       }
 
-
     },
     checkedAll() { // 全选选择事件
       this.allChecked = !this.allChecked
-      if(this.allChecked){  //全选
-        let me  = this
-        this.historyList.forEach(function(item){
+      if (this.allChecked) {  //全选
+        let me = this
+        this.historyList.forEach(function (item) {
           item.checked = true;
           me.orderIds.push(item.orderId)
         });
         this.historyCheckedMon = this.allMoney
         this.historyCheckedLen = this.historyList.length
 
-      }else{ //反选
-        this.historyList.forEach(function(item){
+      } else { //反选
+        this.historyList.forEach(function (item) {
           item.checked = false;
 
         });
@@ -258,45 +280,6 @@ export default {
     },
     toPayCurrent(i, num) { // 缴纳本次在停费用
       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.orderId,
-        terminalSource: '7',
-        parkCode: i.parkCode,
-        carNumber: this.carNumber,
-      }
-      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)
-
-        this.$router.push(
-          {
-            path: 'orderPay',
-            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, // 超时描述
-            }
-          }
-        )
-      })
-
-    },
-    toPayCurrent1(i, num) { // 缴纳本次在停费用
-      var salt = this.$utils.myCommonSalt(32);
       var params = {
         app_id: this.$utils.myVarAppid,
         deviceInfo: this.$utils.myDeviceInfo,
@@ -310,7 +293,7 @@ export default {
       appApplyParkOut(params).then(response => {
         console.log(response)
 
-        if (response.code == '0') {
+        if (response.code == '5005') {
           var salt = this.$utils.myCommonSalt(32);
           var jsondata = {
             app_id: this.$utils.myVarAppid,
@@ -350,14 +333,14 @@ export default {
 
         } else {
           //$('.dialog-out').show()
-          this.$msgbox('提示', response.message)
+          this.$msgbox('提示', '您已成功申请离场！')
         }
 
       })
 
     },
     toPayHisroryPage() { // 缴纳历史费用
-      if(this.historyCheckedLen==0){
+      if (this.historyCheckedLen == 0) {
         this.$msgbox('提示', '请至少选择一条记录')
 
         return
@@ -375,37 +358,39 @@ export default {
         appId: this.$utils.myVxAppId,
         orderIds: list,
         terminalSource: '7',
-        payType: 4,
+        payType: this.$utils.clientBrowsePayType(),
         orgId: this.$utils.myOrgId,
+        backDeveloperCode: this.$route.query.backDeveloperCode
       }
       jsondata.sign = this.$utils.signObject(jsondata)
-
+      console.log(jsondata)
       historyQuery(jsondata).then(response => {
         console.log(response)
         let res = response.data.carArrearages[0]
         console.log(res)
+
         this.orderIds = JSON.stringify(this.orderIds)
+        console.log(this.orderIds)
         this.$router.push(
           {
-            path:'orderPay',
-            query:{
-              carColor:this.carColor,// 车牌颜色
+            path: 'orderPay',
+            query: {
+              carColor: this.carColor,// 车牌颜色
               arrearageTotalFee: res.arrearageTotalFee,// 应收
               arrearageDiscFee: res.arrearageDiscFee,// 优惠
               arrearageActFee: res.arrearageActFee,// 实收
               carNumber: this.carNumber, // 车牌
               paySrcType: 103, //支付的类型   101 是本次   103是历史欠费
               ordeID: this.orderIds, //支付的订单号
-              appOrderTimeout: ''
+              appOrderTimeout: '',
+              backDeveloperCode: response.data.inChargerCode
             }
           }
         )
       })
     }
   },
-  filters: {
-
-  }
+  filters: {}
 }
 </script>
 
@@ -507,70 +492,72 @@ export default {
     }
   }
 
-  .history-con{
+  .history-con {
     height: calc(100% - 38px);
     overflow: hidden;
   }
-  .history-body{
+
+  .history-body {
     height: calc(100% - 81px);
     overflow-y: scroll;
   }
-  .history-footer{
+
+  .history-footer {
     height: 81px;
     background: #F8F8F8;
   }
 
-  .cost-main-history{
+  .cost-main-history {
     margin-bottom: 10px;
-    background:#fff url("../../assets/images/parkPay/choose.png") no-repeat 10px center;
+    background: #fff url("../../assets/images/parkPay/choose.png") no-repeat 10px center;
     background-size: 20px 20px;
     cursor: pointer;
   }
 
-
-  .isChecked{
-    background:#fff url("../../assets/images/parkPay/choosed.png") no-repeat 10px center;
+  .isChecked {
+    background: #fff url("../../assets/images/parkPay/choosed.png") no-repeat 10px center;
     background-size: 20px 20px;
   }
 
-  .money-all{
+  .money-all {
     padding-left: 18px;
     height: 25px;
     line-height: 25px;
     font-weight: 500;
     background: #FEF8DB;
-    span{
+    span {
       color: #BC0202;
     }
   }
 
-  .statistical-data{
+  .statistical-data {
     padding-left: 18px;
     height: 32px;
     line-height: 32px;
     background: #E6FAFA;
-    span{
+    span {
       color: #D20000;
     }
   }
-  .opration-wrap{
+
+  .opration-wrap {
     padding-left: 18px;
     height: 49px;
     line-height: 49px;
     background: #f8f8f8;
     display: flex;
     justify-content: space-between;
-    .check-btn{
+    .check-btn {
       padding-left: 30px;
       background: url("../../assets/images/parkPay/choose.png") no-repeat 0 center;
       background-size: 20px 20px;
       cursor: pointer;
     }
-    .isAllChecked{
+    .isAllChecked {
       background: url("../../assets/images/parkPay/choosed.png") no-repeat 0 center;
       background-size: 20px 20px;
     }
-    .settle-btn{
+    .settle-btn {
       width: 106px;
       height: 49px;
       background: linear-gradient(145deg, #2783E9 0%, #227ADC 100%);