Merge remote-tracking branch 'origin/branch' into branch

chenbiao
2 parents b9ec5385 6805d8d5
Showing 6 changed files with 169 additions and 271 deletions
common/common.js
common/filters.js
pages.json
pages/businessCard/businessCard.vue
pages/businessCard/buyCard.vue
pages/businessCard/cardDetail.vue
@@ -29,9 +29,13 @@ const getBusinessParkOrderByBusIdForPage = serverUrl + &quot;/business/h5/order/getBu
 const getPayOrderByOrderId = serverUrl + "/business/h5/order/getPayOrderByOrderId";
 //刘淇接口
-
 //   商户卡券-可以购买卡券列表-分页
-const couponRuleParkPage = serverUrl + "business/h5/coupon/couponRuleParkPage";
+const couponRuleParkPage = serverUrl + "/business/h5/coupon/couponRuleParkPage";
+
+
+//   商户卡券-卡券申领明细
+const couponIssuedParkPage = serverUrl + "/business/h5/couponIssued/couponIssuedParkPage";
+
 //陈彪接口
@@ -188,8 +192,8 @@ export default {
 	//刘淇接口
 	getBusinessParkOrderByBusIdForPage,
 	getPayOrderByOrderId,
-
-
+  couponRuleParkPage,
+  couponIssuedParkPage,
 	//陈彪接口
 	rechargeList,
@@ -78,6 +78,32 @@ const sexFilter = value =&gt; {
 	}
 }
+// 商户卡券类型
+const cardTypeFormate = num => {
+	console.log('1111111111111')
+ //  1-单次券，2-时长券，3-满减券，4-金额券，5-包天券，6-折扣券
+  if(num == '1'){
+ 		return '单次券'
+  }
+  if(num == 2){
+    return '时长券'
+  }
+  if(num == 3){
+    return '满减券'
+  }
+  if(num == 4){
+    return '金额券'
+  }
+  if(num == 5){
+    return '包天券'
+  }
+  if(num == 6){
+    return '折扣券'
+  }
+
+}
+
+
 export default {
 	tranNull,
 	RMB,
@@ -86,4 +112,5 @@ export default {
 	ortherToFixed,
 	toThousands,
 	sexFilter,
+  cardTypeFormate
 }
@@ -67,6 +67,12 @@
 			}
 		},
 		{
+			"path": "pages/businessCard/cardDetail",
+			"style": {
+				"navigationBarTitleText": "商户卡券明细"
+			}
+		},
+		{
 			"path": "pages/parkRecordList/recordDetail",
 			"style": {
 				"navigationBarTitleText": "订单详情"
 <template>
     <view>
-        <uni-section title="50%(折扣券)" type="line">
-            <uni-card padding="0" spacing="0">
-
-                <uni-list>
-                    <uni-list-item title="适应车场" rightText="万达商业广场">
-                        <text></text>
-                    </uni-list-item>
-                    <uni-list-item title="价格：¥5/张" rightText="商户库存：0张"></uni-list-item>
-                </uni-list>
-                <view slot="actions" class="card-actions no-border">
-
-                    <view class="card-actions-item" @click="actionsClick('购买')">
-                        <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('发放')">
-                        <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('打印')">
-                        <uni-icons type="shop-filled" size="18" color="#999"></uni-icons>
-                        <text class="card-actions-item-text">打印</text>
-                    </view>
-
-
-                </view>
-            </uni-card>
-        </uni-section>
-
-        <uni-section title="2小时(时长券)" type="line">
-            <uni-card padding="0" spacing="0">
-                <!--<template v-slot:cover>-->
-                <!--<view class="custom-cover">-->
-                <!--<image class="cover-image" mode="aspectFill" :src="cover">-->
-                <!--</image>-->
-                <!--<view class="cover-content">-->
-                <!--<text class="uni-subtitle uni-white">今日新闻热点</text>-->
-                <!--</view>-->
-                <!--</view>-->
-                <!--</template>-->
-                <uni-list>
-                    <uni-list-item title="适应车场" rightText="万达商业广场">
-                        <text></text>
-                    </uni-list-item>
-                    <uni-list-item title="价格：¥5/张" rightText="商户库存：0张"></uni-list-item>
-                </uni-list>
-                <view slot="actions" class="card-actions no-border">
-
-                    <view class="card-actions-item" @click="actionsClick('购买')">
-                        <uni-icons type="cart-filled" size="18" color="#999"></uni-icons>
-                        <text class="card-actions-item-text">购买</text>
-                    </view>
-
-                </view>
-            </uni-card>
-        </uni-section>
-
-        <uni-section title="5元(金额券)" type="line">
-            <uni-card padding="0" spacing="0">
-                <!--<template v-slot:cover>-->
-                <!--<view class="custom-cover">-->
-                <!--<image class="cover-image" mode="aspectFill" :src="cover">-->
-                <!--</image>-->
-                <!--<view class="cover-content">-->
-                <!--<text class="uni-subtitle uni-white">今日新闻热点</text>-->
-                <!--</view>-->
-                <!--</view>-->
-                <!--</template>-->
-                <uni-list>
-                    <uni-list-item title="适应车场" rightText="万达商业广场">
-                        <text></text>
-                    </uni-list-item>
-                    <uni-list-item title="价格：¥5/张" rightText="商户库存：0张"></uni-list-item>
-                </uni-list>
-                <view slot="actions" class="card-actions no-border">
-
-                    <view class="card-actions-item" @click="actionsClick('购买')">
-                        <uni-icons type="cart-filled" size="18" color="#999"></uni-icons>
-                        <text class="card-actions-item-text">购买</text>
-                    </view>
-
-                </view>
-            </uni-card>
-        </uni-section>
-
-
-        <uni-section title="满10减5(满减券)" type="line">
-            <uni-card padding="0" spacing="0">
-                <!--<template v-slot:cover>-->
-                <!--<view class="custom-cover">-->
-                <!--<image class="cover-image" mode="aspectFill" :src="cover">-->
-                <!--</image>-->
-                <!--<view class="cover-content">-->
-                <!--<text class="uni-subtitle uni-white">今日新闻热点</text>-->
-                <!--</view>-->
-                <!--</view>-->
-                <!--</template>-->
-                <uni-list>
-                    <uni-list-item title="适应车场" rightText="万达商业广场">
-                        <text></text>
-                    </uni-list-item>
-                    <uni-list-item title="价格：¥5/张" rightText="商户库存：0张"></uni-list-item>
-                </uni-list>
-                <view slot="actions" class="card-actions no-border">
-
-                    <view class="card-actions-item" @click="actionsClick('购买')">
-                        <uni-icons type="cart-filled" size="18" color="#999"></uni-icons>
-                        <text class="card-actions-item-text">购买</text>
-                    </view>
-
-                </view>
-            </uni-card>
-        </uni-section>
-
-
-        <uni-section title="单次(单次券)" type="line">
-            <uni-card padding="0" spacing="0">
-                <!--<template v-slot:cover>-->
-                <!--<view class="custom-cover">-->
-                <!--<image class="cover-image" mode="aspectFill" :src="cover">-->
-                <!--</image>-->
-                <!--<view class="cover-content">-->
-                <!--<text class="uni-subtitle uni-white">今日新闻热点</text>-->
-                <!--</view>-->
-                <!--</view>-->
-                <!--</template>-->
-                <uni-list>
-                    <uni-list-item title="适应车场" rightText="万达商业广场">
-                        <text></text>
-                    </uni-list-item>
-                    <uni-list-item title="价格：¥5/张" rightText="商户库存：0张"></uni-list-item>
-                </uni-list>
-                <view slot="actions" class="card-actions no-border">
-
-                    <view class="card-actions-item" @click="actionsClick('购买')">
-                        <uni-icons type="cart-filled" size="18" color="#999"></uni-icons>
-                        <text class="card-actions-item-text">购买</text>
-                    </view>
-
-                </view>
-            </uni-card>
-        </uni-section>
-
-        <uni-section title="单天(包天券)" type="line">
-            <uni-card padding="0" spacing="0">
-                <!--<template v-slot:cover>-->
-                <!--<view class="custom-cover">-->
-                <!--<image class="cover-image" mode="aspectFill" :src="cover">-->
-                <!--</image>-->
-                <!--<view class="cover-content">-->
-                <!--<text class="uni-subtitle uni-white">今日新闻热点</text>-->
-                <!--</view>-->
-                <!--</view>-->
-                <!--</template>-->
-                <uni-list>
-                    <uni-list-item title="适应车场" rightText="万达商业广场">
-                        <text></text>
-                    </uni-list-item>
-                    <uni-list-item title="价格：¥5/张" rightText="商户库存：0张"></uni-list-item>
-                </uni-list>
-                <view slot="actions" class="card-actions no-border">
-
-                    <view class="card-actions-item" @click="actionsClick('购买')">
-                        <uni-icons type="cart-filled" size="18" color="#999"></uni-icons>
-                        <text class="card-actions-item-text">购买</text>
-                    </view>
-
-                </view>
-            </uni-card>
-        </uni-section>
-
+        <view v-if="dataList.length>0">
+            <view v-for="(i, index) in dataList" :key="i.id">
+                <uni-section :title="`${i.cardRuleName}(${i.cardTypeName })`" type="line">
+                    <uni-card padding="0" spacing="0">
+
+                        <uni-list>
+                            <uni-list-item title="适应车场" :rightText="i.plName">
+                                <text></text>
+                            </uni-list-item>
+                            <uni-list-item :title="`价格: ¥${i.value}/张`"
+                                           :rightText="`商户库存:${i.cardNum}张`"></uni-list-item>
+                        </uni-list>
+                        <view slot="actions" class="card-actions no-border">
+
+                            <view class="card-actions-item" @click="toBuy(i)">
+                                <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">
+                                <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">
+                                <uni-icons type="shop-filled" size="18" color="#999"></uni-icons>
+                                <text class="card-actions-item-text">打印</text>
+                            </view>
+                        </view>
+                    </uni-card>
+                </uni-section>
+            </view>
+
+        </view>
+
+        <view class="common-page-head" v-else>暂无可以购买的商户卡券</view>
     </view>
 </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,
+      dataList: [],
       rows: [],
       pageNum: 1,//当前页
       pageSize: 1,//每页条数
@@ -210,11 +63,8 @@ export default {
   },
   onShow() {
     var me = this;
-
-  },
-  computed: {
-
   },
+  computed: {},
   methods: {
     // 通过商户ID查询停车记录信息
     couponRuleParkPage() {
@@ -225,14 +75,19 @@ export default {
       }
       // 首页信息获取 接口
       that.$myRequest({
-        url: that.$common.getBusinessParkOrderByBusIdForPage,
+        url: that.$common.couponRuleParkPage,
         method: 'POST',
         data: that.$common.requestSign(paramsData)
       }).then(res => {
-        this.recordList = res.data.dataList
+        this.dataList = res.data.dataList
+        console.log(this.dataList)
       })
     },
-
+    toBuy(i) {
+      uni.navigateTo({
+        url: '../businessCard/buyCard?optionData='+JSON.stringify(i)
+      });
+    },
   }
 }
 </script>
@@ -3,15 +3,6 @@
         <uni-section title="2小时(时长券)" type="line" >
             <uni-card padding="0" spacing="0">
-                <!--<template v-slot:cover>-->
-                <!--<view class="custom-cover">-->
-                <!--<image class="cover-image" mode="aspectFill" :src="cover">-->
-                <!--</image>-->
-                <!--<view class="cover-content">-->
-                <!--<text class="uni-subtitle uni-white">今日新闻热点</text>-->
-                <!--</view>-->
-                <!--</view>-->
-                <!--</template>-->
                 <uni-list>
                     <uni-list-item title="适应车场"   rightText="万达商业广场"  >
                         <text></text>
@@ -70,15 +61,7 @@
         </view>
         <uni-section title="24小时(包天券)" type="line" >
             <uni-card padding="0" spacing="0">
-                <!--<template v-slot:cover>-->
-                <!--<view class="custom-cover">-->
-                <!--<image class="cover-image" mode="aspectFill" :src="cover">-->
-                <!--</image>-->
-                <!--<view class="cover-content">-->
-                <!--<text class="uni-subtitle uni-white">今日新闻热点</text>-->
-                <!--</view>-->
-                <!--</view>-->
-                <!--</template>-->
+
                 <uni-list>
                     <uni-list-item title="适应车场"   rightText="万达商业广场"  >
                         <text></text>
@@ -120,7 +103,6 @@
 </template>
 <script>
-import common from "../../common/common.js";
 export default {
   data() {
     const currentDate = this.getDate({
@@ -162,18 +144,7 @@ export default {
   },
   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) {
+
   },
   mounted() {
     setTimeout(() => {
@@ -36,8 +36,9 @@
                     开始时间
                 </view>
                 <view class="uni-list-cell-db">
-                    <picker mode="date" :value="date" :start="startDate" :end="endDate" @change="bindStartDateChange">
-                        <view class="uni-input">{{benginDate}}</view>
+                    <picker mode="date" :value="beginTime" :start="startDate" :end="endDate"
+                            @change="bindStartDateChange">
+                        <view class="uni-input">{{beginTime}}</view>
                     </picker>
                 </view>
             </view>
@@ -49,13 +50,55 @@
                     结束时间
                 </view>
                 <view class="uni-list-cell-db">
-                    <picker mode="date" :value="date" :start="startDate" :end="endDate" @change="bindEndDateChange">
-                        <view class="uni-input">{{overDate}}</view>
+                    <picker mode="date" :value="endTime" :start="startDate" :end="endDate" @change="bindEndDateChange">
+                        <view class="uni-input">{{endTime}}</view>
                     </picker>
                 </view>
             </view>
         </view>
+        <view v-for="(i, index) in dataList" :key="i.id">
+            <uni-section :title="`${i.cardTypeName}（${i.cardType}）`" type="line">
+                <uni-list>
+                    <uni-list-item>
+                        <template v-slot:body>
+                            <view class="slot-box uni-con-width">
+                                <view class="uni-flex uni-space-between ">
+                                    <view class="color-blue">
+                                        JE000100011
+                                    </view>
+                                    <view class="color-blue">
+                                        {{i.carNumber}}
+                                    </view>
+                                </view>
+                                <view class="uni-flex uni-space-between" style="padding: 10px 0">
+                                    <view>
+                                        <text class="color-blue paddingRight">领取时间</text>
+                                        2020-11-01 01:01:01
+                                    </view>
+                                    <view class="color-green">
+                                        已使用
+                                    </view>
+                                </view>
+                                <view class="uni-flex uni-space-between">
+                                    <view>
+                                        <text class="color-red paddingRight">使用时间</text>
+                                        2020-11-01 01:01:01
+                                    </view>
+                                    <view class="color-green">
+                                        {{i.fullCutValue}}元/张
+                                    </view>
+                                </view>
+                            </view>
+                        </template>
+                    </uni-list-item>
+                </uni-list>
+            </uni-section>
+        </view>
+
+
+
+
         <uni-section title="8折（折扣券）" type="line">
             <uni-list>
                 <uni-list-item>
@@ -71,7 +114,7 @@
                             </view>
                             <view class="uni-flex uni-space-between" style="padding: 10px 0">
                                 <view>
-                                    <text class="color-blue paddingRight" >领取时间</text>
+                                    <text class="color-blue paddingRight">领取时间</text>
                                     2020-11-01 01:01:01
                                 </view>
                                 <view class="color-green">
@@ -109,7 +152,7 @@
                             </view>
                             <view class="uni-flex uni-space-between" style="padding: 10px 0">
                                 <view>
-                                    <text class="color-blue paddingRight" >领取时间</text>
+                                    <text class="color-blue paddingRight">领取时间</text>
                                     2020-11-01 01:01:01
                                 </view>
                                 <view class="color-red">
@@ -146,7 +189,7 @@
                             </view>
                             <view class="uni-flex uni-space-between" style="padding: 10px 0">
                                 <view>
-                                    <text class="color-blue paddingRight" >领取时间</text>
+                                    <text class="color-blue paddingRight">领取时间</text>
                                     2020-11-01 01:01:01
                                 </view>
                                 <view class="color-blue">
@@ -167,13 +210,10 @@
                 </uni-list-item>
             </uni-list>
         </uni-section>
-
-
     </view>
 </template>
 <script>
-import common from "../../common/common.js";
 export default {
   data() {
     const currentDate = this.getDate({
@@ -181,15 +221,15 @@ export default {
     })
     return {
       title: 'picker',
-      array: ['折扣券', '金额券', '单次券', '包天券', '满减券', '时长券'],
-      arrayWay: ['所有状态', '已失效', '已使用', '未使用', '已失效'],
+      array: ['单次券', '时长券', '满减券', '金额券', '包天券'],
+      arrayWay: ['已使用/绑定', '未使用'],
       index: 0,
       indexWay: 0,
-      benginDate: currentDate,
-      overDate: currentDate,
+      beginTime: currentDate,
+      endTime: currentDate,
       rows: [],
-      pageNum: 1,//当前页
-      pageSize: 1,//每页条数
+      pageNum: '1',//当前页
+      pageSize: '10',//每页条数
       reload: false,
       status: 'more',
       contentText: {
@@ -198,43 +238,17 @@ export default {
         contentmore: '我是有底线的～'
       },
       iconType: 'auto', // 图标样式
+      dataList: [],
     }
   },
   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());
+    this.couponIssuedParkPage()
   },
   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() {
@@ -245,6 +259,27 @@ export default {
     }
   },
   methods: {
+    couponIssuedParkPage: function () {
+      console.log(this.arrayWay)
+      let that = this
+      let paramsData = {
+        pageNum: this.pageNum,
+        pageSize: this.pageSize,
+        beginTime: this.beginTime,
+        endTime: this.endTime,
+        cardType: '', //卡券类型 ：1-单次券，2-时长券，3-满减券，4-金额券，5-包天券
+        isUesed: '1',  //所有状态：已失效，已使用、未使用
+      }
+      // 首页信息获取 接口
+      that.$myRequest({
+        url: that.$common.couponIssuedParkPage,
+        method: 'POST',
+        data: that.$common.requestSign(paramsData)
+      }).then(res => {
+        this.dataList = res.data.dataList
+        console.log(this.dataList)
+      })
+    },
     bindPickerChange: function (e) {
       console.log('picker发送选择改变，携带值为', e.detail.value)
       this.index = e.detail.value
@@ -254,10 +289,10 @@ export default {
       this.indexWay = e.detail.value
     },
     bindStartDateChange: function (e) {
-      this.benginDate = e.detail.value
+      this.beginTime = e.detail.value
     },
     bindEndDateChange: function (e) {
-      this.overDate = e.detail.value
+      this.endTime = e.detail.value
     },
     getDate(type) {
       const date = new Date();
@@ -296,7 +331,7 @@ export default {
         justify-content: space-between;
     }
-    .paddingRight{
+    .paddingRight {
         padding-right: 20px;
     }
 </style>