Merge branch 'refs/heads/master' into dev-lg

mock/home.json

@@ -113,7 +113,24 @@
 	},
 	"channelTabListMianTitle": "有声频道",
 	"swiperList": [{
-		"videoUrl": "homepage/homeSwiper/V1/dbzx.mp4",
+		"videoUrl": "",
+		"link": {
+			"extra": {
+				"envVersion": "release",
+				"appId": "wx4205ec55b793245e"
+			},
+			"type": 2,
+			"url": "/subPackages/shopMainList/topicNew/index?id=1001146"
+		},
+		"title": "双节28会员日",
+		"url": "homepage/homeSwiper/V1/13.jpg"
+	}, {
+		"videoUrl": "homepage/homeSwiper/V1/lfdxs.mp4",
+		"link": {},
+		"title": "东北真行乡村振兴篇",
+		"url": "homepage/homeSwiper/V1/lfdxs.jpg"
+	}, {
+		"videoUrl": "homepage/homeSwiper/V1/dbzx1.mp4",
 		"link": {},
 		"title": "东北真行",
 		"url": "homepage/homeSwiper/V1/dbzx.jpeg"
@@ -139,11 +156,6 @@
 		"type": 1,
 		"title": "北纬47°鲜活溯源之旅",
 		"url": "homepage/homeSwiper/V1/7.jpg"
-	}, {
-		"videoUrl": "homepage/homeSwiper/V1/12.mp4",
-		"link": {},
-		"title": "妈妈天生女主角",
-		"url": "homepage/homeSwiper/V1/12.jpg"
 	}],
 	"childrenInfoList": [
 		[{

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_bg" :src="$baseUrl + 'heliaixinTool/hlax_bg1.png'" mode="aspectFill" />
 		<image class="hlax_btn" :src="$baseUrl + 'heliaixinTool/btn_go_see.png'" v-if="toolCfg.link?.go_see"
 			@click="onTips" />
 	</view>
@@ -52,7 +52,7 @@
 		position: absolute;
 		width: 465rpx;
 		height: 120rpx;
-		top: 1454rpx;
+		top: 1485rpx;
 		left: 143rpx;
 	}
 </style>
\ No newline at end of file

stores/pageCfg.js

@@ -482,20 +482,20 @@ export const usePageCfgStore = defineStore("pageCfg", {
 
 			if (!data) return;
 
-			this.toolList = data?.tool?.[0] || [];
+			let tools = data?.tool?.[0] || [];
 
 			//-----------这部分是专门判断"生育补贴"和"鹤礼爱心"的逻辑-------------
 			const memberId = useUserStore().userInfo?.memberId;
 			const res = await checkParticipation()
 			console.log("生育补贴和鹤礼爱心是否参与::::", res);
 			if (memberId == 'not_login' || !res.data?.fertilityJoined) { //未登录或者未参与，就删除生育补贴配置项，不展示
-				this.toolList = this.toolList.filter(item => item.title !== "生育补贴");
+				tools = tools.filter(item => item.title !== "生育补贴");
 			}
 
 			if (memberId != 'not_login' && res.data?.v2Joined) { //已登录并且已报名
 				if (res.data?.channel == "DS") { //DS：表示线上报名,跳转链接换成本地页面的路径，并且有去查看按钮
 					let channelName = getChannelName(res.data?.dsPlatform);
-					this.toolList = this.toolList.map(item =>
+					tools = tools.map(item =>
 						item.title === "鹤礼爱心" ? {
 							...item,
 							link: {
@@ -512,7 +512,7 @@ export const usePageCfgStore = defineStore("pageCfg", {
 
 				}
 			} else { //未登录或者未报名,跳转链接换成本地页面的链接
-				this.toolList = this.toolList.map(item =>
+				tools = tools.map(item =>
 					item.title === "鹤礼爱心" ? {
 						...item,
 						link: {
@@ -524,7 +524,9 @@ export const usePageCfgStore = defineStore("pageCfg", {
 					item
 				);
 			}
-			console.log("toolList---------::", this.toolList)
+			console.log("tools---------::", tools)
+			
+			this.toolList = tools;
 			//-----------这部分是专门判断"生育补贴"和"鹤礼爱心"的逻辑-------------
 			
 			this.contentCfg = data.contentCfg;

views/Brand.vue

@@ -235,7 +235,7 @@
 								pageName: '品牌故事页',
 								componentName: '飞鹤ESG',
 								componentContent: infoItem.desc
-							}" @tap="jumpLink(infoItem.link, false, $event)">
+							}" @tap="jumpLink(infoItem.link, infoItem.videoUrl, $event)">
 							<image class="infoimg" :src="$baseUrl + infoItem.bgUrl"></image>
 							<view class="infotitle">{{ infoItem.desc }}</view>
 							<view class="infodesc">{{ infoItem.desc2 }}</view>