diff --git a/src/api/card/card.js b/src/api/card/card.js
index 098c5cd..6d13386 100644
--- a/src/api/card/card.js
+++ b/src/api/card/card.js
@@ -24,3 +24,23 @@ export function queryVipCardByPlNo(params) { //查询某个停车场的 具体�
     data: params
   })
 }
+
+
+export function queryUserCars(params) { //车辆信息查询
+  return request({
+    url: 'user/car/queryUserCars',
+    method: 'post',
+    data: params
+  })
+}
+
+
+export function createVipCardOrder2022(params) { //会员卡购买续费2022
+  return request({
+    url: 'vip/createVipCardOrder2022',
+    method: 'post',
+    data: params
+  })
+}
+
+
diff --git a/src/router/index.js b/src/router/index.js
index ff342c4..077422d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -73,7 +73,8 @@ export default new Router({
     {
       path: "/parkNotes",
       name: "parkNotes",
-      component: () => import("@/views/mySelf/parkNotes/parkNotes.vue")
+      component: () => import("@/views/mySelf/parkNotes/parkNotes.vue"),
+      meta: { title: "停车记录" }
     },
     // ------------------------登录
     {
diff --git a/src/utils/filters.js b/src/utils/filters.js
index f65fc6f..ede3e42 100644
--- a/src/utils/filters.js
+++ b/src/utils/filters.js
@@ -18,7 +18,15 @@ const vFilter = {
         break;
 
     }
-  }
+  },
+
+}
+
+const numFilter=function (value) {
+  // 截取当前数据到小数点后两位
+  let realVal = (Number(value)/100).toFixed(2)
+  return realVal
 }
 
-export default vFilter
+
+export default {vFilter,numFilter}
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 7539346..b59e81c 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -117,7 +117,7 @@ export default {
   myVxAppId: "wx1489e48e6a547023",
   userToken:localStorage.getItem('userToken'),
   userPhoneNum:localStorage.getItem('userPhoneNum'),
-  openId: "",
+  openId: "oWw3o5rY_bFsiT_nFd2CEQWGZfhs",
   myOrgId: "10120", // 归属地 赤峰id  10003    黄石 10079
 
   // myVxAppId: 'wx1489e48e6a547023',
@@ -160,5 +160,6 @@ export default {
     strmd5 = md5(strmd5);
     strmd5 = strmd5.toUpperCase();
     return strmd5;
-  }
+  },
+
 };
diff --git a/src/views/cards/buyCardDetail.vue b/src/views/cards/buyCardDetail.vue
index 52a1eb3..25b4fc3 100644
--- a/src/views/cards/buyCardDetail.vue
+++ b/src/views/cards/buyCardDetail.vue
@@ -1,33 +1,33 @@
 <template>
   <section class="">
     <div class="vipCardBg">
-      <ul class="cardTypeList">
-        <li>年卡</li>
-        <li>月卡</li>
-        <li>半年卡</li>
-      </ul>
+      <!--<ul class="cardTypeList">-->
+      <!--<li>年卡</li>-->
+      <!--<li>月卡</li>-->
+      <!--<li>半年卡</li>-->
+      <!--</ul>-->
 
-      <div class="van-ellipsis" style="padding: 20px 0  10px 20px">万达停车场plName</div>
-      <div class="van-ellipsis" style="padding: 0 0  0 20px">万达停车场plAddress</div>
+      <div class="van-ellipsis" style="padding: 20px 0  10px 20px"> {{plName}}</div>
+      <div class="van-ellipsis" style="padding: 0 0  0 20px">{{plAddress}}</div>
     </div>
-    <van-cell-group inset style="margin-bottom: 10px;" v-for="i in list" @click="LinkBuyCard">
-      <van-cell >
+    <van-cell-group inset style="margin-bottom: 10px;" v-for="(i,index) in list" @click="LinkBuyCard(i)" :key="index">
+      <van-cell>
         <template #title>
-          <span style="font-size: 20px;font-weight: 600;">年卡</span>
+          <span style="font-size: 20px;font-weight: 600;">{{i.cardType | capitalize}}优惠</span>
         </template>
       </van-cell>
-      <van-cell :title= "i.cardName" center value="立即购买" :label="'单价：'+(i.actPrice/100).toFixed(2)"  is-link>
+      <van-cell :title="i.cardName" center value="立即购买" :label="'单价：'+(i.actPrice/100).toFixed(2)" is-link>
       </van-cell>
     </van-cell-group>
 
     <!--<van-cell-group inset style="margin-bottom: 10px;">-->
-      <!--<van-cell >-->
-        <!--<template #title>-->
-          <!--<span style="font-size: 20px;font-weight: 600;">年卡</span>-->
-        <!--</template>-->
-      <!--</van-cell>-->
-      <!--<van-cell title="万达月卡cardName" center value="立即购买" label="单价：￥1800.00"  is-link>-->
-      <!--</van-cell>-->
+    <!--<van-cell >-->
+    <!--<template #title>-->
+    <!--<span style="font-size: 20px;font-weight: 600;">年卡</span>-->
+    <!--</template>-->
+    <!--</van-cell>-->
+    <!--<van-cell title="万达月卡cardName" center value="立即购买" label="单价：￥1800.00"  is-link>-->
+    <!--</van-cell>-->
     <!--</van-cell-group>-->
   </section>
 
@@ -38,38 +38,78 @@
 import { queryVipCardByPlNo } from "@/api/card/card";
 export default {
   name: "buyCardDetail",
-  data(){
-    return{
-      plNo:'',
-      list:[]
-    }
+  data() {
+    return {
+      plNo: "",
+      plName: "",
+      plAddress: "",
+      list: []
+    };
   },
-  created(){
-    this.plNo = this.$route.query.plNo
-    console.log(this.plNo)
-    this.queryVipCardByPlNo()
+  created() {
+    this.plNo = this.$route.query.plNo;
+    this.plName = this.$route.query.plName;
+    this.plAddress = this.$route.query.plAddress;
+    console.log(this.plNo);
+    this.queryVipCardByPlNo();
   },
-
-  methods:{
-    LinkBuyCard(){
+  methods: {
+    LinkBuyCard(i) {
       this.$router.push({
-          name: "buyVipCard"
+          name: "buyVipCard",
+          query: {
+            cardName:i.cardName,
+            carType:i.carType,
+            cardType:i.cardType,
+            actPrice:i.actPrice,
+            discValue:i.discValue,
+            cardNo:i.cardNo,
+            plName:this.plName,
+            plNo:this.plNo
+          }
         }
       );
     },
     queryVipCardByPlNo() {
       let jsondata = {
-        parkNo:this.plNo,
+        parkNo: this.plNo,
         saleChannel: "2"
       };
       jsondata.sign = this.$utils.signObject(jsondata);
       queryVipCardByPlNo(jsondata).then(response => {
         // console.log(response.data[0].parkList);
-
         console.log(response);
-        this.list = response.data
+        this.list = response.data;
       });
     }
+  },
+  filters: {
+    capitalize: function(value) {
+      if (value == 1) {
+        return "年卡";
+      }
+      if (value == 2) {
+        return "半年卡";
+      }
+      if (value == 3) {
+        return "季卡";
+      }
+      if (value == 4) {
+        return "月卡";
+      }
+      if (value == 5) {
+        return "日卡";
+      }
+      if (value == 6) {
+        return "错峰年卡(周末免费)";
+      }
+      if (value == 7) {
+        return "错峰月卡(周末免费)";
+      }
+      if (value == 8) {
+        return "错峰夜晚包月";
+      }
+    }
   }
 };
 </script>
diff --git a/src/views/cards/buyVipCard.vue b/src/views/cards/buyVipCard.vue
index d309b44..76a37ff 100644
--- a/src/views/cards/buyVipCard.vue
+++ b/src/views/cards/buyVipCard.vue
@@ -7,19 +7,19 @@
           <van-action-sheet v-model="show" :actions="actions" @select="onSelect"/>
         </template>
       </van-cell>
-      <van-cell title="适用停车场" value="万达停车场"/>
-      <van-cell title="卡类别" value="小型车月卡"/>
-      <van-cell title="卡名称" value="万达月卡"/>
+      <van-cell title="适用停车场" :value="plName"/>
+      <van-cell title="卡类别" :value="cardNickname"/>
+      <van-cell title="卡名称" :value="cardName"/>
       <van-cell title="生效时间" is-link>
         <template>
           <p @click="showDate = true" style="color: #1989fa"> {{valueStart}}</p>
         </template>
       </van-cell>
-      <van-cell title="失效时间" value="2023-10-20"/>
+      <van-cell title="失效时间" :value="effDate"/>
 
       <van-cell title="购买数量">
         <template>
-          <van-stepper v-model.number="cardNum" theme="round" button-size="22" disable-input/>
+          <van-stepper v-model="count" :min="1" theme="round" button-size="22" disable-input  @change="changeCount"/>
         </template>
       </van-cell>
     </van-cell-group>
@@ -42,21 +42,21 @@
     <van-cell-group style="border-bottom: 10px solid #fafafa">
       <van-cell title="单价">
         <template>
-          <p style="font-size: 16px;font-weight: 600;color: #000;">3420.00元</p>
+          <p style="font-size: 16px;font-weight: 600;color: #000;">{{actPrice|numFilter}}元</p>
         </template>
       </van-cell>
 
 
-      <van-cell title="单价">
+      <van-cell title="优惠">
         <template>
-          <p style="font-size: 16px;font-weight: 600;color: #f00;">20.00元</p>
+          <p style="font-size: 16px;font-weight: 600;color: #f00;">{{discValue}}折</p>
         </template>
       </van-cell>
 
 
       <van-cell title="支付金额">
         <template>
-          <p style="font-size: 16px;font-weight: 600;color: #000;">3420.00元</p>
+          <p style="font-size: 16px;font-weight: 600;color: #000;">{{ ((payPrice*discValue)/10) |numFilter}}元</p>
         </template>
       </van-cell>
 
@@ -65,44 +65,238 @@
 
     <div class="leftRightPadding" style="margin-top: 34px">
       <!--<mt-button type="danger" size="large"></mt-button>-->
-      <van-button type="info" block>购买</van-button>
+      <van-button type="info" block @click="buyCardHandle">购买</van-button>
     </div>
 
   </section>
 </template>
 
 <script>
-import { Toast } from "vant";
+import { queryUserCars, createVipCardOrder2022 } from "@/api/card/card";
 export default {
   name: "buyVipCard",
   data() {
     return {
-      carNum: "京A1231",
+      plName:'',
+      cardNo:'',
+      plNo:'',
+      carList: [],
+      carNum: "",
       show: false,
-      actions: [{ name: "选项一" }, { name: "选项二" }, { name: "选项三" }],
-      minDate: new Date(2020, 1, 1),
-      maxDate: new Date(2025, 10, 11),
-      currentDate: new Date(2023, 10, 11),
-      valueStart: "2023-10-01",
+      actions: [],
+      minDate: '',
+      maxDate: new Date(2099, 10, 14),
+      currentDate: '',
+      valueStart: "",
+      effDate:'',// 失效时间
       showDate: false,
-      cardNum: 1
+      count: 1, // 购买数量
+      cardName: "",//卡名称
+      carType: "",//车辆类型
+      cardType: "",//卡类型
+      cardNickname: "",//卡类别
+      actPrice: "",//单价
+      discValue: "",//优惠
+      payPrice: "" // 支付金额
     };
   },
+  created() {
+
+    this.plNo = this.$route.query.plNo;
+    this.cardNo = this.$route.query.cardNo;
+
+    this.plName = this.$route.query.plName;
+    this.cardName = this.$route.query.cardName;
+    this.carType = this.$route.query.carType;
+    let carTypeName;
+    switch (Number(this.carType)) {
+      case 1:
+        carTypeName = "大型车";
+        break;
+      case 2:
+        carTypeName = "小型车";
+        break;
+      default:
+        break;
+    }
+    this.cardType = this.$route.query.cardType;
+    let cardTypeName;
+    switch (Number(this.cardType)) {
+      case 1:
+        cardTypeName = "年卡";
+        break;
+      case 2:
+        cardTypeName = "半年卡";
+        break;
+      case 3:
+        cardTypeName = "季卡";
+        break;
+      case 4:
+        cardTypeName = "月卡";
+        break;
+      case 5:
+        cardTypeName = "日卡";
+        break;
+      default:
+        break;
+    }
+    this.cardNickname = carTypeName + cardTypeName;
+    this.actPrice = Number(this.$route.query.actPrice);
+    this.discValue = Number(this.$route.query.discValue);
+    this.payPrice = this.actPrice * this.count;
+    console.log(this.actPrice);
+    console.log(this.discValue);
+    console.log(this.payPrice);
+    this.queryUserCars();
+
+    this.getStartDate()
+  },
   methods: {
+    getStartDate(){
+      let dateTime = new Date();
+      this.valueStart = this.$utils.formatDate(dateTime,1)
+      // this.minDate = this.$utils.formatDate(dateTime,1)
+      this.minDate = new Date()
+
+      //  计算失效日期根据卡类型
+      this.getEffDate(1)
+    },
+    getEffDate(num){
+      if(this.cardType==1){ // 年卡  给日期添加12个月
+        console.log(this.valueStart)
+        this.effDate = this.$moment(this.valueStart).add(12*num, 'M').subtract(1,'days').format('YYYY-MM-DD')
+      }
+      if(this.cardType==2){ // 半年卡  给日期添加6个月
+        console.log(this.valueStart)
+        this.effDate = this.$moment(this.valueStart).add(6*num, 'M').subtract(1,'days').format('YYYY-MM-DD')
+      }
+      if(this.cardType==3){ // 季卡  给日期添加3个月
+        console.log(this.valueStart)
+        this.effDate = this.$moment(this.valueStart).add(3*num, 'M').subtract(1,'days').format('YYYY-MM-DD')
+      }
+      if(this.cardType==4){ // 月卡  给日期添加1个月
+        console.log(this.valueStart)
+        this.effDate = this.$moment(this.valueStart).add(1*num, 'M').subtract(1,'days').format('YYYY-MM-DD')
+      }
+      if(this.cardType==5){ // 日卡  给日期添加1个月
+        console.log(this.valueStart)
+        this.effDate = this.$moment(this.valueStart).add(1*num,'days').format('YYYY-MM-DD')
+      }
+
+      if(this.cardType==6){ // 错峰年卡(周末免费)  给日期添加12个月
+        console.log(this.valueStart)
+        this.effDate = this.$moment(this.valueStart).add(12*num, 'M').subtract(1,'days').format('YYYY-MM-DD')
+      }
+
+      if(this.cardType==7){ // 错峰月卡(周末免费)  给日期添加1个月
+        console.log(this.valueStart)
+        this.effDate = this.$moment(this.valueStart).add(1*num, 'M').subtract(1,'days').format('YYYY-MM-DD')
+      }
+
+      if(this.cardType==8){ // 错峰夜晚包月  给日期添加1个月
+        console.log(this.valueStart)
+        this.effDate = this.$moment(this.valueStart).add(1*num, 'M').subtract(1,'days').format('YYYY-MM-DD')
+      }
+
+    },
+    queryUserCars() {
+      let jsondata = {};
+      jsondata.sign = this.$utils.signObject(jsondata);
+      queryUserCars(jsondata).then(response => {
+        console.log(response);
+        this.carList = response.data;
+        if (this.carList.length == 0) {
+          this.carNum = "点击选择车牌";
+          this.carList = {
+            name: "前往绑定车牌页面"
+          };
+        } else if (this.carList.length == 3) {
+          this.carList.forEach((v, i) => {
+            this.actions.push({
+              name: v.carNumber
+            });
+          });
+          this.carNum = this.carList[0].carNumber;
+        } else {
+          this.carList.forEach((v, i) => {
+            console.log(v)
+            this.actions.push({
+              name: v.carNumber
+            });
+          });
+          this.carNum = this.carList[0].carNumber;
+          this.actions.push({
+            name: "前往绑定车牌页面"
+          });
+        }
+      });
+    },
+    changeCount(val){
+      console.log( this.count)
+      this.payPrice = this.actPrice * this.count
+      this.getEffDate(val)
+    },
+
     onSelect(item) {
       // 默认情况下点击选项时不会自动收起
       // 可以通过 close-on-click-action 属性开启自动收起
       this.show = false;
       this.carNum = item.name;
-      Toast(item.name);
+      console.log(item.name);
+      if (item.name == "前往绑定车牌页面") {
+        this.$router.push({
+            name: "addCarNum"
+          }
+        );
+      }
     },
     confirmDate(val) {
       console.log(val);
-      this.valueStart = val;
+      this.valueStart = this.$utils.formatDate(val,1);
+      this.getEffDate(this.count)
       this.showDate = false;
     },
     cancelDate() {
       this.showDate = false;
+    },
+    buyCardHandle(){ // 购买续费
+      //mypaySrcType 301 会员卡购买单 302 会员卡续费
+      // cardCouponsId	是	string	已购买的会员卡id 新增不传 续费必传
+      // optType	是	string	操作类型 1 购买 2 续费
+      if (this.carNum == '点击选择车牌') {
+        this.$toast('请先选择车牌')
+        return;
+      }
+
+      let jsondata = {
+        plNo: this.plNo,
+        cardNo: this.cardNo,
+        cardType: this.cardType,
+        carType: this.carType,
+        price: this.actPrice,
+        totalAmount: (this.payPrice*this.discValue)/10,
+        num: this.count,
+        effDate: this.valueStart,
+        expDate: this.effDate,
+        carNumber: this.carNum,
+        optType: 1,
+        cardCouponsId:'',
+        forceBuy: '1'
+      };
+      jsondata.sign = this.$utils.signObject(jsondata);
+      createVipCardOrder2022(jsondata).then(response => {
+        console.log(response);
+        if(response.code == 0){
+          let orderId = response.data.orderId
+          console.log(orderId)
+        }else if(response.code== 5006){
+          this.$toast('请先去补缴欠费订单')
+        }else{
+          this.$toast(response.message)
+        }
+
+      });
+
     }
   }
 };