From dc7e6e1cbd012fc45f3af749031786312ae55d24 Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Fri, 27 Sep 2024 17:33:11 +0800 Subject: [PATCH] 9.27 --- .../business/fleet/entity/FleetMember.java | 4 + gasStation-uni/pages/my/my.vue | 7 +- gasStation-uni/pagesHome/MyCard/MyCard.vue | 95 ++++---- .../pagesHome/cardDetails/index.vue | 48 +++- .../pagesHome/certificate/details.vue | 5 +- gasStation-uni/pagesMy/Coupons/Coupons.vue | 8 +- gasStation-uni/pagesMy/Coupons/details.vue | 228 ++++++++++++++++-- gasStation-uni/pagesMy/fleetInfo/index.vue | 119 +++++++-- .../pagesMy/fleetMember/addMember.vue | 14 +- gasStation-uni/pagesMy/fleetMember/index.vue | 33 ++- 10 files changed, 451 insertions(+), 110 deletions(-) diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/entity/FleetMember.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/entity/FleetMember.java index 68c202b29..e634926d7 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/entity/FleetMember.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/entity/FleetMember.java @@ -127,6 +127,10 @@ public class FleetMember extends BaseEntity implements Serializable { private Date updateTime; private Integer userId; + /** + * 是否开启消费通知：0开启，1不开启 + */ + private Integer isOpenNotice; } diff --git a/gasStation-uni/pages/my/my.vue b/gasStation-uni/pages/my/my.vue index fc5c44415..b0a5fa751 100644 --- a/gasStation-uni/pages/my/my.vue +++ b/gasStation-uni/pages/my/my.vue @@ -144,7 +144,7 @@ 车队管理 - + @@ -388,6 +388,11 @@ url: '/pagesMy/growthValue/index' }) }, + goJP() { + uni.navigateTo({ + url: '/pagesHome/prize/index' + }) + }, goFleet() { uni.navigateTo({ url: '/pagesMy/fleetInfo/index' diff --git a/gasStation-uni/pagesHome/MyCard/MyCard.vue b/gasStation-uni/pagesHome/MyCard/MyCard.vue index 646b619c4..4e6004f7a 100644 --- a/gasStation-uni/pagesHome/MyCard/MyCard.vue +++ b/gasStation-uni/pagesHome/MyCard/MyCard.vue @@ -53,20 +53,23 @@ --> - - - 车队名称 - - + + + + {{item.fleetName}} + + + + + + 当前余额 + + + ¥{{item.totalBalance || 0}} - - 当前余额 - - - ¥{{cardBalance.cardBalance || 0}} - + @@ -87,7 +90,7 @@ cardsIndex: 0, title: '', giftInfo: {}, - fleetInfo:{} + fleetList: [] } }, @@ -101,22 +104,22 @@ this.getFleetInfo() }, methods: { - getFleetInfo(){ + getFleetInfo() { request({ url: '/fleetInfo/getFleetInfoByStoreId', method: 'get', - params:{storeId:uni.getStorageSync('storeId')} + params: { + storeId: uni.getStorageSync('storeId') + } }).then(res => { if (res.code == 200) { - this.fleetInfo = res.data - console.log(this.fleetInfo, '111'); - }else{ - this.fleetInfo = {} + this.fleetList = res.data + console.log(this.fleetList, '111'); } }) }, - goFleetDetails(){ - + goFleetDetails() { + }, goCode() { uni.navigateTo({ @@ -128,11 +131,38 @@ url: '/pagesHome/oilRecharge/oilRecharge?id=' + id }) }, - goDetails(val) { + goDetails(val, fleetId) { + if (fleetId) { + uni.navigateTo({ + url: '/pagesHome/cardDetails/index?type=' + val + '&fleetId=' + fleetId + }) + return + } uni.navigateTo({ url: '/pagesHome/cardDetails/index?type=' + val }) }, + getCardFuleRecords() { + request({ + url: 'business/marketingActivity/cardFuelRecord/queryByPageApplet', + method: 'get', + }).then(res => { + if (res.code == 200) { + this.cardsList = res.data.records + } + }) + }, + getUserBalance() { + request({ + url: '/business/userManager/user/getUserBalanceApplet', + method: 'get', + params: this.query + }).then(res => { + if (res.code == 200) { + this.cardBalance = res.data + } + }) + }, s_() { if (this.cardsIndex == 0) { uni.showToast({ @@ -156,29 +186,6 @@ } }, - getCardFuleRecords() { - request({ - url: 'business/marketingActivity/cardFuelRecord/queryByPageApplet', - method: 'get', - }).then(res => { - if (res.code == 200) { - this.cardsList = res.data.records - console.log(this.cardsList, '131'); - } - }) - }, - getUserBalance() { - request({ - url: '/business/userManager/user/getUserBalanceApplet', - method: 'get', - params: this.query - }).then(res => { - if (res.code == 200) { - this.cardBalance = res.data - console.log(res.data); - } - }) - }, goback() { uni.navigateBack() } diff --git a/gasStation-uni/pagesHome/cardDetails/index.vue b/gasStation-uni/pagesHome/cardDetails/index.vue index 4fea49397..d6014fe0c 100644 --- a/gasStation-uni/pagesHome/cardDetails/index.vue +++ b/gasStation-uni/pagesHome/cardDetails/index.vue @@ -39,19 +39,19 @@ - 储值卡 + {{fleetInfo.cardType}} 主卡 总余额（元） - 123456.78 + {{fleetInfo.totalBalance}} - 10909.20 + {{fleetInfo.rechargeAmount}} 本金金额（元） - 109053.60 + {{fleetInfo.giveAmount}} 赠送金额（元） @@ -95,7 +95,7 @@ - + @@ -205,11 +205,17 @@ equityShow: false, windex: 0, cardBalance: {}, - equity: {} + equity: {}, + fleetInfo: {}, + fleetId: '' } }, onLoad(e) { - this.type = e.type + if (e.type) this.type = e.type + if (e.fleetId) { + this.fleetId = e.fleetId + this.getFleetInfo() + } }, onShow() { this.query.chainStoreId = uni.getStorageSync('chainStoreId'); @@ -217,10 +223,31 @@ this.getEquity() }, methods: { - // 跳转车队信息 - goFleet(){ + getFleetInfo() { + request({ + url: '/fleetInfo/' + this.fleetId, + method: 'get', + }).then(res => { + if (res.code == 200) { + this.fleetInfo = res.data + console.log(res, '151'); + } + }) + }, + goFleetMember(){ uni.navigateTo({ - url: '/pagesMy/fleetInfo/index' + url:'/pagesMy/fleetMember/index?fleetId='+this.fleetId + }) + }, + goZJ(){ + uni.navigateTo({ + url:'/pagesMy/fleetInfo/fund' + }) + }, + // 跳转车队信息 + goFleet() { + uni.navigateTo({ + url: '/pagesMy/fleetInfo/index?fleetId='+this.fleetId }) }, goCode() { @@ -241,7 +268,6 @@ }).then(res => { if (res.code == 200) { this.equity = res.data - console.log(res, '151'); } }) }, diff --git a/gasStation-uni/pagesHome/certificate/details.vue b/gasStation-uni/pagesHome/certificate/details.vue index 6bcbda05f..e4535e0c6 100644 --- a/gasStation-uni/pagesHome/certificate/details.vue +++ b/gasStation-uni/pagesHome/certificate/details.vue @@ -26,7 +26,10 @@ 1、每人限领{{couponInfo.getNumLimit || 0}}张 2、每日限领{{couponInfo.dayGetLimit || 0}}张 核销说明： - 核销说明： + + + {{item}} + diff --git a/gasStation-uni/pagesMy/Coupons/Coupons.vue b/gasStation-uni/pagesMy/Coupons/Coupons.vue index de2863d2e..955622138 100644 --- a/gasStation-uni/pagesMy/Coupons/Coupons.vue +++ b/gasStation-uni/pagesMy/Coupons/Coupons.vue @@ -18,7 +18,7 @@ + @click="goRecharge(item.cardCouponId,item.bgImg)"> {{item.couponName}} @@ -170,11 +170,9 @@ }) }, - goRecharge(id, cardRecordId) { + goRecharge(id, bgImg) { uni.navigateTo({ - url: '/pages/refuel/refuel?id=0&cardFavorableId=' + id + - '&cardRecordId=' + - cardRecordId + url: '/pagesMy/Coupons/details?certificateId=' + id + '&bgImg=' + bgImg }) }, click(item) { diff --git a/gasStation-uni/pagesMy/Coupons/details.vue b/gasStation-uni/pagesMy/Coupons/details.vue index 207770ce9..2aefd7e4c 100644 --- a/gasStation-uni/pagesMy/Coupons/details.vue +++ b/gasStation-uni/pagesMy/Coupons/details.vue @@ -3,55 +3,201 @@ - + - - 50元优惠券 - 最低消费500元 - - 兑换券 - 剩余3张 + + + + {{couponInfo.name}} + {{couponInfo.useCondition}} + + 代金券 + 兑换券 + 折扣券 + 油品立减券 + 单品代金券 + + 剩余{{ couponInfo.tfGetNum ? (couponInfo.tfTotal - couponInfo.tfGetNum) : couponInfo.tfTotal}}张 + + 使用须知 - 消费条件：订单金额满300元可用 - 有效期：领取后10天内有效 + 有效期：领取后{{couponInfo.validityDay || 0}}天内有效 领取说明： - 1、每人限领10张 2、每日 + 1、每人限领{{couponInfo.getNumLimit || 0}}张 + 2、每日限领{{couponInfo.dayGetLimit || 0}}张 核销说明： - - + + - 以下模块可用：一键加油、扫码买单 + {{item}} 适用门店 - + 导航 - 中建锦绣广场二期站 - 山东省济南市槐荫区 | 3.0km + {{store.name}} + {{store.address}} | {{distance}}km - 保存 + 立即使用 + + + + + + + 立即使用 + + + + + 请向商家出示此码使用 + + + + + 核销码：6688172293684182 + + + + +