From ced5adecb4f2a312ce5f7ddbb2707a9cbc9229bf Mon Sep 17 00:00:00 2001
From: zhouyanli <593579392@qq.com>
Date: Wed, 29 Apr 2026 09:10:23 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E3=80=81=E6=95=85=E9=9A=9C=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pageSubPack/loginSub/login.vue            | 645 +++++++++---------
 .../pageSubPack/loginSub/privacy.vue          | 169 +++++
 .../pageSubPack/loginSub/pwd-login.vue        | 481 ++++++-------
 .../report-record/repairSelect.vue            | 141 ++++
 .../report-record/report-record.vue           | 538 ++++++---------
 wuye-manager-uniapp/pages.json                |  17 +-
 wuye-manager-uniapp/pages/index/index.vue     |   8 +-
 7 files changed, 1124 insertions(+), 875 deletions(-)
 create mode 100644 wuye-manager-uniapp/pageSubPack/loginSub/privacy.vue
 create mode 100644 wuye-manager-uniapp/pageSubPack/report-record/repairSelect.vue

diff --git a/wuye-manager-uniapp/pageSubPack/loginSub/login.vue b/wuye-manager-uniapp/pageSubPack/loginSub/login.vue
index bc70665..d29e166 100644
--- a/wuye-manager-uniapp/pageSubPack/loginSub/login.vue
+++ b/wuye-manager-uniapp/pageSubPack/loginSub/login.vue
@@ -1,19 +1,20 @@
 <template>
-  <view class="login-page">
-	  <view class="status_bar"></view>
-    <!-- 登录标题 -->
-    <view class="login-title">手机验证码登录</view>
+	<view class="login-page">
+		<view class="status_bar"></view>
+		<!-- 登录标题 -->
+		<view class="login-title">手机验证码登录</view>
 
-    <!-- 手机号输入框 -->
-    <view class="input-item">
-      <view class="input-icon">
-        <!-- <uni-icons type="phone" size="24" color="#999"></uni-icons> -->
-		<image src="http://47.104.199.163:9090/images/login/phone.png" mode="" style="height: 100%;width: 100%;"></image>
-      </view>
-	   <uni-easyinput  class="input-content"  type="number" v-model="phoneNumber"
-	  	   placeholder="请输入手机号" :inputBorder="false" maxlength="11"  :placeholderStyle="placeholderStyle">
-	  	   </uni-easyinput>
-   <!--   <input
+		<!-- 手机号输入框 -->
+		<view class="input-item">
+			<view class="input-icon">
+				<!-- <uni-icons type="phone" size="24" color="#999"></uni-icons> -->
+				<image src="http://47.104.199.163:9090/images/login/phone.png" mode=""
+					style="height: 100%;width: 100%;"></image>
+			</view>
+			<uni-easyinput class="input-content" type="number" v-model="phoneNumber" placeholder="请输入手机号"
+				:inputBorder="false" maxlength="11" :placeholderStyle="placeholderStyle">
+			</uni-easyinput>
+			<!--   <input
         class="input-content"
         type="number"
         placeholder="请输入手机号"
@@ -21,17 +22,18 @@
         maxlength="11"
         @input="checkForm"
       /> -->
-    </view>
+		</view>
 
-    <!-- 验证码输入框 + 获取验证码按钮 -->
-    <view class="input-item verify-item">
-      <view class="input-icon">
-		<image src="http://47.104.199.163:9090/images/login/code.png" mode="" style="height: 100%;width: 100%;"></image>
-      </view>
-	  <uni-easyinput  class="input-content verify-input"  type="number" v-model="verifyCode"
-	  	  	   placeholder="请输入验证码" :inputBorder="false" maxlength="6"  :placeholderStyle="placeholderStyle">
-		</uni-easyinput>
-    <!--  <input
+		<!-- 验证码输入框 + 获取验证码按钮 -->
+		<view class="input-item verify-item">
+			<view class="input-icon">
+				<image src="http://47.104.199.163:9090/images/login/code.png" mode="" style="height: 100%;width: 100%;">
+				</image>
+			</view>
+			<uni-easyinput class="input-content verify-input" type="number" v-model="verifyCode" placeholder="请输入验证码"
+				:inputBorder="false" maxlength="6" :placeholderStyle="placeholderStyle">
+			</uni-easyinput>
+			<!--  <input
         class="input-content verify-input"
         type="number"
         placeholder="请输入验证码"
@@ -39,321 +41,350 @@
         maxlength="6"
         @input="checkForm"
       /> -->
-      <button
-        class="get-verify-btn"
-        :disabled="!canGetVerify || countDown > 0"
-        @click="getVerifyCode"
-      >
-        {{ countDown > 0 ? `${countDown}s后重新获取` : '获取验证码' }}
-      </button>
-    </view>
+			<button class="get-verify-btn" :disabled="!canGetVerify || countDown > 0" @click="getVerifyCode">
+				{{ countDown > 0 ? `${countDown}s后重新获取` : '获取验证码' }}
+			</button>
+		</view>
 
-    <!-- 协议勾选 -->
-    <view class="agreement-item" @click="toggleAgreement">
-      <uni-icons
-        type="checkbox-filled"
-        size="24"
-        color="#4D5DFA"
-        v-if="agreeAgreement"
-      ></uni-icons>
-      <uni-icons
-        type="checkbox"
-        size="24"
-        color="#999"
-        v-else
-      ></uni-icons>
-      <text class="agreement-text">我已阅读并同意《用户隐私政策》</text>
-    </view>
+		<!-- 协议勾选 -->
+		<view class="agreement-item" >
+			<view @click="toggleAgreement">
+				<uni-icons type="checkbox-filled" size="24" color="#4D5DFA" v-if="agreeAgreement"></uni-icons>
+				<uni-icons type="checkbox" size="24" color="#999" v-else></uni-icons>
+			</view>
 
-    <!-- 登录按钮 -->
-    <button
-      class="login-btn"
-      :disabled="!canLogin"
-      @click="handleLogin"
-    >
-      登录
-    </button>
+			<text class="agreement-text" @click.stop="goToPrivacy">我已阅读并同意
+				<text class="agreePrivacy" :class="{active:isClicked}">《用户隐私政策》</text>
+			</text>
+		</view>
 
-    <!-- 底部链接 -->
-    <view class="bottom-link">
-      <navigator class="link-item" url="/pageSubPack/loginSub/pwd-login">账号密码登录</navigator>
-      <navigator class="link-item" url="/pageSubPack/loginSub/register-new-user">注册新用户</navigator>
-    </view>
-  </view>
+		<!-- 登录按钮 -->
+		<button class="login-btn" :disabled="!canLogin" @click="handleLogin">
+			登录
+		</button>
+
+		<!-- 底部链接 -->
+		<view class="bottom-link">
+			<navigator class="link-item" url="/pageSubPack/loginSub/pwd-login">账号密码登录</navigator>
+			<navigator class="link-item" url="/pageSubPack/loginSub/register-new-user">注册新用户</navigator>
+		</view>
+	</view>
 </template>
 
 <script setup>
-import { ref, computed, onUnmounted } from 'vue';
-import {getLoginBySms,getSendCode} from '../api/api.js'
+	import {
+		ref,
+		computed,
+		onUnmounted
+	} from 'vue';
+	import {
+		getLoginBySms,
+		getSendCode
+	} from '../api/api.js'
 
-// ========== 响应式数据 ==========
-// 手机号
-const phoneNumber = ref('');
-// 验证码
-const verifyCode = ref('');
-const placeholderStyle = ref('font-size:24rpx')
-// 是否同意协议
-const agreeAgreement = ref(true); // 默认勾选
-// 倒计时（秒）
-const countDown = ref(0);
-// 定时器
-let timer = null;
+	// ========== 响应式数据 ==========
+	// 手机号
+	const phoneNumber = ref('');
+	// 验证码
+	const verifyCode = ref('');
+	const placeholderStyle = ref('font-size:24rpx')
+	// 是否同意协议
+	const agreeAgreement = ref(false); // 默认勾选
+	// 倒计时（秒）
+	const countDown = ref(0);
+	// 定时器
+	let timer = null;
+	// 控制点击变色
+	const isClicked = ref(false)
 
-// ========== 计算属性 ==========
-// 是否可以获取验证码（手机号格式正确）
-const canGetVerify = computed(() => {
-  // 手机号正则：11位数字，以1开头
-  const phoneReg = /^1[3-9]\d{9}$/;
-  return phoneReg.test(phoneNumber.value);
-});
+	// ========== 计算属性 ==========
+	// 是否可以获取验证码（手机号格式正确）
+	const canGetVerify = computed(() => {
+		// 手机号正则：11位数字，以1开头
+		const phoneReg = /^1[3-9]\d{9}$/;
+		return phoneReg.test(phoneNumber.value);
+	});
 
-// 是否可以登录（手机号+验证码+协议都满足）
-const canLogin = computed(() => {
-  const phoneReg = /^1[3-9]\d{9}$/;
-  const verifyReg = /^\d{6}$/;
-  return phoneReg.test(phoneNumber.value) && verifyReg.test(verifyCode.value) && agreeAgreement.value;
-});
+	// 是否可以登录（手机号+验证码+协议都满足）
+	const canLogin = computed(() => {
+		const phoneReg = /^1[3-9]\d{9}$/;
+		const verifyReg = /^\d{6}$/;
+		return phoneReg.test(phoneNumber.value) && verifyReg.test(verifyCode.value) && agreeAgreement.value;
+	});
 
-// ========== 方法 ==========
-// 检查表单状态
-const checkForm = () => {
-  // 无需额外逻辑，计算属性已实时监听
-};
+	// ========== 方法 ==========
+	// 检查表单状态
+	const checkForm = () => {
+		// 无需额外逻辑，计算属性已实时监听
+	};
 
-// 切换协议勾选状态
-const toggleAgreement = () => {
-  agreeAgreement.value = !agreeAgreement.value;
-};
+	// 切换协议勾选状态
+	const toggleAgreement = () => {
+		agreeAgreement.value = !agreeAgreement.value;
+	};
+	// 跳转隐私协议
+	const goToPrivacy = () => {
+	  // 点击变色
+	  isClicked.value = true
+	  uni.navigateTo({
+	    url:'/pageSubPack/loginSub/privacy',
+	  })
+	}
 
-// 获取验证码
-const getVerifyCode = () => {
-  if (!canGetVerify.value) return;
-  let params = {
-  	  phone:phoneNumber.value,
-  	  scene:'login'
-  }
-  uni.showLoading({ title: '发送中...', mask: true });
-  getSendCode(params).then(res =>{
-  	  if(res.code === 200){
-		  uni.hideLoading();
-  		 uni.showToast({
-  		   title: '验证码已发送',
-  		   icon: 'success'
-  		 });
-		 // 开始60秒倒计时
-		 countDown.value = 60;
-		 timer = setInterval(() => {
-		   countDown.value--;
-		   if (countDown.value <= 0) {
-		     clearInterval(timer);
-		     timer = null;
-		   }
-		 }, 1000);
-  	  }else{
-  		 uni.showToast({
-  		   title: '验证码发送失败',
-  		   icon: 'error'
-  		 });
-  	  }
-  }).catch(err => {
-    uni.showToast({
-      title: '网络异常',
-      icon: 'error'
-    });
-  })
-
-};
-
-// 登录处理
-const handleLogin = () => {
-  if (!canLogin.value) return;
-   uni.showLoading({ title: '登录中...', mask: true });
-  let params = {
-	phone:phoneNumber.value,
-	smsCode:'123456',
-	scene:'login',
-  }
-  getLoginBySms(params).then(res =>{
-  	if(res.code === 200){
-		if(res.data){
-			uni.setStorageSync('token', res.data.token);
-			// 存用户ID
-			if(res.data.userId) {
-				uni.setStorageSync('userId', res.data.userId);
-			}
-			// 存当前绑定的小区ID，0 表示未绑定
-			const currentVillageId = res.data.currentVillageId || 0;
-			uni.setStorageSync('currentVillageId', currentVillageId);
-			uni.hideLoading();
-			uni.showToast({ title: '登录成功', icon: 'success' });
-			setTimeout(() =>{
-				uni.switchTab({ url: '/pages/index/index' });
-			},1500)
-		}else{
-			uni.showToast({ title: '登录失败', icon: 'error' });
+	// 获取验证码
+	const getVerifyCode = () => {
+		if (!canGetVerify.value) return;
+		let params = {
+			phone: phoneNumber.value,
+			scene: 'login'
 		}
-
-  	}else{
-  		uni.showToast({ title:'登录失败', icon: 'error' });
-  	}
-
-  }).catch(err => {
-		uni.showToast({
-			title: '网络异常，请重试',
-			icon: 'error'
+		uni.showLoading({
+			title: '发送中...',
+			mask: true
 		});
-	})
+		getSendCode(params).then(res => {
+			if (res.code === 200) {
+				uni.hideLoading();
+				uni.showToast({
+					title: '验证码已发送',
+					icon: 'success'
+				});
+				// 开始60秒倒计时
+				countDown.value = 60;
+				timer = setInterval(() => {
+					countDown.value--;
+					if (countDown.value <= 0) {
+						clearInterval(timer);
+						timer = null;
+					}
+				}, 1000);
+			} else {
+				uni.showToast({
+					title: '验证码发送失败',
+					icon: 'error'
+				});
+			}
+		}).catch(err => {
+			uni.showToast({
+				title: '网络异常',
+				icon: 'error'
+			});
+		})
+
+	};
+
+	// 登录处理
+	const handleLogin = () => {
+		if (!canLogin.value) return;
+		uni.showLoading({
+			title: '登录中...',
+			mask: true
+		});
+		let params = {
+			phone: phoneNumber.value,
+			smsCode: '123456',
+			scene: 'login',
+		}
+		getLoginBySms(params).then(res => {
+			if (res.code === 200) {
+				if (res.data) {
+					uni.setStorageSync('token', res.data.token);
+					// 存用户ID
+					if (res.data.userId) {
+						uni.setStorageSync('userId', res.data.userId);
+					}
+					// 存当前绑定的小区ID，0 表示未绑定
+					const currentVillageId = res.data.currentVillageId || 0;
+					uni.setStorageSync('currentVillageId', currentVillageId);
+					uni.hideLoading();
+					uni.showToast({
+						title: '登录成功',
+						icon: 'success'
+					});
+					setTimeout(() => {
+						uni.switchTab({
+							url: '/pages/index/index'
+						});
+					}, 1500)
+				} else {
+					uni.showToast({
+						title: '登录失败',
+						icon: 'error'
+					});
+				}
+
+			} else {
+				uni.showToast({
+					title: '登录失败',
+					icon: 'error'
+				});
+			}
+
+		}).catch(err => {
+			uni.showToast({
+				title: '网络异常，请重试',
+				icon: 'error'
+			});
+		})
 
 
-  // 模拟登录请求
-  // uni.showLoading({
-  //   title: '登录中...'
-  // });
-};
+		// 模拟登录请求
+		// uni.showLoading({
+		//   title: '登录中...'
+		// });
+	};
 
-// ========== 生命周期 ==========
-// 页面卸载时清除定时器
-onUnmounted(() => {
-  if (timer) {
-    clearInterval(timer);
-  }
-});
+	// ========== 生命周期 ==========
+	// 页面卸载时清除定时器
+	onUnmounted(() => {
+		if (timer) {
+			clearInterval(timer);
+		}
+	});
 </script>
 
 <style scoped>
-/* 页面容器 */
-.login-page {
-  padding: 80rpx 40rpx 40rpx;
-  /* background-color: #f8f9fa; */
-  min-height: 100vh;
-  background: repeating-linear-gradient(to bottom, #E2F0FF, #F6FAFF );
-}
-  .status_bar {
-	 height: 160px;
-	 width: 100%;
+	/* 页面容器 */
+	.login-page {
+		padding: 80rpx 40rpx 40rpx;
+		/* background-color: #f8f9fa; */
+		min-height: 100vh;
+		background: repeating-linear-gradient(to bottom, #E2F0FF, #F6FAFF);
 	}
 
-/* 登录标题 */
-.login-title {
-  font-size: 48rpx;
-  font-weight: 600;
-  color: #333;
-  text-align: center;
-  margin-bottom: 80rpx;
-}
+	.status_bar {
+		height: 160px;
+		width: 100%;
+	}
 
-/* 输入框项 */
-.input-item {
-  display: flex;
-  align-items: center;
-  background-color: #fff;
-  border-radius: 40rpx;
-  padding: 0 30rpx;
-  height: 88rpx;
-  margin-bottom: 30rpx;
-  box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
-}
+	/* 登录标题 */
+	.login-title {
+		font-size: 48rpx;
+		font-weight: 600;
+		color: #333;
+		text-align: center;
+		margin-bottom: 80rpx;
+	}
 
-/* 验证码输入项（特殊布局） */
-.verify-item {
-  position: relative;
-  padding-right: 220rpx;
-}
+	/* 输入框项 */
+	.input-item {
+		display: flex;
+		align-items: center;
+		background-color: #fff;
+		border-radius: 40rpx;
+		padding: 0 30rpx;
+		height: 88rpx;
+		margin-bottom: 30rpx;
+		box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+	}
 
-/* 输入框图标 */
-.input-icon {
-	width: 50rpx;
-	height: 50rpx;
-  margin-right: 20rpx;
-  color: #999;
-}
+	/* 验证码输入项（特殊布局） */
+	.verify-item {
+		position: relative;
+		padding-right: 220rpx;
+	}
 
-/* 输入框内容 */
-.input-content {
-  flex: 1;
-  font-size: 32rpx;
-  color: #333;
-  height: 100%;
-}
+	/* 输入框图标 */
+	.input-icon {
+		width: 50rpx;
+		height: 50rpx;
+		margin-right: 20rpx;
+		color: #999;
+	}
 
-/* 验证码输入框 */
-.verify-input {
-  padding-right: 20rpx;
-}
+	/* 输入框内容 */
+	.input-content {
+		flex: 1;
+		font-size: 32rpx;
+		color: #333;
+		height: 100%;
+	}
 
-/* 获取验证码按钮 */
-.get-verify-btn {
-  position: absolute;
-  right: 10rpx;
-  top: 50%;
-  transform: translateY(-50%);
-  width: 200rpx;
-  height: 70rpx;
-  line-height: 70rpx;
-  background-color: #4D5DFA;
-  color: #fff;
-  border-radius: 35rpx;
-  font-size: 28rpx;
-  padding: 0;
-  margin: 0;
-}
+	/* 验证码输入框 */
+	.verify-input {
+		padding-right: 20rpx;
+	}
 
-/* 获取验证码按钮禁用状态 */
-.get-verify-btn:disabled {
-  background-color: #ccc;
-  color: #fff;
-  border-radius: 50px;
-}
+	/* 获取验证码按钮 */
+	.get-verify-btn {
+		position: absolute;
+		right: 10rpx;
+		top: 50%;
+		transform: translateY(-50%);
+		width: 200rpx;
+		height: 70rpx;
+		line-height: 70rpx;
+		background-color: #4D5DFA;
+		color: #fff;
+		border-radius: 35rpx;
+		font-size: 28rpx;
+		padding: 0;
+		margin: 0;
+	}
 
-/* 协议勾选项 */
-.agreement-item {
-  display: flex;
-  align-items: center;
-  margin: 40rpx 0;
-  padding-left: 10rpx;
-}
+	/* 获取验证码按钮禁用状态 */
+	.get-verify-btn:disabled {
+		background-color: #ccc;
+		color: #fff;
+		border-radius: 50px;
+	}
 
-/* 协议文本 */
-.agreement-text {
-  font-size: 28rpx;
-  color: #666;
-  margin-left: 10rpx;
-}
+	/* 协议勾选项 */
+	.agreement-item {
+		display: flex;
+		align-items: center;
+		margin: 40rpx 0;
+		padding-left: 10rpx;
+	}
 
-/* 登录按钮 */
-.login-btn {
-  width: 100%;
-  height: 88rpx;
-  line-height: 88rpx;
-  background-color: #4D5DFA;
-  color: #fff;
-  border-radius: 44rpx;
-  font-size: 32rpx;
-  margin-bottom: 60rpx;
-}
+	/* 协议文本 */
+	.agreement-text {
+		font-size: 28rpx;
+		color: #666;
+		margin-left: 10rpx;
+	}
+	.agreePrivacy{
+		color: #666;
+	}
+	.agreePrivacy.active{
+		color: #4D5DFA;
+	}
 
-/* 登录按钮禁用状态 */
-.login-btn:disabled {
-  background-color: #99c8ff;
-  color: #fff;
-  /* border-radius: 50px; */
-}
-/* 禁用按钮边框 */
-button:after{
-	border-radius:  50px;
-}
+	/* 登录按钮 */
+	.login-btn {
+		width: 100%;
+		height: 88rpx;
+		line-height: 88rpx;
+		background-color: #4D5DFA;
+		color: #fff;
+		border-radius: 44rpx;
+		font-size: 32rpx;
+		margin-bottom: 60rpx;
+	}
 
-/* 底部链接 */
-.bottom-link {
-  display: flex;
-  justify-content: space-between;
-  padding: 0 20rpx;
-}
+	/* 登录按钮禁用状态 */
+	.login-btn:disabled {
+		background-color: #99c8ff;
+		color: #fff;
+		/* border-radius: 50px; */
+	}
 
-/* 链接项 */
-.link-item {
-  font-size: 28rpx;
-  color: #4D5DFA;
-  text-decoration: none;
-}
-</style>
+	/* 禁用按钮边框 */
+	button:after {
+		border-radius: 50px;
+	}
+
+	/* 底部链接 */
+	.bottom-link {
+		display: flex;
+		justify-content: space-between;
+		padding: 0 20rpx;
+	}
+
+	/* 链接项 */
+	.link-item {
+		font-size: 28rpx;
+		color: #4D5DFA;
+		text-decoration: none;
+	}
+</style>
\ No newline at end of file
diff --git a/wuye-manager-uniapp/pageSubPack/loginSub/privacy.vue b/wuye-manager-uniapp/pageSubPack/loginSub/privacy.vue
new file mode 100644
index 0000000..b09608a
--- /dev/null
+++ b/wuye-manager-uniapp/pageSubPack/loginSub/privacy.vue
@@ -0,0 +1,169 @@
+<template>
+  <view class="privacy-page">
+    
+    <!-- 协议内容 -->
+    <scroll-view class="privacy-content" scroll-y>
+      <view class="content-wrap">
+        <view class="title">隐私政策</view>
+        
+        <view class="section">
+          <!-- <view class="section-title">一、适用范围</view> -->
+          <view class="section-text">
+			  欢迎使用我们的产品/服务（以下统称“服务”）。我们高度重视用户隐私保护，
+			  致力于为您提供安全、可靠的服务体验。本隐私政策旨在向您说明我们如何收集、使用、存储、保护您的个人信息，
+			  以及您享有的相关权利。请您在使用我们的服务前，仔细阅读并理解本政策全部内容，
+			  一旦您使用我们的服务，即视为您同意本政策的所有条款。
+			   一、我们收集的个人信息 为了向您提供更优质、个性化的服务，我们会根据服务功能的需要，收集您主动提供或在使用服务过程中产生的个人信息，
+			   具体如下： （一）您主动提供的信息 账户注册信息：当您注册我们的账户时，您可能需要提供姓名、手机号码、电子邮箱、密码等信息，用于身份验证、账户登录及找回。
+				服务相关信息：根据您使用的具体服务，您可能需要提供相关补充信息（如使用客服咨询服务时，提供问题描述及相关凭证；使用交易类服务时，提供收货地址、支付相关信息等）。
+				 自愿提交的信息：您主动向我们反馈的意见、建议，或参与我们的问卷调查、活动时提交的相关信息。
+				 若您通过第三方平台（如微信、支付宝、QQ等）登录我们的服务，我们会根据您的授权，
+				 从第三方获取您的相关账户信息（如昵称、头像），用于完成登录及账户绑定，
+				 我们不会获取第三方平台的其他未授权信息。
+          
+          </view>
+        </view>
+
+      </view>
+    </scroll-view>
+	    <!-- 底部同意按钮（新增） -->
+	  <!--  <view class="agree-btn-wrap" v-if="needAgree">
+	      <button class="agree-btn" @click="agreePrivacy">同意隐私政策</button>
+	    </view> -->
+  </view>
+</template>
+
+<script setup>
+import { onLoad } from '@dcloudio/uni-app';
+
+// 返回上一页
+// const navigateBack = () => {
+//   uni.navigateBack({
+//     delta: 1
+//   });
+// };
+// 页面加载
+// onLoad((options) => {
+//   // 判断是否需要同意
+//   if (options.needAgree === '1') {
+//     needAgree.value = true;
+//   }
+// });
+
+// 返回上一页
+// const goToBack = () => {
+//   uni.navigateBack({
+//     delta: 1
+//   });
+// };
+
+// 同意隐私政策（新增）
+// const agreePrivacy = () => {
+//   // #ifdef MP-WEIXIN
+//   wx.requirePrivacyAuthorize({
+//     success: () => {
+//       uni.showToast({
+//         title: '已同意隐私政策',
+//         icon: 'success'
+//       });
+//       // 记录授权状态（可选，存入本地缓存）
+//       uni.setStorageSync('privacyAgreed', true);
+//       navigateBack();
+//     },
+//     fail: () => {
+//       uni.showToast({
+//         title: '授权失败',
+//         icon: 'none'
+//       });
+//     }
+//   });
+//   // #endif
+  
+//   // 非微信小程序直接标记同意
+//   // #ifndef MP-WEIXIN
+//   uni.setStorageSync('privacyAgreed', true);
+//   uni.showToast({
+//     title: '已同意隐私政策',
+//     icon: 'success'
+//   });
+//   navigateBack();
+//   // #endif
+// };
+</script>
+
+<style scoped>
+.privacy-page {
+  min-height: 100vh;
+  background-color: #f8f8f8;
+}
+
+/* 导航栏 */
+.nav-bar {
+  display: flex;
+  align-items: center;
+  padding: 20rpx;
+  background-color: #fff;
+  border-bottom: 1rpx solid #eee;
+}
+.nav-back {
+  display: flex;
+  align-items: center;
+}
+.back-text {
+  font-size: 30rpx;
+  color: #333;
+  margin-left: 10rpx;
+}
+.nav-title {
+  font-size: 32rpx;
+  font-weight: 500;
+  margin-left: 60rpx;
+}
+
+/* 协议内容 */
+.privacy-content {
+  height: calc(100vh - 88rpx);
+}
+.content-wrap {
+  padding: 30rpx;
+}
+.title {
+  font-size: 28rpx;
+  font-weight: 600;
+  text-align: center;
+  margin-bottom: 40rpx;
+  color: #333;
+}
+.section {
+  margin-bottom: 30rpx;
+  padding: 0 20rpx;
+}
+.section-title {
+  font-size: 30rpx;
+  font-weight: 500;
+  color: #333;
+  margin-bottom: 10rpx;
+}
+.section-text {
+  font-size: 28rpx;
+  line-height: 1.6;
+  color: #666;
+}
+/* 同意按钮样式（新增） */
+.agree-btn-wrap {
+  padding: 20rpx;
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  background-color: #fff;
+  border-top: 1rpx solid #eee;
+}
+.agree-btn {
+  background-color: #007aff;
+  color: #fff;
+  border-radius: 8rpx;
+  height: 88rpx;
+  font-size: 32rpx;
+}
+</style>
\ No newline at end of file
diff --git a/wuye-manager-uniapp/pageSubPack/loginSub/pwd-login.vue b/wuye-manager-uniapp/pageSubPack/loginSub/pwd-login.vue
index 0a8c2b4..9d3c54e 100644
--- a/wuye-manager-uniapp/pageSubPack/loginSub/pwd-login.vue
+++ b/wuye-manager-uniapp/pageSubPack/loginSub/pwd-login.vue
@@ -1,263 +1,282 @@
 <template>
-  <view class="login-page">
-	  <view class="status_bar"></view>
-    <!-- 标题 -->
-    <view class="login-title">账号密码登录</view>
+	<view class="login-page">
+		<view class="status_bar"></view>
+		<!-- 标题 -->
+		<view class="login-title">账号密码登录</view>
 
-    <!-- 手机号输入框 -->
-    <view class="input-item">
-      <view class="input-icon">
-        <!-- <uni-icons type="phone" size="24" color="#999"></uni-icons> -->
-		<image src="http://47.104.199.163:9090/images/login/phone.png" mode="" style="height: 100%;width: 100%;"></image>
-      </view>
-	  <uni-easyinput  class="input-content"  type="text" v-model="phoneNumber"
-	   placeholder="请输入帐号" :inputBorder="false"  :placeholderStyle="placeholderStyle">
-	   </uni-easyinput>
-    </view>
+		<!-- 手机号输入框 -->
+		<view class="input-item">
+			<view class="input-icon">
+				<!-- <uni-icons type="phone" size="24" color="#999"></uni-icons> -->
+				<image src="http://47.104.199.163:9090/images/login/phone.png" mode=""
+					style="height: 100%;width: 100%;"></image>
+			</view>
+			<uni-easyinput class="input-content" type="text" v-model="phoneNumber" placeholder="请输入帐号"
+				:inputBorder="false" :placeholderStyle="placeholderStyle">
+			</uni-easyinput>
+		</view>
 
-    <!-- 密码输入框 -->
-    <view class="input-item">
-      <view class="input-icon">
-        <!-- <uni-icons type="locked" size="24" color="#999"></uni-icons> -->
-		<image src="http://47.104.199.163:9090/images/login/password.png" mode="" style="height: 100%;width: 100%;"></image>
-      </view>
-	  <uni-easyinput  class="input-content"  type="password" v-model="password"
-	   placeholder="请输入密码" :inputBorder="false"  :placeholderStyle="placeholderStyle">
-	   </uni-easyinput>
+		<!-- 密码输入框 -->
+		<view class="input-item">
+			<view class="input-icon">
+				<!-- <uni-icons type="locked" size="24" color="#999"></uni-icons> -->
+				<image src="http://47.104.199.163:9090/images/login/password.png" mode=""
+					style="height: 100%;width: 100%;"></image>
+			</view>
+			<uni-easyinput class="input-content" type="password" v-model="password" placeholder="请输入密码"
+				:inputBorder="false" :placeholderStyle="placeholderStyle">
+			</uni-easyinput>
 
-    </view>
+		</view>
 
-    <!-- 协议勾选 + 忘记密码 -->
-    <view class="agreement-wrap">
-      <view class="agreement-item" @click="toggleAgreement">
-        <uni-icons
-          type="checkbox-filled"
-          size="24"
-          color="#4D5DFA"
-          v-if="agreeAgreement"
-        ></uni-icons>
-        <uni-icons
-          type="checkbox"
-          size="24"
-          color="#999"
-          v-else
-        ></uni-icons>
-        <text class="agreement-text">我已阅读并同意《用户隐私政策》</text>
-      </view>
-      <navigator class="forget-pwd" url="/pageSubPack/loginSub/forget-pwd">忘记密码？</navigator>
-    </view>
+		<!-- 协议勾选 + 忘记密码 -->
+		<view class="agreement-wrap">
+			<view class="agreement-item">
+				<view @click="toggleAgreement">
+					<uni-icons type="checkbox-filled" size="24" color="#4D5DFA" v-if="agreeAgreement"></uni-icons>
+					<uni-icons type="checkbox" size="24" color="#999" v-else></uni-icons>
+				</view>
+				<text class="agreement-text" @click.stop="goToPrivacy">我已阅读并同意
+					<text class="agreePrivacy" :class="{active:isClicked}">《用户隐私政策》</text>
+				</text>
+			</view>
+			<navigator class="forget-pwd" url="/pageSubPack/loginSub/forget-pwd">忘记密码？</navigator>
+		</view>
 
-    <!-- 登录按钮 -->
-    <button
-      class="login-btn"
-	  :disabled="!canLogin"
-      @click="handleLogin"
-    >
-      登录
-    </button>
+		<!-- 登录按钮 -->
+		<button class="login-btn" :disabled="!canLogin" @click="handleLogin">
+			登录
+		</button>
 
-    <!-- 底部链接 -->
-    <view class="bottom-link">
-      <navigator class="link-item" url="/pageSubPack/loginSub/login">验证码登录</navigator>
-      <navigator class="link-item" url="/pageSubPack/loginSub/register-new-user">注册新用户</navigator>
-    </view>
-  </view>
+		<!-- 底部链接 -->
+		<view class="bottom-link">
+			<navigator class="link-item" url="/pageSubPack/loginSub/login">验证码登录</navigator>
+			<navigator class="link-item" url="/pageSubPack/loginSub/register-new-user">注册新用户</navigator>
+		</view>
+	</view>
 </template>
 
 <script setup>
-import { ref, computed } from 'vue';
-import {onLoad} from "@dcloudio/uni-app"
-import {getLoginPassword} from '../api/api.js'
+	import {
+		ref,
+		computed
+	} from 'vue';
+	import {
+		onLoad
+	} from "@dcloudio/uni-app"
+	import {
+		getLoginPassword
+	} from '../api/api.js'
 
-// 响应式数据
-const phoneNumber = ref('');
-const password = ref('');
-const agreeAgreement = ref(true); // 默认勾选
-const placeholderStyle = ref('font-size:24rpx')
+	// 响应式数据
+	const phoneNumber = ref('');
+	const password = ref('');
+	const agreeAgreement = ref(false); // 默认勾选
+	const placeholderStyle = ref('font-size:24rpx')
+	// 控制点击变色
+	const isClicked = ref(false)
 
-// 计算属性：是否可登录（帐号+密码+协议都满足）
-const canLogin = computed(() => {
-  const phoneReg = /^[a-zA-Z0-9_-]{4,16}$/; // 4-16位
-  const pwdReg = /^.{6,16}$/; // 密码6-16位
-  return phoneReg.test(phoneNumber.value) && pwdReg.test(password.value) && agreeAgreement.value;
-});
-
-// 切换协议勾选
-const toggleAgreement = () => {
-  agreeAgreement.value = !agreeAgreement.value;
-};
-
-// 检查表单
-const checkForm = () => {};
-
-
-onLoad(() =>{
-});
-
-// 登录逻辑
-const handleLogin = () => {
-  // if (!canLogin.value) {
-	 //  uni.showToast({ title: '请输入账号和密码', icon: 'none' });
-	 //  return
-  // }
-
- //  if (!phoneNumber.value) {
-	// 	uni.showToast({ title: '请输入账号', icon: 'none' });
-	// 	return;
- //  }
- //  if (!password.value) {
-	// 	uni.showToast({ title: '请输入密码', icon: 'none' });
-	// 	return;
- //  }
- //  if(!agreeAgreement.value){
-	//   uni.showToast({ title: '请勾选协议', icon: 'none' });
-	//   return;
- //  }
- //   uni.showLoading({ title: '登录中...', mask: true });
- //  	let params = {
- //  		username:phoneNumber.value,
- //  		password:password.value
- //  	}
- //  	getLoginPassword(params).then(res =>{
- //  		console.log('33333',res)
- //  		if(res.code === 200){
- //  			uni.setStorageSync('token', res.data.token);
-	// 		// 存用户ID
-	// 		if(res.data) {
-	// 			// 存当前绑定的小区ID，0 表示未绑定
-	// 			const currentVillageId = res.data.currentVillageId || 0;
-	// 			uni.setStorageSync('currentVillageId', currentVillageId);
-	// 		}
-	// 		uni.hideLoading();
-	// 		uni.showToast({ title: '登录成功', icon: 'success' });
-	// 		setTimeout(() =>{
-	// 			uni.switchTab({
-	// 			  url: '/pages/index/index'
-	// 			},1000);
-	// 		})
- //  		}else{
- //  			uni.showToast({ title: res.msg, icon: 'error' });
- //  		}
-
- //  	}).catch(err => {
-	// 	uni.showToast({
-	// 			title: '网络异常',
-	// 			icon: 'error'
-	// 		});
-	// })
-
-	// 测试
-	uni.showLoading({
-	  title: '登录中...',
-	  mask:true
+	// 计算属性：是否可登录（帐号+密码+协议都满足）
+	const canLogin = computed(() => {
+		const phoneReg = /^[a-zA-Z0-9_-]{4,16}$/; // 4-16位
+		const pwdReg = /^.{6,16}$/; // 密码6-16位
+		return phoneReg.test(phoneNumber.value) && pwdReg.test(password.value) && agreeAgreement.value;
 	});
-	setTimeout(() => {
-	      uni.switchTab({ url: '/pages/index/index' });
-	    }, 1500);
+
+	// 切换协议勾选
+	const toggleAgreement = () => {
+		agreeAgreement.value = !agreeAgreement.value;
+	};
+	// 跳转隐私协议
+	const goToPrivacy = () => {
+	  // 点击变色
+	  isClicked.value = true
+	  uni.navigateTo({
+	    url:'/pageSubPack/loginSub/privacy',
+	  })
+	}
+
+	// 检查表单
+	const checkForm = () => {};
+
+
+	onLoad(() => {});
+
+	// 登录逻辑
+	const handleLogin = () => {
+		// if (!canLogin.value) {
+		//  uni.showToast({ title: '请输入账号和密码', icon: 'none' });
+		//  return
+		// }
+
+		//  if (!phoneNumber.value) {
+		// 	uni.showToast({ title: '请输入账号', icon: 'none' });
+		// 	return;
+		//  }
+		//  if (!password.value) {
+		// 	uni.showToast({ title: '请输入密码', icon: 'none' });
+		// 	return;
+		//  }
+		//  if(!agreeAgreement.value){
+		//   uni.showToast({ title: '请勾选协议', icon: 'none' });
+		//   return;
+		//  }
+		//   uni.showLoading({ title: '登录中...', mask: true });
+		//  	let params = {
+		//  		username:phoneNumber.value,
+		//  		password:password.value
+		//  	}
+		//  	getLoginPassword(params).then(res =>{
+		//  		console.log('33333',res)
+		//  		if(res.code === 200){
+		//  			uni.setStorageSync('token', res.data.token);
+		// 		// 存用户ID
+		// 		if(res.data) {
+		// 			// 存当前绑定的小区ID，0 表示未绑定
+		// 			const currentVillageId = res.data.currentVillageId || 0;
+		// 			uni.setStorageSync('currentVillageId', currentVillageId);
+		// 		}
+		// 		uni.hideLoading();
+		// 		uni.showToast({ title: '登录成功', icon: 'success' });
+		// 		setTimeout(() =>{
+		// 			uni.switchTab({
+		// 			  url: '/pages/index/index'
+		// 			},1000);
+		// 		})
+		//  		}else{
+		//  			uni.showToast({ title: res.msg, icon: 'error' });
+		//  		}
+
+		//  	}).catch(err => {
+		// 	uni.showToast({
+		// 			title: '网络异常',
+		// 			icon: 'error'
+		// 		});
+		// })
+
+		// 测试
+		uni.showLoading({
+			title: '登录中...',
+			mask: true
+		});
+		setTimeout(() => {
+			uni.switchTab({
+				url: '/pages/index/index'
+			});
+		}, 1500);
 		uni.hideLoading()
 
-};
+	};
 </script>
 
 <style scoped>
-.login-page {
-  padding: 80rpx 40rpx 40rpx;
-  /* background-color: #f8f9fa; */
-  min-height: 100vh;
-   background: repeating-linear-gradient(180deg, #E2F0FF, #F6FAFF );
-}
- .status_bar {
-	 height: 160px;
-	 width: 100%;
+	.login-page {
+		padding: 80rpx 40rpx 40rpx;
+		/* background-color: #f8f9fa; */
+		min-height: 100vh;
+		background: repeating-linear-gradient(180deg, #E2F0FF, #F6FAFF);
 	}
-.login-title {
-  font-size: 48rpx;
-  font-weight: 600;
-  color: #333;
-  text-align: center;
-  margin-bottom: 80rpx;
-}
 
-.input-item {
-  display: flex;
-  align-items: center;
-  background-color: #fff;
-  border-radius: 40rpx;
-  padding: 0 30rpx;
-  height: 88rpx;
-  margin-bottom: 30rpx;
-  box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
-}
+	.status_bar {
+		height: 160px;
+		width: 100%;
+	}
 
-.input-icon {
-  margin-right: 20rpx;
-  width: 50rpx;
-  height: 50rpx;
-}
+	.login-title {
+		font-size: 48rpx;
+		font-weight: 600;
+		color: #333;
+		text-align: center;
+		margin-bottom: 80rpx;
+	}
 
-.input-content {
-  flex: 1;
-  font-size: 28rpx;
-  color: #333;
-  height: 100%;
-}
+	.input-item {
+		display: flex;
+		align-items: center;
+		background-color: #fff;
+		border-radius: 40rpx;
+		padding: 0 30rpx;
+		height: 88rpx;
+		margin-bottom: 30rpx;
+		box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+	}
 
-.agreement-wrap {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin: 40rpx 0;
-  padding: 0 10rpx;
-}
+	.input-icon {
+		margin-right: 20rpx;
+		width: 50rpx;
+		height: 50rpx;
+	}
 
-.agreement-item {
-  display: flex;
-  align-items: center;
-}
+	.input-content {
+		flex: 1;
+		font-size: 28rpx;
+		color: #333;
+		height: 100%;
+	}
 
-.agreement-text {
-  font-size: 28rpx;
-  color: #666;
-  margin-left: 10rpx;
-}
+	.agreement-wrap {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		margin: 40rpx 0;
+		padding: 0 10rpx;
+	}
 
-.forget-pwd {
-  font-size: 28rpx;
-  color: #4D5DFA;
-  text-decoration: none;
-}
+	.agreement-item {
+		display: flex;
+		align-items: center;
+	}
 
-.login-btn {
-  width: 100%;
-  height: 88rpx;
-  line-height: 88rpx;
-  background-color: #4D5DFA;
-  color: #fff;
-  border-radius: 44rpx;
-  font-size: 32rpx;
-  margin-bottom: 60rpx;
-}
+	.agreement-text {
+		font-size: 28rpx;
+		color: #666;
+		margin-left: 10rpx;
+	}
+	.agreePrivacy{
+		color: #666;
+	}
+	.agreePrivacy.active{
+		color: #4D5DFA;
+	}
 
-.login-btn:disabled {
-  background-color: #99c8ff;
-  color: #fff;
-  /* border-radius: 50px; */
+	.forget-pwd {
+		font-size: 28rpx;
+		color: #4D5DFA;
+		text-decoration: none;
+	}
 
-}
-/* 禁用按钮边框 */
-button:after{
-	border-radius:  50px;
-}
+	.login-btn {
+		width: 100%;
+		height: 88rpx;
+		line-height: 88rpx;
+		background-color: #4D5DFA;
+		color: #fff;
+		border-radius: 44rpx;
+		font-size: 32rpx;
+		margin-bottom: 60rpx;
+	}
 
-.bottom-link {
-  display: flex;
-  justify-content: space-between;
-  padding: 0 20rpx;
-}
+	.login-btn:disabled {
+		background-color: #99c8ff;
+		color: #fff;
+		/* border-radius: 50px; */
 
-.link-item {
-  font-size: 28rpx;
-  color: #4D5DFA;
-  text-decoration: none;
-}
+	}
+
+	/* 禁用按钮边框 */
+	button:after {
+		border-radius: 50px;
+	}
+
+	.bottom-link {
+		display: flex;
+		justify-content: space-between;
+		padding: 0 20rpx;
+	}
+
+	.link-item {
+		font-size: 28rpx;
+		color: #4D5DFA;
+		text-decoration: none;
+	}
 </style>
\ No newline at end of file
diff --git a/wuye-manager-uniapp/pageSubPack/report-record/repairSelect.vue b/wuye-manager-uniapp/pageSubPack/report-record/repairSelect.vue
new file mode 100644
index 0000000..0234a63
--- /dev/null
+++ b/wuye-manager-uniapp/pageSubPack/report-record/repairSelect.vue
@@ -0,0 +1,141 @@
+<template>
+  <view class="select-container">
+    <!-- 搜索框 -->
+    <view class="search-bar">
+      <input type="text" placeholder="请输入关键字搜索" v-model="searchKey" />
+      <uni-icons type="search" size="18"></uni-icons>
+    </view>
+
+    <!-- 分类选择 -->
+    <view class="category-wrap">
+      <!-- 左侧分类 -->
+      <scroll-view scroll-y class="category-left">
+        <view 
+          class="category-item" 
+          :class="{ active: activeCategory === item.id }"
+          @click="selectCategory(item)"
+          v-for="item in categoryList" 
+          :key="item.id"
+        >
+          {{ item.name }}
+        </view>
+      </scroll-view>
+
+      <!-- 右侧项目 -->
+      <scroll-view scroll-y class="category-right">
+        <view 
+          class="project-item"
+          @click="selectProject(item)"
+          v-for="item in currentProjectList" 
+          :key="item.id"
+        >
+          {{ item.name }}
+        </view>
+      </scroll-view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import { ref, computed } from 'vue'
+// import { uniNavigateTo } from '@dcloudio/uni-app'
+
+// 分类列表
+const categoryList = ref([
+  { id: 1, name: '基础设施' },
+  { id: 2, name: '电子设施' }
+])
+
+// 所有项目数据
+const projectList = ref([
+  { id: 101, categoryId: 1, name: '路灯' },
+  { id: 102, categoryId: 1, name: '楼层指示灯' },
+  { id: 103, categoryId: 2, name: '应急出口灯' },
+  { id: 104, categoryId: 1, name: '草坪灯' }
+])
+
+// 选中的分类
+const activeCategory = ref(1)
+// 搜索关键词
+const searchKey = ref('')
+
+// 筛选当前分类的项目（含搜索）
+const currentProjectList = computed(() => {
+  let list = projectList.value.filter(item => item.categoryId === activeCategory.value)
+  if (searchKey.value) {
+    list = list.filter(item => item.name.includes(searchKey.value))
+  }
+  return list
+})
+
+// 选择分类
+const selectCategory = (item) => {
+  activeCategory.value = item.id
+}
+
+// 选择项目并跳转到维修项目填写页
+const selectProject = (item) => {
+  // 获取分类名称
+  const categoryName = categoryList.value.find(c => c.id === item.categoryId)?.name
+  // 跳转并传参
+  uni.navigateTo({
+    url: `/pageSubPack/report-record/report-record?category=${categoryName}&project=${item.name}`
+  })
+}
+</script>
+
+<style scoped>
+.select-container {
+  padding: 10px;
+  height: 100vh;
+  box-sizing: border-box;
+}
+.search-bar {
+  display: flex;
+  align-items: center;
+  padding: 8px 10px;
+  background: #f5f5f5;
+  border-radius: 6px;
+  margin-bottom: 10px;
+}
+.search-bar input {
+  flex: 1;
+  font-size: 14px;
+}
+.category-wrap {
+  display: flex;
+  height: calc(100% - 50px);
+}
+.category-left {
+  width: 120px;
+  height: 100%;
+  background: #f8f8f8;
+  border-radius: 6px 0 0 6px;
+}
+.category-item {
+  padding: 15px 10px;
+  text-align: center;
+  font-size: 14px;
+  border-bottom: 1px solid #eee;
+}
+.category-item.active {
+  background: #fff;
+  color: #007aff;
+  font-weight: bold;
+}
+.category-right {
+  flex: 1;
+  height: 100%;
+  background: #fff;
+  border-radius: 0 6px 6px 0;
+  padding: 10px;
+}
+.project-item {
+  padding: 12px 10px;
+  font-size: 14px;
+  border-bottom: 1px solid #eee;
+}
+.project-item:active {
+  background: #f5f5f5;
+}
+</style>
\ No newline at end of file
diff --git a/wuye-manager-uniapp/pageSubPack/report-record/report-record.vue b/wuye-manager-uniapp/pageSubPack/report-record/report-record.vue
index 4bd1673..9f87afa 100644
--- a/wuye-manager-uniapp/pageSubPack/report-record/report-record.vue
+++ b/wuye-manager-uniapp/pageSubPack/report-record/report-record.vue
@@ -1,373 +1,245 @@
 <template>
-  <view class="report-record-page">
-	  <view class="status-bar"></view>
-    <!-- 顶部导航栏 -->
-    <uni-nav-bar 
-      left-icon="back" 
-      title="上报记录" 
-	  backgroundColor="transparent"
-	  :border= "false"
-      @clickLeft="navBack"/>
-
-    <!-- 状态筛选标签 -->
-    <view class="status-tabs">
-      <view 
-        v-for="item in statusTabs" 
-        :key="item.value"
-        class="status-tab-item"
-        :class="{ active: activeStatus === item.value }"
-        @tap="switchStatus(item.value)"
-      >
-        {{ item.label }}
+  <view class="form-container">
+    <!-- 维修项目展示 -->
+    <view class="form-item">
+      <text class="label">维修项目</text>
+      <view class="value" @click="goBackSelect">
+		  <view>
+			  <text v-if="!repairProject">请选择项目</text>
+			  {{ repairProject }}
+		</view>
+        <uni-icons type="arrowright" size="16"></uni-icons>
       </view>
     </view>
 
-    <!-- 类型筛选标签 -->
-    <view class="type-tabs">
-      <view 
-        v-for="item in typeTabs" 
-        :key="item.value"
-        class="type-tab-item"
-        :class="{ active: activeType === item.value }"
-        @tap="switchType(item.value)"
-      >
-        {{ item.label }}
+    <!-- 标题输入 -->
+    <view class="form-item">
+      <text class="label">标题</text>
+      <!-- <input type="text" placeholder="请输入问题标题" v-model="form.title" /> -->
+	  <uni-easyinput v-model="form.title" placeholder="请输入内容" :inputBorder="false"></uni-easyinput>
+    </view>
+
+    <!-- 问题描述 -->
+    <view class="form-item-wenti">
+      <text class="label">问题描述</text>
+      <!-- <textarea placeholder="请输入问题内容" v-model="form.desc" rows="5" ></textarea> -->
+	  <uni-easyinput v-model="form.desc" placeholder="请描述你的问题" type="textarea"></uni-easyinput>
+    </view>
+
+    <!-- 手机号 -->
+    <view class="form-item">
+      <text class="label">手机号</text>
+	  <uni-easyinput type="number" v-model="form.phone" placeholder="请输入手机号" :inputBorder="false"></uni-easyinput>
+    </view>
+
+    <!-- 图片上传 -->
+    <view class="form-item-wenti">
+      <text class="label">问题照片</text>
+      <view class="upload-wrap">
+        <!-- 已上传图片 -->
+        <view class="upload-item" v-for="(img, index) in form.images" :key="index">
+          <image :src="img" mode="aspectFill"></image>
+          <uni-icons type="close" size="16" @click="deleteImage(index)"></uni-icons>
+        </view>
+        <!-- 上传按钮 -->
+        <view class="upload-btn" @click="chooseImage">
+          <uni-icons type="plus" size="24"></uni-icons>
+          <text>上传照片</text>
+        </view>
       </view>
     </view>
 
-    <!-- 上报记录列表 -->
-    <scroll-view 
-      class="record-list" 
-      scroll-y 
-      :style="{ height: `calc(100vh - ${navHeight + statusTabHeight + typeTabHeight}px)` }"
-    >
-      <!-- 空状态 -->
-      <view v-if="filteredRecords.length === 0" class="empty-state">
-        <uni-icons type="empty" size="60" color="#ccc"></uni-icons>
-        <text class="empty-text">暂无上报记录</text>
-      </view>
-
-      <!-- 记录卡片 -->
-      <view 
-        v-for="record in filteredRecords" 
-        :key="record.id"
-        class="record-card"
-      >
-        <!-- 标题 + 状态标签 -->
-        <view class="card-header">
-          <text class="card-title">{{ record.title }}</text>
-          <view class="status-tag" :class="record.status">
-            {{ getStatusText(record.status) }}
-          </view>
-        </view>
-
-        <!-- 类型标签 -->
-        <view class="tag-group">
-          <view class="tag-item">{{ record.reportType }}</view>
-          <view class="tag-item">{{ record.category }}</view>
-        </view>
-
-        <!-- 内容 -->
-        <view class="card-content">
-          {{ record.content }}
-        </view>
-
-        <!-- 底部信息 -->
-        <view class="card-footer">
-          <text class="create-time">{{ record.createTime }}</text>
-          <text v-if="record.repairman" class="repairman">维修师傅：{{ record.repairman }}</text>
-        </view>
-      </view>
-    </scroll-view>
+    <!-- 提交按钮 -->
+    <button class="submit-btn" @click="submitForm">提交</button>
   </view>
 </template>
 
 <script setup>
-import { ref, computed } from 'vue'
-import {onReady} from "@dcloudio/uni-app"
+import { ref } from 'vue'
+import{onLoad} from "@dcloudio/uni-app"
+// import { onLoad, uniShowToast, uniNavigateBack, uniChooseImage, uniUploadFile } from '@dcloudio/uni-app'
 
-// 导航栏/标签高度（适配不同设备）
-const navHeight = ref(44)
-const statusTabHeight = ref(88)
-const typeTabHeight = ref(88)
+// 接收上个页面传的维修项目
+const repairProject = ref('')
 
-// 筛选状态
-const activeStatus = ref('all') // 全部/待分配/待解决/已完成
-const activeType = ref('all')   // 全部/公共报修/个人报修
-
-// 状态筛选选项
-const statusTabs = ref([
-  { label: '全部', value: 'all' },
-  { label: '待分配', value: 'pending' },
-  { label: '待解决', value: 'processing' },
-  { label: '已完成', value: 'completed' }
-])
-
-// 类型筛选选项
-const typeTabs = ref([
-  { label: '全部', value: 'all' },
-  { label: '公共报修', value: 'public' },
-  { label: '个人报修', value: 'private' }
-])
-
-// 模拟上报记录数据（实际项目替换为接口请求）
-const reportRecords = ref([
-  {
-    id: 1,
-    title: '标题巴拉巴拉巴拉',
-    status: 'pending', // pending/processing/completed
-    reportType: '公共报修',
-    category: '路灯',
-    content: '1栋楼下道路路灯不亮，并且有的亮度不够，请物业公司及时更换，防止发生意外事故。',
-    createTime: '2026-08-01 10:05:46',
-    repairman: ''
-  },
-  {
-    id: 2,
-    title: '标题巴拉巴拉巴拉',
-    status: 'processing',
-    reportType: '公共报修',
-    category: '路灯',
-    content: '1栋楼下道路路灯不亮，并且有的亮度不够，请物业公司及时更换，防止发生意外事故。',
-    createTime: '2026-08-01 10:05:46',
-    repairman: '张三'
-  },
-  {
-    id: 3,
-    title: '标题巴拉巴拉巴拉',
-    status: 'completed',
-    reportType: '公共报修',
-    category: '路灯',
-    content: '1栋楼下道路路灯不亮，并且有的亮度不够，请物业公司及时更换，防止发生意外事故。',
-    createTime: '2026-08-01 10:05:46',
-    repairman: '张三'
-  }
-])
-
-// 筛选后的记录
-const filteredRecords = computed(() => {
-  return reportRecords.value.filter(record => {
-    // 状态筛选
-    const statusMatch = activeStatus.value === 'all' || record.status === activeStatus.value
-    // 类型筛选
-    const typeMatch = activeType.value === 'all' || record.reportType === typeTabs.value.find(item => item.value === activeType.value)?.label
-    return statusMatch && typeMatch
-  })
+// 表单数据
+const form = ref({
+  title: '',
+  desc: '',
+  phone: '',
+  images: [] // 图片列表
 })
 
-// 切换状态（全部/待分配/待解决/已完成）筛选
-const switchStatus = (value) => {
-  activeStatus.value = value
-}
-
-// 切换类型（公共/个人）筛选
-const switchType = (value) => {
-  activeType.value = value
-}
-
-// 返回上一页
-const navBack = () => {
-  uni.switchTab({
-  	url:"/pages/my/my"
-  })
-}
-
-// 获取状态文本
-const getStatusText = (status) => {
-  const statusMap = {
-    pending: '待分配',
-    processing: '待解决',
-    completed: '已完成'
+// 页面加载时获取传参
+onLoad((options) => {
+  if (options.category && options.project) {
+    repairProject.value = `${options.category}-${options.project}`
   }
-  return statusMap[status] || ''
+})
+
+// 返回选择项目页
+const goBackSelect = () => {
+	uni.navigateTo({
+		url:"/pageSubPack/report-record/repairSelect"
+	})
+  // uni.navigateBack({
+  //   delta: 1
+  // })
 }
 
-// 页面渲染完成后适配高度
-onReady(() => {
-  // 可根据实际设备调整高度
-  uni.getSystemInfo({
+// 选择图片
+const chooseImage = () => {
+  uni.chooseImage({
+    count: 3, // 最多选3张
+    sizeType: ['original', 'compressed'],
+    sourceType: ['album', 'camera'],
     success: (res) => {
-      if (res.platform === 'ios') {
-        navHeight.value = 44
-      } else {
-        navHeight.value = 48
-      }
+      // 临时文件路径
+      const tempFilePaths = res.tempFilePaths
+      form.value.images = [...form.value.images, ...tempFilePaths]
+      
+      // 【可选】如果需要上传到服务器，取消下面注释
+      // tempFilePaths.forEach(path => {
+      //   uni.uploadFile({
+      //     url: '你的上传接口地址',
+      //     filePath: path,
+      //     name: 'file',
+      //     success: (uploadRes) => {
+      //       console.log('上传成功', uploadRes)
+      //     }
+      //   })
+      // })
     }
   })
-})
+}
+
+// 删除图片
+const deleteImage = (index) => {
+  form.value.images.splice(index, 1)
+}
+
+// 表单提交
+const submitForm = () => {
+  // 表单校验
+  if (!repairProject.value) {
+    uni.showToast({ title: '请选择维修项目', icon: 'none' })
+    return
+  }
+  if (!form.value.title) {
+    uni.showToast({ title: '请输入问题标题', icon: 'none' })
+    return
+  }
+  if (!form.value.desc) {
+    uni.showToast({ title: '请输入问题描述', icon: 'none' })
+    return
+  }
+  if (!/^1[3-9]\d{9}$/.test(form.value.phone)) {
+    uni.showToast({ title: '请输入正确的手机号', icon: 'none' })
+    return
+  }
+
+  // 提交数据（替换成你的接口）
+  uni.showLoading({ title: '提交中...' })
+  
+  // 模拟接口请求
+  setTimeout(() => {
+    uni.hideLoading()
+    uni.showToast({ title: '提交成功', icon: 'success' })
+    
+    // 提交成功后重置表单/返回上一页
+    form.value = { title: '', desc: '', phone: '', images: [] }
+    // 或返回上一页
+    uni.navigateBack({ delta: 3 })
+  }, 1000)
+}
 </script>
 
 <style scoped>
-.report-record-page {
-  width: 100%;
-  height: 100vh;
-  background: linear-gradient(to left bottom, #e2efff 0%, #f9f9f9 50%)
+.form-container {
+  padding: 30rpx 40rpx;
+  background: #fff;
+  min-height: 100vh;
 }
-.status-bar{
-	width: 100%;
-	height: 46px;
+.form-item-wenti {
+  margin-bottom: 20px;
+  border-bottom: 1px solid #eee;
+  padding-bottom: 10px;
 }
-/* 状态筛选标签 */
-.status-tabs {
+.form-item {
   display: flex;
-  /* background-color: #fff; */
-  padding: 0 20rpx;
-  height: 88rpx;
-  align-items: center;
+  margin-bottom: 30rpx;
+  align-items: flex-start;
+	border-bottom: 1px solid #eee;
 }
-
-.status-tab-item {
-  flex: 1;
-  text-align: center;
-  font-size: 32rpx;
-  color: #666;
-  height: 100%;
-  line-height: 88rpx;
-  position: relative;
-}
-
-.status-tab-item.active {
-  color: #4D5DFA;
-  font-weight: 500;
-}
-
-.status-tab-item.active::after {
-  content: '';
-  position: absolute;
-  bottom: 0;
-  left: 50%;
-  transform: translateX(-50%);
-  width: 80rpx;
-  height: 8rpx;
-  background: linear-gradient(to bottom, #4D5DFA, #BAC0FA);
-  border-radius: 6rpx;
-}
-
-/* 类型筛选标签 */
-.type-tabs {
-  display: flex;
-  /* background-color: #fff; */
-  padding: 20rpx 30rpx;
-  margin-top: 10rpx;
-  justify-content: flex-start;
-  gap: 20rpx;
-  margin: 0rpx 40rpx;
-}
-
-.type-tab-item {
-  padding: 12rpx 30rpx;
+.label {
+  width: 140rpx;
   font-size: 28rpx;
-  color: #999;
-  border: 2rpx solid #999;
-  border-radius: 25rpx;
-}
-
-.type-tab-item.active {
-  color: #4D5DFA;
-  border: 2rpx solid #4D5DFA;
-  border-radius: 25rpx;
-  /* background-color: #007AFF; */
-}
-
-/* 记录列表 */
-.record-list {
-  padding: 20rpx 40rpx;
-  box-sizing: border-box;
-}
-
-/* 空状态 */
-.empty-state {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  padding: 100rpx 0;
-  color: #ccc;
-}
-
-.empty-text {
-  font-size: 32rpx;
-  color: #999;
-  margin-top: 20rpx;
-}
-
-/* 记录卡片 */
-.record-card {
-  background-color: #fff;
-  border-radius: 16rpx;
-  padding: 30rpx;
-  margin-bottom: 20rpx;
-  box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
-}
-
-.card-header {
-  display: flex;
-  justify-content: flex-start;
-  align-items: center;
-  margin-bottom: 20rpx;
-}
-
-.card-title {
-  font-size: 32rpx;
-  font-weight: 500;
   color: #333;
-  margin-right: 20rpx;
+  line-height: 80rpx;
 }
 
-/* 状态标签 */
-.status-tag {
-  padding: 6rpx 16rpx;
-  font-size: 24rpx;
-  border-radius: 12rpx;
-  color: #fff;
-  border-radius: 198rpx;
-}
-
-.status-tag.pending {
-  background-color: #E34D59; /* 待分配-红色 */
-}
-
-.status-tag.processing {
-  background-color: #09C2BD; /* 待解决-绿色 */
-}
-
-.status-tag.completed {
-  background-color: #4D5DFA; /* 已完成-蓝色 */
-}
-
-/* 类型标签组 */
-.tag-group {
-  display: flex;
-  gap: 15rpx;
-  margin-bottom: 20rpx;
-}
-
-.tag-item {
-  padding: 6rpx 20rpx;
-  font-size: 24rpx;
-  color: #666;
-  border: 1rpx solid #999;
-  border-radius: 8rpx;
-}
-
-/* 内容 */
-.card-content {
+.value {
+  flex: 1;
   font-size: 28rpx;
   color: #666;
-  line-height: 1.6;
-  margin-bottom: 20rpx;
-}
-
-/* 底部信息 */
-.card-footer {
+  line-height: 80rpx;
+  text-align: right;
   display: flex;
   justify-content: space-between;
-  align-items: center;
-  font-size: 28rpx;
-  color: #999;
 }
-
-.repairman {
+.input, .textarea {
+  font-size: 14px;
+  width: 100%;
+  padding: 8px 0;
+  box-sizing: border-box;
+}
+.textarea {
+  resize: none;
+}
+.upload-wrap {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 10px;
+  margin-top: 8px;
+}
+.upload-item {
+  position: relative;
+  width: 80px;
+  height: 80px;
+}
+.upload-item image {
+  width: 100%;
+  height: 100%;
+  border-radius: 4px;
+}
+.upload-item uni-icons {
+  position: absolute;
+  top: -5px;
+  right: -5px;
+  background: #ff3b30;
+  color: #fff;
+  border-radius: 50%;
+  padding: 2px;
+}
+.upload-btn {
+  width: 80px;
+  height: 80px;
+  border: 1px dashed #ccc;
+  border-radius: 4px;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
   color: #999;
+  font-size: 12px;
+}
+.submit-btn {
+  width: 100%;
+  background: #4D5DFA;
+  color: #fff;
+  border-radius: 6px;
+  height: 44px;
+  line-height: 44px;
+  font-size: 16px;
 }
 </style>
\ No newline at end of file
diff --git a/wuye-manager-uniapp/pages.json b/wuye-manager-uniapp/pages.json
index aec39fb..3a9eb15 100644
--- a/wuye-manager-uniapp/pages.json
+++ b/wuye-manager-uniapp/pages.json
@@ -40,6 +40,12 @@
 						"navigationStyle": "custom"
 			          }
 			    },
+				{
+				    "path": "privacy",
+				    "style": {
+						"navigationBarTitleText": "用户隐私政策"
+				      }
+				},
 				{
 				    "path": "register-new-user",
 				    "style": {
@@ -107,8 +113,13 @@
 				{
 					"path": "report-record",
 					"style": {
-						"navigationBarTitleText": "上报记录",
-						"navigationStyle": "custom"
+						"navigationBarTitleText": "填写维修信息"
+					}
+				},
+				{
+					"path": "repairSelect",
+					"style": {
+						"navigationBarTitleText": "维修项目"
 					}
 				}
 			]
@@ -136,7 +147,7 @@
 						"navigationBarTitleText": "修改密码"
 						
 					}
-				},
+				}
 			]
 		}
 		
diff --git a/wuye-manager-uniapp/pages/index/index.vue b/wuye-manager-uniapp/pages/index/index.vue
index 13ccec3..aea886a 100644
--- a/wuye-manager-uniapp/pages/index/index.vue
+++ b/wuye-manager-uniapp/pages/index/index.vue
@@ -78,7 +78,7 @@
 		<view class="function-container">
 			<!-- 第一行功能：故障上报、一键开门、工单大厅、我的工单 -->
 			<view class="function-row">
-				<view class="function-item">
+				<view class="function-item" @click="goToReport">
 					<image class="item-icon" src="/static/imgs/fault-report.png" mode="aspectFit"></image>
 					<text class="item-text">故障上报</text>
 				</view>
@@ -157,6 +157,12 @@
 			url: "/pageSubPack/oneClickOpen/oneClickOpen"
 		})
 	}
+	// 故障上报
+	const goToReport = ()=>{
+		uni.navigateTo({
+			url: "/pageSubPack/report-record/report-record"
+		})
+	}
 	// 接收选择小区返回的参数
 	const slelctHomeData = (data) => {
 		// console.log('收到B页面返回的数据：', data)

From e0ff09374c049d5d0736ff39edf9f1a53477959d Mon Sep 17 00:00:00 2001
From: zhouyanli <593579392@qq.com>
Date: Wed, 29 Apr 2026 09:36:44 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wuye-manager-uniapp/pages.json            | 194 -----
 wuye-manager-uniapp/pages/index/index.vue | 819 ++++++++++------------
 2 files changed, 360 insertions(+), 653 deletions(-)

diff --git a/wuye-manager-uniapp/pages.json b/wuye-manager-uniapp/pages.json
index 71b9340..f36fc16 100644
--- a/wuye-manager-uniapp/pages.json
+++ b/wuye-manager-uniapp/pages.json
@@ -1,192 +1,4 @@
 {
-<<<<<<< HEAD
-	"pages": [
-		{
-			"path": "pages/guide/guide",
-			"style": {
-				"navigationBarTitleText": "引导页",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/index/index",
-			"style": {
-				"navigationBarTitleText": "工作台",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/my/my",
-			"style": {
-				"navigationBarTitleText": "我的",
-				"navigationStyle": "custom"
-			}
-		}
-	],
-	"subPackages": [
-		{
-			"root": "pageSubPack/loginSub",
-			"pages": [
-				{
-					"path": "pwd-login",
-					"style": {
-						"navigationBarTitleText": "账号登录",
-						"navigationStyle": "custom"
-					}
-				},
-			    {
-			        "path": "login",
-			        "style": {
-						"navigationBarTitleText": "手机号登录",
-						"navigationStyle": "custom"
-			          }
-			    },
-				{
-				    "path": "privacy",
-				    "style": {
-						"navigationBarTitleText": "用户隐私政策"
-				      }
-				},
-				{
-				    "path": "register-new-user",
-				    "style": {
-						"navigationBarTitleText": "注册新用户",
-						"navigationStyle": "custom"
-				      }
-				},
-				{
-				    "path": "forget-pwd",
-				    "style": {
-						"navigationBarTitleText": "忘记密码",
-						"navigationStyle": "custom"
-				      }
-				},
-				{
-				    "path": "change-pwd",
-				    "style": {
-						"navigationBarTitleText": "修改密码",
-						"navigationStyle": "custom"
-				      }
-				}
-
-
-			]
-		},
-		{
-			"root": "pageSubPack/notice-list",
-			"pages": [
-				{
-					"path": "select-community",
-					"style": {
-						"navigationBarTitleText": "选择小区"
-					}
-				},
-			    {
-			        "path": "notice-list",
-			        "style": {
-						"navigationBarTitleText": "通知公告"
-			          }
-			    },
-				{
-				    "path": "noticeListDetails",
-				    "style": {
-						"navigationBarTitleText": "公告详情"
-				      }
-				}
-
-			]
-		},
-		{
-			"root": "pageSubPack/oneClickOpen",
-			"pages": [
-				{
-					"path": "oneClickOpen",
-					"style": {
-						"navigationBarTitleText": "一键开门",
-						"navigationStyle": "custom"
-					}
-				}
-			]
-		},
-		{
-			"root": "pageSubPack/report-record",
-			"pages": [
-				{
-					"path": "report-record",
-					"style": {
-						"navigationBarTitleText": "填写维修信息"
-					}
-				},
-				{
-					"path": "repairSelect",
-					"style": {
-						"navigationBarTitleText": "维修项目"
-					}
-				}
-			]
-		},
-		{
-			"root": "pageSubPack/setting",
-			"pages": [
-				{
-					"path": "setting",
-					"style": {
-						"navigationBarTitleText": "设置",
-						"navigationStyle": "custom"
-					}
-				},
-				{
-					"path": "change-phone",
-					"style": {
-						"navigationBarTitleText": "更改手机号码"
-
-					}
-				},
-				{
-					"path": "change -password",
-					"style": {
-						"navigationBarTitleText": "修改密码"
-
-					}
-				}
-			]
-		}
-
-
-	],
-	  "easycom": {
-	    "autoscan": true,
-	    "custom": {
-	      "^uni-(.*)": "@/components/uni-$1.vue"
-	    }
-	  },
-	"tabBar": {
-		"color": "#333333",
-		"backgroundColor": "#F5F6F6",
-		"borderStyle": "white",
-		"selectedColor": "#666666",
-		"list": [
-			{
-				"pagePath": "pages/index/index",
-				"iconPath": "/static/imgs/index.png",
-				"selectedIconPath": "/static/imgs/index-lan.png",
-				"text": "工作台"
-			},
-			{
-				"pagePath": "pages/my/my",
-				"iconPath": "/static/imgs/my.png",
-				"selectedIconPath": "/static/imgs/my-lan.png",
-				"text": "我的"
-			}
-		]
-	},
-	"globalStyle": {
-		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "uni-app",
-		"navigationBarBackgroundColor": "#F8F8F8",
-		"backgroundColor": "#F8F8F8"
-	},
-	"uniIdRouter": {}
   "pages": [{
       "path": "pages/guide/guide",
       "style": {
@@ -349,12 +161,6 @@
       "^uni-(.*)": "@/components/uni-$1.vue"
     }
   },
-  "condition": {
-    "list": [{
-      "name": "巡检记录",
-      "path": "pageSubPack/inspection/inspection_record"
-    }]
-  },
   "tabBar": {
     "color": "#333333",
     "backgroundColor": "#F5F6F6",
diff --git a/wuye-manager-uniapp/pages/index/index.vue b/wuye-manager-uniapp/pages/index/index.vue
index bf51e3b..9713117 100644
--- a/wuye-manager-uniapp/pages/index/index.vue
+++ b/wuye-manager-uniapp/pages/index/index.vue
@@ -26,496 +26,397 @@
         </view>
       </view>
     </view>
-  </view>
 
+    <!-- banner -->
+    <view class="bannarClass">
+      <uni-swiper-dot class="uni-swiper-dot-box" @clickItem="clickItem" :info="bannerList" :current="current" mode="round">
+        <swiper class="swiper-box" :current="current" autoplay>
+          <swiper-item v-for="(item, index) in bannerList" :key="index">
+            <view class="swiper-item">
+              <image :src="item.img" style="width: 100%;height: 100%;"></image>
+            </view>
+          </swiper-item>
+        </swiper>
+      </uni-swiper-dot>
+    </view>
 
-
-
-  <!-- banner -->
-  <view class="bannarClass">
-    <uni-swiper-dot class="uni-swiper-dot-box" @clickItem=clickItem :info="bannerList" :current="current" :mode="mode">
-      <swiper class="swiper-box" :current="swiperDotIndex" :autoplay="true">
-        <swiper-item v-for="(item, index) in bannerList" :key="index">
-          <view class="swiper-item">
-            <image :src="item.img" style="width: 100%;height: 100%;"></image>
-          </view>
-        </swiper-item>
-      </swiper>
-    </uni-swiper-dot>
-  </view>
-  <!-- 巡检 -->
-  <view class="inspectionClass">
-    <!-- 消息通知栏 -->
-    <view class="noticeClass">
-      <!-- 左侧消息通知文字 -->
-      <view class="notice-left">
-        <image src="/static/imgs/notice.png" class="notice-icon"></image>
+    <!-- 巡检 -->
+    <view class="inspectionClass">
+      <!-- 消息通知栏 -->
+      <view class="noticeClass">
+        <!-- 左侧消息通知文字 -->
+        <view class="notice-left">
+          <image src="/static/imgs/notice.png" class="notice-icon"></image>
+        </view>
+        <!-- 右侧滚动公告 -->
+        <view class="notice-right" @click="getNoticeMore">
+          <uni-notice-bar :text="noticeText" type="line" :showIcon="false" show-get-more scrollable color="#fff"
+            background-color="transparent" moreColor="#fff" no-border>
+          </uni-notice-bar>
+        </view>
       </view>
-      <!-- 右侧滚动公告 -->
-      <view class="notice-right" @click="getNoticeMore">
-        <uni-notice-bar :text="noticeText" type="line" :showIcon="false" show-get-more scrollable color="#fff"
-          background-color="transparent" moreColor="#fff" no-border>
-        </uni-notice-bar>
+
+      <!-- 巡检数据统计区 -->
+      <view class="statistics-wrap">
+        <view class="statistics-item" @click="goToInspectionRecord">
+          <text class="num">25</text>
+          <text class="label">全部巡检点</text>
+        </view>
+        <view class="statistics-item" @click="goToDaysInspection">
+          <text class="num">5</text>
+          <text class="label">待巡检点</text>
+        </view>
+        <view class="statistics-item">
+          <text class="num">25</text>
+          <text class="label">已巡检点</text>
+        </view>
       </view>
     </view>
 
-    <!-- 巡检数据统计区 -->
-    <view class="statistics-wrap">
-      <view class="statistics-item">
-        <text class="num">25</text>
-        <text class="label">巡检点</text>
+    <!-- 网格布局功能 -->
+    <view class="function-container">
+      <!-- 第一行功能：故障上报、一键开门、工单大厅、我的工单 -->
+      <view class="function-row">
+        <view class="function-item">
+          <image class="item-icon" src="/static/imgs/fault-report.png" mode="aspectFit"></image>
+          <text class="item-text">故障上报</text>
+        </view>
+        <view class="function-item" @click="goToOneOpenDoor">
+          <image class="item-icon" src="/static/imgs/open.png" mode="aspectFit"></image>
+          <text class="item-text">一键开门</text>
+        </view>
+        <view class="function-item">
+          <image class="item-icon" src="/static/imgs/work-order.png" mode="aspectFit"></image>
+          <text class="item-text">工单大厅</text>
+        </view>
+        <view class="function-item">
+          <image class="item-icon" src="/static/imgs/my-work.png" mode="aspectFit"></image>
+          <text class="item-text">我的工单</text>
+        </view>
       </view>
-      <view class="statistics-item">
-        <text class="num">5</text>
-        <text class="label">巡检点</text>
-      </view>
-      <view class="statistics-item">
-        <text class="num">25</text>
-        <text class="label">巡检点</text>
-      </view>
-    </view>
-  </view>
-  <!-- 网格布局功能 -->
-  <view class="function-container">
-    <!-- 第一行功能：故障上报、一键开门、工单大厅、我的工单 -->
-    <view class="function-row">
-      <view class="function-item" @click="goToReport">
-        <image class="item-icon" src="/static/imgs/fault-report.png" mode="aspectFit"></image>
-        <text class="item-text">故障上报</text>
-      </view>
-      <view class="function-item" @click="goToOneOpenDoor">
-        <image class="item-icon" src="/static/imgs/open.png" mode="aspectFit"></image>
-        <text class="item-text">一键开门</text>
-      </view>
-      <view class="function-item">
-        <image class="item-icon" src="/static/imgs/work-order.png" mode="aspectFit"></image>
-        <text class="item-text">工单大厅</text>
-      </view>
-      <view class="function-item">
-        <image class="item-icon" src="/static/imgs/my-work.png" mode="aspectFit"></image>
-        <text class="item-text">我的工单</text>
-      </view>
-    </view>
-    <!-- 2 -->
-    <view class="function-row" style="margin-top: 2px;">
-      <view class="function-item">
-        <image class="item-icon" src="/static/imgs/complaint.png" mode="aspectFit"></image>
-        <text class="item-text">投诉处理</text>
-      </view>
-    </view>
-
-  </view>
-
-  <!-- banner -->
-  <view class="bannarClass">
-    <uni-swiper-dot class="uni-swiper-dot-box" @clickItem="clickItem" :info="bannerList" :current="current"
-      :mode="mode">
-      <swiper class="swiper-box" :current="swiperDotIndex" :autoplay="true">
-        <swiper-item v-for="(item, index) in bannerList" :key="index">
-          <view class="swiper-item">
-            <image :src="item.img" style="width: 100%; height: 100%"></image>
-          </view>
-        </swiper-item>
-      </swiper>
-    </uni-swiper-dot>
-  </view>
-  <!-- 巡检 -->
-  <view class="inspectionClass">
-    <!-- 消息通知栏 -->
-    <view class="noticeClass">
-      <!-- 左侧消息通知文字 -->
-      <view class="notice-left">
-        <image src="/static/imgs/notice.png" class="notice-icon"></image>
-      </view>
-      <!-- 右侧滚动公告 -->
-      <view class="notice-right" @click="getNoticeMore">
-        <uni-notice-bar :text="noticeText" type="line" :showIcon="false" show-get-more scrollable color="#fff"
-          background-color="transparent" moreColor="#fff" no-border>
-        </uni-notice-bar>
-      </view>
-    </view>
-
-    <!-- 巡检数据统计区 -->
-    <view class="statistics-wrap">
-      <view class="statistics-item" @click="goToInspectionRecord">
-        <text class="num">25</text>
-        <text class="label">全部巡检点</text>
-      </view>
-      <view class="statistics-item" @click="goToDaysInspection">
-        <text class="num">5</text>
-        <text class="label">待巡检点</text>
-      </view>
-      <view class="statistics-item">
-        <text class="num">25</text>
-        <text class="label">已巡检点</text>
-      </view>
-    </view>
-  </view>
-  <!-- 网格布局功能 -->
-  <view class="function-container">
-    <!-- 第一行功能：故障上报、一键开门、工单大厅、我的工单 -->
-    <view class="function-row">
-      <view class="function-item">
-        <image class="item-icon" src="/static/imgs/fault-report.png" mode="aspectFit"></image>
-        <text class="item-text">故障上报</text>
-      </view>
-      <view class="function-item" @click="goToOneOpenDoor">
-        <image class="item-icon" src="/static/imgs/open.png" mode="aspectFit"></image>
-        <text class="item-text">一键开门</text>
-      </view>
-      <view class="function-item">
-        <image class="item-icon" src="/static/imgs/work-order.png" mode="aspectFit"></image>
-        <text class="item-text">工单大厅</text>
-      </view>
-      <view class="function-item">
-        <image class="item-icon" src="/static/imgs/my-work.png" mode="aspectFit"></image>
-        <text class="item-text">我的工单</text>
-      </view>
-    </view>
-    <!-- 2 -->
-    <view class="function-row" style="margin-top: 2px">
-      <view class="function-item">
-        <image class="item-icon" src="/static/imgs/complaint.png" mode="aspectFit"></image>
-        <text class="item-text">投诉处理</text>
+      <!-- 第二行 -->
+      <view class="function-row" style="margin-top: 2px">
+        <view class="function-item">
+          <image class="item-icon" src="/static/imgs/complaint.png" mode="aspectFit"></image>
+          <text class="item-text">投诉处理</text>
+        </view>
       </view>
     </view>
   </view>
 </template>
 
 <script setup>
-  import {
-    ref
-  } from 'vue'
-  import {
-    onLoad,
-    onUnload
-  } from '@dcloudio/uni-app'
+import { ref } from 'vue'
+import { onLoad, onUnload } from '@dcloudio/uni-app'
 
-  // 列表数据状态
-  const current = ref(0)
+// 列表数据状态
+const current = ref(0)
+const currentCommunity = ref('碧桂园小区')
+const bannerList = ref([
+  { img: '/static/imgs/banner1.png' },
+])
+const noticeText = ref('公告公告本小区今天安装了摄像头')
 
-  const currentCommunity = ref('碧桂园小区')
-  const bannerList = ref([{
-      img: '/static/imgs/banner1.png'
-    },
-    {
-      img: '/static/bannar2.png'
-    }
-  ])
-  const noticeText = ref('公告公告本小区今天安装了摄像头')
-
-  // =======方法=======
-  // 跳转小区
-  const navigateToPage = () => {
-    uni.navigateTo({
-      url: '/pageSubPack/notice-list/select-community'
-    })
-  }
-  // 跳转公告
-  const getNoticeMore = () => {
-    uni.navigateTo({
-      url: '/pageSubPack/notice-list/notice-list'
-    })
-  }
-  // 跳转一键开门
-  const goToOneOpenDoor = () => {
-    uni.navigateTo({
-      url: '/pageSubPack/oneClickOpen/oneClickOpen'
-    })
-  }
-
-  // 跳转到 今日巡检
-  const goToDaysInspection = () => {
-    uni.navigateTo({
-      url: '/pageSubPack/inspection/toDays_inscpection'
-    })
-  }
-  // 跳转到 巡检记录
-  const goToInspectionRecord = () => {
-    uni.navigateTo({
-      url: '/pageSubPack/inspection/inspection_record'
-    })
-  }
-
-  // 故障上报
-  const goToReport = () => {
-    uni.navigateTo({
-      url: "/pageSubPack/report-record/report-record"
-    })
-  }
-  // 接收选择小区返回的参数
-  const slelctHomeData = (data) => {
-    // console.log('收到B页面返回的数据：', data)
-    currentCommunity.value = data.name
-  }
-  onLoad(() => {
-        // 绑定全局事件监听
-        uni.$on('confirm', slelctHomeData)
+// =======方法=======
+// 跳转小区
+const navigateToPage = () => {
+  uni.navigateTo({
+    url: '/pageSubPack/notice-list/select-community'
   })
+}
+// 跳转公告
+const getNoticeMore = () => {
+  uni.navigateTo({
+    url: '/pageSubPack/notice-list/notice-list'
+  })
+}
+// 跳转一键开门
+const goToOneOpenDoor = () => {
+  uni.navigateTo({
+    url: '/pageSubPack/oneClickOpen/oneClickOpen'
+  })
+}
+// 跳转到 今日巡检
+const goToDaysInspection = () => {
+  uni.navigateTo({
+    url: '/pageSubPack/inspection/toDays_inscpection'
+  })
+}
+// 跳转到 巡检记录
+const goToInspectionRecord = () => {
+  uni.navigateTo({
+    url: '/pageSubPack/inspection/inspection_record'
+  })
+}
+// 故障上报
+const goToReport = () => {
+  uni.navigateTo({
+    url: "/pageSubPack/report-record/report-record"
+  })
+}
+// 接收选择小区返回的参数
+const slelctHomeData = (data) => {
+  currentCommunity.value = data.name
+}
 
-      // 页面销毁时移除监听（防止内存泄漏）
-  onUnload(() => {
-        uni.$off('confirm', slelctHomeData)
-    })
+onLoad(() => {
+  uni.$on('confirm', slelctHomeData)
+})
 
+onUnload(() => {
+  uni.$off('confirm', slelctHomeData)
+})
+
+const clickItem = (index) => {
+  current.value = index
+}
 </script>
 
 <style lang="scss" scoped>
-  .content-class {
-    // margin: 0 20rpx;
-    // padding: 2rpx;
-    background-color: #f9f9f9;
-    padding-bottom: 100rpx;
+.content-class {
+  background-color: #f9f9f9;
+  padding-bottom: 100rpx;
+  box-sizing: border-box;
+  min-height: 110vh;
+  overflow-y: auto;
+
+  .nar-top {
+    height: 400rpx;
+    width: 100%;
+    background: repeating-linear-gradient(to right, #edf4fa, #c0e4fb);
+    position: absolute;
+  }
+
+  .status_bar {
+    height: 46px;
+    width: 100%;
+  }
+
+  /* 导航栏 */
+  .nav-bar {
+    height: 44px;
+    line-height: 44px;
+    text-align: center;
+  }
+
+  .nav-title {
+    font-size: 14px;
+    font-weight: 400;
+  }
+
+  .header-container {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 4rpx 30rpx;
     box-sizing: border-box;
-    /* 保证padding不会撑大容器 */
-    min-height: 110vh;
-    overflow-y: auto;
+    position: absolute;
+    top: 85px;
+    left: 0;
+    z-index: 9999;
+  }
 
-    .nar-top {
-      height: 400rpx;
-      width: 100%;
-      // background-color: #C0E4FB;
-      background: repeating-linear-gradient(to right, #edf4fa, #c0e4fb);
-      position: absolute;
+  // 左侧区域
+  .location-area {
+    display: flex;
+    align-items: center;
+    position: relative;
+    flex: 1;
+    min-width: 0;
+
+    .location-icon {
+      width: 45rpx;
+      height: 45rpx;
+      margin-right: 12rpx;
+      flex-shrink: 0;
     }
 
-    .status_bar {
-      height: 46px;
-      width: 100%;
-    }
-
-    /* 导航栏 */
-    .nav-bar {
-      height: 44px;
-      line-height: 44px;
-      text-align: center;
-    }
-
-    .nav-title {
-      font-size: 14px;
-      font-weight: 400;
-    }
-
-    .header-container {
+    .community-selector {
       display: flex;
       align-items: center;
-      justify-content: space-between;
-      padding: 4rpx 30rpx;
-      box-sizing: border-box;
-      // border-bottom: 1rpx solid #f0f0f0;
-      position: absolute;
-      top: 85px;
-      left: 0;
-      z-index: 9999;
-    }
+      max-width: 300rpx;
+      cursor: pointer;
 
-    // 左侧区域
-    .location-area {
-      display: flex;
-      align-items: center;
-      position: relative;
-      flex: 1;
-      min-width: 0;
-
-      .location-icon {
-        width: 45rpx;
-        height: 45rpx;
-        margin-right: 12rpx;
-        flex-shrink: 0;
+      .community-name {
+        font-size: 26rpx;
+        font-weight: 500;
+        color: #000;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        max-width: 200rpx;
       }
 
-      .community-selector {
-        display: flex;
-        align-items: center;
-        max-width: 300rpx;
-        cursor: pointer;
-
-        .community-name {
-          font-size: 26rpx;
-          font-weight: 500;
-          color: #000;
-          white-space: nowrap;
-          overflow: hidden;
-          text-overflow: ellipsis;
-          max-width: 200rpx;
-        }
-
-        .community-icon {
-          width: 20rpx;
-          height: 20rpx;
-          margin-left: 20rpx;
-          margin-top: -22rpx;
-        }
+      .community-icon {
+        width: 20rpx;
+        height: 20rpx;
+        margin-left: 20rpx;
+        margin-top: -22rpx;
       }
     }
-
-    .bannarClass {
-      position: relative;
-      top: 110px;
-      left: 0;
-      padding: 40rpx;
-    }
-
-    .swiper-box {
-      height: 300rpx;
-      border-radius: 16rpx !important;
-      overflow: hidden !important;
-    }
-
-    .swiper-item {
-      display: flex;
-      flex-direction: column;
-      justify-content: center;
-      align-items: center;
-      height: 300rpx;
-      color: #fff;
-    }
-
-    .inspectionClass {
-      position: relative;
-      top: 107px;
-      left: 0;
-      margin: 0 40rpx;
-      // height: 236rpx;
-      background: linear-gradient(to right, #7b87fa, #4d5dfa);
-      border-radius: 25rpx;
-      box-sizing: border-box;
-      padding: 30rpx;
-    }
-
-    // 消息通知栏
-    .noticeClass {
-      display: flex;
-      align-items: center;
-      height: 80rpx;
-      background: rgba(255, 255, 255, 0.1);
-      border-radius: 16rpx;
-      padding: 6rpx 20rpx;
-      margin-bottom: 30rpx;
-      border: 1rpx solid rgba(255, 255, 255, 0.1);
-    }
-
-    // 左侧“消息通知”文字
-    .notice-left {
-      margin-right: 20rpx;
-    }
-
-    .notice-icon {
-      width: 48rpx;
-      height: 48rpx;
-    }
-
-    // 右侧公告滚动区
-    .notice-right {
-      flex: 1; // 占满剩余宽度
-    }
-
-    // 深度修改uni-notice-bar样式
-    ::v-deep .uni-noticebar {
-      background-color: transparent !important;
-      height: 100% !important;
-      line-height: 80rpx !important;
-      padding: 0 !important;
-      margin: 0 !important;
-    }
-
-    // 公告文字样式
-    ::v-deep .uni-noticebar__content {
-      font-size: 26rpx !important;
-      color: #fff !important;
-      padding: 0 !important;
-    }
-
-    // 右侧箭头按钮
-    ::v-deep .uni-noticebar__more {
-      color: #fff !important;
-      font-size: 24rpx !important;
-      padding: 0 0 0 10rpx !important;
-    }
-
-    // 隐藏默认滚动动画的多余样式
-    ::v-deep .uni-noticebar__content-wrapper--scrollable {
-      left: 0 !important;
-      width: calc(100% - 30rpx) !important; // 给箭头留空间
-    }
-
-    // 统计区布局
-    .statistics-wrap {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      padding: 0 20rpx;
-    }
-
-    // 统计项样式
-    .statistics-item {
-      text-align: center;
-    }
-
-    .statistics-item .num {
-      font-size: 36rpx;
-      font-weight: bold;
-      color: #fff;
-      display: block;
-      line-height: 1;
-      margin-bottom: 10rpx;
-    }
-
-    .statistics-item .label {
-      font-size: 24rpx;
-      color: #fff;
-      opacity: 0.9;
-    }
-
-    .function-container {
-      background-color: #ffffff;
-      border-radius: 8rpx;
-      padding: 30rpx 20rpx;
-      box-sizing: border-box;
-      position: relative;
-      top: 123px;
-      left: 0;
-      margin: 0 40rpx;
-    }
-
-    // 功能行布局
-    .function-row {
-      display: flex;
-      align-items: center;
-      margin-bottom: 20rpx;
-
-      &:last-child {
-        margin-bottom: 0;
-      }
-    }
-
-    .function-item {
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      justify-content: center;
-      width: 25%; // 一行4个，每个占25%
-      padding: 10rpx 0;
-
-      // 第二行只有1个，单独调整宽度
-      .function-row:nth-child(2) & {
-        width: 25%; // 和第一行图标宽度保持一致
-      }
-    }
-
-    // 功能图标样式
-    .item-icon {
-      width: 88rpx;
-      height: 88rpx;
-      margin-bottom: 10rpx;
-    }
-
-    // 功能文字样式
-    .item-text {
-      font-size: 24rpx;
-      color: #333333;
-      font-weight: 400;
-      text-align: center;
-    }
   }
+
+  .bannarClass {
+    position: relative;
+    top: 110px;
+    left: 0;
+    padding: 40rpx;
+  }
+
+  .swiper-box {
+    height: 300rpx;
+    border-radius: 16rpx !important;
+    overflow: hidden !important;
+  }
+
+  .swiper-item {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    height: 300rpx;
+    color: #fff;
+  }
+
+  .inspectionClass {
+    position: relative;
+    top: 107px;
+    left: 0;
+    margin: 0 40rpx;
+    background: linear-gradient(to right, #7b87fa, #4d5dfa);
+    border-radius: 25rpx;
+    box-sizing: border-box;
+    padding: 30rpx;
+  }
+
+  // 消息通知栏
+  .noticeClass {
+    display: flex;
+    align-items: center;
+    height: 80rpx;
+    background: rgba(255, 255, 255, 0.1);
+    border-radius: 16rpx;
+    padding: 6rpx 20rpx;
+    margin-bottom: 30rpx;
+    border: 1rpx solid rgba(255, 255, 255, 0.1);
+  }
+
+  // 左侧“消息通知”文字
+  .notice-left {
+    margin-right: 20rpx;
+  }
+
+  .notice-icon {
+    width: 48rpx;
+    height: 48rpx;
+  }
+
+  // 右侧公告滚动区
+  .notice-right {
+    flex: 1;
+  }
+
+  // 深度修改uni-notice-bar样式
+  :deep(.uni-noticebar) {
+    background-color: transparent !important;
+    height: 100% !important;
+    line-height: 80rpx !important;
+    padding: 0 !important;
+    margin: 0 !important;
+  }
+
+  // 公告文字样式
+  :deep(.uni-noticebar__content) {
+    font-size: 26rpx !important;
+    color: #fff !important;
+    padding: 0 !important;
+  }
+
+  // 右侧箭头按钮
+  :deep(.uni-noticebar__more) {
+    color: #fff !important;
+    font-size: 24rpx !important;
+    padding: 0 0 0 10rpx !important;
+  }
+
+  // 隐藏默认滚动动画的多余样式
+  :deep(.uni-noticebar__content-wrapper--scrollable) {
+    left: 0 !important;
+    width: calc(100% - 30rpx) !important;
+  }
+
+  // 统计区布局
+  .statistics-wrap {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 0 20rpx;
+  }
+
+  // 统计项样式
+  .statistics-item {
+    text-align: center;
+  }
+
+  .statistics-item .num {
+    font-size: 36rpx;
+    font-weight: bold;
+    color: #fff;
+    display: block;
+    line-height: 1;
+    margin-bottom: 10rpx;
+  }
+
+  .statistics-item .label {
+    font-size: 24rpx;
+    color: #fff;
+    opacity: 0.9;
+  }
+
+  .function-container {
+    background-color: #ffffff;
+    border-radius: 8rpx;
+    padding: 30rpx 20rpx;
+    box-sizing: border-box;
+    position: relative;
+    top: 123px;
+    left: 0;
+    margin: 0 40rpx;
+  }
+
+  // 功能行布局
+  .function-row {
+    display: flex;
+    align-items: center;
+    margin-bottom: 20rpx;
+
+    &:last-child {
+      margin-bottom: 0;
+    }
+  }
+
+  .function-item {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    width: 25%;
+    padding: 10rpx 0;
+  }
+
+  // 功能图标样式
+  .item-icon {
+    width: 88rpx;
+    height: 88rpx;
+    margin-bottom: 10rpx;
+  }
+
+  // 功能文字样式
+  .item-text {
+    font-size: 24rpx;
+    color: #333333;
+    font-weight: 400;
+    text-align: center;
+  }
+}
 </style>

From 1464fe9d7dafe816891090eee1a624167adc9c26 Mon Sep 17 00:00:00 2001
From: zhouyanli <593579392@qq.com>
Date: Wed, 29 Apr 2026 11:02:36 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=94=B9=E5=8F=98=E6=95=85=E9=9A=9C?=
 =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E8=B7=AF=E5=BE=84=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fault-reporting/fault-reporting.vue       | 242 +++++
 .../repairSelect.vue                          |  14 +-
 .../pageSubPack/loginSub/login.vue            |  28 +-
 .../pageSubPack/loginSub/pwd-login.vue        |  16 +-
 .../pageSubPack/notice-list/notice-list.vue   |  10 +-
 .../notice-list/select-community.vue          | 916 +++++++++---------
 .../report-record/report-record.vue           | 535 ++++++----
 .../pageSubPack/setting/change -password.vue  |  60 +-
 .../pageSubPack/setting/change-phone.vue      |  34 +-
 wuye-manager-uniapp/pages.json                |  25 +-
 wuye-manager-uniapp/pages/index/index.vue     |   4 +-
 11 files changed, 1146 insertions(+), 738 deletions(-)
 create mode 100644 wuye-manager-uniapp/pageSubPack/fault-reporting/fault-reporting.vue
 rename wuye-manager-uniapp/pageSubPack/{report-record => fault-reporting}/repairSelect.vue (92%)

diff --git a/wuye-manager-uniapp/pageSubPack/fault-reporting/fault-reporting.vue b/wuye-manager-uniapp/pageSubPack/fault-reporting/fault-reporting.vue
new file mode 100644
index 0000000..93b02d0
--- /dev/null
+++ b/wuye-manager-uniapp/pageSubPack/fault-reporting/fault-reporting.vue
@@ -0,0 +1,242 @@
+<template>
+  <view class="form-container">
+    <!-- 维修项目展示 -->
+    <view class="form-item">
+      <text class="label">维修项目</text>
+      <view class="value" @click="goBackSelect">
+		  <view>
+			  <text v-if="!repairProject">请选择项目</text>
+			  {{ repairProject }}
+		</view>
+        <uni-icons type="arrowright" size="16"></uni-icons>
+      </view>
+    </view>
+
+    <!-- 标题输入 -->
+    <view class="form-item">
+      <text class="label">标题</text>
+      <!-- <input type="text" placeholder="请输入问题标题" v-model="form.title" /> -->
+	  <uni-easyinput v-model="form.title" placeholder="请输入内容" :inputBorder="false"></uni-easyinput>
+    </view>
+
+    <!-- 问题描述 -->
+    <view class="form-item-wenti">
+      <text class="label">问题描述</text>
+      <!-- <textarea placeholder="请输入问题内容" v-model="form.desc" rows="5" ></textarea> -->
+	  <uni-easyinput v-model="form.desc" placeholder="请描述你的问题" type="textarea"></uni-easyinput>
+    </view>
+
+    <!-- 手机号 -->
+    <view class="form-item">
+      <text class="label">手机号</text>
+	  <uni-easyinput type="number" v-model="form.phone" placeholder="请输入手机号" :inputBorder="false"></uni-easyinput>
+    </view>
+
+    <!-- 图片上传 -->
+    <view class="form-item-wenti">
+      <text class="label">问题照片</text>
+      <view class="upload-wrap">
+        <!-- 已上传图片 -->
+        <view class="upload-item" v-for="(img, index) in form.images" :key="index">
+          <image :src="img" mode="aspectFill"></image>
+          <uni-icons type="close" size="16" @click="deleteImage(index)"></uni-icons>
+        </view>
+        <!-- 上传按钮 -->
+        <view class="upload-btn" @click="chooseImage">
+          <uni-icons type="plus" size="24"></uni-icons>
+          <text>上传照片</text>
+        </view>
+      </view>
+    </view>
+
+    <!-- 提交按钮 -->
+    <button class="submit-btn" @click="submitForm">提交</button>
+  </view>
+</template>
+
+<script setup>
+import { ref } from 'vue'
+import{onLoad} from "@dcloudio/uni-app"
+// import { onLoad, uniShowToast, uniNavigateBack, uniChooseImage, uniUploadFile } from '@dcloudio/uni-app'
+
+// 接收上个页面传的维修项目
+const repairProject = ref('')
+
+// 表单数据
+const form = ref({
+  title: '',
+  desc: '',
+  phone: '',
+  images: [] // 图片列表
+})
+
+// 页面加载时获取传参
+onLoad((options) => {
+  if (options.category && options.project) {
+    repairProject.value = `${options.category}-${options.project}`
+  }
+})
+
+// 选择项目页
+const goBackSelect = () => {
+	uni.navigateTo({
+		url:"/pageSubPack/fault-reporting/repairSelect"
+	})
+}
+
+// 选择图片
+const chooseImage = () => {
+  uni.chooseImage({
+    count: 3, // 最多选3张
+    sizeType: ['original', 'compressed'],
+    sourceType: ['album', 'camera'],
+    success: (res) => {
+      // 临时文件路径
+      const tempFilePaths = res.tempFilePaths
+      form.value.images = [...form.value.images, ...tempFilePaths]
+
+      // 【可选】如果需要上传到服务器，取消下面注释
+      // tempFilePaths.forEach(path => {
+      //   uni.uploadFile({
+      //     url: '你的上传接口地址',
+      //     filePath: path,
+      //     name: 'file',
+      //     success: (uploadRes) => {
+      //       console.log('上传成功', uploadRes)
+      //     }
+      //   })
+      // })
+    }
+  })
+}
+
+// 删除图片
+const deleteImage = (index) => {
+  form.value.images.splice(index, 1)
+}
+
+// 表单提交
+const submitForm = () => {
+  // 表单校验
+  if (!repairProject.value) {
+    uni.showToast({ title: '请选择维修项目', icon: 'none' })
+    return
+  }
+  if (!form.value.title) {
+    uni.showToast({ title: '请输入问题标题', icon: 'none' })
+    return
+  }
+  if (!form.value.desc) {
+    uni.showToast({ title: '请输入问题描述', icon: 'none' })
+    return
+  }
+  if (!/^1[3-9]\d{9}$/.test(form.value.phone)) {
+    uni.showToast({ title: '请输入正确的手机号', icon: 'none' })
+    return
+  }
+
+  // 提交数据（替换成你的接口）
+  uni.showLoading({ title: '提交中...' })
+
+  // 模拟接口请求
+  setTimeout(() => {
+    uni.hideLoading()
+    uni.showToast({ title: '提交成功', icon: 'success' })
+
+    // 提交成功后重置表单/返回上一页
+    form.value = { title: '', desc: '', phone: '', images: [] }
+    // 或返回上一页
+    uni.navigateBack({ delta: 3 })
+  }, 1000)
+}
+</script>
+
+<style scoped>
+.form-container {
+  padding: 30rpx 40rpx;
+  background: #fff;
+  min-height: 100vh;
+}
+.form-item-wenti {
+  margin-bottom: 20px;
+  border-bottom: 1px solid #eee;
+  padding-bottom: 10px;
+}
+.form-item {
+  display: flex;
+  margin-bottom: 30rpx;
+  align-items: flex-start;
+	border-bottom: 1px solid #eee;
+}
+.label {
+  width: 140rpx;
+  font-size: 28rpx;
+  color: #333;
+  line-height: 80rpx;
+}
+
+.value {
+  flex: 1;
+  font-size: 28rpx;
+  color: #666;
+  line-height: 80rpx;
+  text-align: right;
+  display: flex;
+  justify-content: space-between;
+}
+.input, .textarea {
+  font-size: 14px;
+  width: 100%;
+  padding: 8px 0;
+  box-sizing: border-box;
+}
+.textarea {
+  resize: none;
+}
+.upload-wrap {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 10px;
+  margin-top: 8px;
+}
+.upload-item {
+  position: relative;
+  width: 80px;
+  height: 80px;
+}
+.upload-item image {
+  width: 100%;
+  height: 100%;
+  border-radius: 4px;
+}
+.upload-item uni-icons {
+  position: absolute;
+  top: -5px;
+  right: -5px;
+  background: #ff3b30;
+  color: #fff;
+  border-radius: 50%;
+  padding: 2px;
+}
+.upload-btn {
+  width: 80px;
+  height: 80px;
+  border: 1px dashed #ccc;
+  border-radius: 4px;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  color: #999;
+  font-size: 12px;
+}
+.submit-btn {
+  width: 100%;
+  background: #4D5DFA;
+  color: #fff;
+  border-radius: 6px;
+  height: 44px;
+  line-height: 44px;
+  font-size: 16px;
+}
+</style>
diff --git a/wuye-manager-uniapp/pageSubPack/report-record/repairSelect.vue b/wuye-manager-uniapp/pageSubPack/fault-reporting/repairSelect.vue
similarity index 92%
rename from wuye-manager-uniapp/pageSubPack/report-record/repairSelect.vue
rename to wuye-manager-uniapp/pageSubPack/fault-reporting/repairSelect.vue
index 0234a63..abdb544 100644
--- a/wuye-manager-uniapp/pageSubPack/report-record/repairSelect.vue
+++ b/wuye-manager-uniapp/pageSubPack/fault-reporting/repairSelect.vue
@@ -10,11 +10,11 @@
     <view class="category-wrap">
       <!-- 左侧分类 -->
       <scroll-view scroll-y class="category-left">
-        <view 
-          class="category-item" 
+        <view
+          class="category-item"
           :class="{ active: activeCategory === item.id }"
           @click="selectCategory(item)"
-          v-for="item in categoryList" 
+          v-for="item in categoryList"
           :key="item.id"
         >
           {{ item.name }}
@@ -23,10 +23,10 @@
 
       <!-- 右侧项目 -->
       <scroll-view scroll-y class="category-right">
-        <view 
+        <view
           class="project-item"
           @click="selectProject(item)"
-          v-for="item in currentProjectList" 
+          v-for="item in currentProjectList"
           :key="item.id"
         >
           {{ item.name }}
@@ -79,7 +79,7 @@ const selectProject = (item) => {
   const categoryName = categoryList.value.find(c => c.id === item.categoryId)?.name
   // 跳转并传参
   uni.navigateTo({
-    url: `/pageSubPack/report-record/report-record?category=${categoryName}&project=${item.name}`
+    url: `/pageSubPack/fault-reporting/fault-reporting?category=${categoryName}&project=${item.name}`
   })
 }
 </script>
@@ -138,4 +138,4 @@ const selectProject = (item) => {
 .project-item:active {
   background: #f5f5f5;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/wuye-manager-uniapp/pageSubPack/loginSub/login.vue b/wuye-manager-uniapp/pageSubPack/loginSub/login.vue
index d29e166..f0dc929 100644
--- a/wuye-manager-uniapp/pageSubPack/loginSub/login.vue
+++ b/wuye-manager-uniapp/pageSubPack/loginSub/login.vue
@@ -14,14 +14,6 @@
 			<uni-easyinput class="input-content" type="number" v-model="phoneNumber" placeholder="请输入手机号"
 				:inputBorder="false" maxlength="11" :placeholderStyle="placeholderStyle">
 			</uni-easyinput>
-			<!--   <input
-        class="input-content"
-        type="number"
-        placeholder="请输入手机号"
-        v-model="phoneNumber"
-        maxlength="11"
-        @input="checkForm"
-      /> -->
 		</view>
 
 		<!-- 验证码输入框 + 获取验证码按钮 -->
@@ -33,14 +25,6 @@
 			<uni-easyinput class="input-content verify-input" type="number" v-model="verifyCode" placeholder="请输入验证码"
 				:inputBorder="false" maxlength="6" :placeholderStyle="placeholderStyle">
 			</uni-easyinput>
-			<!--  <input
-        class="input-content verify-input"
-        type="number"
-        placeholder="请输入验证码"
-        v-model="verifyCode"
-        maxlength="6"
-        @input="checkForm"
-      /> -->
 			<button class="get-verify-btn" :disabled="!canGetVerify || countDown > 0" @click="getVerifyCode">
 				{{ countDown > 0 ? `${countDown}s后重新获取` : '获取验证码' }}
 			</button>
@@ -54,7 +38,7 @@
 			</view>
 
 			<text class="agreement-text" @click.stop="goToPrivacy">我已阅读并同意
-				<text class="agreePrivacy" :class="{active:isClicked}">《用户隐私政策》</text>
+				<text class="agreePrivacy">《用户隐私政策》</text>
 			</text>
 		</view>
 
@@ -95,7 +79,7 @@
 	// 定时器
 	let timer = null;
 	// 控制点击变色
-	const isClicked = ref(false)
+	// const isClicked = ref(false)
 
 	// ========== 计算属性 ==========
 	// 是否可以获取验证码（手机号格式正确）
@@ -125,7 +109,7 @@
 	// 跳转隐私协议
 	const goToPrivacy = () => {
 	  // 点击变色
-	  isClicked.value = true
+	  // isClicked.value = true
 	  uni.navigateTo({
 	    url:'/pageSubPack/loginSub/privacy',
 	  })
@@ -344,12 +328,8 @@
 		margin-left: 10rpx;
 	}
 	.agreePrivacy{
-		color: #666;
-	}
-	.agreePrivacy.active{
 		color: #4D5DFA;
 	}
-
 	/* 登录按钮 */
 	.login-btn {
 		width: 100%;
@@ -387,4 +367,4 @@
 		color: #4D5DFA;
 		text-decoration: none;
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/wuye-manager-uniapp/pageSubPack/loginSub/pwd-login.vue b/wuye-manager-uniapp/pageSubPack/loginSub/pwd-login.vue
index 9d3c54e..ebe0a32 100644
--- a/wuye-manager-uniapp/pageSubPack/loginSub/pwd-login.vue
+++ b/wuye-manager-uniapp/pageSubPack/loginSub/pwd-login.vue
@@ -37,7 +37,7 @@
 					<uni-icons type="checkbox" size="24" color="#999" v-else></uni-icons>
 				</view>
 				<text class="agreement-text" @click.stop="goToPrivacy">我已阅读并同意
-					<text class="agreePrivacy" :class="{active:isClicked}">《用户隐私政策》</text>
+					<text class="agreePrivacy">《用户隐私政策》</text>
 				</text>
 			</view>
 			<navigator class="forget-pwd" url="/pageSubPack/loginSub/forget-pwd">忘记密码？</navigator>
@@ -74,7 +74,7 @@
 	const agreeAgreement = ref(false); // 默认勾选
 	const placeholderStyle = ref('font-size:24rpx')
 	// 控制点击变色
-	const isClicked = ref(false)
+	// const isClicked = ref(false)
 
 	// 计算属性：是否可登录（帐号+密码+协议都满足）
 	const canLogin = computed(() => {
@@ -89,8 +89,8 @@
 	};
 	// 跳转隐私协议
 	const goToPrivacy = () => {
-	  // 点击变色
-	  isClicked.value = true
+
+	  // isClicked.value = true
 	  uni.navigateTo({
 	    url:'/pageSubPack/loginSub/privacy',
 	  })
@@ -233,11 +233,11 @@
 		margin-left: 10rpx;
 	}
 	.agreePrivacy{
-		color: #666;
-	}
-	.agreePrivacy.active{
 		color: #4D5DFA;
 	}
+	/* .agreePrivacy.active{
+		color: #4D5DFA;
+	} */
 
 	.forget-pwd {
 		font-size: 28rpx;
@@ -279,4 +279,4 @@
 		color: #4D5DFA;
 		text-decoration: none;
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/wuye-manager-uniapp/pageSubPack/notice-list/notice-list.vue b/wuye-manager-uniapp/pageSubPack/notice-list/notice-list.vue
index fd49ca7..b78cc70 100644
--- a/wuye-manager-uniapp/pageSubPack/notice-list/notice-list.vue
+++ b/wuye-manager-uniapp/pageSubPack/notice-list/notice-list.vue
@@ -36,7 +36,7 @@ import { ref } from 'vue'
 // 跳转到详情页方法
 const goToDetail = () => {
   uni.navigateTo({
-    url: '/pageSubPack/notice-list/noticeListDetails' 
+    url: '/pageSubPack/notice-list/noticeListDetails'
   })
 }
 </script>
@@ -81,9 +81,9 @@ const goToDetail = () => {
 
 // 右上角未读红点
 .unread-dot {
-  width: 8rpx;
-  height: 8rpx;
-  background-color: #ff3b30;
+  width: 16rpx;
+  height: 16rpx;
+  background-color: #E34D59;
   border-radius: 50%;
   margin-top: 6rpx;
 }
@@ -130,4 +130,4 @@ const goToDetail = () => {
   color: #4D5DFA;
   margin-right: 8rpx;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/wuye-manager-uniapp/pageSubPack/notice-list/select-community.vue b/wuye-manager-uniapp/pageSubPack/notice-list/select-community.vue
index 846962b..2784236 100644
--- a/wuye-manager-uniapp/pageSubPack/notice-list/select-community.vue
+++ b/wuye-manager-uniapp/pageSubPack/notice-list/select-community.vue
@@ -4,13 +4,8 @@
     <view class="search-container">
       <view class="search-input-wrapper">
         <uni-icons class="search-icon" type="search" size="20" color="#999"></uni-icons>
-        <input 
-          class="search-input" 
-          placeholder="请输入关键字进行搜索" 
-          placeholder-class="placeholder"
-          v-model="searchText"
-          @input="handleSearchInput"
-        />
+        <input class="search-input" placeholder="请输入关键字进行搜索" placeholder-class="placeholder" v-model="searchText"
+          @input="handleSearchInput" />
         <view v-if="searchText" class="clear-icon" @tap="clearSearch">
           <uni-icons type="clear" size="18" color="#999"></uni-icons>
         </view>
@@ -19,35 +14,21 @@
     </view>
 
     <!-- 小区列表 -->
-    <scroll-view 
-      class="community-list" 
-      scroll-y
-      :scroll-into-view="scrollIntoViewId"
-      @scrolltolower="loadMoreData"
-      :lower-threshold="100"
-    >
-      <view 
-        v-for="item in displayedCommunities" 
-        :key="item.id" 
-        class="community-item"
-        :id="'item-' + item.id"
-        @tap="selectCommunity(item)"
-      >
+    <scroll-view class="community-list" scroll-y :scroll-into-view="scrollIntoViewId" @scrolltolower="loadMoreData"
+      :lower-threshold="100">
+      <view v-for="item in displayedCommunities" :key="item.id" class="community-item" :id="'item-' + item.id"
+        @tap="selectCommunity(item)" :class="{active:selectedItem?.id === item.id}">
         <view class="community-item-left">
-			<image src="/static/imgs/community.png" style="width: 48rpx;height: 48rpx;"></image>
-          <!-- <uni-icons class="house-icon" type="home" size="24" color="#666"></uni-icons> -->
+          <image src="/static/imgs/community.png" style="width: 48rpx;height: 48rpx;"></image>
           <view class="community-info">
             <text class="community-name">{{ item.name }}</text>
-            <!-- <text class="community-address">{{ item.address }}</text> -->
-            <!-- <text class="community-id">ID: {{ item.id }}</text> -->
           </view>
         </view>
         <view v-if="selectedItem && selectedItem.id === item.id" class="selected-icon">
-          <!-- <uni-icons type="checkbox-filled" size="24" color="#007AFF"></uni-icons> -->
-		  <image src="/static/imgs/check.png"  style="width: 48rpx;height: 48rpx;"></image>
+          <image src="/static/imgs/check.png" style="width: 48rpx;height: 48rpx;"></image>
         </view>
       </view>
-      
+
       <!-- 加载更多 -->
       <view v-if="hasMoreData" class="load-more-container">
         <view v-if="!isLoading" class="load-more-btn" @tap="loadMoreData">
@@ -60,18 +41,18 @@
         </view>
         <!-- <text class="page-info">第 {{ currentPage }} 页 / 共 {{ totalPages }} 页</text> -->
       </view>
-      
+
       <!-- 没有更多数据 -->
       <view v-if="!hasMoreData && displayedCommunities.length > 0" class="no-more-data">
         <text>没有更多数据了</text>
       </view>
-      
+
       <!-- 空状态 -->
       <view v-if="displayedCommunities.length === 0 && !isSearching" class="empty-state">
         <uni-icons type="info" size="60" color="#ccc"></uni-icons>
         <text class="empty-text">暂无小区数据</text>
       </view>
-      
+
       <!-- 搜索无结果 -->
       <view v-if="displayedCommunities.length === 0 && isSearching" class="empty-state">
         <uni-icons type="search" size="60" color="#ccc"></uni-icons>
@@ -82,12 +63,8 @@
 
     <!-- 确认按钮 -->
     <view class="confirm-area">
-      <button 
-        class="confirm-btn" 
-        :disabled="!selectedItem"
-        :class="{ 'disabled-btn': !selectedItem }"
-        @tap="handleConfirm"
-      >
+      <button class="confirm-btn" :disabled="!selectedItem" :class="{ 'disabled-btn': !selectedItem }"
+        @tap="handleConfirm">
         确认选择
       </button>
     </view>
@@ -95,435 +72,490 @@
 </template>
 
 <script setup>
-import { ref, computed, onMounted, watch } from 'vue'
+  import {
+    ref,
+    computed,
+    onMounted,
+    watch
+  } from 'vue'
 
-// 响应式数据
-const searchText = ref('')
-const selectedItem = ref(null)
-const scrollIntoViewId = ref('')
+  // 响应式数据
+  const searchText = ref('')
+  const selectedItem = ref(null)
+  const scrollIntoViewId = ref('')
 
-// 分页相关
-const currentPage = ref(1)
-const pageSize = 5
-const totalCommunities = ref([])
-const displayedCommunities = ref([])
-const hasMoreData = ref(true)
-const isLoading = ref(false)
+  // 分页相关
+  const currentPage = ref(1)
+  const pageSize = 5
+  const totalCommunities = ref([])
+  const displayedCommunities = ref([])
+  const hasMoreData = ref(true)
+  const isLoading = ref(false)
 
-// 搜索状态
-const isSearching = ref(false)
-let searchTimeout = null
+  // 搜索状态
+  const isSearching = ref(false)
+  let searchTimeout = null
 
-// 所有小区数据
-const allCommunities = ref([
-  { id: 1, name: '北境碧桂园小区', address: '北境市光明区碧桂路1号' },
-  { id: 2, name: '南湖花园小区', address: '南湖市滨湖区湖滨路28号' },
-  { id: 3, name: '东城国际社区', address: '东城市新城区人民路156号' },
-  { id: 4, name: '西湖雅苑', address: '西湖市风景区梅灵路88号' },
-  { id: 5, name: '北境锦绣家园', address: '北境市朝阳区朝阳路56号' },
-  { id: 6, name: '阳光100小区', address: '阳光市高新区创业路100号' },
-  { id: 7, name: '绿城玫瑰园', address: '绿城市西湖区学院路188号' },
-  { id: 8, name: '金地自在城', address: '金城市江干区金沙大道200号' },
-  { id: 9, name: '万科城市花园', address: '万城市余杭区文一西路299号' },
-  { id: 10, name: '保利中央公园', address: '保利市拱墅区莫干山路500号' },
-  { id: 11, name: '龙湖天街小区', address: '龙湖市滨江区江南大道100号' },
-])
+  // 所有小区数据
+  const allCommunities = ref([{
+      id: 1,
+      name: '北境碧桂园小区',
+      address: '北境市光明区碧桂路1号'
+    },
+    {
+      id: 2,
+      name: '南湖花园小区',
+      address: '南湖市滨湖区湖滨路28号'
+    },
+    {
+      id: 3,
+      name: '东城国际社区',
+      address: '东城市新城区人民路156号'
+    },
+    {
+      id: 4,
+      name: '西湖雅苑',
+      address: '西湖市风景区梅灵路88号'
+    },
+    {
+      id: 5,
+      name: '北境锦绣家园',
+      address: '北境市朝阳区朝阳路56号'
+    },
+    {
+      id: 6,
+      name: '阳光100小区',
+      address: '阳光市高新区创业路100号'
+    },
+    {
+      id: 7,
+      name: '绿城玫瑰园',
+      address: '绿城市西湖区学院路188号'
+    },
+    {
+      id: 8,
+      name: '金地自在城',
+      address: '金城市江干区金沙大道200号'
+    },
+    {
+      id: 9,
+      name: '万科城市花园',
+      address: '万城市余杭区文一西路299号'
+    },
+    {
+      id: 10,
+      name: '保利中央公园',
+      address: '保利市拱墅区莫干山路500号'
+    },
+    {
+      id: 11,
+      name: '龙湖天街小区',
+      address: '龙湖市滨江区江南大道100号'
+    },
+  ])
 
-// 计算属性
-const totalPages = computed(() => {
-  return Math.ceil(totalCommunities.value.length / pageSize)
-})
+  // 计算属性
+  const totalPages = computed(() => {
+    return Math.ceil(totalCommunities.value.length / pageSize)
+  })
 
-// 方法
-// 加载分页数据
-const loadPageData = (pageNum) => {
-  isLoading.value = true
-  
-  // 模拟网络请求延迟
-  setTimeout(() => {
-    const startIndex = (pageNum - 1) * pageSize
-    const endIndex = startIndex + pageSize
-    const pageData = totalCommunities.value.slice(startIndex, endIndex)
-    
-    if (pageNum === 1) {
-      displayedCommunities.value = pageData
-    } else {
-      displayedCommunities.value = [...displayedCommunities.value, ...pageData]
-    }
-    
-    currentPage.value = pageNum
-    hasMoreData.value = displayedCommunities.value.length < totalCommunities.value.length
-    isLoading.value = false
-    
-    // 滚动到新加载的内容
-    if (pageNum > 1 && pageData.length > 0) {
-      setTimeout(() => {
-        scrollIntoViewId.value = 'item-' + pageData[0].id
-      }, 100)
-    }
-  }, 500)
-}
+  // 方法
+  // 加载分页数据
+  const loadPageData = (pageNum) => {
+    isLoading.value = true
 
-// 加载更多数据
-const loadMoreData = () => {
-  if (isLoading.value || !hasMoreData.value) return
-  loadPageData(currentPage.value + 1)
-}
+    // 模拟网络请求延迟
+    setTimeout(() => {
+      const startIndex = (pageNum - 1) * pageSize
+      const endIndex = startIndex + pageSize
+      const pageData = totalCommunities.value.slice(startIndex, endIndex)
 
-// 处理搜索输入
-const handleSearchInput = () => {
-  // 防抖处理
-  if (searchTimeout) {
-    clearTimeout(searchTimeout)
+      if (pageNum === 1) {
+        displayedCommunities.value = pageData
+      } else {
+        displayedCommunities.value = [...displayedCommunities.value, ...pageData]
+      }
+
+      currentPage.value = pageNum
+      hasMoreData.value = displayedCommunities.value.length < totalCommunities.value.length
+      isLoading.value = false
+
+      // 滚动到新加载的内容
+      if (pageNum > 1 && pageData.length > 0) {
+        setTimeout(() => {
+          scrollIntoViewId.value = 'item-' + pageData[0].id
+        }, 100)
+      }
+    }, 500)
   }
-  
-  searchTimeout = setTimeout(() => {
-    handleSearch()
-  }, 300)
-}
 
-// 处理搜索
-const handleSearch = () => {
-  const keyword = searchText.value.trim().toLowerCase()
-  
-  if (!keyword) {
+  // 加载更多数据
+  const loadMoreData = () => {
+    if (isLoading.value || !hasMoreData.value) return
+    loadPageData(currentPage.value + 1)
+  }
+
+  // 处理搜索输入
+  const handleSearchInput = () => {
+    // 防抖处理
+    if (searchTimeout) {
+      clearTimeout(searchTimeout)
+    }
+
+    searchTimeout = setTimeout(() => {
+      handleSearch()
+    }, 300)
+  }
+
+  // 处理搜索
+  const handleSearch = () => {
+    const keyword = searchText.value.trim().toLowerCase()
+
+    if (!keyword) {
+      isSearching.value = false
+      totalCommunities.value = [...allCommunities.value]
+      loadPageData(1)
+      return
+    }
+
+    isSearching.value = true
+    totalCommunities.value = allCommunities.value.filter(community =>
+      community.name.toLowerCase().includes(keyword) ||
+      community.address.toLowerCase().includes(keyword)
+    )
+
+    loadPageData(1)
+  }
+
+  // 清空搜索
+  const clearSearch = () => {
+    searchText.value = ''
     isSearching.value = false
     totalCommunities.value = [...allCommunities.value]
     loadPageData(1)
-    return
   }
-  
-  isSearching.value = true
-  totalCommunities.value = allCommunities.value.filter(community => 
-    community.name.toLowerCase().includes(keyword) || 
-    community.address.toLowerCase().includes(keyword)
-  )
-  
-  loadPageData(1)
-}
 
-// 清空搜索
-const clearSearch = () => {
-  searchText.value = ''
-  isSearching.value = false
-  totalCommunities.value = [...allCommunities.value]
-  loadPageData(1)
-}
-
-// 选择小区
-const selectCommunity = (item) => {
-  selectedItem.value = item
-}
-
-// 确认选择
-const handleConfirm = () => {
-  if (!selectedItem.value) {
-    uni.showToast({
-      title: '请先选择小区',
-      icon: 'none',
-      duration: 2000
-    })
-    return
+  // 选择小区
+  const selectCommunity = (item) => {
+    selectedItem.value = item
   }
-  
-  uni.showModal({
-    title: '确认选择',
-    content: `您已选择: ${selectedItem.value.name}\n地址: ${selectedItem.value.address}`,
-    success: (res) => {
-      if (res.confirm) {
-        uni.showToast({
-          title: '选择成功',
-          icon: 'success',
-          duration: 1500
-        })
-        
-        // 在实际应用中，这里可以触发回调或页面跳转
-       // uni.navigateBack() 或 emit('confirm', selectedItem.value)
-        uni.$emit('confirm', selectedItem.value)
-        // 模拟2秒后返回上一页
-        setTimeout(() => {
-          uni.navigateBack()
-        }, 1500)
+
+  // 确认选择
+  const handleConfirm = () => {
+    if (!selectedItem.value) {
+      uni.showToast({
+        title: '请先选择小区',
+        icon: 'none',
+        duration: 2000
+      })
+      return
+    }
+
+    uni.showModal({
+      title: '确认选择',
+      content: `您已选择: ${selectedItem.value.name}\n地址: ${selectedItem.value.address}`,
+      success: (res) => {
+        if (res.confirm) {
+          uni.showToast({
+            title: '选择成功',
+            icon: 'success',
+            duration: 1500
+          })
+
+          // 在实际应用中，这里可以触发回调或页面跳转
+          // uni.navigateBack() 或 emit('confirm', selectedItem.value)
+          uni.$emit('confirm', selectedItem.value)
+          // 模拟2秒后返回上一页
+          setTimeout(() => {
+            uni.navigateBack()
+          }, 1500)
+        }
       }
+    })
+  }
+
+  // 监听搜索文本变化
+  watch(searchText, (newVal) => {
+    if (!newVal.trim()) {
+      clearSearch()
     }
   })
-}
 
-// 监听搜索文本变化
-watch(searchText, (newVal) => {
-  if (!newVal.trim()) {
-    clearSearch()
-  }
-})
+  // 初始化
+  onMounted(() => {
+    // 初始化数据
+    totalCommunities.value = [...allCommunities.value]
+    loadPageData(1)
 
-// 初始化
-onMounted(() => {
-  // 初始化数据
-  totalCommunities.value = [...allCommunities.value]
-  loadPageData(1)
-  
-  // 默认选中第一项
-  if (displayedCommunities.value.length > 0) {
-    selectedItem.value = displayedCommunities.value[0]
-  }
-})
+    // 默认选中第一项
+    if (displayedCommunities.value.length > 0) {
+      selectedItem.value = displayedCommunities.value[0]
+    }
+  })
 </script>
 
 <style scoped>
-/* 页面容器 */
-.container {
-  min-height: 100vh;
-  background-color: #f5f5f5;
-  display: flex;
-  flex-direction: column;
-   padding: 0rpx 40rpx;
-}
-
-/* 搜索区域 */
-.search-container {
-  padding: 20rpx 30rpx;
-  background-color: #ffffff;
-  display: flex;
-  align-items: center;
-  box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
-  z-index: 10;
-  position: sticky;
-  top: 0;
-}
-
-.search-input-wrapper {
-  flex: 1;
-  background-color: #f8f8f8;
-  border-radius: 10rpx;
-  padding: 0 20rpx;
-  display: flex;
-  align-items: center;
-  height: 80rpx;
-  margin-right: 20rpx;
-}
-
-.search-icon {
-  margin-right: 15rpx;
-}
-
-.search-input {
-  flex: 1;
-  height: 100%;
-  font-size: 28rpx;
-  color: #333;
-}
-
-.placeholder {
-  color: #999;
-  font-size: 28rpx;
-}
-
-.clear-icon {
-  padding: 10rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-.search-btn {
-  background-color: #007AFF;
-  color: #fff;
-  font-size: 28rpx;
-  height: 80rpx;
-  line-height: 80rpx;
-  border-radius: 10rpx;
-  padding: 0 30rpx;
-  margin: 0;
-  white-space: nowrap;
-}
-
-/* 小区列表 */
-.community-list {
-  flex: 1;
-  /* padding: 0 30rpx; */
-  margin-top: 20rpx;
-  margin-bottom: 180rpx;
-  
-}
-
-.community-item {
-  background-color: #fff;
-  border-radius: 12rpx;
-  padding: 30rpx;
-  margin-bottom: 20rpx;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.05);
-  transition: all 0.2s;
-}
-
-.community-item:active {
-  background-color: #f9f9f9;
-  transform: translateY(2rpx);
-}
-
-.community-item-left {
-  display: flex;
-  align-items: center;
-  flex: 1;
-}
-
-.house-icon {
-  margin-right: 20rpx;
-}
-
-.community-info {
-  display: flex;
-  flex-direction: column;
-  flex: 1;
-}
-
-.community-name {
-  font-size: 32rpx;
-  color: #333;
-  font-weight: 500;
-  margin-bottom: 8rpx;
-}
-
-.community-address {
-  font-size: 24rpx;
-  color: #999;
-  margin-bottom: 5rpx;
-}
-
-.community-id {
-  font-size: 22rpx;
-  color: #ccc;
-}
-
-.selected-icon {
-  margin-left: 20rpx;
-}
-
-/* 加载更多容器 */
-.load-more-container {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  padding: 40rpx 0;
-  color: #999;
-}
-
-.load-more-btn {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  padding: 20rpx 40rpx;
-  background-color: #f8f8f8;
-  border-radius: 50rpx;
-  color: #007AFF;
-  font-size: 28rpx;
-  margin-bottom: 20rpx;
-}
-
-.load-more-btn text {
-  margin-right: 10rpx;
-}
-
-.loading-container {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  padding: 20rpx 40rpx;
-  background-color: #f8f8f8;
-  border-radius: 50rpx;
-  color: #007AFF;
-  font-size: 28rpx;
-  margin-bottom: 20rpx;
-}
-
-.loading-icon {
-  margin-right: 10rpx;
-  animation: rotate 1s linear infinite;
-}
-
-@keyframes rotate {
-  from { transform: rotate(0deg); }
-  to { transform: rotate(360deg); }
-}
-
-.page-info {
-  font-size: 24rpx;
-  color: #999;
-}
-
-/* 没有更多数据 */
-.no-more-data {
-  text-align: center;
-  padding: 40rpx 0;
-  color: #999;
-  font-size: 28rpx;
-}
-
-/* 空状态 */
-.empty-state {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  padding: 100rpx 0;
-}
-
-.empty-text {
-  font-size: 32rpx;
-  color: #999;
-  margin-top: 20rpx;
-  margin-bottom: 10rpx;
-}
-
-.empty-tip {
-  font-size: 24rpx;
-  color: #ccc;
-}
-
-/* 确认区域 */
-.confirm-area {
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  padding: 20rpx 30rpx 40rpx;
-  background-color: #fff;
-  box-shadow: 0 -2rpx 20rpx rgba(0, 0, 0, 0.05);
-}
-
-.confirm-btn {
-  background-color: #4D5DFA;
-  color: #fff;
-  height: 100rpx;
-  line-height: 100rpx;
-  border-radius: 8rpx;
-  font-size: 34rpx;
-  width: 100%;
-  margin: 0;
-}
-
-.disabled-btn {
-  background-color: #ccc;
-  color: #fff;
-}
-
-.selected-info {
-  text-align: center;
-  font-size: 24rpx;
-  color: #666;
-  margin-top: 20rpx;
-  padding: 10rpx;
-  background-color: #f8f8f8;
-  border-radius: 8rpx;
-}
-
-/* 适配不同屏幕 */
-@media (min-width: 768px) {
+  /* 页面容器 */
   .container {
-    max-width: 500px;
-    margin: 0 auto;
+    min-height: 100vh;
+    background-color: #f5f5f5;
+    display: flex;
+    flex-direction: column;
+    padding: 0rpx 40rpx;
+  }
+
+  /* 搜索区域 */
+  .search-container {
+    padding: 20rpx 30rpx;
+    background-color: #ffffff;
+    display: flex;
+    align-items: center;
+    box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+    z-index: 10;
+    position: sticky;
+    top: 0;
+  }
+
+  .search-input-wrapper {
+    flex: 1;
+    background-color: #f8f8f8;
+    border-radius: 10rpx;
+    padding: 0 20rpx;
+    display: flex;
+    align-items: center;
+    height: 80rpx;
+    margin-right: 20rpx;
+  }
+
+  .search-icon {
+    margin-right: 15rpx;
+  }
+
+  .search-input {
+    flex: 1;
+    height: 100%;
+    font-size: 28rpx;
+    color: #333;
+  }
+
+  .placeholder {
+    color: #999;
+    font-size: 28rpx;
+  }
+
+  .clear-icon {
+    padding: 10rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+
+  .search-btn {
+    background-color: #007AFF;
+    color: #fff;
+    font-size: 28rpx;
+    height: 80rpx;
+    line-height: 80rpx;
+    border-radius: 10rpx;
+    padding: 0 30rpx;
+    margin: 0;
+    white-space: nowrap;
+  }
+
+  /* 小区列表 */
+  .community-list {
+    flex: 1;
+    /* padding: 0 30rpx; */
+    margin-top: 20rpx;
+    margin-bottom: 180rpx;
+
+  }
+
+  .community-item {
+    background-color: #fff;
+    border-radius: 12rpx;
+    padding: 30rpx;
+    margin-bottom: 20rpx;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.05);
+    transition: all 0.2s;
+  }
+
+  .community-item.active {
+    background-color: #F5FAFF;
+    border: 1px solid #2F77FD;
+    transform: translateY(2rpx);
+
+  }
+
+  .community-item-left {
+    display: flex;
+    align-items: center;
+    flex: 1;
+  }
+
+  .house-icon {
+    margin-right: 20rpx;
+  }
+
+  .community-info {
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+  }
+
+  .community-name {
+    font-size: 32rpx;
+    color: #333;
+    font-weight: 500;
+    margin-bottom: 8rpx;
+  }
+
+  .community-address {
+    font-size: 24rpx;
+    color: #999;
+    margin-bottom: 5rpx;
+  }
+
+  .community-id {
+    font-size: 22rpx;
+    color: #ccc;
+  }
+
+  .selected-icon {
+    margin-left: 20rpx;
+  }
+
+  /* 加载更多容器 */
+  .load-more-container {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    padding: 40rpx 0;
+    color: #999;
+  }
+
+  .load-more-btn {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 20rpx 40rpx;
+    background-color: #f8f8f8;
+    border-radius: 50rpx;
+    color: #007AFF;
+    font-size: 28rpx;
+    margin-bottom: 20rpx;
+  }
+
+  .load-more-btn text {
+    margin-right: 10rpx;
+  }
+
+  .loading-container {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 20rpx 40rpx;
+    background-color: #f8f8f8;
+    border-radius: 50rpx;
+    color: #007AFF;
+    font-size: 28rpx;
+    margin-bottom: 20rpx;
+  }
+
+  .loading-icon {
+    margin-right: 10rpx;
+    animation: rotate 1s linear infinite;
+  }
+
+  @keyframes rotate {
+    from {
+      transform: rotate(0deg);
+    }
+
+    to {
+      transform: rotate(360deg);
+    }
+  }
+
+  .page-info {
+    font-size: 24rpx;
+    color: #999;
+  }
+
+  /* 没有更多数据 */
+  .no-more-data {
+    text-align: center;
+    padding: 40rpx 0;
+    color: #999;
+    font-size: 28rpx;
+  }
+
+  /* 空状态 */
+  .empty-state {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    padding: 100rpx 0;
+  }
+
+  .empty-text {
+    font-size: 32rpx;
+    color: #999;
+    margin-top: 20rpx;
+    margin-bottom: 10rpx;
+  }
+
+  .empty-tip {
+    font-size: 24rpx;
+    color: #ccc;
+  }
+
+  /* 确认区域 */
+  .confirm-area {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    padding: 20rpx 30rpx 40rpx;
+    background-color: #fff;
+    box-shadow: 0 -2rpx 20rpx rgba(0, 0, 0, 0.05);
+  }
+
+  .confirm-btn {
+    background-color: #4D5DFA;
+    color: #fff;
+    height: 80rpx;
+    line-height: 80rpx;
+    border-radius: 8rpx;
+    font-size: 28rpx;
+    width: 100%;
+    margin: 0;
+  }
+
+  .disabled-btn {
+    background-color: #ccc;
+    color: #fff;
+  }
+
+  .selected-info {
+    text-align: center;
+    font-size: 24rpx;
+    color: #666;
+    margin-top: 20rpx;
+    padding: 10rpx;
+    background-color: #f8f8f8;
+    border-radius: 8rpx;
+  }
+
+  /* 适配不同屏幕 */
+  @media (min-width: 768px) {
+    .container {
+      max-width: 500px;
+      margin: 0 auto;
+    }
   }
-}
 </style>
diff --git a/wuye-manager-uniapp/pageSubPack/report-record/report-record.vue b/wuye-manager-uniapp/pageSubPack/report-record/report-record.vue
index 9f87afa..13410ed 100644
--- a/wuye-manager-uniapp/pageSubPack/report-record/report-record.vue
+++ b/wuye-manager-uniapp/pageSubPack/report-record/report-record.vue
@@ -1,245 +1,376 @@
 <template>
-  <view class="form-container">
-    <!-- 维修项目展示 -->
-    <view class="form-item">
-      <text class="label">维修项目</text>
-      <view class="value" @click="goBackSelect">
-		  <view>
-			  <text v-if="!repairProject">请选择项目</text>
-			  {{ repairProject }}
-		</view>
-        <uni-icons type="arrowright" size="16"></uni-icons>
+  <view class="report-record-page">
+	  <view class="status-bar"></view>
+    <!-- 顶部导航栏 -->
+    <uni-nav-bar
+      left-icon="back"
+      title="上报记录"
+	  backgroundColor="transparent"
+	  :border= "false"
+      @clickLeft="navBack"/>
+
+    <!-- 状态筛选标签 -->
+    <view class="status-tabs">
+      <view
+        v-for="item in statusTabs"
+        :key="item.value"
+        class="status-tab-item"
+        :class="{ active: activeStatus === item.value }"
+        @tap="switchStatus(item.value)"
+      >
+        {{ item.label }}
       </view>
     </view>
 
-    <!-- 标题输入 -->
-    <view class="form-item">
-      <text class="label">标题</text>
-      <!-- <input type="text" placeholder="请输入问题标题" v-model="form.title" /> -->
-	  <uni-easyinput v-model="form.title" placeholder="请输入内容" :inputBorder="false"></uni-easyinput>
-    </view>
-
-    <!-- 问题描述 -->
-    <view class="form-item-wenti">
-      <text class="label">问题描述</text>
-      <!-- <textarea placeholder="请输入问题内容" v-model="form.desc" rows="5" ></textarea> -->
-	  <uni-easyinput v-model="form.desc" placeholder="请描述你的问题" type="textarea"></uni-easyinput>
-    </view>
-
-    <!-- 手机号 -->
-    <view class="form-item">
-      <text class="label">手机号</text>
-	  <uni-easyinput type="number" v-model="form.phone" placeholder="请输入手机号" :inputBorder="false"></uni-easyinput>
-    </view>
-
-    <!-- 图片上传 -->
-    <view class="form-item-wenti">
-      <text class="label">问题照片</text>
-      <view class="upload-wrap">
-        <!-- 已上传图片 -->
-        <view class="upload-item" v-for="(img, index) in form.images" :key="index">
-          <image :src="img" mode="aspectFill"></image>
-          <uni-icons type="close" size="16" @click="deleteImage(index)"></uni-icons>
-        </view>
-        <!-- 上传按钮 -->
-        <view class="upload-btn" @click="chooseImage">
-          <uni-icons type="plus" size="24"></uni-icons>
-          <text>上传照片</text>
-        </view>
+    <!-- 类型筛选标签 -->
+    <view class="type-tabs">
+      <view
+        v-for="item in typeTabs"
+        :key="item.value"
+        class="type-tab-item"
+        :class="{ active: activeType === item.value }"
+        @tap="switchType(item.value)"
+      >
+        {{ item.label }}
       </view>
     </view>
 
-    <!-- 提交按钮 -->
-    <button class="submit-btn" @click="submitForm">提交</button>
+    <!-- 上报记录列表 -->
+    <scroll-view
+      class="record-list"
+      scroll-y
+      :style="{ height: `calc(100vh - ${navHeight + statusTabHeight + typeTabHeight}px)` }"
+    >
+      <!-- 空状态 -->
+      <view v-if="filteredRecords.length === 0" class="empty-state">
+        <uni-icons type="empty" size="60" color="#ccc"></uni-icons>
+        <text class="empty-text">暂无上报记录</text>
+      </view>
+
+      <!-- 记录卡片 -->
+      <view
+        v-for="record in filteredRecords"
+        :key="record.id"
+        class="record-card"
+      >
+        <!-- 标题 + 状态标签 -->
+        <view class="card-header">
+          <text class="card-title">{{ record.title }}</text>
+          <view class="status-tag" :class="record.status">
+            {{ getStatusText(record.status) }}
+          </view>
+        </view>
+
+        <!-- 类型标签 -->
+        <view class="tag-group">
+          <view class="tag-item">{{ record.reportType }}</view>
+          <view class="tag-item">{{ record.category }}</view>
+        </view>
+
+        <!-- 内容 -->
+        <view class="card-content">
+          {{ record.content }}
+        </view>
+
+        <!-- 底部信息 -->
+        <view class="card-footer">
+          <text class="create-time">{{ record.createTime }}</text>
+          <text v-if="record.repairman" class="repairman">维修师傅：{{ record.repairman }}</text>
+        </view>
+      </view>
+    </scroll-view>
   </view>
 </template>
 
 <script setup>
-import { ref } from 'vue'
-import{onLoad} from "@dcloudio/uni-app"
-// import { onLoad, uniShowToast, uniNavigateBack, uniChooseImage, uniUploadFile } from '@dcloudio/uni-app'
+import { ref, computed } from 'vue'
+import {onReady} from "@dcloudio/uni-app"
 
-// 接收上个页面传的维修项目
-const repairProject = ref('')
+// 导航栏/标签高度（适配不同设备）
+const navHeight = ref(44)
+const statusTabHeight = ref(88)
+const typeTabHeight = ref(88)
 
-// 表单数据
-const form = ref({
-  title: '',
-  desc: '',
-  phone: '',
-  images: [] // 图片列表
-})
+// 筛选状态
+const activeStatus = ref('all') // 全部/待分配/待解决/已完成
+const activeType = ref('all')   // 全部/公共报修/个人报修
 
-// 页面加载时获取传参
-onLoad((options) => {
-  if (options.category && options.project) {
-    repairProject.value = `${options.category}-${options.project}`
+// 状态筛选选项
+const statusTabs = ref([
+  { label: '全部', value: 'all' },
+  { label: '待分配', value: 'pending' },
+  { label: '待解决', value: 'processing' },
+  { label: '已完成', value: 'completed' }
+])
+
+// 类型筛选选项
+const typeTabs = ref([
+  { label: '全部', value: 'all' },
+  { label: '公共报修', value: 'public' },
+  { label: '个人报修', value: 'private' }
+])
+
+// 模拟上报记录数据（实际项目替换为接口请求）
+const reportRecords = ref([
+  {
+    id: 1,
+    title: '标题巴拉巴拉巴拉',
+    status: 'pending', // pending/processing/completed
+    reportType: '公共报修',
+    category: '路灯',
+    content: '1栋楼下道路路灯不亮，并且有的亮度不够，请物业公司及时更换，防止发生意外事故。',
+    createTime: '2026-08-01 10:05:46',
+    repairman: ''
+  },
+  {
+    id: 2,
+    title: '标题巴拉巴拉巴拉',
+    status: 'processing',
+    reportType: '公共报修',
+    category: '路灯',
+    content: '1栋楼下道路路灯不亮，并且有的亮度不够，请物业公司及时更换，防止发生意外事故。',
+    createTime: '2026-08-01 10:05:46',
+    repairman: '张三'
+  },
+  {
+    id: 3,
+    title: '标题巴拉巴拉巴拉',
+    status: 'completed',
+    reportType: '公共报修',
+    category: '路灯',
+    content: '1栋楼下道路路灯不亮，并且有的亮度不够，请物业公司及时更换，防止发生意外事故。',
+    createTime: '2026-08-01 10:05:46',
+    repairman: '张三'
   }
+])
+
+// 筛选后的记录
+const filteredRecords = computed(() => {
+  return reportRecords.value.filter(record => {
+    // 状态筛选
+    const statusMatch = activeStatus.value === 'all' || record.status === activeStatus.value
+    // 类型筛选
+    const typeMatch = activeType.value === 'all' || record.reportType === typeTabs.value.find(item => item.value === activeType.value)?.label
+    return statusMatch && typeMatch
+  })
 })
 
-// 返回选择项目页
-const goBackSelect = () => {
-	uni.navigateTo({
-		url:"/pageSubPack/report-record/repairSelect"
-	})
-  // uni.navigateBack({
-  //   delta: 1
-  // })
+// 切换状态（全部/待分配/待解决/已完成）筛选
+const switchStatus = (value) => {
+  activeStatus.value = value
 }
 
-// 选择图片
-const chooseImage = () => {
-  uni.chooseImage({
-    count: 3, // 最多选3张
-    sizeType: ['original', 'compressed'],
-    sourceType: ['album', 'camera'],
-    success: (res) => {
-      // 临时文件路径
-      const tempFilePaths = res.tempFilePaths
-      form.value.images = [...form.value.images, ...tempFilePaths]
-      
-      // 【可选】如果需要上传到服务器，取消下面注释
-      // tempFilePaths.forEach(path => {
-      //   uni.uploadFile({
-      //     url: '你的上传接口地址',
-      //     filePath: path,
-      //     name: 'file',
-      //     success: (uploadRes) => {
-      //       console.log('上传成功', uploadRes)
-      //     }
-      //   })
-      // })
-    }
+// 切换类型（公共/个人）筛选
+const switchType = (value) => {
+  activeType.value = value
+}
+
+// 返回上一页
+const navBack = () => {
+  uni.switchTab({
+  	url:"/pages/my/my"
   })
 }
 
-// 删除图片
-const deleteImage = (index) => {
-  form.value.images.splice(index, 1)
+// 获取状态文本
+const getStatusText = (status) => {
+  const statusMap = {
+    pending: '待分配',
+    processing: '待解决',
+    completed: '已完成'
+  }
+  return statusMap[status] || ''
 }
 
-// 表单提交
-const submitForm = () => {
-  // 表单校验
-  if (!repairProject.value) {
-    uni.showToast({ title: '请选择维修项目', icon: 'none' })
-    return
-  }
-  if (!form.value.title) {
-    uni.showToast({ title: '请输入问题标题', icon: 'none' })
-    return
-  }
-  if (!form.value.desc) {
-    uni.showToast({ title: '请输入问题描述', icon: 'none' })
-    return
-  }
-  if (!/^1[3-9]\d{9}$/.test(form.value.phone)) {
-    uni.showToast({ title: '请输入正确的手机号', icon: 'none' })
-    return
-  }
-
-  // 提交数据（替换成你的接口）
-  uni.showLoading({ title: '提交中...' })
-  
-  // 模拟接口请求
-  setTimeout(() => {
-    uni.hideLoading()
-    uni.showToast({ title: '提交成功', icon: 'success' })
-    
-    // 提交成功后重置表单/返回上一页
-    form.value = { title: '', desc: '', phone: '', images: [] }
-    // 或返回上一页
-    uni.navigateBack({ delta: 3 })
-  }, 1000)
-}
+// 页面渲染完成后适配高度
+onReady(() => {
+  // 可根据实际设备调整高度
+  uni.getSystemInfo({
+    success: (res) => {
+      if (res.platform === 'ios') {
+        navHeight.value = 44
+      } else {
+        navHeight.value = 48
+      }
+    }
+  })
+})
 </script>
 
 <style scoped>
-.form-container {
-  padding: 30rpx 40rpx;
-  background: #fff;
-  min-height: 100vh;
+.report-record-page {
+  width: 100%;
+  height: 100vh;
+  background: linear-gradient(to left bottom, #e2efff 0%, #f9f9f9 50%)
 }
-.form-item-wenti {
-  margin-bottom: 20px;
-  border-bottom: 1px solid #eee;
-  padding-bottom: 10px;
+.status-bar{
+	width: 100%;
+	height: 46px;
 }
-.form-item {
+/* 状态筛选标签 */
+.status-tabs {
   display: flex;
-  margin-bottom: 30rpx;
-  align-items: flex-start;
-	border-bottom: 1px solid #eee;
-}
-.label {
-  width: 140rpx;
-  font-size: 28rpx;
-  color: #333;
-  line-height: 80rpx;
+  /* background-color: #fff; */
+  padding: 0 40rpx;
+  height: 88rpx;
+  align-items: center;
 }
 
-.value {
-  flex: 1;
-  font-size: 28rpx;
-  color: #666;
-  line-height: 80rpx;
-  text-align: right;
+.status-tab-item {
+  /* flex: 1; */
   display: flex;
-  justify-content: space-between;
+  justify-content: flex-start;
+  margin-right: 60rpx;
+  text-align: left;
+  font-size: 32rpx;
+  color: #666;
+  height: 100%;
+  line-height: 88rpx;
+  position: relative;
 }
-.input, .textarea {
-  font-size: 14px;
-  width: 100%;
-  padding: 8px 0;
+
+.status-tab-item.active {
+  color: #4D5DFA;
+  font-weight: 500;
+}
+
+.status-tab-item.active::after {
+  content: '';
+  position: absolute;
+  bottom: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  width: 80rpx;
+  height: 8rpx;
+  background: linear-gradient(to bottom, #4D5DFA, #BAC0FA);
+  border-radius: 6rpx;
+}
+
+/* 类型筛选标签 */
+.type-tabs {
+  display: flex;
+  /* background-color: #fff; */
+  padding: 20rpx 0rpx;
+  margin-top: 10rpx;
+  justify-content: flex-start;
+  gap: 20rpx;
+  margin: 0rpx 40rpx;
+}
+
+.type-tab-item {
+  padding: 12rpx 30rpx;
+  font-size: 28rpx;
+  color: #999;
+  border: 2rpx solid #999;
+  border-radius: 198rpx;
+}
+
+.type-tab-item.active {
+  color: #4D5DFA;
+  border: 2rpx solid #4D5DFA;
+  border-radius: 198rpx;
+  /* background-color: #007AFF; */
+}
+
+/* 记录列表 */
+.record-list {
+  padding: 20rpx 40rpx;
   box-sizing: border-box;
 }
-.textarea {
-  resize: none;
-}
-.upload-wrap {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 10px;
-  margin-top: 8px;
-}
-.upload-item {
-  position: relative;
-  width: 80px;
-  height: 80px;
-}
-.upload-item image {
-  width: 100%;
-  height: 100%;
-  border-radius: 4px;
-}
-.upload-item uni-icons {
-  position: absolute;
-  top: -5px;
-  right: -5px;
-  background: #ff3b30;
-  color: #fff;
-  border-radius: 50%;
-  padding: 2px;
-}
-.upload-btn {
-  width: 80px;
-  height: 80px;
-  border: 1px dashed #ccc;
-  border-radius: 4px;
+
+/* 空状态 */
+.empty-state {
   display: flex;
   flex-direction: column;
-  justify-content: center;
   align-items: center;
+  justify-content: center;
+  padding: 100rpx 0;
+  color: #ccc;
+}
+
+.empty-text {
+  font-size: 32rpx;
   color: #999;
-  font-size: 12px;
+  margin-top: 20rpx;
 }
-.submit-btn {
-  width: 100%;
-  background: #4D5DFA;
+
+/* 记录卡片 */
+.record-card {
+  background-color: #fff;
+  border-radius: 16rpx;
+  padding: 30rpx;
+  margin-bottom: 20rpx;
+  box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+}
+
+.card-header {
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+  margin-bottom: 20rpx;
+}
+
+.card-title {
+  font-size: 32rpx;
+  font-weight: 500;
+  color: #333;
+  margin-right: 20rpx;
+}
+
+/* 状态标签 */
+.status-tag {
+  padding: 6rpx 16rpx;
+  font-size: 20rpx;
+  border-radius: 12rpx;
   color: #fff;
-  border-radius: 6px;
-  height: 44px;
-  line-height: 44px;
-  font-size: 16px;
+  border-radius: 198rpx;
 }
-</style>
\ No newline at end of file
+
+.status-tag.pending {
+  background-color: #E34D59; /* 待分配-红色 */
+}
+
+.status-tag.processing {
+  background-color: #09C2BD; /* 待解决-绿色 */
+}
+
+.status-tag.completed {
+  background-color: #4D5DFA; /* 已完成-蓝色 */
+}
+
+/* 类型标签组 */
+.tag-group {
+  display: flex;
+  gap: 15rpx;
+  margin-bottom: 20rpx;
+}
+
+.tag-item {
+  padding: 6rpx 20rpx;
+  font-size: 24rpx;
+  color: #666;
+  border: 1rpx solid #999;
+  border-radius: 8rpx;
+}
+
+/* 内容 */
+.card-content {
+  font-size: 28rpx;
+  color: #666;
+  line-height: 1.6;
+  margin-bottom: 20rpx;
+}
+
+/* 底部信息 */
+.card-footer {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  font-size: 28rpx;
+  color: #999;
+}
+
+.repairman {
+  color: #999;
+}
+</style>
diff --git a/wuye-manager-uniapp/pageSubPack/setting/change -password.vue b/wuye-manager-uniapp/pageSubPack/setting/change -password.vue
index a05a9c8..badbd5a 100644
--- a/wuye-manager-uniapp/pageSubPack/setting/change -password.vue	
+++ b/wuye-manager-uniapp/pageSubPack/setting/change -password.vue	
@@ -9,26 +9,26 @@
 
     <!-- 旧密码输入框 -->
     <view class="input-item">
-      <uni-easyinput 
-        class="input-content"  
-        type="password" 
+      <uni-easyinput
+        class="input-content"
+        type="password"
         v-model="oldPassword"
-        placeholder="请输入旧密码" 
-        :inputBorder="false"  
+        placeholder="请输入旧密码"
+        :inputBorder="false"
         :placeholderStyle="placeholderStyle"
         @input="checkForm"
       >
       </uni-easyinput>
     </view>
-    
+
     <!-- 新密码输入框 -->
     <view class="input-item">
-      <uni-easyinput 
-        class="input-content"  
-        type="password" 
+      <uni-easyinput
+        class="input-content"
+        type="password"
         v-model="newPassword"
-        placeholder="请输入新密码（6-16位，含字母+数字）" 
-        :inputBorder="false"  
+        placeholder="请输入新密码（6-16位，含字母+数字）"
+        :inputBorder="false"
         :placeholderStyle="placeholderStyle"
         @input="checkForm"
       >
@@ -37,12 +37,12 @@
 
     <!-- 确认密码输入框 -->
     <view class="input-item">
-      <uni-easyinput 
-        class="input-content"  
-        type="password" 
+      <uni-easyinput
+        class="input-content"
+        type="password"
         v-model="confirmPassword"
-        placeholder="请再次输入新密码" 
-        :inputBorder="false"  
+        placeholder="请再次输入新密码"
+        :inputBorder="false"
         :placeholderStyle="placeholderStyle"
         @input="checkForm"
       >
@@ -55,8 +55,8 @@
     </view>
 
     <!-- 确定按钮 -->
-    <button 
-      class="confirm-btn" 
+    <button
+      class="confirm-btn"
       :disabled="!canConfirm"
       @click="handleConfirm"
     >
@@ -88,15 +88,15 @@ const smsCode = ref('');
 const canConfirm = computed(() => {
   // 密码格式规则：6-16位，必须包含字母+数字
   const pwdReg = /^(?=.*[a-zA-Z])(?=.*\d).{6,16}$/;
-  
+
   // 校验条件：
-  // 1. 旧密码不为空 
-  // 2. 新密码符合格式 
-  // 3. 确认密码和新密码一致 
+  // 1. 旧密码不为空
+  // 2. 新密码符合格式
+  // 3. 确认密码和新密码一致
   // 4. 所有密码输入框不为空
-  return oldPassword.value.trim() 
-    && pwdReg.test(newPassword.value) 
-    && newPassword.value === confirmPassword.value 
+  return oldPassword.value.trim()
+    && pwdReg.test(newPassword.value)
+    && newPassword.value === confirmPassword.value
     && newPassword.value && confirmPassword.value;
 });
 
@@ -109,11 +109,11 @@ const goBack = () => {
 // 页面显示时读取缓存参数
 onShow(() => {
   // 从缓存读取参数
-  const params = uni.getStorageSync('tempChangePwdParams') || {}; 
+  const params = uni.getStorageSync('tempChangePwdParams') || {};
   // 赋值
   phone.value = params.phoneNumber || ''
   smsCode.value = params.verifyCode || ''
-  
+
   // 校验参数是否完整
   // if (!phone.value || !smsCode.value) {
   //   uni.showToast({
@@ -124,7 +124,7 @@ onShow(() => {
   //     goBack()
   //   }, 1500)
   // }
-  
+
   // 用完删除缓存（避免下次跳转读取旧值）
   uni.removeStorageSync('tempChangePwdParams');
 });
@@ -266,7 +266,7 @@ const handleConfirm = () => {
   background-color: #4D5DFA;
   color: #fff;
   border-radius: 44rpx;
-  font-size: 32rpx;
+  font-size: 28rpx;
   margin-top: 20rpx;
   border: none;
 }
@@ -282,4 +282,4 @@ button:after {
   border: none;
   border-radius: 44rpx;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/wuye-manager-uniapp/pageSubPack/setting/change-phone.vue b/wuye-manager-uniapp/pageSubPack/setting/change-phone.vue
index 4104031..f6eac00 100644
--- a/wuye-manager-uniapp/pageSubPack/setting/change-phone.vue
+++ b/wuye-manager-uniapp/pageSubPack/setting/change-phone.vue
@@ -23,8 +23,8 @@
 		  <uni-easyinput  class="input-content verify-input"  type="number" v-model="verifyCode"  trim="all"
 		  	  	   placeholder="请输入验证码" :inputBorder="false" maxlength="6"  :placeholderStyle="placeholderStyle">
 		  		</uni-easyinput>
-		  <button 
-		    class="get-verify-btn" 
+		  <button
+		    class="get-verify-btn"
 		    :disabled="!canGetVerify || countDown > 0"
 		    @click="getVerifyCode"
 		  >
@@ -32,18 +32,18 @@
 		  </button>
 		</view>
 		<!-- 确定 -->
-		<button 
-		  class="forget-btn" 
+		<button
+		  class="forget-btn"
 		  :disabled="!canRegister"
 		  @click="handleConfirm"
 		>
 		  确定
 		</button>
-		
+
 	</view>
 </template>
 <script setup>
-import { ref, computed, onUnmounted } from 'vue';	
+import { ref, computed, onUnmounted } from 'vue';
 import {getSendCode} from '../api/api.js'
 
 // ====响应式数据======
@@ -73,7 +73,7 @@ const getVerifyCode = () => {
   		 uni.showToast({
   		   title: '验证码已发送',
   		   icon: 'success'
-  		 }); 
+  		 });
 		// 开始60秒倒计时
 		countDown.value = 60;
 		timer = setInterval(() => {
@@ -82,25 +82,25 @@ const getVerifyCode = () => {
 		    clearInterval(timer);
 		    timer = null;
 		  }
-		}, 1000); 
-  		
+		}, 1000);
+
   	  }else{
   		 uni.showToast({
   		   title: '验证码发送失败',
   		   icon: 'error'
-  		 }); 
+  		 });
   	  }
   })
 
-  
+
 };
 // 是否确认
 const canRegister = computed(() => {
   const phoneReg = /^1[3-9]\d{9}$/; // 手机号11位
   const verifyReg = /^\d{6}$/; // 验证码6位
 
-  return phoneReg.test(phoneNumber.value) 
-    && verifyReg.test(verifyCode.value) 
+  return phoneReg.test(phoneNumber.value)
+    && verifyReg.test(verifyCode.value)
 });
 // 确认
 const handleConfirm = () =>{
@@ -118,7 +118,7 @@ const handleConfirm = () =>{
 const goBack = () => {
   uni.navigateBack();
 };
-	
+
 </script>
 <style scoped>
 .forget-page{
@@ -126,7 +126,7 @@ const goBack = () => {
 	min-height: 100vh;
 	background-color: #f9f9f9;
 	/* background: repeating-linear-gradient(180deg, #E2F0FF, #F6FAFF ); */
-}	
+}
 .status_bar{
 	width: 100%;
 	height: 46px;
@@ -211,7 +211,7 @@ const goBack = () => {
 	background-color: #4D5DFA;
 	color: #fff;
 	border-radius: 8rpx;
-	font-size: 32rpx;
+	font-size: 28rpx;
 	margin-bottom: 40rpx;
 }
 .forget-btn:disabled{
@@ -223,5 +223,5 @@ button:after{
 	border-radius:  8px;
 }
 
-	
+
 </style>
diff --git a/wuye-manager-uniapp/pages.json b/wuye-manager-uniapp/pages.json
index f36fc16..186f851 100644
--- a/wuye-manager-uniapp/pages.json
+++ b/wuye-manager-uniapp/pages.json
@@ -37,6 +37,12 @@
             "navigationStyle": "custom"
           }
         },
+        {
+          "path": "privacy",
+          "style": {
+            "navigationBarTitleText": "用户隐私协议"
+          }
+        },
         {
           "path": "register-new-user",
           "style": {
@@ -117,6 +123,22 @@
         }
       }]
     },
+    {
+      "root": "pageSubPack/fault-reporting",
+      "pages": [{
+        "path": "fault-reporting",
+        "style": {
+          "navigationBarTitleText": "填写维修信息"
+        }
+      },
+      {
+        "path": "repairSelect",
+        "style": {
+          "navigationBarTitleText": "选择维修项目"
+        }
+      }
+      ]
+    },
     {
       "root": "pageSubPack/report-record",
       "pages": [{
@@ -125,7 +147,8 @@
           "navigationBarTitleText": "上报记录",
           "navigationStyle": "custom"
         }
-      }]
+      }
+      ]
     },
     {
       "root": "pageSubPack/setting",
diff --git a/wuye-manager-uniapp/pages/index/index.vue b/wuye-manager-uniapp/pages/index/index.vue
index 9713117..51e8dfd 100644
--- a/wuye-manager-uniapp/pages/index/index.vue
+++ b/wuye-manager-uniapp/pages/index/index.vue
@@ -77,7 +77,7 @@
     <view class="function-container">
       <!-- 第一行功能：故障上报、一键开门、工单大厅、我的工单 -->
       <view class="function-row">
-        <view class="function-item">
+        <view class="function-item" @click="goToReport">
           <image class="item-icon" src="/static/imgs/fault-report.png" mode="aspectFit"></image>
           <text class="item-text">故障上报</text>
         </view>
@@ -151,7 +151,7 @@ const goToInspectionRecord = () => {
 // 故障上报
 const goToReport = () => {
   uni.navigateTo({
-    url: "/pageSubPack/report-record/report-record"
+    url: "/pageSubPack/fault-reporting/fault-reporting"
   })
 }
 // 接收选择小区返回的参数