diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralSettingsServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralSettingsServiceImpl.java index 8d873940f..1449dc5b5 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralSettingsServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralSettingsServiceImpl.java @@ -396,9 +396,11 @@ public class IntegralSettingsServiceImpl implements IntegralSettingsService { Pattern pattern = Pattern.compile("\\d+"); Matcher matcher = pattern.matcher(integralDetail.getChangeReason()); StringBuilder numbers = new StringBuilder(); + StringBuilder classColor = new StringBuilder(); numbers.append(0); while (matcher.find()) { numbers.append(matcher.group()); + classColor.append(matcher.group()); } if (StrUtil.isEmpty(numbers)) { integralSettingsVo.setSignInDays("0"); @@ -408,6 +410,7 @@ public class IntegralSettingsServiceImpl implements IntegralSettingsService { numbers.deleteCharAt(0); } integralSettingsVo.setSignInDays(numbers.toString()); + integralSettingsVo.setClassColor(Integer.parseInt(classColor.toString())); } else { integralSettingsVo.setSignInDays("0"); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/vo/IntegralSettingsVo.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/vo/IntegralSettingsVo.java index 5321cee1f..c9bf026f2 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/vo/IntegralSettingsVo.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/vo/IntegralSettingsVo.java @@ -17,6 +17,7 @@ import java.util.List; public class IntegralSettingsVo{ private String signInDays; private List integralSettings; + private Integer classColor; } diff --git a/gasStation-uni/pagesMy/signIn/index.vue b/gasStation-uni/pagesMy/signIn/index.vue index b8c113af8..1157fa2df 100644 --- a/gasStation-uni/pagesMy/signIn/index.vue +++ b/gasStation-uni/pagesMy/signIn/index.vue @@ -10,7 +10,7 @@ + :class="{'acv_w' : (index + 1) <= wIndex }"> {{item.integralName}} {{item.integral}}积分 @@ -147,7 +147,7 @@ this.equityShow = false }, setIndex(index, data) { - this.wIndex = index + // this.wIndex = index this.integral = data.integral }, getList() { @@ -161,6 +161,7 @@ if (res.code == 200) { this.list = res.data.integralSettings this.signInDays = res.data.signInDays + this.wIndex = res.data.classColor } }) },