更新10.8
This commit is contained in:
parent
41b52c140a
commit
3452957db9
@ -396,9 +396,11 @@ public class IntegralSettingsServiceImpl implements IntegralSettingsService {
|
|||||||
Pattern pattern = Pattern.compile("\\d+");
|
Pattern pattern = Pattern.compile("\\d+");
|
||||||
Matcher matcher = pattern.matcher(integralDetail.getChangeReason());
|
Matcher matcher = pattern.matcher(integralDetail.getChangeReason());
|
||||||
StringBuilder numbers = new StringBuilder();
|
StringBuilder numbers = new StringBuilder();
|
||||||
|
StringBuilder classColor = new StringBuilder();
|
||||||
numbers.append(0);
|
numbers.append(0);
|
||||||
while (matcher.find()) {
|
while (matcher.find()) {
|
||||||
numbers.append(matcher.group());
|
numbers.append(matcher.group());
|
||||||
|
classColor.append(matcher.group());
|
||||||
}
|
}
|
||||||
if (StrUtil.isEmpty(numbers)) {
|
if (StrUtil.isEmpty(numbers)) {
|
||||||
integralSettingsVo.setSignInDays("0");
|
integralSettingsVo.setSignInDays("0");
|
||||||
@ -408,6 +410,7 @@ public class IntegralSettingsServiceImpl implements IntegralSettingsService {
|
|||||||
numbers.deleteCharAt(0);
|
numbers.deleteCharAt(0);
|
||||||
}
|
}
|
||||||
integralSettingsVo.setSignInDays(numbers.toString());
|
integralSettingsVo.setSignInDays(numbers.toString());
|
||||||
|
integralSettingsVo.setClassColor(Integer.parseInt(classColor.toString()));
|
||||||
} else {
|
} else {
|
||||||
integralSettingsVo.setSignInDays("0");
|
integralSettingsVo.setSignInDays("0");
|
||||||
}
|
}
|
||||||
|
@ -17,6 +17,7 @@ import java.util.List;
|
|||||||
public class IntegralSettingsVo{
|
public class IntegralSettingsVo{
|
||||||
private String signInDays;
|
private String signInDays;
|
||||||
private List<IntegralSettingsBo> integralSettings;
|
private List<IntegralSettingsBo> integralSettings;
|
||||||
|
private Integer classColor;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
</view>
|
</view>
|
||||||
<view class="wrap-box">
|
<view class="wrap-box">
|
||||||
<view class="w_box" v-for="(item,index) in list" :key="index" @click="setIndex(index,item)"
|
<view class="w_box" v-for="(item,index) in list" :key="index" @click="setIndex(index,item)"
|
||||||
:class="{'acv_w' : wIndex == index }">
|
:class="{'acv_w' : (index + 1) <= wIndex }">
|
||||||
<view class="">{{item.integralName}}</view>
|
<view class="">{{item.integralName}}</view>
|
||||||
<image src="@/static/imgs/jinbi.png" style="width: 25px; height: 25px; "></image>
|
<image src="@/static/imgs/jinbi.png" style="width: 25px; height: 25px; "></image>
|
||||||
<view class="">{{item.integral}}积分</view>
|
<view class="">{{item.integral}}积分</view>
|
||||||
@ -147,7 +147,7 @@
|
|||||||
this.equityShow = false
|
this.equityShow = false
|
||||||
},
|
},
|
||||||
setIndex(index, data) {
|
setIndex(index, data) {
|
||||||
this.wIndex = index
|
// this.wIndex = index
|
||||||
this.integral = data.integral
|
this.integral = data.integral
|
||||||
},
|
},
|
||||||
getList() {
|
getList() {
|
||||||
@ -161,6 +161,7 @@
|
|||||||
if (res.code == 200) {
|
if (res.code == 200) {
|
||||||
this.list = res.data.integralSettings
|
this.list = res.data.integralSettings
|
||||||
this.signInDays = res.data.signInDays
|
this.signInDays = res.data.signInDays
|
||||||
|
this.wIndex = res.data.classColor
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
Loading…
Reference in New Issue
Block a user