diff --git a/common/common.js b/common/common.js
index 615498d..6eea98a 100644
--- a/common/common.js
+++ b/common/common.js
@@ -30,8 +30,8 @@ const getPayOrderByOrderId = serverUrl + "/business/h5/order/getPayOrderByOrderI
//刘淇接口
-
-
+// 商户卡券-可以购买卡券列表-分页
+const couponRuleParkPage = serverUrl + "business/h5/coupon/couponRuleParkPage";
//陈彪接口
diff --git a/pages/businessCard/businessCard.vue b/pages/businessCard/businessCard.vue
index 01dcbc5..6661293 100644
--- a/pages/businessCard/businessCard.vue
+++ b/pages/businessCard/businessCard.vue
@@ -2,17 +2,9 @@
-
-
-
-
-
-
-
-
-
+
-
+
@@ -49,7 +41,7 @@
-
+
@@ -77,7 +69,7 @@
-
+
@@ -106,7 +98,7 @@
-
+
@@ -135,7 +127,7 @@
-
+
@@ -163,7 +155,7 @@
-
+
@@ -179,138 +171,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -329,109 +189,62 @@ export default {
indexWay: 0,
benginDate: currentDate,
overDate: currentDate,
- rows:[],
- pageNum:1,//当前页
- pageSize:1,//每页条数
- reload:false,
- status:'more',
- contentText:{
- contentdown:'上拉加载更多~',
- contentrefresh:'正在加载更多~',
- contentmore:'我是有底线的~'
+ rows: [],
+ pageNum: 1,//当前页
+ pageSize: 1,//每页条数
+ reload: false,
+ status: 'more',
+ contentText: {
+ contentdown: '上拉加载更多~',
+ contentrefresh: '正在加载更多~',
+ contentmore: '我是有底线的~'
},
- iconType:'auto', // 图标样式
+ iconType: 'auto', // 图标样式
}
},
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.couponRuleParkPage()
},
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;
+ // 通过商户ID查询停车记录信息
+ couponRuleParkPage() {
+ let that = this
+ let paramsData = {
+ pageNum: '1',
+ pageSize: '10'
}
- month = month > 9 ? month : '0' + month;
- day = day > 9 ? day : '0' + day;
- return `${year}-${month}-${day}`;
+ // 首页信息获取 接口
+ that.$myRequest({
+ url: that.$common.getBusinessParkOrderByBusIdForPage,
+ method: 'POST',
+ data: that.$common.requestSign(paramsData)
+ }).then(res => {
+ this.recordList = res.data.dataList
+ })
},
+
}
}