diff --git a/src/api/card/card.js b/src/api/card/card.js
new file mode 100644
index 0000000..098c5cd
--- /dev/null
+++ b/src/api/card/card.js
@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+export function queryVipCardListByOrgId(params) { //查询停车场-会员卡-根据orgID
+  return request({
+    url: 'parkvip/queryVipCardListByOrgId',
+    method: 'post',
+    data: params
+  })
+}
+
+
+export function queryVipCardListByPlName(params) { //搜索有会员卡的停车场
+  return request({
+    url: 'parkvip/queryVipCardListByPlName',
+    method: 'post',
+    data: params
+  })
+}
+
+export function queryVipCardByPlNo(params) { //查询某个停车场的 具体的会员卡信息
+  return request({
+    url: 'parkvip/queryVipCardByPlNo',
+    method: 'post',
+    data: params
+  })
+}
diff --git a/src/router/index.js b/src/router/index.js
index 16dcbba..ff342c4 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,17 +1,15 @@
-import Vue from 'vue'
-import Router from 'vue-router'
-import plateNumber from '@/views/parkPay/plateNumber'
+import Vue from "vue";
+import Router from "vue-router";
+import plateNumber from "@/views/parkPay/plateNumber";
 // import parkRecord from '@/views/parkPay/parkRecord'
 // import selfNav from '@/views/mySelf/selfNav'
-
-Vue.use(Router)
-
+Vue.use(Router);
 export default new Router({
   routes: [
     {
-      path: '/',
+      path: "/",
       redirect: {
-        name: 'plateNumber'
+        name: "plateNumber"
       }
     },
     // {
@@ -19,155 +17,119 @@ export default new Router({
     //   name: 'navigation',
     //   component: navigation
     // },
-
     {
-      path: '/parkRecord',
-      name: 'parkRecord',
+      path: "/parkRecord",
+      name: "parkRecord",
       component: () => import("@/views/parkPay/parkRecord.vue")
     },
     {
-      path: '/plateNumber',
-      name: 'plateNumber',
+      path: "/plateNumber",
+      name: "plateNumber",
       component: plateNumber
     },
-
     {
-      path: '/orderPay',
-      name: 'orderPay',
+      path: "/orderPay",
+      name: "orderPay",
       component: () => import("@/views/parkPay/orderPay.vue")
     },
-
-
     {
-      path: '/map',
-      name: 'map',
+      path: "/map",
+      name: "map",
       component: () => import("@/views/map/map.vue")
     },
-
     {
-      path: '/parkList',
-      name: 'parkList',
+      path: "/parkList",
+      name: "parkList",
       component: () => import("@/views/map/parkList.vue")
     },
-
     {
-      path: '/parkinfo',
-      name: 'parkinfo',
+      path: "/parkinfo",
+      name: "parkinfo",
       component: () => import("@/views/map/parkinfo.vue")
     },
-
     {
-      path: '/search',
-      name: 'search',
+      path: "/search",
+      name: "search",
       component: () => import("@/views/map/search.vue")
     },
-
-
-
-
-
-
-     //---------------- 个人页面导航
+    //---------------- 个人页面导航
     {
-      path: '/selfNav',
-      name: 'selfNav',
+      path: "/selfNav",
+      name: "selfNav",
       component: () => import("@/views/mySelf/selfNav.vue"),
-      meta: {title: "个人中心"}
+      meta: {
+        title: "个人中心" ,
+        keepAlive: false, //此组件不需要被缓存
+      }
     },
-
     // ------------------------建议反馈
     {
-      path: '/suggestionBack',
-      name: 'suggestionBack',
+      path: "/suggestionBack",
+      name: "suggestionBack",
       component: () => import("@/views/mySelf/feedback/suggestionBack.vue"),
-      meta: {title: "建议反馈"}
+      meta: { title: "建议反馈" }
     },
-
     // ------------------------停车记录
     {
-      path: '/parkNotes',
-      name: 'parkNotes',
+      path: "/parkNotes",
+      name: "parkNotes",
       component: () => import("@/views/mySelf/parkNotes/parkNotes.vue")
     },
-
-
     // ------------------------登录
     {
-      path: '/binDing',
-      name: 'binDing',
+      path: "/binDing",
+      name: "binDing",
       component: () => import("@/views/binding/binDing.vue"),
-      meta: {title: "绑定手机号"}
+      meta: { title: "绑定手机号" }
     },
     {
-      path: '/myCars',
-      name: 'myCars',
+      path: "/myCars",
+      name: "myCars",
       component: () => import("@/views//mySelf/myCars/myCars.vue"),
-      meta: {title: "我的车牌"}
+      meta: { title: "我的车牌" }
     },
-
     {
-      path: '/addCarNum',
-      name: 'addCarNum',
+      path: "/addCarNum",
+      name: "addCarNum",
       component: () => import("@/views//mySelf/myCars/addCarNum.vue"),
-      meta: {title: "添加车牌"}
+      meta: { title: "添加车牌" }
     },
     {
-      path: '/rzCarNumber',
-      name: 'rzCarNumber',
-      component: () => import("@/views//mySelf/myCars/rzCarNumber.vue"),
+      path: "/rzCarNumber",
+      name: "rzCarNumber",
+      component: () => import("@/views//mySelf/myCars/rzCarNumber.vue")
       // meta: {title: "认证车牌"}
     },
-
-
     {
-      path: '/cardList',
-      name: 'cardList',
+      path: "/cardList",
+      name: "cardList",
       component: () => import("@/views//cards/cardList.vue"),
-      meta: {title: "会员卡列表"}
+      meta: { title: "会员卡列表" }
     },
-
-
     {
-      path: '/buyCardDetail',
-      name: 'buyCardDetail',
+      path: "/buyCardDetail",
+      name: "buyCardDetail",
       component: () => import("@/views//cards/buyCardDetail.vue"),
-      meta: {title: "购买会员卡"}
+      meta: { title: "购买会员卡" }
     },
-
     {
-      path: '/buyVipCard',
-      name: 'buyVipCard',
+      path: "/buyVipCard",
+      name: "buyVipCard",
       component: () => import("@/views//cards/buyVipCard.vue"),
-      meta: {title: "购买会员卡"}
+      meta: { title: "购买会员卡" }
     },
-
-
-
-
-
     // ------------------------购买会员卡提示
     {
-      path: '/cardPoint',
-      name: 'cardPoint',
+      path: "/cardPoint",
+      name: "cardPoint",
       component: () => import("@/views/cards/cardPoint.vue")
     },
-
-
     // ------------------------购买会员卡
     {
-      path: '/buyCard',
-      name: 'buyCard',
+      path: "/buyCard",
+      name: "buyCard",
       component: () => import("@/views/cards/buyCard.vue"),
-      meta: {title: "购买会员卡"}
-    },
-
-
-
-
-
-
-
-
-
+      meta: { title: "购买会员卡" }
+    }
   ]
-})
+});
diff --git a/src/views/cards/buyCardDetail.vue b/src/views/cards/buyCardDetail.vue
index 2e90b86..52a1eb3 100644
--- a/src/views/cards/buyCardDetail.vue
+++ b/src/views/cards/buyCardDetail.vue
@@ -10,35 +10,45 @@
       <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;" @click="LinkBuyCard">
+    <van-cell-group inset style="margin-bottom: 10px;" v-for="i in list" @click="LinkBuyCard">
       <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 :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-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-group>-->
   </section>
 
 </template>
 
 <script>
+
+import { queryVipCardByPlNo } from "@/api/card/card";
 export default {
   name: "buyCardDetail",
+  data(){
+    return{
+      plNo:'',
+      list:[]
+    }
+  },
+  created(){
+    this.plNo = this.$route.query.plNo
+    console.log(this.plNo)
+    this.queryVipCardByPlNo()
+  },
 
   methods:{
     LinkBuyCard(){
@@ -46,6 +56,19 @@ export default {
           name: "buyVipCard"
         }
       );
+    },
+    queryVipCardByPlNo() {
+      let jsondata = {
+        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
+      });
     }
   }
 };
diff --git a/src/views/cards/cardList.vue b/src/views/cards/cardList.vue
index e9cf55a..7d2969a 100644
--- a/src/views/cards/cardList.vue
+++ b/src/views/cards/cardList.vue
@@ -15,21 +15,17 @@
       </van-col>
     </van-row>
 
-    <ul>
-      <li class="cardListWrap" @click="toBuyCardPage">
-        <div class="van-ellipsis" style="padding: 20px 0  10px 10px">万达停车场plName</div>
-        <div class="van-ellipsis" style="padding: 10px 0  20px 10px">万达停车场plAddress</div>
-      </li>
-      <li class="cardListWrap">
-        <div class="van-ellipsis" style="padding: 20px 0  10px 10px">万达停车场plName</div>
-        <div class="van-ellipsis" style="padding: 10px 0  20px 10px">万达停车场plAddress</div>
+    <ul v-if="cardList.length>0">
+      <li class="cardListWrap" v-for="i in cardList[0].parkList" @click="toBuyCardPage(i)">
+        <div class="van-ellipsis" style="padding: 20px 0  10px 10px">{{i.plName}}</div>
+        <div class="van-ellipsis" style="padding: 10px 0  20px 10px;color: #999">{{i.plAddress}}</div>
       </li>
     </ul>
 
 
-    <section style="text-align: center;padding-top: 20px">
-      <van-image :src="require('../../assets/images/cards/novipcard.png')" />
-      <p>为找到会员卡</p>
+    <section style="text-align: center;padding-top: 20px" v-else>
+      <van-image :src="require('../../assets/images/cards/novipcard.png')"/>
+      <p>未找到会员卡</p>
     </section>
 
 
@@ -38,33 +34,69 @@
 </template>
 
 <script>
-import { Toast } from 'vant';
+import { queryVipCardListByOrgId, queryVipCardListByPlName } from "@/api/card/card";
 export default {
   name: "cardList",
   data() {
     return {
-      value: '',
+      value: "",
+      cardList: []
     };
   },
+  created() {
+    this.queryVipCardListByOrgId();
+  },
   methods: {
     onSearch(val) {
-      Toast(val);
+      console.log("111" + val);
+      // Toast(val);
+      let jsondata = {
+        orgId: this.$utils.orgId,
+        parkName: val,
+        saleChannel: "2"
+      };
+      jsondata.sign = this.$utils.signObject(jsondata);
+      queryVipCardListByPlName(jsondata).then(response => {
+        // console.log(response.data[0].parkList);
+        this.cardList = response.data;
+        console.log(response);
+      });
     },
     onCancel() {
-      Toast('取消');
+      // Toast('取消');
     },
-    toBuyCardPage(){
+    toBuyCardPage(i) {
       this.$router.push({
-          name: "buyCardDetail"
+          name: "buyCardDetail",
+          query: {
+            plNo: i.plNo,
+            plName: i.plName,
+            plAddress: i.plAddress
+          }
         }
       );
+    },
+    queryVipCardListByOrgId() {
+      let jsondata = {
+        orgId: this.$utils.orgId,
+        longitude: "115.10114",
+        latitude: "40.616892",
+        type: "00",
+        limit: "10000000",
+        saleChannel: "2"
+      };
+      jsondata.sign = this.$utils.signObject(jsondata);
+      queryVipCardListByOrgId(jsondata).then(response => {
+        console.log(response.data);
+        this.cardList = response.data;
+      });
     }
-  },
+  }
 };
 </script>
 
 <style scoped>
-  .cardListWrap{
+  .cardListWrap {
     margin-top: 15px;
     margin-left: 0px;
     margin-right: 0px;
diff --git a/src/views/mySelf/selfNav.vue b/src/views/mySelf/selfNav.vue
index fa2fd72..1e45e99 100644
--- a/src/views/mySelf/selfNav.vue
+++ b/src/views/mySelf/selfNav.vue
@@ -81,10 +81,10 @@ export default {
         );
       } else {
         this.$toast("请先登录");
-        this.$router.push({
-            name: "binDing"
-          }
-        );
+        // this.$router.push({
+        //     name: "binDing"
+        //   }
+        // );
       }
     },
     toBindingPage() {