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)