Merge branch 'dev' of gitlab2.dui88.com:fh/20250528_FHQ1 into dev

api/feeding.js

@@ -147,4 +147,4 @@ export const feedingVoiceResult = (data) => api.get('/c/feeding/voice/result', {
 
 
 
-// export const fetchHomeJSON = () => api.get('/c/front/content',{type:'home'});
+export const fetchFeedingJSON = () => api.get('/c/front/content',{type:'feeding'});
\ No newline at end of file

pages/feedingIndex/feedingIndex.vue

@@ -2,9 +2,9 @@
 	<view class="feeding-record-add-page">
 		<!-- 可滚动内容区域 -->
 		<!-- 广告横幅 -->
-		<swiper class="banner-swiper" :indicator-dots="swiperData.length > 1" :autoplay="swiperData.length > 1"
-			:circular="swiperData.length > 1" indicator-color="#dfddd9" indicator-active-color="#b27c1e"
-			:indicator-top="596">
+		<swiper class="banner-swiper" v-if="swiperData.length > 0" :indicator-dots="swiperData.length > 1"
+			:autoplay="swiperData.length > 1" :circular="swiperData.length > 1" indicator-color="#dfddd9"
+			indicator-active-color="#b27c1e" :indicator-top="596">
 			<swiper-item v-for="(item, index) in swiperData" :key="index">
 				<image class="banner-img" :src="`${item?.bannerImg}`" mode="aspectFill" @click="bannerHandler(item)" />
 			</swiper-item>
@@ -422,7 +422,7 @@
 import { ref, computed, onMounted, onUnmounted, getCurrentInstance } from 'vue'
 import { onShow, onLoad, onHide } from '@dcloudio/uni-app'
 import BabySwitchPopup from '@/components/BabySwitchPopup.vue'
-import { feedingHome, feedingRecords, feedingFoodsCustom, feedingFoodsCustomAdd, feedingFoodsCustomDelete, feedingTimerStart, feedingTimerStop, feedingVoiceUpload, feedingVoiceResult } from '@/api/feeding.js'
+import { fetchFeedingJSON, feedingHome, feedingRecords, feedingFoodsCustom, feedingFoodsCustomAdd, feedingFoodsCustomDelete, feedingTimerStart, feedingTimerStop, feedingVoiceUpload, feedingVoiceResult } from '@/api/feeding.js'
 import { useUserStore } from '@/stores/user.js'
 import { jump, JumpType } from '../../utils'
 import { getHealthField } from "@/api/common";
@@ -510,27 +510,9 @@ const feedingIndexRes = {
 	icon_btn_cancel: $baseUrl + `feedingIndex/${version}/icon_btn_cancel.png`,
 }
 
-const swiperData = ref([{
-	bannerImg: feedingIndexRes.banner,
-	jumpType: JumpType.H5,
-
-	url: 'https://www.baidu.com'
-}, {
-	bannerImg: feedingIndexRes.banner,
-	jumpType: JumpType.MINI,
-	extra: {
-		appId: 'wx4205ec55b793245e',
-		envVersion: 'release',
-		success: () => {
-			console.log('跳转成功')
-		},
-	},
-	url: 'subPackages/xmhMainProcess/member/index?entrySource=xmh_wechatmp_points_recgoodsbot'
-}, {
-	bannerImg: feedingIndexRes.banner,
-	jumpType: JumpType.INNER,
-	url: '/pages/index/index'
-}]);
+const swiperData = ref([
+
+]);
 const indicatorStyle = `height: 40px; border: none;`
 
 // 当前时间，使用 home 接口的 timestamp
@@ -987,6 +969,22 @@ async function loadHomeData() {
 			icon: 'none'
 		})
 	}
+	swiperData.value = 
+
+
+	// 获取轮播图数据
+	try {
+		const feedingResponse = await fetchFeedingJSON()
+		console.log('轮播图数据:', feedingResponse)
+
+		if (feedingResponse && feedingResponse.data) {
+			swiperData.value = feedingResponse.data.swiperData
+		}
+	} catch (error) {
+		console.error('获取轮播图数据失败:', error)
+		// 使用默认的轮播图数据作为fallback
+		swiperData.value = []
+	}
 }
 
 // 根据接口数据初始化页面状态
@@ -3461,7 +3459,7 @@ function loadDefaultFoodsData() {
 
 /* ===== 广告横幅 ===== */
 .banner-swiper {
-	position: absolute;
+	position: relative;
 	top: 0;
 	left: 16rpx;
 	width: 718rpx;
@@ -3476,8 +3474,8 @@ function loadDefaultFoodsData() {
 
 /* ===== 喂养时间区域 ===== */
 .feeding-time {
-	position: absolute;
-	top: 174rpx;
+	position: relative;
+	// margin-top: 174rpx;
 	left: 0;
 	right: 0;
 	display: flex;
@@ -3564,8 +3562,8 @@ function loadDefaultFoodsData() {
 
 /* ===== 喂养记录链接 ===== */
 .feeding-records {
-	position: absolute;
-	top: 270rpx;
+	position: relative;
+	// margin-top: 270rpx;
 	left: 0;
 	right: 0;
 	display: flex;
@@ -3595,8 +3593,8 @@ function loadDefaultFoodsData() {
 
 /* ===== 喂养类型选择 ===== */
 .feeding-types {
-	position: absolute;
-	top: 320rpx;
+	position: relative;
+	// margin-top: 320rpx;
 	left: 0;
 	right: 0;
 	display: flex;
@@ -3663,8 +3661,8 @@ function loadDefaultFoodsData() {
 
 /* ===== 温馨提示 ===== */
 .warm-tip {
-	position: absolute;
-	top: 20rpx;
+	position: relative;
+	// margin-top: 20rpx;
 	left: 0;
 	right: 0;
 	text-align: center;
@@ -4467,8 +4465,7 @@ function loadDefaultFoodsData() {
 
 /* ===== 下半部分背景区域 ===== */
 .bottom-section {
-	position: absolute;
-	top: 460rpx;
+	position: relative;
 	left: 0;
 	right: 0;
 	width: 100%;