From 513f5ab42f130b4860a8930b74f9e7544126dfe0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com> Date: Thu, 26 Sep 2024 16:47:47 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E6=9B=B4=E6=96=B09.26?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../integral/entity/IntegralSettings.java | 10 +++ .../cardCoupon/mapper/CardCouponMapper.java | 8 +++ .../mapper/CardCouponUserMapper.java | 4 ++ .../mapper/xml/CardCouponMapper.xml | 45 ++++++++++++- .../mapper/xml/CardCouponUserMapper.xml | 8 +++ .../service/impl/CardCouponServiceImpl.java | 63 ++++++++++++++++--- .../cardCoupon/vo/CardCouponUniVo.java | 10 +++ 7 files changed, 139 insertions(+), 9 deletions(-) diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/entity/IntegralSettings.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/entity/IntegralSettings.java index d0e6bdba3..a2f07c8f8 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/entity/IntegralSettings.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/entity/IntegralSettings.java @@ -96,6 +96,16 @@ public class IntegralSettings extends BaseEntity { */ private Integer chainStoreId; + /** + * 适用规则 0-无限制 1-有限制 + */ + private Integer signApplicableRules; + + /** + * 签到周期 0-一周 1-两周 2-一个月 只有适用规则为1时有值 + */ + private Integer signCycle; + } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/mapper/CardCouponMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/mapper/CardCouponMapper.java index ea5f2d758..ccd848be7 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/mapper/CardCouponMapper.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/mapper/CardCouponMapper.java @@ -21,5 +21,13 @@ public interface CardCouponMapper extends BaseMapper { IPage pageVo(Page page, @Param("cardCoupon") CardCoupon cardCoupon); IPage selectAllByPageAndStoreId(Page page, @Param("cardCoupon")CardCoupon cardCoupon); + IPage selectAllByPageAndIds(Page page,@Param("ids") List ids); + + /** + * 根据店铺id查询优惠券今日领取数量 + * @param cardCouponUniVos + * @return + */ + List selectByStoreIdCount(CardCouponUniVo cardCouponUniVos); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/mapper/CardCouponUserMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/mapper/CardCouponUserMapper.java index d2a92c445..7b6657980 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/mapper/CardCouponUserMapper.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/mapper/CardCouponUserMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fuint.business.marketingActivity.cardCoupon.entity.CardCouponUser; +import com.fuint.business.marketingActivity.cardCoupon.vo.CardCouponUniVo; import com.fuint.business.marketingActivity.cardCoupon.vo.CardCouponUserVo; import com.fuint.business.marketingActivity.cardCoupon.vo.CardCouponVO; import org.apache.ibatis.annotations.Mapper; @@ -11,6 +12,7 @@ import org.apache.ibatis.annotations.Param; import java.util.Date; import java.util.List; +import java.util.Map; /** * 用户优惠卷表2024(CardCouponUser)表数据库访问层 @@ -38,5 +40,7 @@ public interface CardCouponUserMapper extends BaseMapper { * @return */ IPage queryPage(Page page,@Param("entity") CardCouponUserVo cardCouponUserVo); + + List selectCouponCount(@Param("storeId") Integer storeId,@Param("userId") Integer userId); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/mapper/xml/CardCouponMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/mapper/xml/CardCouponMapper.xml index d1e0241ef..7455a26a1 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/mapper/xml/CardCouponMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/mapper/xml/CardCouponMapper.xml @@ -31,7 +31,7 @@ resultType="com.fuint.business.marketingActivity.cardCoupon.vo.CardCouponUniVo"> SELECT cc.*, - mt.NAME AS typeName, + mt.NAME AS storeName, CASE cc.type WHEN 1 THEN @@ -44,7 +44,7 @@ '油品立减券' WHEN 5 THEN '单品代金券' - END AS statusName + END AS typeName FROM card_coupon cc LEFT JOIN mt_store mt ON mt.id = cc.store_id @@ -66,5 +66,46 @@ + + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/mapper/xml/CardCouponUserMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/mapper/xml/CardCouponUserMapper.xml index d3ee783ef..c0d6a60b9 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/mapper/xml/CardCouponUserMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/mapper/xml/CardCouponUserMapper.xml @@ -29,4 +29,12 @@ + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/impl/CardCouponServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/impl/CardCouponServiceImpl.java index 6dd229a56..52e081aef 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/impl/CardCouponServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/impl/CardCouponServiceImpl.java @@ -1,6 +1,9 @@ package com.fuint.business.marketingActivity.cardCoupon.service.impl; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -8,6 +11,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fuint.business.marketingActivity.cardCoupon.entity.CardCoupon; import com.fuint.business.marketingActivity.cardCoupon.mapper.CardCouponMapper; +import com.fuint.business.marketingActivity.cardCoupon.mapper.CardCouponUserMapper; import com.fuint.business.marketingActivity.cardCoupon.service.CardCouponService; import com.fuint.business.marketingActivity.cardCoupon.vo.CardCouponUniVo; import com.fuint.business.marketingActivity.cardCoupon.vo.CardCouponVO; @@ -20,6 +24,8 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** * 油站优惠卷表2024(CardCoupon)表服务实现类 @@ -32,6 +38,9 @@ public class CardCouponServiceImpl extends ServiceImpl pageVo(Page page, CardCoupon cardCoupon) { return baseMapper.pageVo( page, cardCoupon); @@ -49,24 +58,64 @@ public class CardCouponServiceImpl extends ServiceImpl cardCouponUniVos = baseMapper.selectAllByPageAndStoreId(page, cardCoupon); - List cardCouponVos = new ArrayList<>(); + //用户拥有的优惠券以及数量 + List list= cardCouponUserMapper.selectCouponCount(cardCoupon.getStoreId(), nowAccountInfo.getId()); + Map map = list.stream().collect(Collectors.toMap(CardCouponUniVo::getId, CardCouponUniVo::getCount)); + + CardCouponUniVo cardCouponUniVo1 = new CardCouponUniVo(); + cardCouponUniVo1.setStoreId(cardCoupon.getStoreId()); + cardCouponUniVo1.setStartTime(startTime.toString()); + cardCouponUniVo1.setEndTime(endTime.toString()); + //根据店铺id查询优惠券今日领取数量 + List cardCouponUniVos1 = baseMapper.selectByStoreIdCount(cardCouponUniVo1); + Map cardCouponMap = cardCouponUniVos1.stream().collect(Collectors.toMap(CardCouponUniVo::getId, CardCouponUniVo::getCount)); + + + //存放最终可领取的优惠券id集合 + List ids = new ArrayList<>(); //循环店铺优惠券 for (CardCouponUniVo coupon : cardCouponUniVos.getRecords()) { //查询该优惠券是否已到达限制数量 - if (coupon.getTfGetNum() < coupon.getTfTotal()){ - CardCouponUniVo cardCouponUniVo = BeanUtil.copyProperties(coupon, CardCouponUniVo.class); - //计算领取的比例 - double scale = (coupon.getTfGetNum() * 1.0 / coupon.getTfTotal()) * 100; - cardCouponUniVo.setScale(scale + "%"); + if ((coupon.getTfGetNum() < coupon.getTfTotal())) { + Integer count = 0; + if (ObjectUtil.isNotEmpty(cardCouponMap.get(coupon.getId()))){ + count = cardCouponMap.get(coupon.getId()); + } + if (count < coupon.getDayGetLimit()) { + Integer getNumLimit = coupon.getGetNumLimit(); + Integer userCount = 0; + if (ObjectUtil.isNotEmpty(map.get(coupon.getId()))){ + userCount = map.get(coupon.getId()); + } + if (userCount < getNumLimit) { + //查询当前用户所拥有的优惠券数量 + ids.add(coupon.getId()); + } + } } } - return cardCouponUniVos; + IPage cardCouponUniVoIPage = new Page<>(page.getCurrent(), page.getSize()); + if (CollUtil.isNotEmpty(ids)) { + cardCouponUniVoIPage = baseMapper.selectAllByPageAndIds(page, ids); + cardCouponUniVoIPage.getRecords().stream().forEach(coupon -> extracted(coupon)); + } + return cardCouponUniVoIPage; + } + + private static void extracted(CardCouponUniVo coupon) { + //计算领取的比例 + double scale = (coupon.getTfGetNum() * 1.0 / coupon.getTfTotal()) * 100; + coupon.setScale(scale + "%"); } } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/vo/CardCouponUniVo.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/vo/CardCouponUniVo.java index c4a75b6ed..26c0fa75a 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/vo/CardCouponUniVo.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/vo/CardCouponUniVo.java @@ -1,5 +1,7 @@ package com.fuint.business.marketingActivity.cardCoupon.vo; +import cn.hutool.core.date.DateTime; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fuint.business.marketingActivity.cardCoupon.entity.CardCoupon; import lombok.Data; @@ -11,4 +13,12 @@ public class CardCouponUniVo extends CardCoupon { private String scale; //兑换券类型 private String typeName; + + private Integer count; + + @JsonIgnore + private String startTime; + + @JsonIgnore + private String endTime; } From 1c6df767a50955b76461537d2ace132b158d9da7 Mon Sep 17 00:00:00 2001 From: PQZ Date: Thu, 26 Sep 2024 17:13:51 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E9=80=82=E7=94=A8=E5=95=86=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fuintAdmin/.env.development | 2 +- .../EventMarketing/newCertificate/index.vue | 35 +++++++++++++++++-- .../controller/CardCouponController.java | 11 +++++- .../cardCoupon/entity/CardCoupon.java | 3 ++ .../src/main/resources/application.properties | 3 +- 5 files changed, 48 insertions(+), 6 deletions(-) diff --git a/fuintAdmin/.env.development b/fuintAdmin/.env.development index 473d93732..41a54452d 100644 --- a/fuintAdmin/.env.development +++ b/fuintAdmin/.env.development @@ -11,7 +11,7 @@ VUE_APP_BASE_API = '/dev-api' VUE_APP_PUBLIC_PATH = '/' # 后端接口地址 -VUE_APP_SERVER_URL = 'http://192.168.31.95:8080/' +VUE_APP_SERVER_URL = 'http://127.0.0.1:8080/' # http://192.168.0.121:8080/ diff --git a/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue b/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue index 9d7ec7f4a..6dc6ced3d 100644 --- a/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue +++ b/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue @@ -270,6 +270,22 @@ + + + 不限 + 自定义 + + + + + + + + { + this.goodsList = response.data.records; + }); + }, sxCoupon(id) { getCoupon(id).then(res => { if (res.code == 200) { @@ -925,6 +952,7 @@ export default { pageNo: 1, pageSize: 10 } + this.goodsList = []; this.getlist(); }, getlist() { @@ -1062,8 +1090,8 @@ export default { if (this.ruleForm.oilNumber) { this.ruleForm.oilNumber = this.ruleForm.oilNumber.toString() } - - + let productIds = this.ruleForm.productIdList + '' + this.ruleForm.productIds = productIds if (!this.ruleForm.id) { addCardCoupon(this.ruleForm).then(res => { @@ -1071,6 +1099,7 @@ export default { this.$message.success('添加成功'); this.gettj() this.getlist() + this.centerDialogVisible = false } else { this.$message.error('操作失败请稍后再试'); } @@ -1083,6 +1112,7 @@ export default { this.$message.success('修改成功'); this.gettj() this.getlist() + this.centerDialogVisible = false } else { this.$message.error('操作失败请稍后再试'); } @@ -1092,7 +1122,6 @@ export default { } - this.centerDialogVisible = false } } } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/controller/CardCouponController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/controller/CardCouponController.java index 95331d536..4a7945e98 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/controller/CardCouponController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/controller/CardCouponController.java @@ -10,6 +10,7 @@ import com.fuint.business.marketingActivity.cardCoupon.entity.CardCoupon; import com.fuint.business.marketingActivity.cardCoupon.service.CardCouponService; import com.fuint.business.marketingActivity.cardGiftActive.entity.CardGiftActive; import com.fuint.common.dto.AccountInfo; +import com.fuint.common.util.StringUtils; import com.fuint.common.util.TokenUtil; import com.fuint.framework.web.BaseController; import com.fuint.framework.web.ResponseObject; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.io.Serializable; +import java.util.Arrays; import java.util.List; /** @@ -59,7 +61,14 @@ public class CardCouponController extends BaseController { */ @GetMapping("{id}") public ResponseObject selectOne(@PathVariable Serializable id) { - return getSuccessResult(this.cardCouponService.getById(id)); + CardCoupon cardCoupon = cardCouponService.getById(id); + if (StringUtils.isNotEmpty(cardCoupon.getProductIds())){ + String[] array = cardCoupon.getProductIds().split(","); + // 转换为列表 + List list = Arrays.asList(array); + cardCoupon.setProductIdList(list); + } + return getSuccessResult(cardCoupon); } /** diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/entity/CardCoupon.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/entity/CardCoupon.java index 33da5ad28..d0a30dbab 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/entity/CardCoupon.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/entity/CardCoupon.java @@ -13,6 +13,7 @@ import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; +import java.util.List; /** * 油站优惠卷表2024(CardCoupon)表实体类 @@ -138,6 +139,8 @@ public class CardCoupon extends Model { //当次获取数量 @TableField(exist = false) private Integer giftCardTotal; + @TableField(exist = false) + private List productIdList; } diff --git a/fuintBackend/fuint-application/src/main/resources/application.properties b/fuintBackend/fuint-application/src/main/resources/application.properties index 1fa299b97..1ce626a3f 100644 --- a/fuintBackend/fuint-application/src/main/resources/application.properties +++ b/fuintBackend/fuint-application/src/main/resources/application.properties @@ -1,7 +1,8 @@ # \u57FA\u672C\u914D\u7F6E server.port=8080 env.profile=dev -env.properties.path=D:/my_project/oil-station/fuintBackend/configure/ +#env.properties.path=D:/my_project/oil-station/fuintBackend/configure/ +env.properties.path=D:/Code/yuzhan/oil-station/fuintBackend/configure/ #env.properties.path=F:/work/oilSystem/fuintBackend/configure/ #env.properties.path=D:/oil/new-oil/oilSystem/fuintBackend/configure/ #env.properties.path=D:/work/oilSystem/fuintBackend/configure/ From 6a95c2833a1d7136e3a43605d060e6263cf43b83 Mon Sep 17 00:00:00 2001 From: PQZ Date: Thu, 26 Sep 2024 17:19:45 +0800 Subject: [PATCH 03/10] 1 --- .../EventMarketing/newCertificate/index.vue | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue b/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue index 6dc6ced3d..4c5fdc23c 100644 --- a/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue +++ b/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue @@ -527,64 +527,64 @@ export default { weekList: [ { label: "周一", - value: "1" + value: "周一" }, { label: "周二", - value: "2" + value: "周二" }, { label: "周三", - value: "3" + value: "周三" }, { label: "周四", - value: "4" + value: "周四" }, { label: "周五", - value: "5" + value: "周五" }, { label: "周六", - value: "6" + value: "周六" }, { label: "周天", - value: "7" + value: "周天" } ], monthList: [ { label: "每月1号", - value: "01" + value: "1" }, { label: "每月2号", - value: "02" + value: "2" }, { label: "每月3号", - value: "03" + value: "3" }, { label: "每月4号", - value: "04" + value: "4" }, { label: "每月5号", - value: "05" + value: "5" }, { label: "每月6号", - value: "06" + value: "6" }, { label: "每月7号", - value: "07" + value: "7" }, { label: "每月8号", - value: "08" + value: "8" }, { label: "每月9号", - value: "09" + value: "9" }, { label: "每月10号", value: "10" From 2ec927d3b0992b179f390df465de09eb922dfe65 Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Thu, 26 Sep 2024 17:58:06 +0800 Subject: [PATCH 04/10] 9.26 --- .../service/impl/FleetInfoServiceImpl.java | 3 +- gasStation-uni/pagesHome/MyCard/MyCard.vue | 44 ++++- .../pagesHome/certificate/details.vue | 17 +- .../pagesHome/certificate/index.vue | 13 +- .../pagesHome/memberRecharge/index.vue | 153 +++++++++++++----- gasStation-uni/pagesMy/Coupons/details.vue | 23 ++- gasStation-uni/pagesMy/signIn/index.vue | 74 +++++---- 7 files changed, 226 insertions(+), 101 deletions(-) diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/impl/FleetInfoServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/impl/FleetInfoServiceImpl.java index 9ddbc71b3..396015b0f 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/impl/FleetInfoServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/impl/FleetInfoServiceImpl.java @@ -231,7 +231,8 @@ public class FleetInfoServiceImpl extends ServiceImpl //获取所在车队的id集合 List fleetIds = fleetMembers.stream().map(FleetMember::getFleetId).collect(Collectors.toList()); if (CollUtil.isEmpty(fleetIds)) { - throw new RuntimeException("未绑定车队"); +// throw new RuntimeException("未绑定车队"); + return null; } List fleetInfos = baseMapper.selectList(new LambdaQueryWrapper() diff --git a/gasStation-uni/pagesHome/MyCard/MyCard.vue b/gasStation-uni/pagesHome/MyCard/MyCard.vue index aea8868fe..e6bde6506 100644 --- a/gasStation-uni/pagesHome/MyCard/MyCard.vue +++ b/gasStation-uni/pagesHome/MyCard/MyCard.vue @@ -20,7 +20,7 @@ 囤油卡 - + 汽油92# 7.28元/L @@ -52,6 +52,21 @@ NO.xxxxxxxxxxxxxxxxxx --> + + + + 车队名称 + + + + + + 当前余额 + + + ¥{{cardBalance.cardBalance || 0}} + + @@ -71,7 +86,8 @@ cardsList: [], cardsIndex: 0, title: '', - giftInfo:{}, + giftInfo: {}, + fleetInfo:{} } }, @@ -82,8 +98,26 @@ this.query.chainStoreId = uni.getStorageSync('chainStoreId'); // this.getCardFuleRecords(); this.getUserBalance() + this.getFleetInfo() }, methods: { + getFleetInfo(){ + request({ + url: '/fleetInfo/getFleetInfoByStoreId', + method: 'get', + params:{storeId:uni.getStorageSync('storeId')} + }).then(res => { + if (res.code == 200) { + this.fleetInfo = res.data + console.log(this.fleetInfo, '111'); + }else{ + this.fleetInfo = {} + } + }) + }, + goFleetDetails(){ + + }, goCode() { uni.navigateTo({ url: '/pagesHome/QRcode/QRcode' @@ -96,7 +130,7 @@ }, goDetails(val) { uni.navigateTo({ - url: '/pagesHome/cardDetails/index?type='+val + url: '/pagesHome/cardDetails/index?type=' + val }) }, s_() { @@ -129,7 +163,7 @@ }).then(res => { if (res.code == 200) { this.cardsList = res.data.records - console.log(this.cardsList,'131'); + console.log(this.cardsList, '131'); } }) }, @@ -350,4 +384,4 @@ text-align: right; } - + \ No newline at end of file diff --git a/gasStation-uni/pagesHome/certificate/details.vue b/gasStation-uni/pagesHome/certificate/details.vue index 39100e358..d1cc2bb6c 100644 --- a/gasStation-uni/pagesHome/certificate/details.vue +++ b/gasStation-uni/pagesHome/certificate/details.vue @@ -55,13 +55,28 @@