Merge remote-tracking branch 'origin/master'

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardExchange/service/CardExchangeRecordService.java

@@ -36,7 +36,7 @@ public interface CardExchangeRecordService extends IService<CardExchangeRecord>
     /**
      * 核销记录（小程序端）
      * @param page
-     * @param cardExchangeRecord
+     * @param cardExchangeRecordDTO
      * @return
      */
     IPage<CardExchangeRecordVO> selectCancelRecords (Page page, CardExchangeRecordDTO cardExchangeRecordDTO);

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

gasStation-uni/pagesMy/Coupons/Coupons.vue

@@ -26,7 +26,7 @@
 					<view class="hui-size">{{item.couponContent}}</view>
 					<view class="dis-bt">
 						<view class="hui-size">有效期：2023-11-30</view>
-						<view class="anniu">
+						<view class="anniu" v-if="item.couponType == '优惠券'" @click="goRecharge()">
 							<text>立即使用</text>
 						</view>
 					</view>
@@ -85,6 +85,11 @@
 			this.getGiftRecords()
 		},
 		methods: {
+			goRecharge() {
+				uni.navigateTo({
+					url: '/pagesHome/oilRecharge/oilRecharge'
+				})
+			},
 			click(item) {
 				console.log('item', item);
 

gasStation-uni/pagesMy/writeOff/writeOff.vue

@@ -60,7 +60,7 @@
 			return {
 				cardsList: [],
 				query: {
-					cardType: '',
+					cardType: '兑换券',
 					pageNo: 1,
 					pageSize: 10
 				},