tMerge branch 'dev' of http://gitlab2.dui88.com/sparkprojects/20250528_FHQ1 into dev

mock/brand.js

@@ -68,7 +68,7 @@ export const brandObj = {
         "productId": "1234567890",
         "skuId": "1234567890",
         "contentImg": "0-2",
-        "contentImgLen": 10,
+        "contentImgLen": 25,
         "shareTitle": "星飞帆卓睿 3段",
         "shareImg": "brandpage/products/share/0/0_2.png",
       },
@@ -142,7 +142,7 @@ export const brandObj = {
         "productId": "1234567890",
         "skuId": "1234567890",
         "contentImg": "1-2",
-        "contentImgLen": 10,
+        "contentImgLen": 25,
         "shareTitle": "星飞帆卓睿 3段",
         "shareImg": "brandpage/products/share/1/1_2.png",
       },

mock/home.js

@@ -16,7 +16,7 @@ export const homeObj = {
             "url": "homepage/banner1.jpg",
             "link": {
                 "type": 1,
-                "url": "/pages/product/product?id:1-1"
+                "url": "/pages/library/ContentLibrary"
             }
         },
         {
@@ -233,7 +233,7 @@ export const homeObj = {
                 "title": "教宝宝认识人体：【为什么肚子会咕咕叫？】",
                 "link": {
                     "type": 3,
-                    "url": "https://mom.feihe.com/babyWikipedia/audioDetail?id=21880&type=3&period_id=5&tag_id=1&navActive=1&fnTagId=1220",
+                    "url": "https://mom.feihe.com/babyWikipedia/audioDetail?id=21823&type=3&period_id=5&tag_id=1&navActive=1&fnTagId=1220",
                     "extra": {}
                 }
             }

mock/node_brand.js

- const brandObj = {
+const brandObj = {
   "channel":{
     "finderUserName": "sphgexisAi0pRGm",
     "feedId": "export/UzFfAgtgekIEAQAAAAAABbEMmxr36QAAAAstQy6ubaLX4KHWvLEZgBPEgaJkYSYbLr6JzNPgMJp7tTZCYcYsIpU6Z0fgSnSE"
@@ -68,7 +68,7 @@
         "productId": "1234567890",
         "skuId": "1234567890",
         "contentImg": "0-2",
-        "contentImgLen": 10,
+        "contentImgLen": 25,
         "shareTitle": "星飞帆卓睿 3段",
         "shareImg": "brandpage/products/share/0/0_2.png",
       },
@@ -142,7 +142,7 @@
         "productId": "1234567890",
         "skuId": "1234567890",
         "contentImg": "1-2",
-        "contentImgLen": 10,
+        "contentImgLen": 25,
         "shareTitle": "星飞帆卓睿 3段",
         "shareImg": "brandpage/products/share/1/1_2.png",
       },

mock/node_home.js

- const homeObj = {
+const homeObj = {
     "voiceStory":{
        "link":{
         "type": 3,
@@ -16,7 +16,7 @@
             "url": "homepage/banner1.jpg",
             "link": {
                 "type": 1,
-                "url": "/pages/product/product?id:1-1"
+                "url": "/pages/library/ContentLibrary"
             }
         },
         {
@@ -233,7 +233,7 @@
                 "title": "教宝宝认识人体：【为什么肚子会咕咕叫？】",
                 "link": {
                     "type": 3,
-                    "url": "https://mom.feihe.com/babyWikipedia/audioDetail?id=21880&type=3&period_id=5&tag_id=1&navActive=1&fnTagId=1220",
+                    "url": "https://mom.feihe.com/babyWikipedia/audioDetail?id=21823&type=3&period_id=5&tag_id=1&navActive=1&fnTagId=1220",
                     "extra": {}
                 }
             }
@@ -351,5 +351,6 @@
 
 
 
+
 var b = JSON.stringify(JSON.stringify(homeObj));
 console.log(b);
\ No newline at end of file

pages/person/person.vue

@@ -17,7 +17,7 @@
     <view class="person-header">
       <image
         class="banner_bg"
-        :src="$baseUrl + 'person/banner.png'"
+        :src="formData.backgroundImg || $baseUrl + 'person/banner.png'"
         mode="aspectFill"
       />
       <image
@@ -542,12 +542,11 @@ const onSubmit = async (e) => {
   }
 
   const data = {
-    dueDate: formData.value.dueDate,
+    dueDate: formData.value.dueDate || formData.value.babyBirthday,
     babyType: formData.value.babyType,
     contentPreference: formData.value.contentPreference,
     followInfo: formData.value.followInfo,
     babyName: formData.value.babyName,
-    babyBirthday: formData.value.babyBirthday,
     feedingType: formData.value.feedingType,
     productPreference: formData.value.productPreference,
     purchaseChannel: formData.value.purchaseChannel,

views/Brand.vue

@@ -6,7 +6,7 @@
 				:indicator-color="indicatorColor" :indicator-active-color="indicatoractiveColor">
 				<swiper-item v-for="item in swiperList" :key="item.url">
 					<view class="swiper-item banneritem">
-						<image :data-link="item.link" @tap="jumpLink(item.link,item.videoUrl)" class="b-img"
+						<image :data-link="item.link" @tap="jumpLink(item.link, item.videoUrl)" class="b-img"
 							:src="$baseUrl + item.url">
 						</image>
 					</view>
@@ -50,7 +50,7 @@
 
 			</view>
 			<view class="ipbox">
-				<image class="iphexiaofei" :src="$baseUrl + 'brandpage/iphexiaofei.png'"></image>
+				<image @tap="showPopup(1)" class="iphexiaofei" :src="$baseUrl + 'brandpage/iphexiaofei.png'"></image>
 				<view class="ipcard">
 					<view class="title">
 						飞鹤品牌IP<view class="t1">鹤小飞一家</view>
@@ -153,9 +153,9 @@ export default {
 			esgInfoList: [],
 			qrInfoList: [],
 			popupIndex: 0,
-			showVideo:false,
-			testVideoUrl:'',
-			channel:{}
+			showVideo: false,
+			testVideoUrl: '',
+			channel: {}
 
 
 		}
@@ -172,9 +172,9 @@ export default {
 		this.initBrandInfo();
 	},
 	methods: {
-		async initBrandInfo(){
-			const {data} = await fetchBrandJSON();
-			if(data){
+		async initBrandInfo() {
+			const { data } = await fetchBrandJSON();
+			if (data) {
 				this.swiperList = data.swiperList;
 				this.productTabList = data.productTabList;
 				this.productInfoList = data.product;
@@ -182,8 +182,8 @@ export default {
 				this.qrInfoList = data.qrInfoList;
 				this.ipDesc = data.ipDesc;
 				this.swiperIconList = data.swiperIconList;
-				this.testVideoUrl=data.videoUrl;
-				this.currentVideoUrl=data.videoUrl;
+				this.testVideoUrl = data.videoUrl;
+				this.currentVideoUrl = data.videoUrl;
 				this.channel = data.channel;
 			}
 		},
@@ -194,7 +194,7 @@ export default {
 			this.swiperIndex = _index;
 		},
 
-		jumpLink(_link,videoUrl) {
+		jumpLink(_link, videoUrl) {
 			// console.log(_link)
 			// uni.navigateTo({
 			// 	url: "/pages/product/product?id=1-1"
@@ -210,10 +210,10 @@ export default {
 				jump(_link);
 			}
 		},
-		jumpProduct(item){
-			const {productId,skuId,contentImg,contentImgLen,shareTitle,shareImg} = item;
+		jumpProduct(item) {
+			const { productId, skuId, contentImg, contentImgLen, shareTitle, shareImg } = item;
 			uni.navigateTo({
-				url: "/pages/product/product?productId="+productId+"&skuId="+skuId+"&contentImg="+contentImg+"&contentImgLen="+contentImgLen+"&shareTitle="+shareTitle+"&shareImg="+shareImg
+				url: "/pages/product/product?productId=" + productId + "&skuId=" + skuId + "&contentImg=" + contentImg + "&contentImgLen=" + contentImgLen + "&shareTitle=" + shareTitle + "&shareImg=" + shareImg
 			})
 		},
 		channelTabHandler(_index) {
@@ -261,16 +261,16 @@ export default {
 				}
 			});
 		},
-		showVideoHandler(){
+		showVideoHandler() {
 			this.currentVideoUrl = this.testVideoUrl;
 			this.showVideo = true;
 		},
-		
+
 		closeVideo() {
 			this.showVideo = false;
 			this.currentVideoUrl = '';
 		},
-		openChannel(){
+		openChannel() {
 			const finderUserName = this.channel.finderUserName;
 			const feedId = this.channel.feedId;
 			uni.openChannelsActivity({
@@ -366,13 +366,15 @@ export default {
 			.listbox {
 				display: flex;
 				margin-top: 10rpx;
-
+				width: 686rpx;
+				align-content: center;
+				justify-content:space-between;
 				.tabitem {
 					color: @color-black-deep;
 					background-color: #e9edf1;
-					padding: 15rpx;
+					padding: 15rpx 20rpx;
 					font-size: 22rpx;
-					margin-right: 15rpx;
+					// margin-right: 15rpx;
 					border-radius: 30rpx;
 				}
 
@@ -404,7 +406,7 @@ export default {
 						.infotitle {
 							font-size: 36rpx;
 							font-weight: 400;
-							width: 75rpx;
+							width: 100rpx;
 							color: @color-black-deep;
 							margin-left: 36rpx; //一点偏移量
 							text-align: center;
@@ -562,6 +564,7 @@ export default {
 			.listbox {
 				display: flex;
 				margin-top: 10rpx;
+				
 
 				.tabitem {
 					color: @color-black-deep;
@@ -677,6 +680,7 @@ export default {
 			left: 232rpx;
 		}
 	}
+
 	.video-popup {
 		position: fixed;
 		left: 0;

views/Home.vue

@@ -600,13 +600,15 @@ export default {
 			.listbox {
 				display: flex;
 				margin-top: 10rpx;
-
+				width: 686rpx;
+				align-content: center;
+				justify-content:space-between;
 				.tabitem {
 					color: @color-black-deep;
 					background-color: #e9edf1;
-					padding: 15rpx;
+					padding: 15rpx 20rpx;
 					font-size: 22rpx;
-					margin-right: 15rpx;
+					// margin-right: 15rpx;
 					border-radius: 30rpx;
 				}
 

views/My.vue

@@ -14,13 +14,18 @@
       <image
         class="bg-img"
         :src="
-          babyInfo?.content?.backgroundImg || $baseUrl + 'my/cover_white_bg.png'
+          babyInfo?.content?.backgroundImg || $baseUrl + 'my/default_bg.png'
         "
         mode="widthFix"
         lazy-load="false"
         binderror=""
         bindload=""
       />
+      <image
+        class="banner_cover"
+        :src="$baseUrl + 'my/cover_white.png'"
+        mode="aspectFill"
+      />
     </view>
 
     <button
@@ -400,6 +405,15 @@ defineExpose({});
       height: 100%;
       display: block;
     }
+    .banner_cover {
+      width: 100%;
+      height: 239rpx;
+      position: absolute;
+      bottom: -10rpx;
+      left: 0;
+      z-index: 1;
+      display: block;
+    }
   }
 
   .user-info {