From a5015246469ad05835a2e8ba013e1faceee4fc87 Mon Sep 17 00:00:00 2001
From: zhouyanli <593579392@qq.com>
Date: Wed, 24 Jun 2026 09:06:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B4=BB=E5=8A=A8=E6=8A=A5?=
 =?UTF-8?q?=E5=90=8D=E6=8C=89=E9=92=AE=E7=8A=B6=E6=80=81=EF=BC=8C=E6=8A=A5?=
 =?UTF-8?q?=E4=BF=AE=E6=B7=BB=E5=8A=A0=E5=B0=8F=E5=8C=BA=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=EF=BC=9B=E8=AE=BF=E5=AE=A2=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 property-uniapp-project/manifest.json         |  4 +-
 .../activity-list/activityList.vue            |  2 +-
 .../activity-list/activityListDetails.vue     | 47 +++++++++++++++----
 .../pageSubPack/activity-list/live-add.vue    |  1 -
 .../online-repair/onlineRepair.vue            |  2 +
 .../pageSubPack/payment-list/paymentIndex.vue |  2 +-
 .../pageSubPack/visitor/visitor-list.vue      | 15 ++++--
 property-uniapp-project/pages/index/index.vue | 23 ++++++++-
 .../pages/serviceIndex/serviceIndex.vue       |  7 ++-
 9 files changed, 82 insertions(+), 21 deletions(-)

diff --git a/property-uniapp-project/manifest.json b/property-uniapp-project/manifest.json
index cabc741..7fcfee4 100644
--- a/property-uniapp-project/manifest.json
+++ b/property-uniapp-project/manifest.json
@@ -19,14 +19,14 @@
         /* 模块配置 */
         "modules" : {
             "Geolocation" : {},
-            "Maps" : {},
             "Camera" : {},
             "Contacts" : {},
             "Gallery" : {},
             "Push" : {},
             "Barcode" : {},
             "Payment" : {},
-            "Bluetooth" : {}
+            "Bluetooth" : {},
+            "Maps" : {}
         },
         /* 应用发布信息 */
         "distribute" : {
diff --git a/property-uniapp-project/pageSubPack/activity-list/activityList.vue b/property-uniapp-project/pageSubPack/activity-list/activityList.vue
index 6425045..b858674 100644
--- a/property-uniapp-project/pageSubPack/activity-list/activityList.vue
+++ b/property-uniapp-project/pageSubPack/activity-list/activityList.vue
@@ -98,7 +98,7 @@
 								@tap.stop="signupActivity(activity)">
 								立即报名
 							</button>
-							<button v-if="activeTab === 'list' && activity.applied === true" class="action-btn signup-btn"
+							<button v-if="activeTab === 'list' && activity.applied === true && activity.statusText !== '已结束'" class="action-btn signup-btn"
 								@tap.stop="cancelActivity(activity)">
 								取消报名
 							</button>
diff --git a/property-uniapp-project/pageSubPack/activity-list/activityListDetails.vue b/property-uniapp-project/pageSubPack/activity-list/activityListDetails.vue
index 32b5ecc..9ebecd3 100644
--- a/property-uniapp-project/pageSubPack/activity-list/activityListDetails.vue
+++ b/property-uniapp-project/pageSubPack/activity-list/activityListDetails.vue
@@ -119,10 +119,11 @@
             <view class="record-user">
               <view class="user-avatar">
                 <uni-icons type="person" size="20" color="#999"></uni-icons>
+				<!-- <image :src="record.userAvatar" mode="aspectFill"></image> -->
               </view>
               <view class="user-info">
-                <view class="user-name">微信用户</view>
-                <view class="record-time">{{ record.time }}</view>
+                <view class="user-name">{{record.userNickname || '微信用户'}}</view>
+                <view class="record-time">{{ record.createTime }}</view>
 				<view class="record-content">{{ record.content }}</view>
 				<!-- 图片展示 -->
 				<view v-if="record.images && record.images.length > 0" class="record-images">
@@ -149,9 +150,18 @@
 
     <!-- 底部操作栏 -->
     <view class="bottom-bar">
+      <!-- 活动已结束且未报名，显示不可点击的结束按钮 -->
+      <button
+        v-if="isActivityEnded && !hasSigned && activeTab === 'detail'"
+        class="action-btn ended-btn"
+        disabled
+      >
+        报名已结束
+      </button>
+
       <!-- 未报名状态显示报名按钮 -->
       <button
-        v-if="!hasSigned && activeTab === 'detail'"
+        v-if="!isActivityEnded && !hasSigned && activeTab === 'detail'"
         class="action-btn signup-btn"
         @tap="handleSignup"
       >
@@ -209,7 +219,7 @@
 </template>
 
 <script setup>
-import { ref, onMounted } from 'vue'
+import { ref, onMounted, computed } from 'vue'
 import {onLoad,onUnload} from '@dcloudio/uni-app'
 import moment from 'moment'
 import {getActivityDetails,confirmResident,cancelActivity,getActivityLive} from '../api/api.js'
@@ -226,6 +236,15 @@ const navTitle = ref('')
 const curActivityId = ref('') // 当前活动的id
 const activityConent = ref({}) // 获取详情数据
 
+// 判断活动是否已结束
+const isActivityEnded = computed(() => {
+  // 优先使用后端返回的状态字段（status: '2' 或 statusText: '已结束'）
+  if (activityConent.value.status === '2' || activityConent.value.statusText === '已结束') return true
+  // 备选：通过 endTime 时间判断
+  if (!activityConent.value.applyDeadline) return false
+  return moment().isAfter(moment(activityConent.value.applyDeadline))
+})
+
 // 实况记录数据
 const liveRecords = ref([
   // {
@@ -262,13 +281,13 @@ onLoad((option) =>{
       // 2. 初始化数据
       if (curActivityId.value) {
         getActivityDetailsData(curActivityId.value) // 获取活动详情
-        getLiveActivityList() // 获取实况列表
+        // getLiveActivityList() // 获取实况列表
       }
 
       // 3. 监听实况列表刷新事件
-      uni.$on('refreshLiveList', () => {
-        getLiveActivityList()
-      })
+      // uni.$on('refreshLiveList', () => {
+      //   getLiveActivityList()
+      // })
 })
 
 // 获取列表详情
@@ -294,9 +313,13 @@ const getActivityDetailsData = async (id) =>{
     }
 }
 
+
 // 切换选项卡
 const switchTab = (tab) => {
   activeTab.value = tab
+  if (tab === 'status') {
+    getLiveActivityList()
+  }
 }
 
 // 返回上一页
@@ -434,7 +457,7 @@ const liveClick = () =>{
 
 // ---------
 onUnload(() => {
-    uni.$off('refreshLiveList')
+    // uni.$off('refreshLiveList')
 })
 
 // 显示提示信息
@@ -759,6 +782,12 @@ const showToastMessage = (message) => {
   box-shadow: 0 4rpx 20rpx rgba(0, 122, 255, 0.2);
 }
 
+.ended-btn {
+  background: linear-gradient(135deg, #ccc 0%, #999 100%);
+  color: #fff;
+  opacity: 0.7;
+}
+
 /* 模态框 */
 .modal {
   display: none;
diff --git a/property-uniapp-project/pageSubPack/activity-list/live-add.vue b/property-uniapp-project/pageSubPack/activity-list/live-add.vue
index 48acd92..1e1f8a0 100644
--- a/property-uniapp-project/pageSubPack/activity-list/live-add.vue
+++ b/property-uniapp-project/pageSubPack/activity-list/live-add.vue
@@ -77,7 +77,6 @@ const latitude = ref('');
 
 // 接收活动ID
 onLoad((option) => {
-	console.log('idiidd',option)
   activityId.value = option?.id || '';
 });
 
diff --git a/property-uniapp-project/pageSubPack/online-repair/onlineRepair.vue b/property-uniapp-project/pageSubPack/online-repair/onlineRepair.vue
index 38d8542..1736f52 100644
--- a/property-uniapp-project/pageSubPack/online-repair/onlineRepair.vue
+++ b/property-uniapp-project/pageSubPack/online-repair/onlineRepair.vue
@@ -203,6 +203,8 @@ const goBack = () => {
   	uni.switchTab({
   		url:"/pages/serviceIndex/serviceIndex"
   	})
+  }else{
+	  uni.navigateBack()
   }
   uni.removeStorageSync('sourcePage')
 
diff --git a/property-uniapp-project/pageSubPack/payment-list/paymentIndex.vue b/property-uniapp-project/pageSubPack/payment-list/paymentIndex.vue
index e38fd6e..89dd135 100644
--- a/property-uniapp-project/pageSubPack/payment-list/paymentIndex.vue
+++ b/property-uniapp-project/pageSubPack/payment-list/paymentIndex.vue
@@ -278,7 +278,7 @@
 	}
 
 	const goBack = () => {
-		console.log(uni.getStorageSync('sourcePage'))
+		console.log('返回',uni.getStorageSync('sourcePage'))
 		if (uni.getStorageSync('sourcePage') == 'serviceIndex') {
 			uni.switchTab({
 				url: '/pages/serviceIndex/serviceIndex'
diff --git a/property-uniapp-project/pageSubPack/visitor/visitor-list.vue b/property-uniapp-project/pageSubPack/visitor/visitor-list.vue
index 79d33d9..ddedb1d 100644
--- a/property-uniapp-project/pageSubPack/visitor/visitor-list.vue
+++ b/property-uniapp-project/pageSubPack/visitor/visitor-list.vue
@@ -107,7 +107,7 @@
 
 <script setup>
 import { ref, computed } from "vue";
-import { onLoad } from "@dcloudio/uni-app";
+import { onLoad,onShow} from "@dcloudio/uni-app";
 import { getVisitorList } from "../api/api.js";
 
 const activeTab = ref("waiting");
@@ -132,9 +132,13 @@ const mapData = (list) => {
 };
 
 const fetchVisitorList = async () => {
-  const userId = uni.getStorageSync("userId");
+
   try {
-    const res = await getVisitorList({ userId });
+	  const params = {
+		userId: uni.getStorageSync("userId"),
+		villageId:uni.getStorageSync('currentVillageId')
+	  }
+    const res = await getVisitorList(params);
     visitorList.value = mapData(res.data || []);
   } catch (err) {
     uni.showToast({ title: err.msg, icon: "none" });
@@ -156,8 +160,11 @@ onLoad(() => {
   // 列表区域可用高度 = 窗口高度 - 状态栏 - 导航栏 - tab栏 - 底部按钮区
   scrollHeight.value = info.windowHeight - statusBarHeight.value - navPx - tabPx - btnPx;
 
-  fetchVisitorList();
+  
 });
+onShow(()=>{
+	fetchVisitorList();
+})
 
 const filterdList = computed(() => {
   return visitorList.value.filter((item) => item.status === activeTab.value);
diff --git a/property-uniapp-project/pages/index/index.vue b/property-uniapp-project/pages/index/index.vue
index 1e349df..9f08546 100644
--- a/property-uniapp-project/pages/index/index.vue
+++ b/property-uniapp-project/pages/index/index.vue
@@ -37,7 +37,11 @@
 		<scroll-view class="main-scroll" scroll-y>
 			<!-- banner -->
 			<view class="bannarClass">
-				  <up-swiper :key="bannerSwiperKey" :list="bannerList" indicator indicatorMode="dot" imgMode="aspectFill" radius="10"></up-swiper>
+				  <up-swiper :key="bannerSwiperKey" :list="bannerList" indicator indicatorMode="dot" radius="10">
+					<template #default="{ item, index }">
+						<image :src="item" mode="aspectFill" class="banner-img" @tap="bannerClick(index)"></image>
+					</template>
+				</up-swiper>
 			</view>
 			<!-- 公告 -->
 			<view class="noticeClass" @click="getNoticeMore">
@@ -182,6 +186,7 @@ const currentCommunity = ref('请绑定房屋')
 const currentVillageId  = ref('')
 const statusBarHeight = ref(0)
 const bannerList = ref([])
+const bannerRawData = ref([]) // 保留原始数据（含link）
 const bannerSwiperKey = ref(0)
 const noticeText = ref('暂无公告')
 const noticeId = ref('')
@@ -205,7 +210,8 @@ const getbannarData = async () =>{
 	try{
 		const res = await getBannarList({villageId:uni.getStorageSync('currentVillageId')})
 		if(res.code === 200){
-			const newList = res.data.map(item => item.url)
+			bannerRawData.value = res.data || []
+				const newList = (res.data || []).map(item => item.url)
 			// 只有 banner 数据真正变化时才更新，避免 swiper 反复重建
 			if (JSON.stringify(newList) !== JSON.stringify(bannerList.value)) {
 				bannerList.value = newList
@@ -220,6 +226,13 @@ const getbannarData = async () =>{
 		uni.showToast({title: msg,icon:'error'})
 	}
 }
+// banner点击跳转
+const bannerClick = (index) => {
+	const item = bannerRawData.value[index]
+	if (item && item.link) {
+		uni.navigateTo({ url: item.link })
+	}
+}
 // 接收选择小区返回的参数
 const slelctHomeData = (data) =>{
 	  // console.log('收到B页面返回的数据：', data)
@@ -317,6 +330,7 @@ const resetPageData = () => {
   currentVillageId.value = ''
   activityList.value = []
   bannerList.value = []
+	  bannerRawData.value = []
   noticeText.value = '暂无公告'
   noticeId.value = ''
 }
@@ -555,6 +569,11 @@ const moreClick = () =>{
 		::v-deep .u-swiper__wrapper__item__wrapper__image{
 			height: 300rpx !important;
 		}
+		::v-deep .banner-img{
+			height: 300rpx !important;
+			width: 100%;
+			border-radius: 10rpx;
+		}
 	}
 	.noticeClass{
 		padding: 0rpx 36rpx;
diff --git a/property-uniapp-project/pages/serviceIndex/serviceIndex.vue b/property-uniapp-project/pages/serviceIndex/serviceIndex.vue
index 44c7ee2..9dc60d2 100644
--- a/property-uniapp-project/pages/serviceIndex/serviceIndex.vue
+++ b/property-uniapp-project/pages/serviceIndex/serviceIndex.vue
@@ -8,7 +8,7 @@
 			<view class="container">
 				<!-- 顶部 Banner 轮播 -->
 				<view class="banner-box" style="overflow-y: hidden;">
-					<image class="banner-img" src="http://47.104.199.163:9090/images/propertyImgs/serviceImg2.png" />
+					<image class="banner-img" src="http://47.104.199.163:9090/images/propertyImgs/serviceImg2.png" @tap="bannnerClick"/>
 				</view>
 
 				<!-- 常用功能区 -->
@@ -140,6 +140,11 @@
 			complete: () => {}
 		});
 	}
+	
+	// banner跳转
+	function bannnerClick(){
+		uni.navigateTo({ url: '/pageSubPack/online-repair/onlineRepair'})
+	}
 </script>