From 75b91c089acad57cc87112e1b25cdddf0a8b9a90 Mon Sep 17 00:00:00 2001
From: liugongyu <290219706@qq.com>
Date: Wed, 18 May 2022 10:33:32 +0800
Subject: [PATCH] 卡券发放

---
 common/common.js                    |   8 +++-----
 pages.json                          |  27 +++++++++++++++------------
 pages/businessCard/businessCard.vue |  15 +++++++++++++--
 pages/businessCard/cardPrint.vue    | 133 +++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------
 pages/businessCard/provideCard.vue  | 124 +++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------
 5 files changed, 101 insertions(+), 206 deletions(-)

diff --git a/common/common.js b/common/common.js
index dd43f6e..cc07868 100644
--- a/common/common.js
+++ b/common/common.js
@@ -31,12 +31,10 @@ const getPayOrderByOrderId = serverUrl + "/business/h5/order/getPayOrderByOrderI
 
 //   商户卡券-可以购买卡券列表-分页
 const couponRuleParkPage = serverUrl + "/business/h5/coupon/couponRuleParkPage";
-
-
 //   商户卡券-卡券申领明细
 const couponIssuedParkPage = serverUrl + "/business/h5/couponIssued/couponIssuedParkPage";
-
-
+//   商户卡券-卡券发放-生成领券的动态码
+const getCouponDynamicQR = serverUrl + "/business/h5/couponsend/getCouponDynamicQR";
 
 //陈彪接口
 
@@ -216,7 +214,7 @@ export default {
 	getPayOrderByOrderId,
   couponRuleParkPage,
   couponIssuedParkPage,
-
+  getCouponDynamicQR,
 	//陈彪接口
 	rechargeList,
 	walletKindType,
diff --git a/pages.json b/pages.json
index 5ace5ed..22d7618 100644
--- a/pages.json
+++ b/pages.json
@@ -14,6 +14,19 @@
 	"pages": [
 		// pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
+			"path": "pages/businessCard/provideCard",
+			"style": {
+				"navigationBarTitleText": "商户卡券发放"
+			}
+		},
+		{
+			"path": "pages/businessCard/businessCard",
+			"style": {
+				"navigationBarTitleText": "商户卡券"
+			}
+		},
+
+		{
 			"path": "pages/businessCard/cardDetail",
 			"style": {
 				"navigationBarTitleText": "商户卡券明细",
@@ -64,24 +77,14 @@
 			}
 		},
 
-		{
-			"path": "pages/businessCard/provideCard",
-			"style": {
-				"navigationBarTitleText": "商户卡券发放"
-			}
-		},
+
 		{
 			"path": "pages/businessCard/buyCard",
 			"style": {
 				"navigationBarTitleText": "商户卡券购买"
 			}
 		},
-		{
-			"path": "pages/businessCard/businessCard",
-			"style": {
-				"navigationBarTitleText": "商户卡券"
-			}
-		},
+
 
 		{
 			"path": "pages/parkRecordList/recordDetail",
diff --git a/pages/businessCard/businessCard.vue b/pages/businessCard/businessCard.vue
index 7e3a1a1..63f1801 100644
--- a/pages/businessCard/businessCard.vue
+++ b/pages/businessCard/businessCard.vue
@@ -18,11 +18,11 @@
                                 <uni-icons type="cart-filled" size="18" color="#999"></uni-icons>
                                 <text class="card-actions-item-text">购买</text>
                             </view>
-                            <view class="card-actions-item" @click="actionsClick('发放')" v-if="i.cardNum>0">
+                            <view class="card-actions-item" @click="provideCard(i)" v-show="i.cardNum>0">
                                 <uni-icons type="redo-filled" size="18" color="#999"></uni-icons>
                                 <text class="card-actions-item-text">发放</text>
                             </view>
-                            <view class="card-actions-item" @click="actionsClick('打印')" v-if="i.cardNum>0">
+                            <view class="card-actions-item" @click="printClick(i)" v-show="i.cardNum>0">
                                 <uni-icons type="shop-filled" size="18" color="#999"></uni-icons>
                                 <text class="card-actions-item-text">打印</text>
                             </view>
@@ -88,6 +88,17 @@ export default {
         url: '../businessCard/buyCard?optionData='+JSON.stringify(i)
       });
     },
+    printClick(i){
+      uni.navigateTo({
+        url: '../businessCard/cardPrint?optionData='+JSON.stringify(i)
+      });
+    },
+    provideCard(i){
+      uni.navigateTo({
+        url: '../businessCard/provideCard?optionData='+JSON.stringify(i)
+      });
+    }
+
   }
 }
 </script>
diff --git a/pages/businessCard/cardPrint.vue b/pages/businessCard/cardPrint.vue
index 6f1119e..98672e8 100644
--- a/pages/businessCard/cardPrint.vue
+++ b/pages/businessCard/cardPrint.vue
@@ -1,12 +1,12 @@
 <template>
     <view>
-        <uni-section title="50%(折扣券)" type="line">
+        <uni-section :title="`${cardRuleName}(${cardTypeName})`" type="line">
             <uni-card padding="0" spacing="0">
                 <uni-list>
-                    <uni-list-item title="适应车场"   rightText="万达商业广场"  >
+                    <uni-list-item title="适应车场" :rightText="plName">
                         <text></text>
                     </uni-list-item>
-                    <uni-list-item title="价格：¥5/张" rightText="商户库存：0张"></uni-list-item>
+                    <uni-list-item :title="`价格：¥${price}/张`" :rightText="`商户库存：${cardNum}张`"></uni-list-item>
                 </uni-list>
             </uni-card>
         </uni-section>
@@ -14,11 +14,10 @@
 
         <view class="paddinglr30 bg-white" style="margin-top: 10px;padding-top: 10px;padding-bottom: 10px;">
             <text style="float: left;margin-right: 15px;line-height: 29px;">打印张数:</text>
-            <uni-number-box @change="changeValue" />
+            <uni-number-box @change="changeValue" min="1" :max="maxNum"/>
         </view>
 
 
-
         <view class="uni-padding-wrap uni-common-mt">
             <!--<button type="primary" style="margin-bottom: 15px">停止自动发放</button>-->
             <button type="warn">立即打印</button>
@@ -29,127 +28,64 @@
 </template>
 
 <script>
-import common from "../../common/common.js";
 export default {
   data() {
-    const currentDate = this.getDate({
-      format: true
-    })
+
     return {
-      numberValue: 0,
-      title: 'picker',
-      array: ['全部', '充值', '支付'],
-      arrayWay: ['所有方式', '微信', '线下公对公'],
-      index: 0,
-      indexWay: 0,
-      benginDate: currentDate,
-      overDate: currentDate,
-      rows:[],
-      pageNum:1,//当前页
-      pageSize:1,//每页条数
-      reload:false,
-      status:'more',
-      contentText:{
-        contentdown:'上拉加载更多～',
-        contentrefresh:'正在加载更多～',
-        contentmore:'我是有底线的～'
-      },
-      iconType:'auto', // 图标样式
+      numberValue: 0,// 选择打印张数
+
+      cardTypeName: '',// 卡类型名称
+      cardRuleName: '',// 卡名称
+      plName:'', // 停车场
+      price:'', // 卡价格
+      cardNum:'', // 库存
+      maxNum:'', // 最多可打印
+
     }
   },
   onLoad(params) {
     wx.showShareMenu({
       withShareTicket: true
     })
-    // this.mycarNumber = params.carNumber;
-    // this.myorderId = params.orderId;
-    // this.myparkCode = params.parkCode;
-    // this.myorderState = params.orderState;
-    // this.totalFee = params.totalFee
-    // this.unPayFee = params.unPayFee
-    // if (params.orderState == 5) {
-    //   //停车补缴单 103
-    //   this.mypaySrcType = '103'
-    // } else {
-    //   this.mypaySrcType = '101'
-    // }
-    // // this.GetbillQueryInfo(this.mycarNumber, this.myorderId, this.myparkCode);
-    // this.getWxCode();
-    // this.PDlogin();
-    //console.log("xxxmake = "+this.makedateFormat());
+    let option = JSON.parse(params.optionData)
+    console.log(option)
+    this.cardTypeName = option.cardTypeName
+    this.cardRuleName = option.cardRuleName
+    this.plName = option.plName
+    this.price = option.value
+    this.cardNum = option.cardNum
+    this.maxNum = option.cardNum
   },
   onShow() {
     var me = this;
-    var userInfo = me.getGlobalUser("globalUser");
-    if (userInfo != null) {
-      me.phoneNumb = userInfo.userPhone;
-    }
-    var pages = getCurrentPages();
-    var currPage = pages[pages.length - 1]; //当前页面
-    console.log('currPage.data.selCoupon = ' + currPage.data.selCoupon);
-    me.selCoupon = currPage.data.selCoupon;
-    console.log(JSON.stringify(me.selCoupon));
-    // me.GetbillQueryInfo(me.mycarNumber, me.myorderId, me.myparkCode, me.selCoupon.cardNo, me.selCoupon.couponType, me.selCoupon
-    //   .discValue);
     // GetbillQueryInfo(carnum, orderId, parkCode, cardNo, couponType, disValue) {
   },
   computed: {
-    startDate() {
-      return this.getDate('start');
-    },
-    endDate() {
-      return this.getDate('end');
-    }
+
   },
   methods: {
-    change(value) {
+    changeValue(value) {
       this.numberValue = value
     },
-    actionsClick(text){
+    actionsClick(text) {
       uni.showToast({
-        title:text,
-        icon:'none'
+        title: text,
+        icon: 'none'
       })
     },
-    bindPickerChange: function (e) {
-      console.log('picker发送选择改变，携带值为', e.detail.value)
-      this.index = e.detail.value
-    },
-    bindPickerChangeWay: function (e) {
-      console.log('picker发送选择改变，携带值为', e.detail.value)
-      this.indexWay = e.detail.value
-    },
-    bindStartDateChange: function (e) {
-      this.benginDate = e.detail.value
-    },
-    bindEndDateChange: function (e) {
-      this.overDate = e.detail.value
-    },
-    getDate(type) {
-      const date = new Date();
-      let year = date.getFullYear();
-      let month = date.getMonth() + 1;
-      let day = date.getDate();
-      if (type === 'start') {
-        year = year - 60;
-      } else if (type === 'end') {
-        year = year + 2;
-      }
-      month = month > 9 ? month : '0' + month;
-      day = day > 9 ? day : '0' + day;
-      return `${year}-${month}-${day}`;
-    },
+
   }
 }
 </script>
 
 <style lang="scss" scoped>
-    /deep/ .uni-section{
+    /deep/ .uni-section {
         padding-bottom: 10px;
     }
-    .rechargeWrap{
+
+    .rechargeWrap {
         position: relative;
-        .rechargeArrow{
+        .rechargeArrow {
             position: absolute;
             right: 10px;
             top: 30px;
@@ -157,6 +93,7 @@ export default {
             color: #999;
         }
     }
+
     .recordCon {
         padding-right: 35px;
         color: #999;
@@ -197,20 +134,24 @@ export default {
         height: 45px;
         border-top: 1px #eee solid;
     }
+
     .card-actions-item {
         display: flex;
         flex-direction: row;
         align-items: center;
     }
+
     .card-actions-item-text {
         font-size: 12px;
         color: #666;
         margin-left: 5px;
     }
+
     .cover-image {
         flex: 1;
         height: 150px;
     }
+
     .no-border {
         border-width: 0;
     }
diff --git a/pages/businessCard/provideCard.vue b/pages/businessCard/provideCard.vue
index 4560748..1e7bd89 100644
--- a/pages/businessCard/provideCard.vue
+++ b/pages/businessCard/provideCard.vue
@@ -1,12 +1,12 @@
 <template>
     <view>
-        <uni-section title="50%(折扣券)" type="line">
+        <uni-section :title="`${cardRuleName}(${cardTypeName})`" type="line">
             <uni-card padding="0" spacing="0">
                 <uni-list>
-                    <uni-list-item title="适应车场"   rightText="万达商业广场"  >
+                    <uni-list-item title="适应车场" :rightText="plName">
                         <text></text>
                     </uni-list-item>
-                    <uni-list-item title="价格：¥5/张" rightText="商户库存：0张"></uni-list-item>
+                    <uni-list-item :title="`价格：¥${price}/张`" :rightText="`商户库存：${cardNum}张`"></uni-list-item>
                 </uni-list>
             </uni-card>
         </uni-section>
@@ -32,111 +32,53 @@
 </template>
 
 <script>
-import common from "../../common/common.js";
 export default {
   data() {
-    const currentDate = this.getDate({
-      format: true
-    })
     return {
-      title: 'picker',
-      array: ['全部', '充值', '支付'],
-      arrayWay: ['所有方式', '微信', '线下公对公'],
-      index: 0,
-      indexWay: 0,
-      benginDate: currentDate,
-      overDate: currentDate,
-      rows:[],
-      pageNum:1,//当前页
-      pageSize:1,//每页条数
-      reload:false,
-      status:'more',
-      contentText:{
-        contentdown:'上拉加载更多～',
-        contentrefresh:'正在加载更多～',
-        contentmore:'我是有底线的～'
-      },
-      iconType:'auto', // 图标样式
+
+      cardTypeName: '',// 卡类型名称
+      cardRuleName: '',// 卡名称
+      plName:'', // 停车场
+      price:'', // 卡价格
+      cardNum:'', // 库存
     }
   },
   onLoad(params) {
     wx.showShareMenu({
       withShareTicket: true
     })
-    // this.mycarNumber = params.carNumber;
-    // this.myorderId = params.orderId;
-    // this.myparkCode = params.parkCode;
-    // this.myorderState = params.orderState;
-    // this.totalFee = params.totalFee
-    // this.unPayFee = params.unPayFee
-    // if (params.orderState == 5) {
-    //   //停车补缴单 103
-    //   this.mypaySrcType = '103'
-    // } else {
-    //   this.mypaySrcType = '101'
-    // }
-    // // this.GetbillQueryInfo(this.mycarNumber, this.myorderId, this.myparkCode);
-    // this.getWxCode();
-    // this.PDlogin();
-    //console.log("xxxmake = "+this.makedateFormat());
+    let option = JSON.parse(params.optionData)
+    console.log(option)
+    this.cardTypeName = option.cardTypeName
+    this.cardRuleName = option.cardRuleName
+    this.plName = option.plName
+    this.price = option.value
+    this.cardNum = option.cardNum
+    // this.maxNum = option.cardNum
+    this.getCouponDynamicQR()
   },
   onShow() {
     var me = this;
-    var userInfo = me.getGlobalUser("globalUser");
-    if (userInfo != null) {
-      me.phoneNumb = userInfo.userPhone;
-    }
-    var pages = getCurrentPages();
-    var currPage = pages[pages.length - 1]; //当前页面
-    console.log('currPage.data.selCoupon = ' + currPage.data.selCoupon);
-    me.selCoupon = currPage.data.selCoupon;
-    console.log(JSON.stringify(me.selCoupon));
-    // me.GetbillQueryInfo(me.mycarNumber, me.myorderId, me.myparkCode, me.selCoupon.cardNo, me.selCoupon.couponType, me.selCoupon
-    //   .discValue);
-    // GetbillQueryInfo(carnum, orderId, parkCode, cardNo, couponType, disValue) {
+
   },
   computed: {
-    startDate() {
-      return this.getDate('start');
-    },
-    endDate() {
-      return this.getDate('end');
-    }
+
   },
   methods: {
-    actionsClick(text){
-      uni.showToast({
-        title:text,
-        icon:'none'
-      })
-    },
-    bindPickerChange: function (e) {
-      console.log('picker发送选择改变，携带值为', e.detail.value)
-      this.index = e.detail.value
-    },
-    bindPickerChangeWay: function (e) {
-      console.log('picker发送选择改变，携带值为', e.detail.value)
-      this.indexWay = e.detail.value
-    },
-    bindStartDateChange: function (e) {
-      this.benginDate = e.detail.value
-    },
-    bindEndDateChange: function (e) {
-      this.overDate = e.detail.value
-    },
-    getDate(type) {
-      const date = new Date();
-      let year = date.getFullYear();
-      let month = date.getMonth() + 1;
-      let day = date.getDate();
-      if (type === 'start') {
-        year = year - 60;
-      } else if (type === 'end') {
-        year = year + 2;
+    getCouponDynamicQR() {
+      let that = this
+      let paramsData = {
+        cardRelParkNo: '123qwe',
+        codeType: '2'
       }
-      month = month > 9 ? month : '0' + month;
-      day = day > 9 ? day : '0' + day;
-      return `${year}-${month}-${day}`;
+      // 首页信息获取 接口
+      that.$myRequest({
+        url: that.$common.getCouponDynamicQR,
+        method: 'POST',
+        data: that.$common.requestSign(paramsData)
+      }).then(res => {
+        console.log(res)
+      })
     },
   }
 }
--
libgit2 0.21.4