修复支付未设置密码时关闭支付前需要输入密码未立即生效问题,修复会员页面周期福利弹窗显示问题
This commit is contained in:
@@ -182,8 +182,9 @@
|
||||
}
|
||||
if (name == '周期福利') {
|
||||
model.title = '周期福利'
|
||||
let couponLen=memberLevel.value.cycleRewardCouponList?memberLevel.value.cycleRewardCouponList.length:0
|
||||
modelContent.value =
|
||||
`每${memberLevel.value.cycleUnit}赠送${memberLevel.value.cycleRewardPoints}积分,${memberLevel.value.cycleRewardCouponList.length}张优惠券`
|
||||
`每${memberLevel.value.cycleUnit}赠送${memberLevel.value.cycleRewardPoints}积分${couponLen?(','+couponLen+'张优惠券'):''}`
|
||||
}
|
||||
if (name == '会员说明') {
|
||||
model.title = '会员说明'
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
<view class="lv">{{ memberLevel ? memberLevel.name : '' }}</view>
|
||||
<view class="time" v-if="shopUserInfo.openType == 'PAY'">
|
||||
<text>{{ memberLevel ? dayjs(memberLevel.endTime).format('YYYY-MM-DD') : '' }}到期</text>
|
||||
<text style="margin-left: 8px;">{{ memberLevel ? memberLevel.memberName : '' }}</text>
|
||||
<text style="margin-left: 8px;">{{ memberLevel ? memberLevel.memberCircleName : '' }}</text>
|
||||
</view>
|
||||
<view class="rule u-m-t-40 u-flex u-flex-between u-flex-y-center">
|
||||
<text class="color-one">
|
||||
@@ -235,6 +235,27 @@
|
||||
const res = await vipApi.config({
|
||||
shopId: shopId
|
||||
});
|
||||
|
||||
const res1 = await vipApi.detail({
|
||||
shopId: shopId
|
||||
});
|
||||
if (res1) {
|
||||
memberLevel.value = {
|
||||
...res1.memberLevel,
|
||||
endTime: res1.endTime,
|
||||
memberName: res1.memberName,
|
||||
experience: res1.experience,
|
||||
nextExperienceValue: res1.nextExperienceValue,
|
||||
memberCircleName:res1.memberCircleName,
|
||||
memberCircleReward:res1.memberCircleReward,
|
||||
};
|
||||
const total = res1.experience * 1 + res1.nextExperienceValue * 1;
|
||||
const percent = ((res1.experience * 1) / total) * 100;
|
||||
if (total <= 0 || res1.experience * 1 <= 0) {
|
||||
expProgress.value = 100;
|
||||
}
|
||||
expProgress.value = percent;
|
||||
}
|
||||
if (res) {
|
||||
res.memberLevel.cycleRewardCouponList = res.memberLevel.cycleRewardCouponList || []
|
||||
res.memberLevel = res.memberLevel || {}
|
||||
@@ -254,7 +275,7 @@
|
||||
return true
|
||||
}).map((v) => {
|
||||
if (v.name == '赠送成长值' && res.memberLevel) {
|
||||
v.desc = `赠送${res.memberLevel.experienceValue}成长值`
|
||||
v.desc = `赠送${memberLevel.value.memberCircleReward}成长值`
|
||||
}
|
||||
if (v.name == '优惠券') {
|
||||
if (res.memberLevel.cycleRewardCouponList.length) {
|
||||
@@ -301,24 +322,6 @@
|
||||
menus.value = tiaojian_menus;
|
||||
}
|
||||
}
|
||||
const res1 = await vipApi.detail({
|
||||
shopId: shopId
|
||||
});
|
||||
if (res1) {
|
||||
memberLevel.value = {
|
||||
...res1.memberLevel,
|
||||
endTime: res1.endTime,
|
||||
memberName: res1.memberName,
|
||||
experience: res1.experience,
|
||||
nextExperienceValue: res1.nextExperienceValue
|
||||
};
|
||||
const total = res1.experience * 1 + res1.nextExperienceValue * 1;
|
||||
const percent = ((res1.experience * 1) / total) * 100;
|
||||
if (total <= 0 || res1.experience * 1 <= 0) {
|
||||
expProgress.value = 100;
|
||||
}
|
||||
expProgress.value = percent;
|
||||
}
|
||||
}
|
||||
|
||||
const nextName = computed(() => {
|
||||
|
||||
Reference in New Issue
Block a user