修复bug

2026-08-13 14:12:11 +08:00
parent 94146ce27a
commit 32765cc004
12 changed files with 145 additions and 48 deletions
--- a/property-uniapp-project/manifest.json
+++ b/property-uniapp-project/manifest.json
@@ -2,8 +2,8 @@
    "name" : "花开物业",
    "appid" : "__UNI__29C3D60",
    "description" : "智慧社区居民端面向小区业主使用，支持注册、验证码、账号密码多种登录方式，提供密码找回功能，账号使用安全便捷。支持多小区切换，首页设有轮播 banner、社区公告，集成远程开门、生活缴费、在线报修、访客邀请、社区活动常用服务。全服务板块统一涵盖门禁开门、线上缴费、报修申报、访客预约、投诉反馈、问卷调研、活动报名、社区公示、一键联系物业功能。个人中心可管理房屋、住户、车位、车辆信息，支持更换手机号、修改密码、消息通知设置、版本更新及账号退出，一站式满足业主居家生活、社区服务、房产车辆管理需求，实现社区生活数字化、便捷化。",
-    "versionName" : "1.1.1",
-    "versionCode" : 124,
+    "versionName" : "1.1.2",
+    "versionCode" : 125,
    "transformPx" : false,
    "uniCloud" : {
        "provider" : "aliyun",
--- a/property-uniapp-project/pageSubPack/activity-list/activityList.vue
+++ b/property-uniapp-project/pageSubPack/activity-list/activityList.vue
@@ -94,10 +94,13 @@
 						</view>

 						<view class="action-buttons">
-							<button v-if="activeTab === 'list' && activity.applied === false && activity.statusText !== '已结束'" class="action-btn signup-btn"
+							<button v-if="activeTab === 'list' && activity.applied === false && activity.statusText !== '已结束' && !isDeadlinePassed(activity) && !isQuotaFull(activity)" class="action-btn signup-btn"
 								@tap.stop="signupActivity(activity)">
 								立即报名
 							</button>
+							<view v-if="activeTab === 'list' && activity.applied === false && activity.statusText !== '已结束' && getDisabledText(activity)" class="action-btn disabled-btn">
+								{{ getDisabledText(activity) }}
+							</view>
 							<button v-if="activeTab === 'list' && activity.applied === true && activity.statusText !== '已结束'" class="action-btn signup-btn"
 								@tap.stop="cancelActivity(activity)">
 								取消报名
@@ -316,6 +319,37 @@ const formatDate = (date) => {
 	return moment(date).format('YYYY-MM-DD HH:mm')
 }

+/**
+ * 报名是否已截止（applyDeadline 已过）
+ * @param {object} activity - 活动对象
+ * @returns {boolean}
+ */
+const isDeadlinePassed = (activity) => {
+	if (!activity.applyDeadline) return false
+	return moment().isAfter(moment(activity.applyDeadline))
+}
+
+/**
+ * 报名名额是否已满（quota 为 0 表示不限名额）
+ * @param {object} activity - 活动对象
+ * @returns {boolean}
+ */
+const isQuotaFull = (activity) => {
+	if (!activity.quota) return false
+	return (Number(activity.appliedCount) || 0) >= Number(activity.quota)
+}
+
+/**
+ * 获取报名不可用时的置灰文案
+ * @param {object} activity - 活动对象
+ * @returns {string} 截止返回“报名已结束”，已满返回“名额已满”，否则空字符串
+ */
+const getDisabledText = (activity) => {
+	if (isDeadlinePassed(activity)) return '报名已结束'
+	if (isQuotaFull(activity)) return '名额已满'
+	return ''
+}
+
 /**
 * 报名活动（跳转详情页）
 * @param {object} activity - 活动对象
@@ -633,6 +667,12 @@ watch(() => myFilter.value, () => {
 	background-color: #0056cc;
 }

+.disabled-btn {
+	background-color: #f2f3f5;
+	color: #999;
+	text-align: center;
+}
+
 /* 加载更多 */
 .load-more-container {
 	display: flex;
--- a/property-uniapp-project/pageSubPack/api/request.js
+++ b/property-uniapp-project/pageSubPack/api/request.js
@@ -2,7 +2,7 @@ import { navigateToLogin } from '@/common/checkLogin.js'

 let baseUrl = '';
 if (process.env.NODE_ENV === 'development') {
-	baseUrl = 'http://192.168.1.222:8080'; // 开发环境
+	baseUrl = 'http://192.168.1.6:8080'; // 开发环境
 	// baseUrl = 'https://wuyeapi.ckdzkj.com';
 } else {
 	baseUrl = 'https://wuyeapi.ckdzkj.com'; // 生产环境
--- a/property-uniapp-project/pageSubPack/my/addParkingSpace.vue
+++ b/property-uniapp-project/pageSubPack/my/addParkingSpace.vue
@@ -231,7 +231,7 @@
 									uni.removeStorageSync("bindCarName")
 									uni.removeStorageSync("ownerId")
 									uni.removeStorageSync("ownerName")
-									uni.redirectTo({ url: "/pageSubPack/my/myParkingSpaceIndex" })
+									uni.navigateBack({ delta: type.value === '修改' ? 2 : 1 })
 							}, 1500)
 						} else {
 							uni.showToast({
--- a/property-uniapp-project/pageSubPack/my/myHouseIndex.vue
+++ b/property-uniapp-project/pageSubPack/my/myHouseIndex.vue
@@ -81,11 +81,6 @@
 		getList()
 	}

-	onPullDownRefresh(() => {
-		onRefresh()
-	})
-
-
 	// ==================== 获取列表数据 ====================
 	const getList = async () => {
 		if (loading.value) return
--- a/property-uniapp-project/pageSubPack/my/myParkingSpaceIndex.vue
+++ b/property-uniapp-project/pageSubPack/my/myParkingSpaceIndex.vue
@@ -63,9 +63,11 @@

 <script setup>
 	import {
-		ref,
-		onMounted
+		ref
 	} from 'vue'
+	import {
+		onShow
+	} from '@dcloudio/uni-app'
 	import {
 		getCarList
 	} from '@/pageSubPack/api/apiSub.js'
@@ -83,8 +85,12 @@
 		getList()
 	}

-	// 页面加载时请求第一页
-	onMounted(() => {
+	// 页面显示时请求第一页（首次进入和从详情/修改页返回时都会刷新）
+	onShow(() => {
+		pageNum.value = 1
+		noMoreData.value = false
+		parkingSpaceList.value = []
+		loadingMore.value = false
 		getList()
 	})

--- a/property-uniapp-project/pageSubPack/my/parkingSpaceDetail.vue
+++ b/property-uniapp-project/pageSubPack/my/parkingSpaceDetail.vue
@@ -1,8 +1,8 @@
 <template>
 	<view class="contentStyle">
-		<view class="status-bar"></view>
+	<!-- 	<view class="status-bar"></view>
 		<uni-nav-bar title="车位详情" left-icon="left" @clickLeft="goBack" :border="false" backgroundColor="transparent">
-		</uni-nav-bar>
+		</uni-nav-bar> -->

 		<scroll-view class="page" scroll-y="true">
 			<view class="status-header">
@@ -204,7 +204,7 @@
 								icon: 'success'
 							})
 							setTimeout(() => {
-									uni.redirectTo({ url: "/pageSubPack/my/myParkingSpaceIndex" })
+									uni.navigateBack({ delta: 1 })
 							}, 1500)
 						} else {
 							uni.showToast({
@@ -249,7 +249,7 @@
 								icon: 'success'
 							})
 							setTimeout(() => {
-									uni.redirectTo({ url: "/pageSubPack/my/myParkingSpaceIndex" })
+									uni.navigateBack({ delta: 1 })
 							}, 1500)
 						} else {
 							uni.showToast({
@@ -472,7 +472,6 @@
 	.bottom-btn-wrap {
 		padding: 20rpx 30rpx 40rpx;
 		display: flex;
-		gap: 20rpx;
 	}

 	.btn-modify {
@@ -484,6 +483,7 @@
 		font-size: 30rpx;
 		border-radius: 8rpx;
 		border: none;
+		margin-right: 20rpx;
 	}

 	.btn-delete {
--- a/property-uniapp-project/pageSubPack/online-repair/onlineRepair.vue
+++ b/property-uniapp-project/pageSubPack/online-repair/onlineRepair.vue
@@ -12,7 +12,7 @@

    <!-- 报修类型Tab -->
 	<scroll-view class="scroll-container" scroll-y="true"
-		:lower-threshold="100">
+		:lower-threshold="100" @scrolltolower="loadMore">
    <view class="repair-type-tabs">
      <view 
        class="type-tab" 
@@ -102,12 +102,18 @@
 	    <text class="empty-text">暂无数据</text>
 	  </view>
    </view>
+
+    <!-- 加载更多提示 -->
+    <view v-if="repairList.length > 0" class="load-more-tip">
+      <text v-if="loading">加载中...</text>
+      <text v-else-if="!hasMoreData">没有更多数据了</text>
+    </view>
 	</scroll-view>
  </view>
 </template>

 <script setup>
-import { ref, watch } from 'vue';
+import { ref, watch, computed } from 'vue';
 import { onLoad, onShow, onUnload } from '@dcloudio/uni-app';
 import { getQueryRepair } from '../api/api.js';

@@ -120,6 +126,8 @@ const repairList = ref([]);
 const loading = ref(false);
 const pageNum = ref(1);
 const pageSize = ref(10);
+const total = ref(0);
+const hasMoreData = computed(() => repairList.value.length < total.value);
 const maintenanceItemId = ref('');
 const statusBarHeight = ref(uni.getSystemInfoSync().statusBarHeight || 0)

@@ -138,14 +146,23 @@ const getStatusInfo = (val) => {
 };

 // 获取报修列表
-const fetchRepairList = async () => {
+// reset = true 时重置到第一页；否则按当前 pageNum 追加加载
+const fetchRepairList = async (reset = false) => {
 	const villageId = uni.getStorageSync('currentVillageId');
 	if (!villageId || villageId === '0') {
 		uni.showToast({ title: '请先选择小区', icon: 'none' });
 		return;
 	}

+	// 防止重复请求
+	if (loading.value) return;
 	loading.value = true;
+
+	if (reset) {
+		pageNum.value = 1;
+		repairList.value = [];
+		total.value = 0;
+	}
 	try {
 		const params = {
 			villageId,
@@ -158,7 +175,8 @@ const fetchRepairList = async () => {
 		// console.log('接口返回:', res);
 		if (res.code === 200) {
 			const list = res.rows || [];
-			repairList.value = list.map(item => {
+			total.value = Number(res.total) || 0;
+			const mapped = list.map(item => {
 				const statusInfo = getStatusInfo(item.problemStatus);
 				const images = item.problemImageUrl ? item.problemImageUrl.split(',').filter(Boolean) : [];
 				if (statusInfo) {
@@ -166,6 +184,7 @@ const fetchRepairList = async () => {
 				}
 				return { ...item, imageList: images };
 			});
+			repairList.value = pageNum.value === 1 ? mapped : [...repairList.value, ...mapped];
 		} else {
 			uni.showToast({ title: res.msg || '获取失败', icon: 'none' });
 		}
@@ -176,10 +195,16 @@ const fetchRepairList = async () => {
 	}
 };

-// 监听状态变化自动刷新（切换 tab 时重置页码）
-watch(activeStatus, () => {
-	pageNum.value = 1;
+// 加载更多（滚动到底部触发）
+const loadMore = () => {
+	if (loading.value || !hasMoreData.value) return;
+	pageNum.value++;
 	fetchRepairList();
+};
+
+// 监听状态变化自动刷新（切换 tab 时重置到第一页）
+watch(activeStatus, () => {
+	fetchRepairList(true);
 });

 function publicClick(){
@@ -219,11 +244,11 @@ const goDetail = (item) => {

 onLoad(() => {
 	// maintenanceItemId.value = option.maintenanceProjectId || '' // 接收维修项目id
-	fetchRepairList()
+	fetchRepairList(true)
 });
 onShow(() => {
 	// 从其他页面返回时刷新列表
-	fetchRepairList()
+	fetchRepairList(true)
 });
 onUnload(() =>{

@@ -382,6 +407,10 @@ onUnload(() =>{
  color: #333;
  padding-right: 20rpx;
  width: 77%;
+  word-break: break-all;
+  word-wrap: break-word;
+  white-space: normal;
+  line-height: 1.4;
 }
 .item-status {
  font-size: 14px;
@@ -472,6 +501,16 @@ onUnload(() =>{
 	margin-bottom: 10rpx;
 }

+/* 加载更多提示 */
+.load-more-tip {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	padding: 30rpx 0;
+	color: #999;
+	font-size: 26rpx;
+}
+
 /* 底部时间和详情 */
 .item-footer {
  display: flex;
--- a/property-uniapp-project/pageSubPack/online-repair/personalRepair.vue
+++ b/property-uniapp-project/pageSubPack/online-repair/personalRepair.vue
@@ -169,8 +169,21 @@ const form = ref({

 // ========== 基础数据 ==========
 const timePopupRef = ref(null)
-const selectedTime = ref('')
-const tempTime = ref(moment().hour(9).minute(30).second(0))
+
+// 默认预约时间：今天（向上取整到下一个整点/半点）
+const getDefaultTime = () => {
+  const t = moment().second(0).millisecond(0)
+  if (t.minute() > 30) {
+    t.add(1, 'hour').minute(0)
+  } else if (t.minute() > 0) {
+    t.minute(30)
+  }
+  return t
+}
+
+const selectedTime = ref(getDefaultTime())
+const tempTime = ref(getDefaultTime())
+form.value.datetime = selectedTime.value.format('YYYY-MM-DD HH:mm')

 // ========== 时间选择列数据 ==========
 const dateList = ref([
@@ -191,12 +204,15 @@ const minuteList = ref([
 ])

 // ========== 选中状态 ==========
-const selectedDate = ref('')
-const selectedHour = ref('')
-const selectedMinute = ref('')
+const selectedDate = ref(selectedTime.value.format('YYYY-MM-DD'))
+const selectedHour = ref(selectedTime.value.format('HH'))
+const selectedMinute = ref(selectedTime.value.format('mm'))

 // ========== 滚动配置 ==========
-const itemHeight = 80
+// 每项高度 / 可视高度（rpx 转 px，避免直接用数字导致滚动错位）
+const itemHeight = uni.upx2px(80)
+const visibleHeight = uni.upx2px(400)
+const centerOffset = (visibleHeight - itemHeight) / 2
 const dateScrollTop = ref(0)
 const hourScrollTop = ref(0)
 const minuteScrollTop = ref(0)
@@ -243,9 +259,10 @@ const syncScrollPosition = () => {
  const hourIdx = hourList.value.findIndex(i => i.time === selectedHour.value)
  const minIdx = minuteList.value.findIndex(i => i.minute === selectedMinute.value)

-  dateScrollTop.value = dateIdx * itemHeight
-  hourScrollTop.value = hourIdx * itemHeight
-  minuteScrollTop.value = minIdx * itemHeight
+  // 让选中项滚动到可视区域居中位置，并限制不小于 0
+  dateScrollTop.value = dateIdx >= 0 ? Math.max(0, dateIdx * itemHeight - centerOffset) : 0
+  hourScrollTop.value = hourIdx >= 0 ? Math.max(0, hourIdx * itemHeight - centerOffset) : 0
+  minuteScrollTop.value = minIdx >= 0 ? Math.max(0, minIdx * itemHeight - centerOffset) : 0
 }

 // 点击选择日期
--- a/property-uniapp-project/pageSubPack/online-repair/repairDetail.vue
+++ b/property-uniapp-project/pageSubPack/online-repair/repairDetail.vue
@@ -54,7 +54,7 @@
 					</view>
 					<view class="photo-container" v-else>
 						<view class="photo-item">
-							<uni-icons type="plusempty" size="24" color="#ccc"></uni-icons>
+							<!-- <uni-icons type="plusempty" size="24" color="#ccc"></uni-icons> -->
 						</view>
 					</view>
 				</view>
--- a/property-uniapp-project/pageSubPack/online-repair/selectHouse.vue
+++ b/property-uniapp-project/pageSubPack/online-repair/selectHouse.vue
@@ -57,12 +57,11 @@ const fetchHouseList = async () => {
    if (res.code === 200) {
      const list = res.rows || []
      houseList.value = list
-      if (houseList.value.length > 0) {
+      // 仅当从表单页带入了房屋ID时，自动选中对应房屋；否则不默认选择
      if (preSelectedHouseId.value) {
        const found = houseList.value.find(item => String(item.id) === String(preSelectedHouseId.value))
-          selectedHouse.value = found || houseList.value[0]
-        } else {
-          selectedHouse.value = houseList.value[0]
+        if (found) {
+          selectedHouse.value = found
        }
      }
    }
@@ -85,7 +84,7 @@ const selectHouse = (item) => {

 // 确认选择并返回
 const confirmSelect = () => {
-  if (!selectedHouse.value) {
+  if (!selectedHouse.value.id) {
    uni.showToast({ title: '请选择房屋', icon: 'none' })
    return
  }
@@ -113,6 +112,8 @@ const confirmSelect = () => {
 }
 .house-list {
  flex: 1;
+  min-height: 0;
+  overflow-y: auto;
 }
 .house-item {
  display: flex;
--- a/property-uniapp-project/pages.json
+++ b/property-uniapp-project/pages.json
@@ -299,8 +299,7 @@
 				{
 					"path": "parkingSpaceDetail",
 					"style": {
-						"navigationBarTitleText": "",
-						"navigationStyle": "custom"
+						"navigationBarTitleText": "车位详情"
 					}

 				},