Commit ff8eaa13 authored by spc's avatar spc

fixed

parent a7c19a31
...@@ -467,7 +467,7 @@ export default { ...@@ -467,7 +467,7 @@ export default {
currentQuestion: '', currentQuestion: '',
correctAnswer: '', correctAnswer: '',
answerAnalysis: '', answerAnalysis: '',
// 悬浮图片相关配置 // 悬浮图片相关配置
floatIcon: { floatIcon: {
// imageUrl: 'homepage/btnclose.png', // imageUrl: 'homepage/btnclose.png',
...@@ -1100,21 +1100,7 @@ export default { ...@@ -1100,21 +1100,7 @@ export default {
// 显示奖励弹窗 // 显示奖励弹窗
showRewardPopup(rewardData) { showRewardPopup(rewardData) {
// 设置奖励信息 // 设置奖励信息
let rewardText = ''; let rewardText = rewardData.prizeName;
if (rewardData.credits) {
// 处理字符串格式的积分
const credits = parseInt(rewardData.credits) || 0;
if (credits > 0) {
rewardText += `${credits}`;
}
}
if (rewardData.prizeName) {
if (rewardText) {
rewardText += `${rewardData.prizeName}`;
} else {
rewardText = rewardData.prizeName;
}
}
// 根据奖品类型设置图片 // 根据奖品类型设置图片
let imageUrl = ''; let imageUrl = '';
......
...@@ -103,7 +103,8 @@ ...@@ -103,7 +103,8 @@
</view> </view>
<!-- 完成任务模块 --> <!-- 完成任务模块 -->
<view class="task-module"> <view class="task-module"
v-if="!cfgStatus.isRegister || (babyInfo?.allBabyBaseInfo && babyInfo.allBabyBaseInfo.length > 0)">
<image class="task-guide-bg" :src="$baseUrl + 'homepage/Q3Res/my_taskGuideBg.png'"></image> <image class="task-guide-bg" :src="$baseUrl + 'homepage/Q3Res/my_taskGuideBg.png'"></image>
<image class="task-do-btn" :src="$baseUrl + 'homepage/Q3Res/my_taskDoBtn.png'" @tap="handleTaskClick"></image> <image class="task-do-btn" :src="$baseUrl + 'homepage/Q3Res/my_taskDoBtn.png'" @tap="handleTaskClick"></image>
</view> </view>
...@@ -177,7 +178,7 @@ ...@@ -177,7 +178,7 @@
</view> </view>
<!-- 协议 --> <!-- 协议 -->
<view class="protocol-container"> <!-- <view class="protocol-container">
<image :src="$baseUrl + 'my/protocol.png'" mode="aspectFit" /> <image :src="$baseUrl + 'my/protocol.png'" mode="aspectFit" />
<view class="hot-member" :data-log="{ <view class="hot-member" :data-log="{
xcxClick: '我的页面点击', xcxClick: '我的页面点击',
...@@ -189,7 +190,7 @@ ...@@ -189,7 +190,7 @@
pageName: '我的页面', pageName: '我的页面',
buttonName: '隐私协议', buttonName: '隐私协议',
}" @click="handleHot" data-type="privacy"></view> }" @click="handleHot" data-type="privacy"></view>
</view> </view> -->
<RegisterLayer v-model="showRegisterLayer" @confirm="onRegisterConfirm" /> <RegisterLayer v-model="showRegisterLayer" @confirm="onRegisterConfirm" />
</view> </view>
...@@ -316,7 +317,7 @@ const handleTaskClick = async () => { ...@@ -316,7 +317,7 @@ const handleTaskClick = async () => {
}); });
return; return;
} }
// 已登录,正常执行任务逻辑 // 已登录,正常执行任务逻辑
await integralStore.getSigninAndTaskInfo(false); await integralStore.getSigninAndTaskInfo(false);
globalStore.showTaskPop(integralStore?.signinAndTaskInfo?.data?.taskTodo); globalStore.showTaskPop(integralStore?.signinAndTaskInfo?.data?.taskTodo);
......
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