Merge branch 'refs/heads/master' into feat/activity-page

# Conflicts: # mock/my.json # pages.json # views/Integral.vue # views/My.vue

Merge branch 'refs/heads/master' into feat/activity-page
# Conflicts: # mock/my.json # pages.json # views/Integral.vue # views/My.vue
0e071a4a · 劳琪峰 · c0e858b8 · 8f65c31d · 0e071a4a · 0e071a4a
Commit 0e071a4a authored Oct 13, 2025 by 劳琪峰
9 changed files
--- a/mock/brand.json
+++ b/mock/brand.json
 {
 	"swiperList": [
+	  {
+		"videoUrl": "",
+		"link": {
+		  "extra": {},
+		  "type": 3,
+		  "url": "https://fh0926-activity.dexfu.cn/customShare/share?id=Did1NjI1NTE"
+		},
+		"title": "东北真行中国飞鹤出品h5视频",
+		"url": "brandpage/Banner0928.jpg"
+	  },
 	  {
 		"link": {
 		  "extra": {},
@@ -504,8 +514,8 @@
 	  [
 		{
 		  "desc2": "飞鹤始终坚信，做母婴事业和做教育事业一样，要做母亲的事业、良心的事业，守护孩子健康成长。",
-				"link": {},
 		  "videoUrl": "https://course.feihe.com/momclub-picture/brandpage/esg4.mp4",
+		  "link": {},
 		  "desc": "中国飞鹤助力龙江教育",
 		  "bgUrl": "brandpage/esg4_1.png"
 		},
@@ -562,6 +572,11 @@
 	  "儿童产品"
 	],
 	"swiperIconList": [
+	  {
+		"baseUrl": "brandpage/factory1.png",
+		"activeUrl": "brandpage/factory2.png",
+		"text": "中国飞鹤出品"
+	  },
 	  {
 		"baseUrl": "brandpage/factory1.png",
 		"activeUrl": "brandpage/factory2.png",
@@ -579,4 +594,4 @@
 	  }
 	],
 	"ipDesc": "鹤小飞一家是由鹤爸、鹤妈、鹤小飞（哥哥）、鹤小小（妹妹） 组成的一家。\n四口热爱生活、积极向上，是他们一家对生活的态度。"
-}
\ No newline at end of file
+  }
\ No newline at end of file
--- a/mock/home.json
+++ b/mock/home.json
@@ -113,63 +113,20 @@
 	},
 	"channelTabListMianTitle": "有声频道",
 	"swiperList": [{
-		"videoUrl": "homepage/homeSwiper/V1/lfdxs1.mp4",
-		"link": {},
-		"title": "东北真行乡村振兴篇",
-		"url": "homepage/homeSwiper/V1/lfdxs.jpg"
-	}, {
-		"videoUrl": "",
-		"link": {
-			"extra": {},
-			"type": 3,
-			"url": "https://fh0926-activity.dexfu.cn/customShare/share?id=Did1NjI1MzU"
-		},
-		"title": "晒出飞鹤宝宝",
-		"url": "homepage/homeSwiper/V1/scfhbb1.jpg"
-	}, {
-		"videoUrl": "homepage/homeSwiper/V1/krdmm.mp4",
+		"videoUrl": "homepage/video3.mp4",
 		"link": {},
 		"title": "烤肉的秘密",
 		"url": "homepage/homeSwiper/V1/krdmm.jpg"
 	}, {
-		"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/lfdxs1.mp4",
+		"link": {},
+		"title": "东北真行乡村振兴篇",
+		"url": "homepage/homeSwiper/V1/lfdxs.jpg"
 	}, {
 		"videoUrl": "homepage/homeSwiper/V1/dbzx1.mp4",
 		"link": {},
-		"title": "东北真行",
+		"title": "东北真行寻人",
 		"url": "homepage/homeSwiper/V1/dbzx.jpeg"
-	}, {
-		"videoUrl": "",
-		"link": {
-			"extra": {
-				"envVersion": "release",
-				"appId": "wx4205ec55b793245e"
-			},
-			"type": 2,
-			"url": "/subPackages/shopMainList/topicNew/index?id=1001134"
-		},
-		"title": "0911品牌积分联名派“兑”",
-		"url": "homepage/homeSwiper/V1/10.png"
-	}, {
-		"img": "homepage/homeSwiper/V1/7.jpg",
-		"link": {
-			"extra": {},
-			"type": 1,
-			"url": "/pages/syWebview/syWebview?p=xmh09"
-		},
-		"type": 1,
-		"title": "北纬47°鲜活溯源之旅",
-		"url": "homepage/homeSwiper/V1/7.jpg"
 	}],
 	"childrenInfoList": [
 		[{

--- a/mock/integral.json
+++ b/mock/integral.json
@@ -285,7 +285,7 @@
 					"appId": "wx4205ec55b793245e"
 				},
 				"type": 2,
-				"url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_star",
+				"url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_north",
 				"skuId": "694019044167238067"
 			}, {
 				"productId": "548984197069284758",
@@ -294,7 +294,7 @@
 					"appId": "wx4205ec55b793245e"
 				},
 				"type": 2,
-				"url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_star",
+				"url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_north",
 				"skuId": "548984197069284759"
 			}, {
 				"productId": "548991402553569325",
@@ -303,7 +303,7 @@
 					"appId": "wx4205ec55b793245e"
 				},
 				"type": 2,
-				"url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_star",
+				"url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_north",
 				"skuId": "548991402553569326"
 			}, {
 				"productId": "757045038059549612",
@@ -312,7 +312,7 @@
 					"appId": "wx4205ec55b793245e"
 				},
 				"type": 2,
-				"url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_star",
+				"url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_north",
 				"skuId": "757045038059549613"
 			}, {
 				"productId": "555507401709887582",
@@ -321,7 +321,7 @@
 					"appId": "wx4205ec55b793245e"
 				},
 				"type": 2,
-				"url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_star",
+				"url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_north",
 				"skuId": "555507401709887583"
 			}, {
 				"productId": "555151404052796950",
@@ -330,7 +330,7 @@
 					"appId": "wx4205ec55b793245e"
 				},
 				"type": 2,
-				"url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_star",
+				"url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_north",
 				"skuId": "555151404052796951"
 			}, {
 				"productId": "704050114989893289",
@@ -339,7 +339,7 @@
 					"appId": "wx4205ec55b793245e"
 				},
 				"type": 2,
-				"url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_star",
+				"url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_north",
 				"skuId": "704050114989893290"
 			}, {
 				"productId": "710290587034550507",
@@ -348,7 +348,7 @@
 					"appId": "wx4205ec55b793245e"
 				},
 				"type": 2,
-				"url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_star",
+				"url": "subPackages/shopMainProcess/product/index?productId={productId}&skuId={skuId}&entrySource=xmh_wechatmp_points_north",
 				"skuId": "710290587034550508"
 			}]
 		}
@@ -423,23 +423,14 @@
 		]
 	},
 	"vipActive": [{
-		"img": "vipAct250911001.png",
-		"extra": {
-			"envVersion": "release",
-			"appId": "wx4205ec55b793245e"
-		},
-		"type": 2,
-		"title": "0911品牌积分联名派“兑”",
-		"url": "/subPackages/shopMainList/topicNew/index?id=1001134"
-	}, {
-		"img": "vipAct250910001.png",
+		"img": "vipAct251009001.jpg",
 		"extra": {
 			"envVersion": "release",
 			"appId": "wx4205ec55b793245e"
 		},
 		"type": 2,
-		"title": "黄糯玉米",
-		"url": "/subPackages/shopMainProcess/product/index?productId=543558664688883066&skuId=543560605494007100"
+		"title": "兑换礼品",
+		"url": "/subPackages/shopMainList/topicNew/index?id=1001165"
 	}, {
 		"img": "vipAct2.png",
 		"extra": {
@@ -448,15 +439,6 @@
 		},
 		"type": 2,
 		"url": "/subPackages/shopMainProcess/lottery/index?utm_campaign=%E6%BA%AF%E6%BA%90%E6%8A%BD%E5%A5%96&_channel_track_key=ngSppZAj"
-	}, {
-		"img": "vipAct250911002-1.png",
-		"extra": {
-			"envVersion": "release",
-			"appId": "wx4205ec55b793245e"
-		},
-		"type": 2,
-		"title": "斑马AI学",
-		"url": "/subPackages/shopMainList/topicNew/index?id=1001134"
 	}],
 	"vipLvInfo": [{
 		"vipLvIcon": "vipLvIcon0.png",

--- a/mock/my.json
+++ b/mock/my.json
--- a/pages.json
+++ b/pages.json
 {
-	"pages": [
-		{
+	"pages": [{
 			"path": "pages/index/index",
 			"style": {
 				"navigationBarTitleText": "首页",
@@ -212,24 +211,22 @@
 			}
 		},
 		{
-			"path": "pages/middlePage/middlePage",
-			"style": {
-				"navigationBarTitleText": ""
+			"path" : "pages/middlePage/middlePage",
+			"style" : 
+			{
+				"navigationBarTitleText" : ""
 			}
 		},
 		{
-			"path" : "pages/heliaixinTools/heliaixinTools",
-			"style" : 
-			{
-				"navigationBarTitleText" : "鹤礼爱心"
+			"path": "pages/heliaixinTools/heliaixinTools",
+			"style": {
+				"navigationBarTitleText": "鹤礼爱心"
 			}
 		}
 	],
-	"subPackages": [
-		{
+	"subPackages": [{
 			"root": "reservation",
-			"pages": [
-				{
+			"pages": [{
 					"path": "home/index",
 					"style": {
 						"navigationBarTitleText": "飞鹤奶粉"
@@ -269,8 +266,7 @@
 		},
 		{
 			"root": "activity0915",
-			"pages": [
-				{
+			"pages": [{
 					"path": "act0915/act0915",
 					"style": {
 						"navigationBarTitleText": "",
@@ -287,6 +283,23 @@
 					}
 				}
 			]
+		},
+		{
+			"root": "subPackages",
+			"pages": [{
+				"path" : "momclub/momclub",
+				"style" :
+				{
+					"navigationBarTitleText" : ""
+				}
+			},
+			{
+				"path" : "xmhAactivity/xmhAactivity",
+				"style" :
+				{
+					"navigationBarTitleText" : ""
+				}
+			}]
 		}
 	],
 	"globalStyle": {

--- a/subPackages/momclub/momclub.vue
+++ b/subPackages/momclub/momclub.vue
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>
--- a/subPackages/xmhAactivity/xmhAactivity.vue
+++ b/subPackages/xmhAactivity/xmhAactivity.vue
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>
--- a/views/Integral.vue
+++ b/views/Integral.vue
--- a/views/My.vue
+++ b/views/My.vue