diff --git a/src/views/cards/buyVipCard.vue b/src/views/cards/buyVipCard.vue
index 76a37ff..87a6805 100644
--- a/src/views/cards/buyVipCard.vue
+++ b/src/views/cards/buyVipCard.vue
@@ -1,25 +1,40 @@
 <template>
   <section style="width: 100%;height: 100%;background: #fff">
     <van-cell-group style="border-bottom: 10px solid #fafafa">
-      <van-cell title="车牌号" is-link>
+      <van-cell title="车牌号" v-if="xufeiFlag==2">
+        <template>{{$route.query.carNumber}}</template>
+      </van-cell>
+
+      <van-cell title="车牌号" is-link v-else>
         <template>
           <p @click="show = true" style="color: #1989fa">{{carNum}}</p>
           <van-action-sheet v-model="show" :actions="actions" @select="onSelect"/>
         </template>
       </van-cell>
+
+
       <van-cell title="适用停车场" :value="plName"/>
       <van-cell title="卡类别" :value="cardNickname"/>
       <van-cell title="卡名称" :value="cardName"/>
-      <van-cell title="生效时间" is-link>
+
+      <van-cell title="生效时间"  v-if="xufeiFlag==2">
+        <template>
+          {{valueStart}}
+        </template>
+      </van-cell>
+      <van-cell title="生效时间" is-link v-else>
         <template>
           <p @click="showDate = true" style="color: #1989fa"> {{valueStart}}</p>
         </template>
       </van-cell>
+
+
+
       <van-cell title="失效时间" :value="effDate"/>
 
       <van-cell title="购买数量">
         <template>
-          <van-stepper v-model="count" :min="1" theme="round" button-size="22" disable-input  @change="changeCount"/>
+          <van-stepper v-model="count" :min="1" theme="round" button-size="22" disable-input @change="changeCount"/>
         </template>
       </van-cell>
     </van-cell-group>
@@ -48,8 +63,11 @@
 
 
       <van-cell title="优惠">
+
         <template>
-          <p style="font-size: 16px;font-weight: 600;color: #f00;">{{discValue}}折</p>
+          <p style="font-size: 16px;font-weight: 600;color: #f00;" v-if="discValue == undefined || discValue >= 10">
+            暂无优惠</p>
+          <p style="font-size: 16px;font-weight: 600;color: #f00;" v-else>{{discValue}}折</p>
         </template>
       </van-cell>
 
@@ -77,18 +95,18 @@ export default {
   name: "buyVipCard",
   data() {
     return {
-      plName:'',
-      cardNo:'',
-      plNo:'',
+      plName: "",
+      cardNo: "",
+      plNo: "",
       carList: [],
       carNum: "",
       show: false,
       actions: [],
-      minDate: '',
+      minDate: "",
       maxDate: new Date(2099, 10, 14),
-      currentDate: '',
+      currentDate: "",
       valueStart: "",
-      effDate:'',// 失效时间
+      effDate: "",// 失效时间
       showDate: false,
       count: 1, // 购买数量
       cardName: "",//卡名称
@@ -97,14 +115,14 @@ export default {
       cardNickname: "",//卡类别
       actPrice: "",//单价
       discValue: "",//优惠
-      payPrice: "" // 支付金额
+      payPrice: "", // 支付金额
+      xufeiFlag: ""//判断是否续费  1否    2是
     };
   },
   created() {
-
+    this.xufeiFlag = this.$route.query.xufeiFlag;
     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;
@@ -147,57 +165,57 @@ export default {
     console.log(this.actPrice);
     console.log(this.discValue);
     console.log(this.payPrice);
-    this.queryUserCars();
-
-    this.getStartDate()
+    if (this.xufeiFlag == 2) { // 2代表续费
+      this.valueStart = this.$route.query.expDate;
+      // effDate
+      this.getEffDate(1);
+    } else {
+      this.queryUserCars();
+      this.getStartDate();
+    }
   },
   methods: {
-    getStartDate(){
+    getStartDate() {
       let dateTime = new Date();
-      this.valueStart = this.$utils.formatDate(dateTime,1)
+      this.valueStart = this.$utils.formatDate(dateTime, 1);
       // this.minDate = this.$utils.formatDate(dateTime,1)
-      this.minDate = new Date()
-
+      this.minDate = new Date();
       //  计算失效日期根据卡类型
-      this.getEffDate(1)
+      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')
+    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 == 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 == 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 == 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 == 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 == 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 == 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')
+      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 = {};
@@ -219,7 +237,7 @@ export default {
           this.carNum = this.carList[0].carNumber;
         } else {
           this.carList.forEach((v, i) => {
-            console.log(v)
+            console.log(v);
             this.actions.push({
               name: v.carNumber
             });
@@ -231,12 +249,11 @@ export default {
         }
       });
     },
-    changeCount(val){
-      console.log( this.count)
-      this.payPrice = this.actPrice * this.count
-      this.getEffDate(val)
+    changeCount(val) {
+      console.log(this.count);
+      this.payPrice = this.actPrice * this.count;
+      this.getEffDate(val);
     },
-
     onSelect(item) {
       // 默认情况下点击选项时不会自动收起
       // 可以通过 close-on-click-action 属性开启自动收起
@@ -252,51 +269,48 @@ export default {
     },
     confirmDate(val) {
       console.log(val);
-      this.valueStart = this.$utils.formatDate(val,1);
-      this.getEffDate(this.count)
+      this.valueStart = this.$utils.formatDate(val, 1);
+      this.getEffDate(this.count);
       this.showDate = false;
     },
     cancelDate() {
       this.showDate = false;
     },
-    buyCardHandle(){ // 购买续费
-      //mypaySrcType 301 会员卡购买单 302 会员卡续费
+    buyCardHandle() { // 购买续费
+      // paySrcType 301 会员卡购买单 302 会员卡续费
       // cardCouponsId	是	string	已购买的会员卡id 新增不传 续费必传
       // optType	是	string	操作类型 1 购买 2 续费
-      if (this.carNum == '点击选择车牌') {
-        this.$toast('请先选择车牌')
+      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,
+        totalAmount: (this.payPrice * this.discValue) / 10,
         num: this.count,
         effDate: this.valueStart,
         expDate: this.effDate,
         carNumber: this.carNum,
-        optType: 1,
-        cardCouponsId:'',
-        forceBuy: '1'
+        optType: this.xufeiFlag == 1 ? "1" : "2",
+        cardCouponsId: this.$router.query.custCardNo,
+        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)
+        if (response.code == 0) {
+          let orderId = response.data.orderId;
+          console.log(orderId);
+        } else if (response.code == 5006) {
+          this.$toast("请先去补缴欠费订单");
+        } else {
+          this.$toast(response.message);
         }
-
       });
-
     }
   }
 };
diff --git a/src/views/cards/cardList.vue b/src/views/cards/cardList.vue
index 7d2969a..4e13af4 100644
--- a/src/views/cards/cardList.vue
+++ b/src/views/cards/cardList.vue
@@ -11,7 +11,7 @@
         />
       </van-col>
       <van-col span="6" style="margin-top: 5px;">
-        <van-button type="info" round block>续费</van-button>
+        <van-button type="info" round block @click="toOwnCards">续费</van-button>
       </van-col>
     </van-row>
 
@@ -90,6 +90,12 @@ export default {
         console.log(response.data);
         this.cardList = response.data;
       });
+    },
+    toOwnCards() {
+      this.$router.push({
+          name: "ownCards",
+        }
+      );
     }
   }
 };
diff --git a/src/views/cards/ownCards.vue b/src/views/cards/ownCards.vue
index 9499ee6..a9b6181 100644
--- a/src/views/cards/ownCards.vue
+++ b/src/views/cards/ownCards.vue
@@ -78,7 +78,7 @@ export default {
             carType: i.carType,
             cardType: i.cardType,
             actPrice: i.actPrice,
-            discValue: i.discValue,
+            discValue: i.discount,
             plName: i.parkName,
             plAddress: i.parkAddr,
             plNo: i.parkNo,
@@ -86,10 +86,13 @@ export default {
             carNumber: i.carNumber,
             effDate: i.effDate,
             expDate: i.expDate,
-            orderPayedFee: i.orderPayedFee
+            orderPayedFee: i.orderPayedFee,
+            custCardNo: i.custCardNo,
+            xufeiFlag: 2
           }
         }
-      );
+      )
+      ;
     }
   }
 };