6666

components/qiandao/SignRuleDes.vue

@@ -19,7 +19,7 @@
 </template>
 
 <script setup>
-import { defineProps, defineEmits, ref } from 'vue';
+import { defineProps, defineEmits, ref, onMounted } from 'vue';
 import { useIntegralStore } from '../../stores/integral';
 
 // Props 定义
@@ -35,13 +35,20 @@ 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 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 ruleContent = ref(ruleText.value ? ruleText.value : '');
 
 // 关闭弹窗
 const handleClose = () => {
 	emit('close');
 };
+
+onMounted(() => {
+	ruleText.value = integralStore.signinAndTaskInfo?.checkInTodo?.checkInExtra?.rule;
+	console.log('ruleContent=',ruleContent.value);
+});
 </script>
 
 <style lang="less" scoped>

pages/invate/sharepage.vue

@@ -158,6 +158,7 @@ const initPage = async () => {
 				// 如果有邀请码，调用助力接口
 				if (ivtCode && isLogin.value) {
 					await callAssistInvite(ivtCode, uid);
+					hideLoading();
 				}
 			}
 
@@ -237,11 +238,17 @@ const callAssistInvite = async (ivtCode,unionId) => {
 		
 		const res = await integralStore.assistInvite(ivtCode, unionId);
 		if(res.success && res.data.newUser) {
-			globalStore.invateUseType = 'new';
-		} else {
-			globalStore.invateUseType = 'old';
-			gotoIntegral();
+			// globalStore.invateUseType = 'new';
+		}else{
+			showSharePopLogin.value = true;
 		}
+
+		// if(res.success && res.data.newUser) {
+		// 	globalStore.invateUseType = 'new';
+		// } else {
+		// 	globalStore.invateUseType = 'old';
+		// 	gotoIntegral();
+		// }
 		console.log('助力接口返回:', res);
 		hideLoading();
 	} catch (error) {