From ce2f96006b1a1c0936a6e99a7aefec0c19c6893d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com> Date: Wed, 10 Jan 2024 13:54:45 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fuintAdmin/src/api/EventMarketing/oilBlock.js | 2 +- .../src/views/EventMarketing/SaveBlock/index.vue | 4 ++-- .../src/views/EventMarketing/storeOilBlock/index.vue | 8 ++++---- .../mapper/xml/OilNumberMapper.xml | 12 +++++++++--- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/fuintAdmin/src/api/EventMarketing/oilBlock.js b/fuintAdmin/src/api/EventMarketing/oilBlock.js index 1b90a21c6..d90104883 100644 --- a/fuintAdmin/src/api/EventMarketing/oilBlock.js +++ b/fuintAdmin/src/api/EventMarketing/oilBlock.js @@ -11,7 +11,7 @@ export function getList(query) { // 查询油号 export function oilName(oilType) { return request({ - url: 'business/petrolStationManagement/oilName/getList?oilType='+oilType, + url: '/business/petrolStationManagement/oilNumber/getList2?oilType='+oilType, method: 'get', }) diff --git a/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue b/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue index 2de5b4a10..fbaa97466 100644 --- a/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue +++ b/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue @@ -465,7 +465,7 @@ label="券详情" width="100"> + :value="dict.id"> @@ -365,8 +365,8 @@ this.oilList = [] oilName(this.queryParams.type).then(res=>{ - this.oilList = res.data - console.log( this.oilList) + this.oilList = res.data.records + console.log('我的油站' ,res) }) }, getlist(){ diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilNumberMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilNumberMapper.xml index 5dab6ffaa..fb573dd7e 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilNumberMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilNumberMapper.xml @@ -31,17 +31,23 @@ where store_id = #{oilNumber.storeId} + @@ -139,4 +145,4 @@ onu.store_id = #{storeId} and onu.state = '启用' - \ No newline at end of file + From 62635c72c2caa94c14142e718ec1e2b6f42ca812 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com> Date: Wed, 10 Jan 2024 14:34:55 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/EventMarketing/activeConsumption/index.vue | 2 +- fuintAdmin/src/views/EventMarketing/giftBlock/index.vue | 6 +++--- .../service/impl/ActiveConsumptionServiceImpl.java | 7 +++++++ .../cardFule/service/impl/CardFuelDieselServiceImpl.java | 4 +++- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue index 7b9b57b2f..f648a19cb 100644 --- a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue +++ b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue @@ -828,7 +828,7 @@ export default { validityZero: row.validityZero, validityOne: row.validityOne, validityTwo:row.validityTwo, - giftCardDetail: "满"+ row.fullDeduction+"减 "+row.discountAmount+"元" , //券详情 + giftCardDetail: "满"+ row.satisfiedAmount+"减 "+row.discountAmount+"元" , //券详情 giftCardTime: "", //券有效期 giftCardTotal: 1//券数量 } diff --git a/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue b/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue index f7e3ecb89..ef6e7eeb3 100644 --- a/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue +++ b/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue @@ -42,11 +42,11 @@
{{tjdata.remaining_amount || 0}}
剩余额度
- + @@ -328,7 +328,7 @@ margin-bottom: 20px; } .kar{ - width: 20%; + width: 25%; margin-right: 10px; } .tj-num{ diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/impl/ActiveConsumptionServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/impl/ActiveConsumptionServiceImpl.java index faf9b2080..6789a1afd 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/impl/ActiveConsumptionServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/impl/ActiveConsumptionServiceImpl.java @@ -69,7 +69,10 @@ public class ActiveConsumptionServiceImpl extends ServiceImpl Date: Wed, 10 Jan 2024 15:30:04 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/EventMarketing/online/index.vue | 2 +- .../service/impl/CardValueServiceImpl.java | 13 ++++++++++--- .../pagesHome/oilRecharge/oilRecharge.vue | 17 ++++++++++++++++- 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/fuintAdmin/src/views/EventMarketing/online/index.vue b/fuintAdmin/src/views/EventMarketing/online/index.vue index 8874da12f..c22d6300a 100644 --- a/fuintAdmin/src/views/EventMarketing/online/index.vue +++ b/fuintAdmin/src/views/EventMarketing/online/index.vue @@ -75,7 +75,7 @@ this.couponList = response.data.records; this.total = response.data.total if( response.data.total == 0){ - this.$message.error("未找到兑换券") + /* this.$message.error("未找到兑换券")*/ }else{ } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueServiceImpl.java index 625b2a820..e4671fff4 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueServiceImpl.java @@ -110,7 +110,7 @@ public class CardValueServiceImpl extends ServiceImpl records = page1.getRecords(); + List records = page1.getRecords(); CardValueVOs cardValueVO = new CardValueVOs(); ArrayList cardValueVOs = new ArrayList<>(); //返回储值卡活动进度状态 @@ -135,9 +135,16 @@ public class CardValueServiceImpl extends ServiceImpl { + uni.showToast({ + title: "支付失败!", + icon: "error" + }) + }) + console.log('fail:', err); + } }); } From 21f5b6884a24a23e4c076e0b6af007455eda83ac Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Wed, 10 Jan 2024 15:40:22 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/keyboard/keyboard.vue | 159 ++++++++++++++++++ 1 file changed, 159 insertions(+) create mode 100644 gasStation-uni/components/keyboard/keyboard.vue diff --git a/gasStation-uni/components/keyboard/keyboard.vue b/gasStation-uni/components/keyboard/keyboard.vue new file mode 100644 index 000000000..210a2c1fb --- /dev/null +++ b/gasStation-uni/components/keyboard/keyboard.vue @@ -0,0 +1,159 @@ + + + + +