66666

components/integralArea/InviteGift.vue

@@ -66,10 +66,6 @@ onMounted(() => {
 // 去邀请按钮点击事件
 const handleInviteClick = () => {
 	console.log('去邀请按钮点击');
-	// jump({
-	// 	url: '/pages/invate/sharepage',
-	// 	type: JumpType.INNER
-	// });
 	
 	emit('invite');
 };

components/qiandao/SignRuleDes.less

@@ -36,22 +36,30 @@
 			}
 
 			.rule_list {
-				width: 100%;
-				margin-left: 108rpx;
+				margin-left: 56rpx;
+				margin-right: 56rpx;
+				height: 190rpx;
+				overflow-y: auto;
+				-webkit-overflow-scrolling: touch;
 
-				.rule_date {
-					font-size: 26rpx;
-					color: #54390D;
+				.rule_rich_text {
 					width: 100%;
-					display: block;
-				}
 
-				.rule_text {
-					font-size: 26rpx;
-					color: #54390D;
-					// line-height: 1.5;
-					display: block;
-					// margin-bottom: 20rpx;
+					// :deep(.rule_date) {
+					// 	font-size: 26rpx;
+					// 	color: #54390D;
+					// 	// line-height: 1.5;
+					// 	// margin-bottom: 12rpx;
+					// 	display: block;
+					// }
+
+					:deep(.rule_text) {
+						font-size: 24rpx;
+						color: #54390D;
+						// line-height: 1.8;
+						display: block;
+						// margin-bottom: 8rpx;
+					}
 				}
 			}
 		}

components/qiandao/SignRuleDes.vue

@@ -6,11 +6,7 @@
 				<text class="rule_title">任务规则</text>
 				
 				<view class="rule_list">
-					<text class="rule_date">2025年4月1日签到规则升级</text>
-					<text class="rule_text">1. 当月连签2天后,单日签到奖励升至2分</text>
-					<text class="rule_text">2. 当周满签7天,额外再奖励5分</text>
-					<text class="rule_text">3. 断签也有机会补,邀请小伙伴帮你助力</text>
-					<text class="rule_text">4. 每月1号连签次数清零</text>
+					<rich-text class="rule_rich_text" :nodes="ruleContent"></rich-text>
 				</view>
 			</view>
 			
@@ -23,7 +19,8 @@
 </template>
 
 <script setup>
-import { defineProps, defineEmits } from 'vue';
+import { defineProps, defineEmits, ref } from 'vue';
+import { useIntegralStore } from '../../stores/integral';
 
 // Props 定义
 const props = defineProps({
@@ -35,6 +32,11 @@ const props = defineProps({
 
 // Emits 定义
 const emit = defineEmits(['close']);
+const integralStore = useIntegralStore();
+const ruleText = ref(integralStore.signinAndTaskInfo?.checkInTodo?.checkInExtra?.rule);
+
+// 富文本内容字符串
+const ruleContent = ref(ruleText.value ? ruleText.value : '<div class="rule_text">2025年4月1日签到规则升级</div><div class="rule_text">1. 当月连签2天后,单日签到奖励升至2分</div><div class="rule_text">2. 当周满签7天,额外再奖励5分</div><div class="rule_text">3. 断签也有机会补,邀请小伙伴帮你助力</div><div class="rule_text">4. 每月1号连签次数清零</div>');
 
 // 关闭弹窗
 const handleClose = () => {

components/renwu/TaskCompleteTips.less

@@ -30,17 +30,22 @@
 		z-index: 2;
 
 		.tips_title {
-			font-size: 50rpx;
-			font-weight: bold;
+			font-size: 64rpx;
+			font-weight: 400rpx;
 			color: #ffffff;
 			margin-bottom: 20rpx;
 			text-align: center;
+			display: block;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			white-space: nowrap;
+			max-width: 560rpx;
 		}
 
 		.points_text {
 			font-size: 32rpx;
 			color: #ffffff;
-			margin-bottom: 80rpx;
+			margin-bottom: 60rpx;
 			text-align: center;
 		}
 
@@ -48,7 +53,7 @@
 			position: relative;
 			width: 300rpx;
 			height: 300rpx;
-			margin-bottom: 90rpx;
+			margin-bottom: 60rpx;
 			display: flex;
 			align-items: center;
 			justify-content: center;
@@ -56,8 +61,8 @@
 
 		.task_complete_icon {
 			position: absolute;
-			width: 122rpx;
-			height: 122rpx;
+			width: 238rpx;
+			height: 232rpx;
 			left: 50%;
 			top: 50%;
 			transform: translate(-50%, -50%);
@@ -69,8 +74,8 @@
 		}
 
 		.accept_button {
-			width: 300rpx;
-			height: 80rpx;
+			width: 324rpx;
+			height: 78rpx;
 			background: #D3A458;
 			border-radius: 40rpx;
 			display: flex;
@@ -81,7 +86,7 @@
 			.accept_button_text {
 				font-size: 32rpx;
 				color: #ffffff;
-				font-weight: 500;
+				font-weight: 400;
 			}
 		}
 
@@ -92,14 +97,14 @@
 			display: flex;
 			align-items: center;
 			justify-content: center;
-			background: rgba(0, 0, 0, 0.5);
+			background: rgba(255, 255, 255, 0.5);
 
 			.close_icon {
 				margin-top: -7rpx;
 				margin-left: 2rpx;
 				font-size: 40rpx;
 				color: #ffffff;
-				font-weight: bold;
+				// font-weight: bold;
 			}
 		}
 	}

components/renwu/TaskCompleteTips.vue

@@ -13,7 +13,7 @@
 			
 		<!-- 第三行：图片 -->
 		<view class="task_complete_icon_container">
-			<image class="task_complete_icon" :class="{ 'task_complete_icon_animating': isAnimating }" :src="$baseUrl + `integral/1023/jifenIcon1.png`" mode="aspectFit" />
+			<image class="task_complete_icon" :class="{ 'task_complete_icon_animating': isAnimating }" :src="$baseUrl + `integral/1023/jifenIcon_renwu.png`" mode="aspectFit" />
 		</view>
 			
 			<!-- 第四行：开心收下按钮 -->
@@ -40,7 +40,7 @@ const props = defineProps({
 	},
 	points: {
 		type: Number,
-		default: 100
+		default: 0
 	},
 	taskTitle: {
 		type: String,

pages/index/index.vue

@@ -235,8 +235,6 @@ const handleTaskComplete = async (taskIdParam) => {
 	globalStore.taskCompleteTitle = res?.data?.taskName;
 	//刷新签到和任务信息
 	await integralStore.getSigninAndTaskInfo();
-
-  
 };
 
 onShow(async () => {

pages/invate/sharepage.less

@@ -9,7 +9,7 @@
 		top: 0;
 		left: 0;
 		width: 100%;
-		height: 2462rpx;
+		height: 2800rpx;
 		.background_image {
 			position: absolute;
 			top: 0;
@@ -21,7 +21,7 @@
 		
 		// 一键领取按钮
 		.claim_button {
-			position: absolute;
+			position: fixed;
 			bottom: 60rpx;
 			left: 50%;
 			transform: translateX(-50%);

pages/invate/sharepage.vue

@@ -2,7 +2,7 @@
 	<view class="sharepage_container">
 		<view class="background_image_container">
 			<!-- 背景图片 -->
-			<image class="background_image" :src="$baseUrl + 'homepage/shareImg_jf1.jpg'" mode="aspectFit" />
+			<image class="background_image" :src="$baseUrl + 'homepage/shareImg_jf2.jpg'" mode="aspectFit" />
 			
 			<!-- 一键领取按钮 -->
 			<view class="claim_button" @click="handleClaim">

views/Integral.vue

@@ -258,7 +258,7 @@
 							mode="aspectFit" />
 					</view>
 					<text class="day_label" :class="`item-${itemIndex}`">{{ (day < todaynum && !signinStatus[day - 1])
-						? '未签到' : `第${day}天` }}</text>
+						? '未签到' : getWeekdayLabel(day) }}</text>
 				</view>
 			</view>
 
@@ -381,14 +381,18 @@
 							<view class="title-container1">
 								<text class="title-text1">{{ goodItem?.goodsName }}</text>
 							</view>
-							<text v-if="Number(goodItem?.priceSale) && Number(goodItem?.credits)" class="num0">低至{{
+
+							<text class="price-text"><text class="num">{{
+								goodItem?.credits }}</text>积分</text>
+
+							<!-- <text v-if="Number(goodItem?.priceSale) && Number(goodItem?.credits)" class="num0">低至{{
 								goodItem?.credits }}<text class="price-text0">积分</text><text
 									class="price-text1">+</text><text class="price-text0">￥</text>{{
 										goodItem?.priceSale }}</text>
 							<text v-else-if="Number(goodItem?.priceSale)" class="price-text"><text class="num">￥{{
 								goodItem?.priceSale }}</text></text>
 							<text v-else-if="Number(goodItem?.credits)" class="price-text"><text class="num">{{
-								goodItem?.credits }}</text>积分</text>
+								goodItem?.credits }}</text>积分</text> -->
 						</view>
 
 					</view>
@@ -455,10 +459,10 @@
 		</view>
 
 		<!-- 查看更多容器 -->
-		<view class="more-container" v-if="goodsDataArr?.length > 0" @click="handleMoreClick">
+		<!-- <view class="more-container" v-if="goodsDataArr?.length > 0" @click="handleMoreClick">
 			<text class="more-text">点击查看更多</text>
 			<image class="more-arrow" :src="$baseUrl + `integral/${tupianBanben}/integralArrow.png`" mode="aspectFit" />
-		</view>
+		</view> -->
 
 		<!-- 测试注册层按钮（开发调试用） -->
 		<!-- <view class="test-register-btn" @click="showRegisterDialog" v-if="!islogin">
@@ -1635,6 +1639,12 @@ const getProgress = (index) => {
 	}
 	return progress;
 }
+
+// 将天数转换为星期标签
+const getWeekdayLabel = (day) => {
+	const weekdays = ['', '周一', '周二', '周三', '周四', '周五', '周六', '周日'];
+	return weekdays[day] || `第${day}天`;
+}
 const getColor = (type) => {
 	let colors = '';
 	switch (type) {