diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardExchange/service/CardExchangeRecordService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardExchange/service/CardExchangeRecordService.java index ea00f3be6..95f8db5e9 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardExchange/service/CardExchangeRecordService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardExchange/service/CardExchangeRecordService.java @@ -36,7 +36,7 @@ public interface CardExchangeRecordService extends IService /** * 核销记录(小程序端) * @param page - * @param cardExchangeRecord + * @param cardExchangeRecordDTO * @return */ IPage selectCancelRecords (Page page, CardExchangeRecordDTO cardExchangeRecordDTO); diff --git a/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue b/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue index 27873ca73..209453e62 100644 --- a/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue +++ b/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue @@ -196,6 +196,13 @@ }, onLoad(option) { this.actinput = option.id + if (option.id == 0) { + this.getValueCars(); + } + if (option.id == 1) { + this.getFuelCars(); + + } }, onShow() { this.getValueCars(); @@ -287,6 +294,7 @@ this.cardValueList = [] if (res.code == 200) { this.cardFuleList = res.data.records + console.log('213'); this.fuleindex(0, this.cardValueList[0].rechargeBalance, this.cardValueList[0] .fringeBenefit, this.cardFuleList[0].rechargeBalance, this.cardFuleList[0].points, this diff --git a/gasStation-uni/pagesMy/Coupons/Coupons.vue b/gasStation-uni/pagesMy/Coupons/Coupons.vue index 54c52302a..9ac677e05 100644 --- a/gasStation-uni/pagesMy/Coupons/Coupons.vue +++ b/gasStation-uni/pagesMy/Coupons/Coupons.vue @@ -26,7 +26,7 @@ {{item.couponContent}} 有效期:2023-11-30 - + 立即使用 @@ -85,6 +85,11 @@ this.getGiftRecords() }, methods: { + goRecharge() { + uni.navigateTo({ + url: '/pagesHome/oilRecharge/oilRecharge' + }) + }, click(item) { console.log('item', item); diff --git a/gasStation-uni/pagesMy/writeOff/writeOff.vue b/gasStation-uni/pagesMy/writeOff/writeOff.vue index 13b7dc7f2..dae8d4027 100644 --- a/gasStation-uni/pagesMy/writeOff/writeOff.vue +++ b/gasStation-uni/pagesMy/writeOff/writeOff.vue @@ -60,7 +60,7 @@ return { cardsList: [], query: { - cardType: '', + cardType: '兑换券', pageNo: 1, pageSize: 10 }, @@ -250,4 +250,4 @@ font-size: 14px; border-radius: 15px; } - \ No newline at end of file +