diff --git a/src/components/points-and-badge/holiday.vue b/src/components/points-and-badge/holiday.vue index b218e940..594081b9 100644 --- a/src/components/points-and-badge/holiday.vue +++ b/src/components/points-and-badge/holiday.vue @@ -175,6 +175,17 @@ // 退出 const close = (status: boolean): void => { + // 如果是固定积分,就设置一下 + console.log('如果是固定积分,就设置一下', holidayInfo.rewardType); + if(holidayInfo.rewardType === RewardType.FIXED_POINT) { + startLotteryCallback({ + holidayCode: '', + failCb: undefined, + successCb: () => { + console.log('设置成功'); + } + }) + } uni.showTabBar({ success() { popup.value.close(); @@ -193,7 +204,7 @@ ): void => { startLotteryCallback = lotteryCb; // 抽奖的回调 completeCallback = completeCb; // 关闭弹窗的回调 - + console.log('holidayBody', holidayBody); Object.assign(holidayInfo, holidayBody); if (!holidayInfo.rewardFlag || holidayInfo.obtainFlag) { // if (!holidayInfo.rewardFlag) { diff --git a/src/composables/useCheckIn.js b/src/composables/useCheckIn.js index d7a55548..c23c87df 100644 --- a/src/composables/useCheckIn.js +++ b/src/composables/useCheckIn.js @@ -258,16 +258,22 @@ export default function useCheckIn() { successCb = () => {}, failCb = () => {} }) => { - obtainRewardRandom({ - holidayCode - }).then(({body}) => { - console.log('抽取成功回调', body); - // 把缓存中的记录设置为已经抽取积分 + if(holidayCode) { + obtainRewardRandom({ + holidayCode + }).then(({body}) => { + console.log('抽取成功回调', body); + // 把缓存中的记录设置为已经抽取积分 + setLocalSignStatus({ obtainFlag: true}); + successCb?.(body); + }).catch((error) => { + failCb?.(error) + }) + } else { setLocalSignStatus({ obtainFlag: true}); - successCb?.(body); - }).catch((error) => { - failCb?.(error) - }) + successCb?.(); + } + }; /**