From 986eee5e7f5d1bdf8dcb6ec4e464fb55bc6cca22 Mon Sep 17 00:00:00 2001
From: wangzimeng <3297159934@qq.com>
Date: Wed, 6 Aug 2025 11:57:31 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=A6=96=E9=A1=B5=E8=BD=AE=E6=92=AD?=
 =?UTF-8?q?=E5=9B=BE=E8=B7=B3=E8=BD=AC=202=E3=80=81=E6=8B=9B=E7=A7=9F?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=9A=84=E8=BD=AE=E6=92=AD=E5=9B=BE=E7=9A=84?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D=E9=A1=B5=E6=95=B0=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/canteenRent/rentDetail.vue | 54 +++++++++++++++++++++-----------
 pages/index/index.vue            | 29 +++++++++++++++--
 2 files changed, 63 insertions(+), 20 deletions(-)

diff --git a/pages/canteenRent/rentDetail.vue b/pages/canteenRent/rentDetail.vue
index 3e069d6..6995f63 100644
--- a/pages/canteenRent/rentDetail.vue
+++ b/pages/canteenRent/rentDetail.vue
@@ -4,26 +4,20 @@
 			<!-- 顶部banner -->
 			<view class="swiper-box">
 				<view class="swiper_s">
-					<swiper class="swiper_s" :circular="true" :autoplay="true" indicator-active-color="#0DAE11"
-						indicator-color="#ffffff" :indicator-dots="false" :current="currentImgIndex"
-						@animationfinish="swiperChange">
+					<swiper class="swiper_s" :circular="true" :autoplay="true" :indicator-dots="false" :current="currentImgIndex"
+						@change="swiperChange" :duration="2000" @animationfinish="animationfinish">
 						<!-- v-for="(item, index) in swiperList" :key="index" @click="openSwiper(item)"-->
-						<swiper-item style="margin: 0 auto;">
+						<swiper-item style="margin: 0 auto;" v-for="(item,index) in imageList" :key="index">
 							<view style="position: relative;width: 100%;height: 100%;"
-								v-for="(item,index) in detailRent.images" :key="index">
-								<image class="swiper-image" :src="item" mode="scaleToFill" />
+								>
+								<image class="swiper-image" :src="item" />
 							</view>
+							
 						</swiper-item>
 
-
-						<!-- <swiper-item style="margin: 0 auto;">
-							<view style="position: relative;width: 100%;height: 100%">
-								<image class="swiper-image" src="/static/cart-empty.png" mode="scaleToFill" />
-							</view>
-						</swiper-item> -->
 					</swiper>
 					<view class="bannerNum">
-						{{currentImgIndex}}/{{imagesNum}}
+						{{currentShowImgIndex}}/{{imagesNum}}
 					</view>
 				</view>
 			</view>
@@ -184,7 +178,8 @@
 	const rentId = ref('');
 	const detailRent = ref('')
 	const imagesNum = ref(0);
-	const currentImgIndex = ref(1)
+	const currentImgIndex = ref(0)
+	const currentShowImgIndex = ref(1)
 	const showContacted = ref(false)
 	const showContactNo = ref(false)
 	onLoad((options) => {
@@ -200,7 +195,8 @@
 			getDetail();
 		}
 	})
-
+	
+	const imageList = ref([])
 	async function getDetail() {
 		const res = await sheep.$api.rent.rentInfo(rentId.value)
 		console.log('获取招租详情', res);
@@ -208,9 +204,9 @@
 			detailRent.value = res.data.detail
 			detailRent.value.release_time_text = detailRent.value.release_time_text.substring(0, 10);
 
-			const imageList = res.data.detail.images
-			console.log('imageList:', imageList.length);
-			imagesNum.value = imageList.length
+			imageList.value = res.data.detail.images
+			console.log('imageList:', imageList.value);
+			imagesNum.value = imageList.value.length
 			console.log('imagesNum:', imagesNum.value);
 		} else {
 			uni.showToast({
@@ -219,6 +215,28 @@
 			})
 		}
 	}
+	
+	function swiperChange(e) {
+		console.log('切换轮播图',e.detail.current);
+		if(e.detail.current<imagesNum.value) {
+			// if(e.detail.current == 0){
+			// 	currentImgIndex.value = imagesNum.value
+			// }else {
+			// 	currentImgIndex.value = e.detail.current;
+			// }
+			currentImgIndex.value = e.detail.current;
+			currentShowImgIndex.value = e.detail.current + 1;
+		}
+		// if(e.detail.source =='autoplay' || e.detail.source == 'touch' || e.detail.source === ''){
+		// 	currentImgIndex.value = e.detail.current + 1;
+		// }else {
+		// 	// currentImgIndex.value = e.detail.current + 1; // 无条件更新
+		// }
+	}
+	
+	function animationfinish(e) {
+	 console.log('animationfinish',e);
+	};
 
 	//返回首页
 	function backHome() {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 0d08754..98ba6bb 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -50,9 +50,9 @@
 					<view class="swiper_s">
 						<swiper class="swiper_s" :circular="true" :autoplay="true" indicator-active-color="#0DAE11"
 							indicator-color="#ffffff" :indicator-dots="false" :current="swiperCurrent"
-							@animationfinish="swiperChange" v-for="(item, index) in bannerList" :key="index">
+							@animationfinish="swiperChange">
 							<!-- v-for="(item, index) in swiperList" :key="index" @click="openSwiper(item)"-->
-							<swiper-item style="margin: 0 auto;" >
+							<swiper-item style="margin: 0 auto;"  v-for="(item, index) in bannerList" :key="index" @click="swiperJump(item)">
 								<view style="position: relative;width: 100%;height: 100%;">
 									<!--<view class="fnon_tit"></view>
 									 <view class="text">{{ item.title ? item.title : '' }}</view> 
@@ -298,6 +298,30 @@
 			sheep.$router.go(decodeURIComponent(options.page));
 		}
 	});
+	
+	//轮播图跳转
+	function swiperJump(item) {
+		console.log('轮播图跳转事件：',item.url);
+		const tabBarPages = [
+		    '/pages/index/index',
+		    '/pages/index/fabu',
+		    '/pages/index/user'
+		  ];
+		console.log('tabbarsList：',tabBarPages);
+		if(item.type == "in") {
+			console.log('跳进内页');
+			if(tabBarPages.includes(item.url)) {
+				console.log('导航页');
+				uni.switchTab({
+					url: item.url,
+				})
+			}else {
+				uni.navigateTo({
+					url: item.url,
+				})
+			}
+		}
+	}
 
 	// 下拉刷新
 	onPullDownRefresh(() => {
@@ -315,6 +339,7 @@
 		console.log('banner',res);
 		if(res.code == 1) {
 			bannerList.value = res.data.list
+			console.log('bannerList',bannerList.value);
 		}
 		
 	}