Commit f0ce81fb authored by jt's avatar jt

Merge branch 'feihesanqi_20251014' of gitlab2.dui88.com:fh/20250528_FHQ1 into feihesanqi_20251014

parents 98678044 a7c19a31
...@@ -190,11 +190,14 @@ onMounted(async () => { ...@@ -190,11 +190,14 @@ onMounted(async () => {
// const unionId = uni.getStorageSync('unionId'); // const unionId = uni.getStorageSync('unionId');
const unclaimedPrize = res.data?.unclaimedPrize; const unclaimedPrize = res.data?.unclaimedPrize;
if(res.success && unclaimedPrize) { if(res.success){
globalStore.isShowInvitePrizePanel = true; if(unclaimedPrize) {
globalStore.inviteCount = res.data?.invitedCount; globalStore.isShowInvitePrizePanel = true;
globalStore.prizeName = unclaimedPrize?.prizeName; globalStore.inviteCount = res.data?.invitedCount;
globalStore.prizeImage = unclaimedPrize?.prizeImageUrl; globalStore.prizeName = unclaimedPrize?.prizeName;
globalStore.prizeImage = unclaimedPrize?.prizeImageUrl;
}
} }
console.log('邀请活动首页数据:', res); console.log('邀请活动首页数据:', res);
}); });
......
...@@ -640,8 +640,8 @@ ...@@ -640,8 +640,8 @@
} }
.reward_coin { .reward_coin {
width: 50rpx; width: 42rpx;
height: 50rpx; height: 40rpx;
} }
// 已签到状态样式 // 已签到状态样式
...@@ -659,8 +659,8 @@ ...@@ -659,8 +659,8 @@
position: relative; position: relative;
.check_mark { .check_mark {
width: 14rpx; width: 21rpx;
height: 10rpx; height: 15rpx;
} }
} }
} }
......
...@@ -223,7 +223,7 @@ ...@@ -223,7 +223,7 @@
</view> </view>
<!-- 7天连续签到奖励容器 --> <!-- 7天连续签到奖励容器 -->
<view class="signin_reward_container" :class="`item-${itemIndex}`" v-if="true"> <view class="signin_reward_container" :class="`item-${itemIndex}`" v-if="integralStore?.signinAndTaskInfo?.data">
<!-- 标题区域 --> <!-- 标题区域 -->
<view class="signin_title_area" :class="`item-${itemIndex}`"> <view class="signin_title_area" :class="`item-${itemIndex}`">
<text class="signin_main_title">连签7天,奖励翻5倍</text> <text class="signin_main_title">连签7天,奖励翻5倍</text>
...@@ -250,7 +250,7 @@ ...@@ -250,7 +250,7 @@
<!-- 已签到状态:显示白色圆圈内的对勾 --> <!-- 已签到状态:显示白色圆圈内的对勾 -->
<view class="reward_status signed" v-if="signinStatus[day - 1]"> <view class="reward_status signed" v-if="signinStatus[day - 1]">
<view class="check_circle"> <view class="check_circle">
<image class="check_mark" :src="$baseUrl + `integral/1023/sign_duihao1.png`" mode="aspectFit" /> <image class="check_mark" :src="$baseUrl + `integral/1023/sign_duihao.png`" mode="aspectFit" />
</view> </view>
</view> </view>
<!-- 未签到状态:显示金币图标 --> <!-- 未签到状态:显示金币图标 -->
...@@ -274,7 +274,7 @@ ...@@ -274,7 +274,7 @@
<!-- 积分限时购 --> <!-- 积分限时购 -->
<SeckillSection :isdebug="isdebug" :itemIndex="itemIndex" @credits-sale-click="handleCreditsSaleClick" /> <SeckillSection :isdebug="isdebug" :itemIndex="itemIndex" @credits-sale-click="handleCreditsSaleClick" />
<!-- 邀请得好礼组件 --> <!-- 邀请得好礼组件 -->
<InviteGift v-if="true" class="invite_container" :itemIndex="itemIndex" @invite="handleInviteClick" <InviteGift v-if="integralStore.originInviteHome?.data" class="invite_container" :itemIndex="itemIndex" @invite="handleInviteClick"
@record="handleRecordClick" /> @record="handleRecordClick" />
<!-- 会员活动 --> <!-- 会员活动 -->
<view class="vip-active-area" v-if="vipActive?.length > 0"> <view class="vip-active-area" v-if="vipActive?.length > 0">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment