From d2fe64ed862067b702b7b6e4830a7b262edff09d Mon Sep 17 00:00:00 2001
From: liugongyu <290219706@qq.com>
Date: Fri, 4 Aug 2023 09:08:36 +0800
Subject: [PATCH] 西城 所有车牌购买会员卡

---
 src/api/cards/cards.js             |  28 +++++++++++++++++++++++++++-
 src/api/plateNumber/plateNumber.js |   3 ---
 src/router/index.js                |   2 +-
 src/utils/request.js               |   2 +-
 src/utils/utils.js                 |   4 ++--
 src/views/cards/Cards.vue          |  33 ++++++++++++++++++++++++++++++---
 src/views/cards/buyCard.vue        | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------
 src/views/parkPay/plateNumber.vue  |  26 +++++++++++++-------------
 8 files changed, 135 insertions(+), 72 deletions(-)

diff --git a/src/api/cards/cards.js b/src/api/cards/cards.js
index c6f4e70..8c1be67 100644
--- a/src/api/cards/cards.js
+++ b/src/api/cards/cards.js
@@ -11,6 +11,19 @@ export function queryVipCardsByCustId(params) {
 }
 
 
+//   查询车牌已购买的会员卡
+export function queryVipCardsByCarNumberForH5(params) {  //  轮播图
+  return request({
+    url: '/parkvip/queryVipCardsByCarNumberForH5',
+    method: 'post',
+    data: params
+  })
+}
+
+
+
+
+
 //   根据组织id查询区域卡/时域卡规则信息
 export function queryVipAreaCardByOrgId(params) {
   return request({
@@ -34,12 +47,25 @@ export function queryVipAreaCardByOrgId(params) {
 // 搜索停车场
 export function queryParkListForVipCard(params) {
   return request({
-    url: 'applyVipCard/queryParkListForVipCard',
+    url: 'parkvip/queryParkListForVipCardByH5',
     method: 'post',
     data: params
   })
 }
 
+
+
+
+// 搜索卡类型 xuqiang
+export function queryVipCardInfoByPlNoForH5(params) {
+  return request({
+    url: '/parkvip/queryVipCardInfoByPlNoForH5',
+    method: 'post',
+    data: params
+  })
+}
+
+
 // 搜索卡类型
 export function queryVipCardInfoByPlNo(params) {
   return request({
diff --git a/src/api/plateNumber/plateNumber.js b/src/api/plateNumber/plateNumber.js
index 52dba6f..437a3cb 100644
--- a/src/api/plateNumber/plateNumber.js
+++ b/src/api/plateNumber/plateNumber.js
@@ -9,6 +9,3 @@ export function swiperQuery(params) {  //  轮播图
 }
 
 
-
-
-
diff --git a/src/router/index.js b/src/router/index.js
index 60bdec3..229a748 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -32,7 +32,7 @@ export default new Router({
       name: 'plateNumber',
       component: plateNumber,
       meta:{
-        title:'停车缴费'
+        title:'车牌查询会员卡'
       }
     },
 
diff --git a/src/utils/request.js b/src/utils/request.js
index a858551..7a15926 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -5,7 +5,7 @@ import axios from 'axios'
 const service = axios.create({
   // http://dev.renniting.cn/pay/  赤峰测试
   // http://pay.service.renniting.cn/  赤峰
-  baseURL: 'http://pay.service.renniting.cn/', // url = base url + request url
+  baseURL: 'http://dev.renniting.cn/pay/', // url = base url + request url
   // withCredentials: true, // send cookies when cross-domain requests
   timeout: 6000 // request timeout
 })
diff --git a/src/utils/utils.js b/src/utils/utils.js
index d801115..79e1ddd 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -162,7 +162,7 @@ export default {
   // 黄石 appid    wxa1a66cc7d263afe6
   // 阳明 wxdfb0276f85514ea3
   // 无锡 wx1e9001e5940605b1
-  myOrgId: "10005", // 归属地 赤峰id  10003    黄石 10079  无锡10005    扬明10193
+  myOrgId: "10003", // 归属地 赤峰id  10003    黄石 10079  无锡10005    扬明10193  西城10007
   myGetSign: function(objb) { // 获取签名
     var compare = function(obj1, obj2) {
       var val1 = obj1.keyname;
@@ -209,7 +209,7 @@ export default {
       deviceInfo: this.myDeviceInfo,
       salt: salt,
       sign_type: "md5",
-      token:  sessionStorage.getItem("wx_Token"),  //c23849735f3442f3b95f7bec816317ae  "63a193ae1db543fab63052348cbcfa1d"   sessionStorage.getItem("wx_Token")
+      // token:  sessionStorage.getItem("wx_Token"),  //c23849735f3442f3b95f7bec816317ae  "63a193ae1db543fab63052348cbcfa1d"   sessionStorage.getItem("wx_Token")
       orgId: this.myOrgId
     };
     return reqData;
diff --git a/src/views/cards/Cards.vue b/src/views/cards/Cards.vue
index 963eba5..a9ab167 100644
--- a/src/views/cards/Cards.vue
+++ b/src/views/cards/Cards.vue
@@ -45,12 +45,13 @@
 
     </div>
     <!--<x-button type="primary" ></x-button>-->
-    <mt-button type="primary" size="large" @click.native="$router.push({path:'buyCard'})">购买会员卡</mt-button>
+    <!--<mt-button type="primary" size="large" @click.native="$router.push({path:'buyCard'})">购买会员卡</mt-button>-->
+    <mt-button type="primary" size="large" @click.native="toBuy">购买会员卡</mt-button>
   </div>
 </template>
 
 <script>
-import { queryVipCardsByCustId } from "@/api/cards/cards";
+import { queryVipCardsByCustId, queryVipCardsByCarNumberForH5 } from "@/api/cards/cards";
 export default {
   name: "Cards",
   data() {
@@ -59,10 +60,25 @@ export default {
     };
   },
   mounted() {
-    this.queryVipCardsByCustId();
+    // this.queryVipCardsByCustId();
+    this.queryVipCardsByCarNumberForH5()
   },
   methods: {
     // 获取会员卡列表
+    queryVipCardsByCarNumberForH5:function(){
+      let jsondata = this.$utils.commonParams();
+      jsondata.carNumber = this.$route.query.carNumber
+      jsondata.carNumberColor = this.$route.query.carNumberColor
+      jsondata.sign = this.$utils.signObject(jsondata);
+      queryVipCardsByCarNumberForH5(jsondata).then(data => {
+        console.log(data);
+        if (data.code == 0) {
+
+        } else {
+          this.$vux.toast.text(data.message, "top");
+        }
+      });
+    },
     queryVipCardsByCustId: function() {
       let jsondata = this.$utils.commonParams();
       jsondata.sign = this.$utils.signObject(jsondata);
@@ -81,6 +97,17 @@ export default {
       console.log(i);
       sessionStorage.setItem("renewData", JSON.stringify(i));
       this.$router.push("renew");
+    },
+
+    // 购买
+    toBuy:function() {
+      this.$router.push({
+        path:'buyCard',
+        query:{
+          carNumber:this.$route.query.carNumber,
+          carNumberColor: this.$route.query.carNumberColor
+        }
+      })
     }
   }
 };
diff --git a/src/views/cards/buyCard.vue b/src/views/cards/buyCard.vue
index 298bee2..4b7b67d 100644
--- a/src/views/cards/buyCard.vue
+++ b/src/views/cards/buyCard.vue
@@ -11,24 +11,36 @@
       </li>
 
 
+      <li>
+        <div style="color: #666">绑定车牌</div>
+        <div> {{$route.query.carNumber}}</div>
+      </li>
+
+
+      <li>
+        <div style="color: #666">卡类型</div>
+        <div>月卡</div>
+      </li>
+
+
       <!--<li>-->
       <!--<div style="color: #666">卡名称</div>-->
       <!--<div>微纳园卡</div>-->
       <!--</li>-->
 
-      <li>
-        <div style="color: #666">选择卡类型</div>
-        <div @click="cardTypeListVisible = true">{{carType}}</div>
-        <div class="arrow">></div>
-        <!--<div class="arrow">></div>-->
-      </li>
+      <!--<li>-->
+      <!--<div style="color: #666">选择卡类型</div>-->
+      <!--<div @click="cardTypeListVisible = true">{{carType}}</div>-->
+      <!--<div class="arrow">></div>-->
+      <!--&lt;!&ndash;<div class="arrow">></div>&ndash;&gt;-->
+      <!--</li>-->
 
 
-      <li>
-        <div style="color: #666">绑定车牌</div>
-        <div @click="carNumberVisible = true">{{carNumber}}</div>
-        <div class="arrow">></div>
-      </li>
+      <!--<li>-->
+      <!--<div style="color: #666">绑定车牌</div>-->
+      <!--<div @click="carNumberVisible = true">{{carNumber}}</div>-->
+      <!--<div class="arrow">></div>-->
+      <!--</li>-->
 
       <li>
         <div style="color: #A31414">生效时间</div>
@@ -167,7 +179,8 @@ import {
   queryVipCardInfoByPlNo,
   queryUserCars,
   weixinpay,
-  createVipCardOrder
+  createVipCardOrder,
+  queryVipCardInfoByPlNoForH5
 } from "@/api/cards/cards";
 import { timestampToTime } from "../../utils/utils.js";
 export default {
@@ -180,7 +193,7 @@ export default {
       startDate: new Date(),
       dateVal: "",
       selectedValue: "",
-      startData: "",
+      startData: new Date(),
       endDate: "",
       parkName: "请点击选择",
       parkNameVisible: false,
@@ -200,7 +213,7 @@ export default {
       disPrice: 0, // 优惠金额
       needPay: 0, // 应付
       agreement: false,
-      typeNum: 0, // 卡类型判断
+      typeNum: 4, // 卡类型判断
       showHideOnBlur: false, // 购买协议
       createVipCardOrder: {}, // 创建订单对象
       orderId: "" // 订单号
@@ -208,7 +221,7 @@ export default {
   },
   mounted() {
     this.queryParkListForVipCard();  // 获取停车场
-    this.queryUserCars();  // 获取用户车牌
+    // this.queryUserCars();  // 获取用户车牌
   },
   computed: {
     // 卡类型 1-年卡；2-半年卡；3-季卡；4-月卡；5-日卡；
@@ -216,24 +229,24 @@ export default {
       if (this.startData) {
         switch (this.typeNum) {
           case 1:
-            this.endDate = this.$moment(this.startData).add(12*this.cardNum, "month").format("YYYY-MM-DD");
-            return this.$moment(this.startData).add(12*this.cardNum, "month").format("YYYY-MM-DD");
+            this.endDate = this.$moment(this.startData).add(12 * this.cardNum, "month").format("YYYY-MM-DD");
+            return this.$moment(this.startData).add(12 * this.cardNum, "month").format("YYYY-MM-DD");
             break;
           case 2:
-            this.endDate = this.$moment(this.startData).add(6*this.cardNum, "month").format("YYYY-MM-DD");
-            return this.$moment(this.startData).add(6*this.cardNum, "month").format("YYYY-MM-DD");
+            this.endDate = this.$moment(this.startData).add(6 * this.cardNum, "month").format("YYYY-MM-DD");
+            return this.$moment(this.startData).add(6 * this.cardNum, "month").format("YYYY-MM-DD");
             break;
           case 3:
-            this.endDate = this.$moment(this.startData).add(3*this.cardNum, "month").format("YYYY-MM-DD");
-            return this.$moment(this.startData).add(3*this.cardNum, "month").format("YYYY-MM-DD");
+            this.endDate = this.$moment(this.startData).add(3 * this.cardNum, "month").format("YYYY-MM-DD");
+            return this.$moment(this.startData).add(3 * this.cardNum, "month").format("YYYY-MM-DD");
             break;
           case 4:
-            this.endDate = this.$moment(this.startData).add(1*this.cardNum, "month").format("YYYY-MM-DD");
-            return this.$moment(this.startData).add(1*this.cardNum, "month").format("YYYY-MM-DD");
+            this.endDate = this.$moment(this.startData).add(1 * this.cardNum, "month").format("YYYY-MM-DD");
+            return this.$moment(this.startData).add(1 * this.cardNum, "month").format("YYYY-MM-DD");
             break;
           case 5:
-            this.endDate = this.$moment(this.startData).add(1*this.cardNum, "days").format("YYYY-MM-DD");
-            return this.$moment(this.startData).add(1*this.cardNum, "days").format("YYYY-MM-DD");
+            this.endDate = this.$moment(this.startData).add(1 * this.cardNum, "days").format("YYYY-MM-DD");
+            return this.$moment(this.startData).add(1 * this.cardNum, "days").format("YYYY-MM-DD");
             break;
         }
         // return  this.$moment(this.startData).add(1,"month").format("YYYY-MM-DD");
@@ -274,7 +287,7 @@ export default {
     },
     // 打开时间选择器
     selectData() {
-      this.dateVal = this.startData
+      this.dateVal = this.startData;
       this.$refs["datePicker"].open();
       // console.log(this.startData)
       // this.endDate = this.startData.setMonth(this.startData.getMonth()+1)
@@ -283,7 +296,7 @@ export default {
     //
     queryParkListForVipCard() {
       let jsondata = this.$utils.commonParams();
-      jsondata.parkName = ""; //搜索的停车场名称
+      jsondata.plName = ""; //搜索的停车场名称
       jsondata.sign = this.$utils.signObject(jsondata);
       queryParkListForVipCard(jsondata).then(data => {
         console.log(data);
@@ -302,7 +315,7 @@ export default {
       });
     },
     handleConfirm() {
-      console.log('11111');
+      console.log("11111");
       console.log(this.dateVal);
       this.startData = this.$utils.timestampToTime(this.dateVal);
       // this.endDate = this.dateVal.setMonth(this.dateVal.getMonth() + 1);
@@ -313,20 +326,22 @@ export default {
       this.parkName = e.name;
       this.parkNo = e.parkNo;
       // alert(this.parkNo)
-      this.queryVipCardInfoByPlNo();
+      this.queryVipCardInfoByPlNoForH5();
     },
     //  根据停车场搜卡类型
-    queryVipCardInfoByPlNo() {
+    queryVipCardInfoByPlNoForH5() {
       let me = this;
       let jsondata = this.$utils.commonParams();
       jsondata.plNo = this.parkNo;
-      jsondata.plNo = this.parkNo;
+      jsondata.cardType = "4";
+      // jsondata.parkName = this.parkName;
+
       jsondata.sign = this.$utils.signObject(jsondata);
-      queryVipCardInfoByPlNo(jsondata).then(data => {
+      queryVipCardInfoByPlNoForH5(jsondata).then(data => {
         console.log(data);
         if (data.code == 0) {
-          me.cardTypeList = []
-          me.carType = '请点击选择'
+          me.cardTypeList = [];
+          me.carType = "请点击选择";
           // res.vipCardList =
           // this.cardTypeList = res.vipCardList
           // { name: "月卡", num: 1, method: this.clickAction },
@@ -337,10 +352,9 @@ export default {
             me.cardTypeList.push(item);
           });
           console.log(me.cardTypeList);
-          if(me.carType=='请点击选择'){
-
-          }else{
-            me.cardNum = 1
+          if (me.carType == "请点击选择") {
+          } else {
+            me.cardNum = 1;
             me.unitPrice = vipCardList[0].price;
             me.disPrice = vipCardList[0].price * ((10 - vipCardList[0].discValue) / 10);
             me.needPay = this.unitPrice - this.disPrice;
@@ -385,7 +399,6 @@ export default {
     },
     addCardNum() { // 增加购买数量
       this.cardNum++;
-
       this.calcMoney();
     },
     reduceCarNum() { // 增加购买数量
@@ -404,15 +417,15 @@ export default {
         this.$vux.toast.text("请选择停车场", "top");
         return;
       }
-      console.log(this.carType)
-      if (this.carType == "请点击选择") {
-        this.$vux.toast.text("请选择卡类型", "top");
-        return;
-      }
-      if (this.carNumber == "请选择车牌") {
-        this.$vux.toast.text("请选择车牌", "top");
-        return;
-      }
+      // console.log(this.carType);
+      // if (this.carType == "请点击选择") {
+      //   this.$vux.toast.text("请选择卡类型", "top");
+      //   return;
+      // }
+      // if (this.carNumber == "请选择车牌") {
+      //   this.$vux.toast.text("请选择车牌", "top");
+      //   return;
+      // }
       if (!this.agreement) {
         this.$vux.toast.text("请同意购买须知", "top");
         return;
diff --git a/src/views/parkPay/plateNumber.vue b/src/views/parkPay/plateNumber.vue
index 68b32be..11c581d 100644
--- a/src/views/parkPay/plateNumber.vue
+++ b/src/views/parkPay/plateNumber.vue
@@ -74,19 +74,19 @@
 
 
       <div class="submit-box" @click="submitFn()">
-        查询
+        购买
       </div>
 
-      <div>
-        <p style="margin-bottom: 18px;margin-top: 18px;">查询记录</p>
-        <ul class="bound-list" v-if="boundList.length>0">
-          <li v-for="i in boundList" :key="i" @click="boundHandle(i)">
-            <span>{{ i }}</span>
-          </li>
-        </ul>
-        <div v-else style="text-align: center;padding: 10px 0;">暂无查询记录</div>
-        <!--<div class="addCarNum"><span></span>添加车辆</div>-->
-      </div>
+      <!--<div>-->
+        <!--<p style="margin-bottom: 18px;margin-top: 18px;">查询车牌记录</p>-->
+        <!--<ul class="bound-list" v-if="boundList.length>0">-->
+          <!--<li v-for="i in boundList" :key="i" @click="boundHandle(i)">-->
+            <!--<span>{{ i }}</span>-->
+          <!--</li>-->
+        <!--</ul>-->
+        <!--<div v-else style="text-align: center;padding: 10px 0;">暂无查询记录</div>-->
+        <!--&lt;!&ndash;<div class="addCarNum"><span></span>添加车辆</div>&ndash;&gt;-->
+      <!--</div>-->
 
 
 
@@ -416,7 +416,7 @@ export default {
     boundHandle(i) { // 记录点击事件
       console.log(i)
       this.$router.push({
-        path:'parkRecord',
+        path:'cards',
         query:{
           carNumber:i,
           carNumberColor: this.currentColor
@@ -530,7 +530,7 @@ export default {
       console.log(this.boundList)
 
       this.$router.push({
-        path:'parkRecord',
+        path:'Cards',
         query:{
           carNumber:plateLicense,
           carNumberColor: this.currentColor
--
libgit2 0.21.4