Commit 2ae773e9 authored by 王炽's avatar 王炽

6666

parent 2c82d31b
...@@ -41,7 +41,7 @@ const tabList = ref([ ...@@ -41,7 +41,7 @@ const tabList = ref([
selectedIconPath: $baseUrl + "tabBar/icon_tab_brand_selected.png", selectedIconPath: $baseUrl + "tabBar/icon_tab_brand_selected.png",
}, },
{ {
text: "积分服务", text: "积分权益",
iconPath: $baseUrl + "tabBar/icon_tab_gift_normal.png", iconPath: $baseUrl + "tabBar/icon_tab_gift_normal.png",
selectedIconPath: $baseUrl + "tabBar/icon_tab_gift_selected.png", selectedIconPath: $baseUrl + "tabBar/icon_tab_gift_selected.png",
}, },
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
</view> </view>
<view class="task_content"> <view class="task_content">
<text class="task_title">{{ task?.taskTodoExtra?.title }}</text> <text class="task_title">{{ task?.taskTodoExtra?.title }}</text>
<text class="task_points">积分+{{ task?.taskTodoExtra?.credits }}</text> <text class="task_points">{{ task?.taskTodoExtra?.desc }}</text>
</view> </view>
<view <view
class="task_button" class="task_button"
......
...@@ -182,13 +182,14 @@ onMounted(async () => { ...@@ -182,13 +182,14 @@ onMounted(async () => {
// 调用邀请活动首页接口 // 调用邀请活动首页接口
const integralStore = useIntegralStore(); const integralStore = useIntegralStore();
const res = await integralStore.getOriginInviteHome(true); // 使用 mock 数据 //获取邀请码和奖励
const res = await integralStore.getOriginInviteHome();
if(res.success) { if(res.success && !res.data?.unclaimedPrize) {
globalStore.isShowInvitePrizePanel = true; globalStore.isShowInvitePrizePanel = true;
globalStore.inviteCount = res.data.invitedCount; globalStore.inviteCount = res.data?.invitedCount;
globalStore.prizeName = '邀请好友奖励';//+res.data.prizeName; globalStore.prizeName = res.data?.invitationImageUrl;//????
globalStore.prizeImage = 'https://course.feihe.com/momclub-picture/integral/1023/invate_star_character1023.png'; globalStore.prizeImage = res.data?.invitationImageUrl;
} }
console.log('邀请活动首页数据:', res); console.log('邀请活动首页数据:', res);
}); });
......
...@@ -92,7 +92,7 @@ const callAssistInvite = async (ivtCode,unionId) => { ...@@ -92,7 +92,7 @@ const callAssistInvite = async (ivtCode,unionId) => {
// 获取用户unionId // 获取用户unionId
const wxUnionId = userStore.unionId || ''; const wxUnionId = userStore.unionId || '';
const res = await integralStore.assistInvite(ivtCode, unionId, true); const res = await integralStore.assistInvite(ivtCode, unionId);
console.log('助力接口返回:', res); console.log('助力接口返回:', res);
} catch (error) { } catch (error) {
console.error('调用助力接口失败:', error); console.error('调用助力接口失败:', error);
...@@ -109,7 +109,7 @@ onShow(() => { ...@@ -109,7 +109,7 @@ onShow(() => {
// 如果有邀请码,调用助力接口 // 如果有邀请码,调用助力接口
if (inviteCode.value) { if (inviteCode.value) {
callAssistInvite(ivtCode,unionId.value); callAssistInvite(ivtCode, unionId.value);
} }
isnew.value = false; isnew.value = false;
} }
......
...@@ -258,7 +258,7 @@ ...@@ -258,7 +258,7 @@
<image class="reward_coin" v-else :src="$baseUrl + `integral/1023/signIcon.png`" <image class="reward_coin" v-else :src="$baseUrl + `integral/1023/signIcon.png`"
mode="aspectFit" /> mode="aspectFit" />
</view> </view>
<text class="day_label">第{{ day }}</text> <text class="day_label">{{ (day < todaynum && !signinStatus[day - 1]) ? '未签到' : `第${day}天` }}</text>
</view> </view>
</view> </view>
...@@ -504,7 +504,7 @@ ...@@ -504,7 +504,7 @@
<!-- <GongzhonghaoPop :visible="showGongzhonghaoPop" :title="gongzhonghaoTitle" <!-- <GongzhonghaoPop :visible="showGongzhonghaoPop" :title="gongzhonghaoTitle"
:description="gongzhonghaoDescription" :qrCodeUrl="gongzhonghaoQrCodeUrl" :description="gongzhonghaoDescription" :qrCodeUrl="gongzhonghaoQrCodeUrl"
@close="handleCloseGongzhonghaoPop" @download="handleDownloadQrCode" /> --> @close="handleCloseGongzhonghaoPop" @download="handleDownloadQrCode" /> -->
</view> </view>
</template> </template>
<!-- showShengriliTipPanel --> <!-- showShengriliTipPanel -->
...@@ -1536,7 +1536,7 @@ const bonusTagStatus = ref([false, false, false, false, false, false, true]); // ...@@ -1536,7 +1536,7 @@ const bonusTagStatus = ref([false, false, false, false, false, false, true]); //
const bonusTagText = ref(['', '', '', '', '', '', '5倍']); // 示例:第7天显示"5倍" const bonusTagText = ref(['', '', '', '', '', '', '5倍']); // 示例:第7天显示"5倍"
// 奖励积分数组,控制每天获得的积分 // 奖励积分数组,控制每天获得的积分
const rewardPoints = ref([20, 20, 20, 20, 20, 20, 100]); // 默认积分值 const rewardPoints = ref([0, 0, 0, 0, 0, 0, 0]); // 默认积分值
// 签到提示弹窗相关 // 签到提示弹窗相关
const showSignedTips = ref(false); const showSignedTips = ref(false);
...@@ -1911,10 +1911,10 @@ onMounted(async () => { ...@@ -1911,10 +1911,10 @@ onMounted(async () => {
showShareNPopNoLogin.value = true; showShareNPopNoLogin.value = true;
} else if (globalStore.invateUseType === 'old') { } else if (globalStore.invateUseType === 'old') {
showSharePopLogin.value = true; showSharePopLogin.value = true;
} }
hideLoading(); hideLoading();
initExposure(); initExposure();
......
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