Merge branch '20250528-dev-king' into dev

views/Integral.vue

@@ -14,7 +14,7 @@
 			<swiper-item v-for="(item, index) in swiperData" :key="index">
 				<image 
 					class="banner-img"
-					:src="$baseUrl + `integral/1001/${item?.bannerImg}`"
+					:src="$baseUrl + `integral/1002/${item?.bannerImg}`"
 					mode="aspectFill"
 					@click="bannerHandler(item)"
 				/>
@@ -227,7 +227,7 @@
 				<swiper-item v-for="(item, index) in vipActive" :key="index">
 					<image
 						class="vip-active-img"
-						:src="$baseUrl + `integral/1001/${item?.img}`"
+						:src="$baseUrl + `integral/1002/${item?.img}`"
 						mode="aspectFit"
 						@click="handleVipActiveClick(index, item)"
 					/>
@@ -390,8 +390,7 @@
 				bannerImg:"integralBannerBg0.png",
 				url:"subPackages/shopMainList/topicNew/index?id=1000916",
 				type:2,
-				extra: 
-				{"appId": "wx4205ec55b793245e", "envVersion": "release"}
+				extra:{"appId": "wx4205ec55b793245e", "envVersion": "release"}
 			}
 		],
 		viplv: {
@@ -500,7 +499,7 @@
 			],
 			rule:{
 				url:"https://mom.feihe.com/member/mine/pointStrategy",
-				type:2
+				type:3
 			},
 			vipQuanyiUrl:{
 				url:"subPackages/xmhMainProcess/member/index?entrySource=xmh_wechatmp_points_recgoodsbot",
@@ -704,15 +703,13 @@
 	
 	//banner点击事件
 	const bannerHandler = (item) => {
-		// const url = swiperData.value[index].url;
-		if(item ?.url != ""){
+		if(item?.url != ""){
 			jump({
 				type: item.type,
-				url: url, 
+				url: item.url, 
 				extra: item.extra
 			})
 		}
-		console.log('bannerHandler=',url);
 	}
 
 	//攻略点击事件
@@ -832,9 +829,10 @@
 
 	//会员权益点击跳转
 	const handlePrivilegeClick = () => {
+		
 		const url = vipQuanyiUrl.value.url; 
-		const type = vipIntegral.value.type;
-		const extra = vipIntegral.value.extra;
+		const type = vipQuanyiUrl.value.type;
+		const extra = vipQuanyiUrl.value.extra;
 
 		jump({
 			type: type,
@@ -1041,6 +1039,7 @@
 	.vip-swiper {
 		width: 686rpx;
 		height: 154rpx;
+		// margin-top: 15rpx;
 		margin-left:auto;
 		margin-right: auto;
 		.vip-area {
@@ -1418,6 +1417,7 @@
 				flex-wrap: wrap;
 				
 				.goods-item {
+					background-color: #6f6d67;
 					position: relative;
 					width: 333rpx;
 					height: 459rpx;
@@ -1441,9 +1441,10 @@
 
 					.title-container1{
 						width: 100%;
-						height: auto;
+						// height: auto;
 						margin-left: 20rpx;
-						margin-bottom: 20rpx;
+						margin-bottom: 0rpx;
+						margin-top: 26rpx;
 						.title-text1 {
 							position: relative;
 							width:100%;
@@ -1454,7 +1455,7 @@
 
 					
 					.price-text {
-						height: auto;
+						// height: auto;
 						position: relative;
 						font-size: 24rpx;
 						color: #b27c1e;