666666

components/qiandao/SignedTips.vue

@@ -15,7 +15,7 @@
 </template>
 
 <script setup>
-import { defineProps, defineEmits, ref, watch } from 'vue';
+import { defineProps, defineEmits, ref, watch, onMounted } from 'vue';
 
 // Props 定义
 const props = defineProps({
@@ -29,6 +29,15 @@ const props = defineProps({
 	}
 });
 
+onMounted(() => {
+	isAnimating.value = true;
+	
+	// 动画播放完毕后（1.5秒）关闭弹窗
+	setTimeout(() => {
+		isAnimating.value = false;
+		emit('close');
+	}, 1500);
+});
 // Emits 定义
 const emit = defineEmits(['close']);
 
@@ -38,16 +47,16 @@ const isAnimating = ref(false);
 // 关闭弹窗 - 点击时播放动画，动画结束后关闭
 const handleClose = () => {
 	// 如果正在播放动画，则不重复触发
-	if (isAnimating.value) return;
+	// if (isAnimating.value) return;
 	
-	// 开始播放动画
-	isAnimating.value = true;
+	// // 开始播放动画
+	// isAnimating.value = true;
 	
-	// 动画播放完毕后（1.5秒）关闭弹窗
-	setTimeout(() => {
-		isAnimating.value = false;
-		emit('close');
-	}, 1500);
+	// // 动画播放完毕后（1.5秒）关闭弹窗
+	// setTimeout(() => {
+	// 	isAnimating.value = false;
+	// 	emit('close');
+	// }, 1500);
 };
 </script>
 

components/renwu/TaskCompleteTips.less

@@ -69,7 +69,7 @@
 		}
 
 		.task_complete_icon_animating {
-			animation: taskCompleteIconFly 1.5s linear 1;
+			animation: taskCompleteIconFly 1s linear 1;
 			z-index: 5;
 		}
 
@@ -97,7 +97,7 @@
 			display: flex;
 			align-items: center;
 			justify-content: center;
-			background: rgba(255, 255, 255, 0.5);
+			background: rgba(255, 255, 255, 0.7);
 
 			.close_icon {
 				margin-top: -7rpx;

pages/invate/sharepage.vue

@@ -29,18 +29,18 @@
 		/>
 		
 		<!-- 分享登录弹窗 -->
-		<!-- <sharepoplogin 
+		<sharepoplogin 
 			:visible="showSharePopLogin" 
 			@close="handleCloseSharePopLogin"
 			@viewBenefits="handleViewBenefits"
-		/> -->
+		/>
 		
 		<!-- 分享未登录弹窗 -->
-		<!-- <sharenpopnologin 
+		<sharenpopnologin 
 			:visible="showShareNPopNoLogin" 
 			@close="handleCloseShareNPopNoLogin"
 			@viewBenefits="handleViewBenefits"
-		/> -->
+		/>
 	</view>
 </template>
 
@@ -269,25 +269,26 @@ onShow(() => {
 	}
 });
 
-// // 关闭分享登录弹窗
-// const handleCloseSharePopLogin = () => {
-// 	showSharePopLogin.value = false;
-// };
-
-// // 关闭分享未登录弹窗
-// const handleCloseShareNPopNoLogin = () => {
-// 	showShareNPopNoLogin.value = false;
-// };
-
-// // 查看权益按钮点击
-// const handleViewBenefits = () => {
-// 	console.log('查看我的权益');
-// 	// 这里可以添加跳转到权益页面的逻辑
-// 	uni.showToast({
-// 		title: '跳转到权益页面',
-// 		icon: 'none'
-// 	});
-// };
+// 关闭分享登录弹窗
+const handleCloseSharePopLogin = () => {
+	showSharePopLogin.value = false;
+};
+
+// 关闭分享未登录弹窗
+const handleCloseShareNPopNoLogin = () => {
+	showShareNPopNoLogin.value = false;
+};
+
+// 查看权益按钮点击
+const handleViewBenefits = () => {
+	console.log('查看我的权益');
+	// 这里可以添加跳转到权益页面的逻辑
+	// uni.showToast({
+	// 	title: '跳转到权益页面',
+	// 	icon: 'none'
+	// });
+	gotoIntegral();
+};
 
 // 一键领取按钮点击事件
 const handleClaim = () => {
@@ -299,11 +300,12 @@ const handleClaim = () => {
 	// 设置邀请用户类型
 	if(integralStore.assistInviteData?.data?.newUser) {
 		globalStore.invateUseType = 'new';
+		gotoIntegral();
 	} else {
-		globalStore.invateUseType = 'old';
+		showSharePopLogin.value = true;
+		// globalStore.invateUseType = 'old';
 	}
 
-	gotoIntegral();
 };
 
 const gotoIntegral = () => {

views/Integral.less

@@ -843,6 +843,12 @@
 		display: flex;
 		justify-content: space-between;
 
+		// 当只有两个标签时，居中显示并设置间距
+		&.tabs-two {
+			justify-content: center;
+			gap: 106rpx;
+		}
+
 		.tab-item {
 			width: 245rpx;
 			height: 112rpx;

views/Integral.vue

@@ -353,7 +353,7 @@
 		<view class="goods-container" v-if="goodsDataArr?.length > 0">
 			<!-- <view class="goods-container"> -->
 			<!-- 页签栏 -->
-			<view class="custom-tabs">
+			<view class="custom-tabs" :class="{ 'tabs-two': goodsDataArr?.length === 2 }" v-if="goodsDataArr?.length > 1">
 				<!-- <view v-for="(tab, index) in tabInfo.tabTexts" :key="index" class="tab-item" :class="{ -->
 				<view v-for="(tab, index) in goodsDataArr" :key="index" class="tab-item" :class="{
 					active: activeIndex === index && itemIndex !== 4,
@@ -1825,6 +1825,7 @@ onShow(async () => {
 })
 
 onMounted(async () => {
+	// showSignedTips.value = true;
 	showLoading();
 
 	// maxVal.value = getHuangjinMaxVal();
@@ -1917,9 +1918,13 @@ onMounted(async () => {
 	}
 
 	// 根据邀请用户类型显示对应的分享弹窗
+	// if (globalStore.invateUseType === 'new') {
+	// 	showShareNPopNoLogin.value = true;
+	// } else if (globalStore.invateUseType === 'old') {
+	// 	showSharePopLogin.value = true;
+	// }
+
 	if (globalStore.invateUseType === 'new') {
-		showShareNPopNoLogin.value = true;
-	} else if (globalStore.invateUseType === 'old') {
 		showSharePopLogin.value = true;
 	}
 
@@ -2922,7 +2927,7 @@ const handleRecordClick = () => {
 // 分享配置
 onShareAppMessage(() => {
 	return {
-		title: '积分分享',
+		title: integralStore.originInviteHome?.data?.invitationText,
 		path: '/pages/invate/sharepage' + '?inviteCode=' + integralStore.originInviteHome?.data?.invitationCode,
 		imageUrl: integralStore.originInviteHome?.data?.invitationImageUrl || 'https://course.feihe.com/momclub-picture/integral/1023/invate_star_character1023.png'
 	};