Merge branch 'master' into dev-lg

api/user.js

@@ -46,4 +46,7 @@ export const fetchMemberInfo = () => api.get('/c/user/memberInfo');
  */
 export const updateBabyInfo = (data) => api.post('/c/user/saveBaby', data);
 
-export const fetchUserJSON = () => api.get('/c/front/content',{type:'my'});
+export const fetchUserJSON = () => api.get('/c/front/content',{type:'my'});
\ No newline at end of file
+
+/** 查询用户是否参与生育补贴和鹤礼2.0*/
+export const checkParticipation = (data) => api.get('/c/fertility/index', data);
\ No newline at end of file

components/pointRightsCom/monthGift.vue

@@ -2976,35 +2976,35 @@
 				background: linear-gradient(135deg, #503404, #6a4505);
 				color: #fff;
 				box-shadow: 0 2rpx 8rpx rgba(80, 52, 4, 0.3);
-				opacity: 0.7;
+				// opacity: 0.7;
 			}
 
 			&.buy-btn-purchased-platinum {
 				background: linear-gradient(135deg, #284a6c, #3a5e80);
 				color: #fff;
 				box-shadow: 0 2rpx 8rpx rgba(40, 74, 108, 0.3);
-				opacity: 0.7;
+				// opacity: 0.7;
 			}
 
 			&.buy-btn-purchased-diamond {
 				background: linear-gradient(135deg, #503404, #6a4505);
 				color: #fff;
 				box-shadow: 0 2rpx 8rpx rgba(80, 52, 4, 0.3);
-				opacity: 0.7;
+				// opacity: 0.7;
 			}
 
 			&.buy-btn-purchased-starlight {
 				background: linear-gradient(135deg, #503404, #6a4505);
 				color: #fff;
 				box-shadow: 0 2rpx 8rpx rgba(80, 52, 4, 0.3);
-				opacity: 0.7;
+				// opacity: 0.7;
 			}
 
 			&.buy-btn-purchased-starshine {
 				background: linear-gradient(135deg, #f7d1a0, #f9dca8);
 				color: #000;
 				box-shadow: 0 2rpx 8rpx rgba(247, 209, 160, 0.3);
-				opacity: 0.7;
+				// opacity: 0.7;
 			}
 
 			&.buy-btn-locked-gold {

mock/my.json

@@ -234,6 +234,24 @@
 	}],
 	"tool": [
 		[{
+			"link": {
+				"extra": {},
+				"type": 3,
+				"url": "https://momuat.feihe.com/activity-platform/marketingActivity?source=xmhmini"
+			},
+			"title": "生育补贴",
+			"desc": "生育补贴",
+			"bgUrl": "my/icon_sybt_lab.png"
+		}, {
+			"link": {
+				"extra": {},
+				"type": 3,
+				"url": "https://momuat.feihe.com/activity-platform/craneGiftActivity?source=xmhmini"
+			},
+			"title": "鹤礼爱心",
+			"desc": "鹤礼爱心",
+			"bgUrl": "my/icon_hlax_lab.png"
+		}, {
 			"link": {
 				"extra": {},
 				"type": 1,
@@ -323,12 +341,6 @@
 		],
 		"specialAttentionOptions": ["过敏", "长肉", "肠道", "消化", "脑发育"],
 		"activeInfo": [{
-			"img": "https://course.feihe.com/momclub-picture/my/20250915002.png",
-			"extra": {},
-			"type": 1,
-			"title": "915专题活动",
-			"url": "/activity0915/act0915/act0915"
-		}, {
 			"img": "https://course.feihe.com/momclub-picture/my/activeImg0911_1.png",
 			"extra": {
 				"envVersion": "release",

pages.json

@@ -216,6 +216,13 @@
 			"style": {
 				"navigationBarTitleText": ""
 			}
+		},
+		{
+			"path" : "pages/heliaixinTools/heliaixinTools",
+			"style" : 
+			{
+				"navigationBarTitleText" : "鹤礼爱心"
+			}
 		}
 	],
 	"subPackages": [

pages/heliaixinTools/heliaixinTools.vue

+<template>
+	<view class="hlaxPage">
+		<view class="hlax_bg"></view>
+		<image class="hlax_bg" :src="$baseUrl + 'heliaixinTool/hlax_bg.png'" mode="aspectFill" />
+		<image class="hlax_btn" :src="$baseUrl + 'heliaixinTool/btn_go_see.png'" v-if="toolCfg.link?.go_see"
+			@click="onTips" />
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		onMounted,
+		getCurrentInstance,
+		computed
+	} from "vue";
+	import {
+		usePageCfgStore
+	} from "@/stores/pageCfg";
+	const {
+		proxy
+	} = getCurrentInstance();
+	const $baseUrl = proxy.$baseUrl;
+	const pageCfgStore = usePageCfgStore();
+
+	const toolCfg = computed(() =>
+		pageCfgStore?.toolList.find((item) => item.title == "鹤礼爱心") || {}
+	);
+
+	onMounted(() => {})
+
+	//点击去查看按钮提示
+	const onTips = () => {
+		console.log("toolCfg:::", toolCfg);
+		uni.showToast({
+			title: '可去' + toolCfg.value?.link?.channelName + '渠道查看',
+			icon: "none"
+		})
+	}
+</script>
+
+<style lang="less" scoped>
+	.hlax_bg {
+		position: absolute;
+		width: 750rpx;
+		height: 1624rpx;
+		top: 0rpx;
+		left: 0rpx;
+	}
+
+	.hlax_btn {
+		position: absolute;
+		width: 465rpx;
+		height: 120rpx;
+		top: 1454rpx;
+		left: 143rpx;
+	}
+</style>
\ No newline at end of file

pages/middlePage/middlePage.vue

 <template>
-	<view class="third-jump-page"  @click="retryJump">
+	<view class="third-jump-page" @click="retryJump">
 		<image class="bg-img" :src="`${$baseUrl}${bgImg}`" mode="widthFix"></image>
 	</view>
 </template>
@@ -16,7 +16,7 @@ const $baseUrl = proxy.$baseUrl
 const jumpFailed = ref(false)
 const errorMessage = ref('')
 const jumpParams = ref({})
-const bgImg = ref('')
+const bgImg = ref('middlePage/middleBg.png')
 
 // const bgImgObj = {
 // 	'sy': 'thirdJumpMiddlePage/v1/syJumpPageBg.jpg'
@@ -39,15 +39,17 @@ onMounted(() => {
 		type: options.type,
 		embedded: options.embedded,
 	}
+	setTimeout(() => {
+		// 执行跳转
+		executeJump()
+	}, 30)
 
-	// 执行跳转
-	executeJump()
 })
 
 // 执行跳转
 const executeJump = () => {
 	const jumpData = {
-		type: jumpParams.value.type*1,
+		type: jumpParams.value.type * 1,
 		url: jumpParams.value.path,
 		extra: {
 			appId: jumpParams.value.appId,
@@ -70,20 +72,20 @@ const retryJump = () => {
 
 <style lang="less" scoped>
 .third-jump-page {
-	background: white;
-	display: flex;
-	align-items: center;
-	justify-content: center;
 	width: 100vw;
 	height: 100vh;
-	padding: 40rpx;
+	overflow: hidden;
+	position: absolute;
 }
 
 .bg-img {
-	width: 100%;
+	width: 750rpx;
+	height: 1624rpx;
 	position: absolute;
 	top: 0;
+	bottom: 0;
 	left: 0;
+	margin: auto;
 	z-index: 1;
 }
 </style>

views/My.vue

@@ -282,13 +282,6 @@ const handleToolClick = async (item) => {
     // }
   }
 };
-//跳转到ai取名页面
-// const toAiNaming = () => {
-// 	jump({
-//       type: JumpType.INNER,
-//       url: "/pages/naming/naming",
-// 	})
-// };
 
 // 编辑个人资料
 const handleEditProfile = (e) => {