From 36ee7c356212b57082856415203786969d152d5c Mon Sep 17 00:00:00 2001
From: zhouyanli <593579392@qq.com>
Date: Thu, 18 Jun 2026 16:38:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=91=E7=9A=84=E8=BD=A6?=
 =?UTF-8?q?=E8=BE=86=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81=E3=80=81=E9=97=AE?=
 =?UTF-8?q?=E5=8D=B7=E8=B0=83=E6=9F=A5=E3=80=81=E7=99=BB=E5=BD=95=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=94=A8=E6=88=B7=E9=9A=90=E7=A7=81=E5=8D=8F=E8=AE=AE?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../privacy-popup/privacy-popup.vue           | 156 ++++
 .../pageSubPack/api/apiSub.js                 |   6 +-
 .../pageSubPack/loginSub/login.vue            |  43 +-
 .../pageSubPack/loginSub/pwd-login.vue        | 119 ++-
 .../loginSub/register-new-user.vue            | 834 +++++++++---------
 .../pageSubPack/my/myCarIndex.vue             |   4 +-
 .../service-list/questionnaireFillout.vue     |  25 +-
 7 files changed, 734 insertions(+), 453 deletions(-)
 create mode 100644 property-uniapp-project/components/privacy-popup/privacy-popup.vue

diff --git a/property-uniapp-project/components/privacy-popup/privacy-popup.vue b/property-uniapp-project/components/privacy-popup/privacy-popup.vue
new file mode 100644
index 0000000..37e912f
--- /dev/null
+++ b/property-uniapp-project/components/privacy-popup/privacy-popup.vue
@@ -0,0 +1,156 @@
+<template>
+	<view class="privacy-mask" v-if="show" @click="handleMaskClick">
+		<view class="privacy-popup" @click.stop>
+			<view class="popup-header">
+				<text class="popup-title">请先阅读并同意协议</text>
+				<view class="popup-close" @click="handleClose">✕</view>
+			</view>
+			<scroll-view class="popup-body" scroll-y>
+				<view class="popup-content">
+					<view class="section-text">
+						我已仔细阅读并同意
+						<text class="privacy-link" @click="goToPrivacy">《用户协议》和《隐私政策》</text>
+						全部内容。
+					</view>
+				</view>
+			</scroll-view>
+			<view class="popup-footer">
+				<button class="popup-btn disagree-btn" @click="handleDisagree">不同意</button>
+				<button class="popup-btn agree-btn" @click="handleAgree">同意</button>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+defineProps({
+	show: {
+		type: Boolean,
+		default: false
+	}
+})
+
+const emit = defineEmits(['agree', 'disagree', 'close', 'update:show'])
+
+const handleAgree = () => {
+	emit('agree')
+}
+
+const handleDisagree = () => {
+	emit('disagree')
+}
+
+const handleClose = () => {
+	emit('close')
+	emit('update:show', false)
+}
+
+const handleMaskClick = () => {
+	emit('close')
+	emit('update:show', false)
+}
+
+const goToPrivacy = () => {
+	uni.navigateTo({ url: '/pageSubPack/loginSub/privacy' })
+}
+</script>
+
+<style scoped>
+.privacy-mask {
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	background: rgba(0, 0, 0, 0.5);
+	z-index: 9999;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.privacy-popup {
+	width: 640rpx;
+	max-height: 80vh;
+	background: #fff;
+	border-radius: 16rpx;
+	display: flex;
+	flex-direction: column;
+	overflow: hidden;
+}
+
+.popup-header {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	padding: 28rpx 30rpx 16rpx;
+	border-bottom: 1rpx solid #eee;
+}
+
+.popup-title {
+	font-size: 32rpx;
+	font-weight: 600;
+	color: #333;
+}
+
+.popup-close {
+	width: 48rpx;
+	height: 48rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	font-size: 28rpx;
+	color: #999;
+	border-radius: 50%;
+	background: #f5f5f5;
+}
+
+.popup-body {
+	flex: 1;
+	padding: 24rpx 30rpx;
+	max-height: 50vh;
+}
+
+.popup-content .section-text {
+	font-size: 26rpx;
+	line-height: 1.8;
+	color: #666;
+	text-align: justify;
+}
+
+.privacy-link {
+	color: #007aff;
+}
+
+.popup-footer {
+	display: flex;
+	padding: 20rpx 30rpx 30rpx;
+	gap: 20rpx;
+	border-top: 1rpx solid #eee;
+}
+
+.popup-btn {
+	flex: 1;
+	height: 80rpx;
+	line-height: 80rpx;
+	border-radius: 8rpx;
+	font-size: 28rpx;
+	border: none;
+	padding: 0;
+	margin: 0;
+}
+
+.popup-btn::after {
+	border: none;
+}
+
+.disagree-btn {
+	background: #f5f5f5;
+	color: #666;
+}
+
+.agree-btn {
+	background: #007aff;
+	color: #fff;
+}
+</style>
diff --git a/property-uniapp-project/pageSubPack/api/apiSub.js b/property-uniapp-project/pageSubPack/api/apiSub.js
index ba204d2..bbc425b 100644
--- a/property-uniapp-project/pageSubPack/api/apiSub.js
+++ b/property-uniapp-project/pageSubPack/api/apiSub.js
@@ -95,12 +95,12 @@ export const getQuestionnaireList = (data) => {
 	return get('/api/resident/questionnaire/list',data)
 }
 // 问卷详情
-export const getQuestionnaireDetail = (data) => {
-	return get('/api/resident/questionnaire/myAnswers',data)
+export const getQuestionnaireDetail = (id,data) => {
+	return get(`/api/resident/questionnaire/${id}`,data)
 }
 // 提交问卷
 export const submitQuestionnair = (id,data) => {
-	return post(`/api/resident/questionnaire/${id}/submit`, data)
+	return post(`/api/resident/questionnaire/submit/${id}`, data)
 }
 // =====投诉意见=======
 // 获取投诉类型
diff --git a/property-uniapp-project/pageSubPack/loginSub/login.vue b/property-uniapp-project/pageSubPack/loginSub/login.vue
index 0934d56..647e456 100644
--- a/property-uniapp-project/pageSubPack/loginSub/login.vue
+++ b/property-uniapp-project/pageSubPack/loginSub/login.vue
@@ -56,7 +56,11 @@
 			  v-else
 			></uni-icons>
 		</view>
-      <text class="agreement-text" @click.stop="goToPrivacy">我已阅读并同意<text class="agreePrivacy">《用户隐私政策》</text></text>
+      <text class="agreement-text" >
+		  我已阅读并同意
+		  <text class="agreePrivacy">《用户协议》</text>和
+		   <text @click.stop="goToPrivacy"  class="agreePrivacy">《隐私政策》</text>
+		  </text>
     </view>
 
     <!-- 登录按钮 -->
@@ -72,12 +76,16 @@
       <navigator class="link-item" url="/pageSubPack/loginSub/pwd-login">账号密码登录</navigator>
       <navigator class="link-item" url="/pageSubPack/loginSub/register-new-user">注册新用户</navigator>
     </view>
+
+    <!-- 隐私协议弹窗 -->
+    <privacy-popup v-model:show="showPrivacyPopup" @agree="agreePrivacy" @disagree="disagreePrivacy" @close="showPrivacyPopup = false" />
   </view>
 </template>
 
 <script setup>
 import { ref, computed, onUnmounted } from 'vue';
 import {getLoginBySms,getSendCode} from '../api/api.js'
+import PrivacyPopup from '@/components/privacy-popup/privacy-popup.vue'
 
 // ========== 响应式数据 ==========
 // 手机号
@@ -91,6 +99,9 @@ const agreeAgreement = ref(false); // 默认不勾选
 const countDown = ref(0);
 // 定时器
 let timer = null;
+// 隐私弹窗
+const showPrivacyPopup = ref(false)
+const pendingAction = ref('')
 
 // ========== 计算属性 ==========
 // 是否可以获取验证码（手机号格式正确）
@@ -124,6 +135,28 @@ const goToPrivacy = () => {
   })
 }
 
+// 打开隐私弹窗
+const openPrivacyPopup = (action) => {
+  pendingAction.value = action || ''
+  showPrivacyPopup.value = true
+}
+
+// 同意隐私协议
+const agreePrivacy = () => {
+  showPrivacyPopup.value = false
+  agreeAgreement.value = true
+  if (pendingAction.value === 'login') {
+    doLogin()
+  }
+  pendingAction.value = ''
+}
+
+// 不同意隐私协议
+const disagreePrivacy = () => {
+  showPrivacyPopup.value = false
+  pendingAction.value = ''
+}
+
 // 获取验证码
 const getVerifyCode = () => {
   if (!canGetVerify.value) return;
@@ -183,9 +216,13 @@ const handleLogin = () => {
     return;
   }
   if (!agreeAgreement.value) {
-    uni.showToast({ title: '请勾选协议', icon: 'none' });
+    openPrivacyPopup('login')
     return;
   }
+  doLogin()
+};
+
+const doLogin = () => {
    uni.showLoading({ title: '登录中...', mask: true });
     const push_cid = uni.getStorageSync('push_cid')
   let params = {
@@ -246,7 +283,7 @@ const handleLogin = () => {
 				// #endif
 
  //  setTimeout(() =>{
-	// uni.switchTab({ url: '/pages/index/index' });  
+	// uni.switchTab({ url: '/pages/index/index' });
  //  },1500)
   uni.hideLoading()
 };
diff --git a/property-uniapp-project/pageSubPack/loginSub/pwd-login.vue b/property-uniapp-project/pageSubPack/loginSub/pwd-login.vue
index 8852823..dbe6e52 100644
--- a/property-uniapp-project/pageSubPack/loginSub/pwd-login.vue
+++ b/property-uniapp-project/pageSubPack/loginSub/pwd-login.vue
@@ -30,7 +30,7 @@
     <!-- 协议勾选 + 忘记密码 -->
     <view class="agreement-wrap">
       <view class="agreement-item">
-		  <view @click="toggleAgreement">
+		  <view @click="toggleAgreement" class="checkbox-icon">
 			 <uni-icons
 			   type="checkbox-filled"
 			   size="24"
@@ -42,11 +42,12 @@
 			   size="24"
 			   color="#999"
 			   v-else
-			 ></uni-icons> 
+			 ></uni-icons>
 		  </view>
-   
-        <text class="agreement-text" @click.stop="goToPrivacy">我已阅读并同意
-			<text  class="agreePrivacy" >《用户隐私政策》</text>
+
+        <text class="agreement-text" >我已阅读并同意
+			<text class="agreePrivacy" @click.stop="">《用户协议》</text>和
+			<text class="agreePrivacy" @click.stop="goToPrivacy">《隐私政策》</text>
 		</text>
       </view>
       <navigator class="forget-pwd" url="/pageSubPack/loginSub/forget-pwd">忘记密码？</navigator>
@@ -66,12 +67,16 @@
       <navigator class="link-item" url="/pageSubPack/loginSub/register-new-user">注册新用户</navigator>
     </view>
   </view>
+	<!-- 隐私协议弹窗 -->
+	<privacy-popup v-model:show="showPrivacyPopup" @agree="agreePrivacy" @disagree="disagreePrivacy" @close="showPrivacyPopup = false" />
+
 </template>
 
 <script setup>
 import { ref, computed } from 'vue';
 import {onLoad} from "@dcloudio/uni-app"
 import {getLoginPassword} from '../api/api.js'
+import PrivacyPopup from '@/components/privacy-popup/privacy-popup.vue'
 
 // 响应式数据
 const phoneNumber = ref('');
@@ -92,11 +97,37 @@ const toggleAgreement = () => {
   agreeAgreement.value = !agreeAgreement.value;
 };
 
-// 跳转隐私协议
+const showPrivacyPopup = ref(false)
+const pendingAction = ref('') // 记录待执行操作，如 'smsLogin'
+
+// 跳转隐私协议页面
 const goToPrivacy = () => {
-  uni.navigateTo({
-    url:'/pageSubPack/loginSub/privacy',
-  })
+  uni.navigateTo({ url: "/pageSubPack/loginSub/privacy" })
+}
+
+// 打开隐私弹窗（可传入待执行操作标识）
+const openPrivacyPopup = (action) => {
+  pendingAction.value = action || ''
+  showPrivacyPopup.value = true
+}
+
+// 同意隐私协议
+const agreePrivacy = () => {
+  showPrivacyPopup.value = false
+  agreeAgreement.value = true
+  // 执行之前拦截的操作
+  if (pendingAction.value === 'smsLogin') {
+    uni.navigateTo({ url: '/pageSubPack/loginSub/login' })
+  } else if (pendingAction.value === 'login') {
+    doLogin()
+  }
+  pendingAction.value = ''
+}
+
+// 不同意隐私协议
+const disagreePrivacy = () => {
+  showPrivacyPopup.value = false
+  pendingAction.value = ''
 }
 
 // 检查表单
@@ -130,9 +161,13 @@ const handleLogin = () => {
 		return;
   }
   if(!agreeAgreement.value){
-	  uni.showToast({ title: '请勾选协议', icon: 'none' });
+	  openPrivacyPopup('login')
 	  return;
   }
+  doLogin()
+};
+
+const doLogin = () => {
    uni.showLoading({ title: '登录中...', mask: true });
    const push_cid = uni.getStorageSync('push_cid')
   	let params = {
@@ -143,33 +178,32 @@ const handleLogin = () => {
   	getLoginPassword(params).then(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.setStorageSync('userId',res.data.userId)
-			}
-			uni.hideLoading();
-			uni.showToast({ title: '登录成功', icon: 'success' });
-			setTimeout(() =>{
-				uni.switchTab({
-				  url: '/pages/index/index'
-				},1000);
-			})
+				// 存用户ID
+				if(res.data) {
+					// 存当前绑定的小区ID，0 表示未绑定
+					const currentVillageId = res.data.currentVillageId || 0;
+					uni.setStorageSync('currentVillageId', currentVillageId);
+					uni.setStorageSync('userId',res.data.userId)
+				}
+				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 => {
-		// console.log('密码登录异常',err)
-		uni.hideLoading();
-		uni.showToast({
-				title: err.msg || '网络异常',
-				icon: 'error'
-			});
-	})
-
+			// console.log('密码登录异常',err)
+			uni.hideLoading();
+			uni.showToast({
+					title: err.msg || '网络异常',
+					icon: 'error'
+				});
+		})
 };
 </script>
 
@@ -233,33 +267,41 @@ const handleLogin = () => {
 
 .agreement-wrap {
   display: flex;
+  align-items: flex-start;
   justify-content: space-between;
-  align-items: center;
   margin: 70rpx 0 28rpx 0;
   padding: 0 10rpx;
 }
 
 .agreement-item {
   display: flex;
-  align-items: center;
+  align-items: flex-start;
+  flex: 1;
+  min-width: 0;
+}
+
+.checkbox-icon {
+  flex-shrink: 0;
+  margin-top: 2rpx;
 }
 
 .agreement-text {
   font-size: 24rpx;
   color: #666;
   margin-left: 10rpx;
+  line-height: 1.5;
 }
 .agreePrivacy{
 	color: #2F77FD;
 }
-/* .agreePrivacy.active{
-	color: #2F77FD;
-} */
 
 .forget-pwd {
   font-size: 24rpx;
   color: #666;
   text-decoration: none;
+  flex-shrink: 0;
+  margin-left: 16rpx;
+  line-height: 1.5;
 }
 
 .login-btn {
@@ -295,4 +337,5 @@ button:after{
   color: #007aff;
   text-decoration: none;
 }
-</style>
\ No newline at end of file
+
+</style>
diff --git a/property-uniapp-project/pageSubPack/loginSub/register-new-user.vue b/property-uniapp-project/pageSubPack/loginSub/register-new-user.vue
index 5b52f97..aba9f6f 100644
--- a/property-uniapp-project/pageSubPack/loginSub/register-new-user.vue
+++ b/property-uniapp-project/pageSubPack/loginSub/register-new-user.vue
@@ -1,456 +1,486 @@
 <template>
-	<view class="register-page">
-		<view class="status_bar"></view>
-		<!-- 顶部导航 -->
-		<view class="nav-bar">
-			<uni-icons type="left" size="28" color="#333" @click="goBack"></uni-icons>
-			<view class="nav-title">注册</view>
-		</view>
-
-		<!-- 注册标题 -->
-		<view class="register-title">注册用户</view>
-
-		<!-- 手机号输入框 -->
-		<view class="input-item">
-			<view class="input-icon">
-				<image src="https://wuyeadmin.bugtc.com/images/login/phone.png" mode=""
-					style="height: 100%;width: 100%;"></image>
+		<view class="register-page">
+			<view class="status_bar"></view>
+			<!-- 顶部导航 -->
+			<view class="nav-bar">
+				<uni-icons type="left" size="28" color="#333" @click="goBack"></uni-icons>
+				<view class="nav-title">注册</view>
 			</view>
-			<uni-easyinput class="input-content" type="number" v-model="phoneNumber" placeholder="请输入手机号"
-				:inputBorder="false" maxlength="11" :placeholderStyle="placeholderStyle">
-			</uni-easyinput>
-		</view>
 
-		<!-- 验证码输入 + 获取验证码按钮 -->
-		<view class="input-item verify-item">
-			<view class="input-icon">
-				<image src="https://wuyeadmin.bugtc.com/images/login/code.png" mode="" style="height: 100%;width: 100%;">
-				</image>
-				<!-- <uni-icons type="locked" size="24" color="#999"></uni-icons> -->
+			<!-- 注册标题 -->
+			<view class="register-title">注册用户</view>
+
+			<!-- 手机号输入框 -->
+			<view class="input-item">
+				<view class="input-icon">
+					<image src="https://wuyeadmin.bugtc.com/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>
 			</view>
-			<uni-easyinput class="input-content verify-input" type="number" v-model="verifyCode" placeholder="请输入验证码"
-				:inputBorder="false" maxlength="6" :placeholderStyle="placeholderStyle">
-			</uni-easyinput>
 
-			<button class="get-verify-btn" :disabled="!canGetVerify || countDown > 0" @click="getVerifyCode">
-				{{ countDown > 0 ? `${countDown}s后重新获取` : '获取验证码' }}
+			<!-- 验证码输入 + 获取验证码按钮 -->
+			<view class="input-item verify-item">
+				<view class="input-icon">
+					<image src="https://wuyeadmin.bugtc.com/images/login/code.png" mode="" style="height: 100%;width: 100%;">
+					</image>
+					<!-- <uni-icons type="locked" size="24" color="#999"></uni-icons> -->
+				</view>
+				<uni-easyinput class="input-content verify-input" type="number" v-model="verifyCode" placeholder="请输入验证码"
+					:inputBorder="false" maxlength="6" :placeholderStyle="placeholderStyle">
+				</uni-easyinput>
+
+				<button class="get-verify-btn" :disabled="!canGetVerify || countDown > 0" @click="getVerifyCode">
+					{{ countDown > 0 ? `${countDown}s后重新获取` : '获取验证码' }}
+				</button>
+			</view>
+
+			<!-- 账号输入框 -->
+			<view class="input-item">
+				<view class="input-icon">
+					<image src="https://wuyeadmin.bugtc.com/images/login/account.png" mode=""
+						style="height: 100%;width: 100%;"></image>
+					<!-- <uni-icons type="person" size="24" color="#999"></uni-icons> -->
+				</view>
+				<uni-easyinput class="input-content" type="text" v-model="account" placeholder="请输入账号" :inputBorder="false"
+					:placeholderStyle="placeholderStyle">
+				</uni-easyinput>
+
+			</view>
+
+			<!-- 密码输入框 -->
+			<view class="input-item">
+				<view class="input-icon">
+					<image src="https://wuyeadmin.bugtc.com/images/login/password.png" mode=""
+						style="height: 100%;width: 100%;"></image>
+					<!-- <uni-icons type="locked" size="24" color="#999"></uni-icons> -->
+				</view>
+				<uni-easyinput class="input-content" type="password" v-model="password" placeholder="请输入密码"
+					:inputBorder="false" :placeholderStyle="placeholderStyle">
+				</uni-easyinput>
+
+			</view>
+			<!-- 协议勾选 -->
+			<view class="agreement-item">
+				<view @click="toggleAgreement">
+					<uni-icons type="checkbox-filled" size="24" color="#007aff" 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">《用户隐私政策》</text></text> -->
+				
+				<text class="agreement-text" >我已阅读并同意
+					<text class="agreePrivacy" @click.stop="">《用户协议》</text>和
+					<text class="agreePrivacy" @click.stop="goToPrivacy">《隐私政策》</text>
+				</text>
+			</view>
+
+
+			<!-- 立即注册按钮 -->
+			<button class="register-btn" @click="handleRegister">
+				立即注册
 			</button>
-		</view>
 
-		<!-- 账号输入框 -->
-		<view class="input-item">
-			<view class="input-icon">
-				<image src="https://wuyeadmin.bugtc.com/images/login/account.png" mode=""
-					style="height: 100%;width: 100%;"></image>
-				<!-- <uni-icons type="person" size="24" color="#999"></uni-icons> -->
+			<!-- 跳转登录链接 -->
+			<view class="login-link">
+				<navigator class="link-item" url="/pageSubPack/loginSub/login">已有账号，去登录</navigator>
 			</view>
-			<uni-easyinput class="input-content" type="text" v-model="account" placeholder="请输入账号" :inputBorder="false"
-				:placeholderStyle="placeholderStyle">
-			</uni-easyinput>
 
+			<!-- 隐私协议弹窗 -->
+			<privacy-popup v-model:show="showPrivacyPopup" @agree="agreePrivacy" @disagree="disagreePrivacy" @close="showPrivacyPopup = false" />
 		</view>
+	</template>
 
-		<!-- 密码输入框 -->
-		<view class="input-item">
-			<view class="input-icon">
-				<image src="https://wuyeadmin.bugtc.com/images/login/password.png" mode=""
-					style="height: 100%;width: 100%;"></image>
-				<!-- <uni-icons type="locked" size="24" color="#999"></uni-icons> -->
-			</view>
-			<uni-easyinput class="input-content" type="password" v-model="password" placeholder="请输入密码"
-				:inputBorder="false" :placeholderStyle="placeholderStyle">
-			</uni-easyinput>
+	<script setup>
+		import {
+			ref,
+			computed,
+			onUnmounted
+		} from 'vue';
+		import {
+			getRegisterUser,
+			getSendCode
+		} from '../api/api.js'
+		import PrivacyPopup from '@/components/privacy-popup/privacy-popup.vue'
 
-		</view>
-		<!-- 协议勾选 -->
-		<view class="agreement-item">
-			<view @click="toggleAgreement">
-				<uni-icons type="checkbox-filled" size="24" color="#007aff" 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">《用户隐私政策》</text></text>
-		</view>
+		// ========== 响应式数据 ==========
+		// 表单数据
+		const phoneNumber = ref('');
+		const verifyCode = ref('');
+		const account = ref('');
+		const password = ref('');
+		const placeholderStyle = ref('font-size:24rpx')
+		// 协议勾选
+		const agreeAgreement = ref(false);
+		// 隐私弹窗
+		const showPrivacyPopup = ref(false)
+		const pendingAction = ref('')
+		// 验证码倒计时
+		const countDown = ref(0);
+		let timer = null;
 
+		// ========== 计算属性 ==========
+		// 是否可获取验证码（手机号格式正确）
+		const canGetVerify = computed(() => {
+			const phoneReg = /^1[3-9]\d{9}$/;
+			return phoneReg.test(phoneNumber.value);
+		});
 
-		<!-- 立即注册按钮 -->
-		<button class="register-btn" @click="handleRegister">
-			立即注册
-		</button>
+		// 是否可注册（所有表单项+协议都满足）
+		const canRegister = computed(() => {
+			const phoneReg = /^1[3-9]\d{9}$/; // 手机号11位
+			const verifyReg = /^\d{6}$/; // 验证码6位
+			const accountReg = /^.{4,20}$/; // 账号4-20位
+			const pwdReg = /^.{6,16}$/; // 密码6-16位
 
-		<!-- 跳转登录链接 -->
-		<view class="login-link">
-			<navigator class="link-item" url="/pageSubPack/loginSub/login">已有账号，去登录</navigator>
-		</view>
-	</view>
-</template>
+			return phoneReg.test(phoneNumber.value) &&
+				verifyReg.test(verifyCode.value) &&
+				accountReg.test(account.value) &&
+				pwdReg.test(password.value) &&
+				agreeAgreement.value;
+		});
 
-<script setup>
-	import {
-		ref,
-		computed,
-		onUnmounted
-	} from 'vue';
-	import {
-		getRegisterUser,
-		getSendCode
-	} from '../api/api.js'
+		// ========== 方法 ==========
+		// 返回上一页
+		const goBack = () => {
+			uni.navigateBack();
+		};
 
-	// ========== 响应式数据 ==========
-	// 表单数据
-	const phoneNumber = ref('');
-	const verifyCode = ref('');
-	const account = ref('');
-	const password = ref('');
-	const placeholderStyle = ref('font-size:24rpx')
-	// 协议勾选
-	const agreeAgreement = ref(false);
-	// 验证码倒计时
-	const countDown = ref(0);
-	let timer = null;
-
-	// ========== 计算属性 ==========
-	// 是否可获取验证码（手机号格式正确）
-	const canGetVerify = computed(() => {
-		const phoneReg = /^1[3-9]\d{9}$/;
-		return phoneReg.test(phoneNumber.value);
-	});
-
-	// 是否可注册（所有表单项+协议都满足）
-	const canRegister = computed(() => {
-		const phoneReg = /^1[3-9]\d{9}$/; // 手机号11位
-		const verifyReg = /^\d{6}$/; // 验证码6位
-		const accountReg = /^.{4,20}$/; // 账号4-20位
-		const pwdReg = /^.{6,16}$/; // 密码6-16位
-
-		return phoneReg.test(phoneNumber.value) &&
-			verifyReg.test(verifyCode.value) &&
-			accountReg.test(account.value) &&
-			pwdReg.test(password.value) &&
-			agreeAgreement.value;
-	});
-
-	// ========== 方法 ==========
-	// 返回上一页
-	const goBack = () => {
-		uni.navigateBack();
-	};
-
-	// 切换协议勾选状态
-	const toggleAgreement = () => {
-		agreeAgreement.value = !agreeAgreement.value;
-	};
-	// 跳转隐私协议
-	const goToPrivacy = () => {
-		uni.navigateTo({
-			url: '/pageSubPack/loginSub/privacy',
-		})
-	}
-	// 检查表单状态（实时更新按钮状态）
-	const checkForm = () => {};
-
-
-	// 获取验证码
-	const getVerifyCode = () => {
-		if (!canGetVerify.value) return;
-		let params = {
-			phone: phoneNumber.value,
-			scene: 'register'
+		// 切换协议勾选状态
+		const toggleAgreement = () => {
+			agreeAgreement.value = !agreeAgreement.value;
+		};
+		// 跳转隐私协议
+		const goToPrivacy = () => {
+			uni.navigateTo({
+				url: '/pageSubPack/loginSub/privacy',
+			})
 		}
-		getSendCode(params).then(res => {
-			if (res.code === 200) {
-				uni.showToast({
-					title: '验证码已发送',
-					icon: 'success'
-				});
-				// 开始60秒倒计时
-				countDown.value = 60;
-				timer = setInterval(() => {
-					countDown.value--;
-					if (countDown.value <= 0) {
-						clearInterval(timer);
-						timer = null;
-					}
-				}, 1000);
+		// 检查表单状态（实时更新按钮状态）
+		const checkForm = () => {};
 
-			} else {
+		// 打开隐私弹窗
+		const openPrivacyPopup = (action) => {
+			pendingAction.value = action || ''
+			showPrivacyPopup.value = true
+		}
+
+		// 同意隐私协议
+		const agreePrivacy = () => {
+			showPrivacyPopup.value = false
+			agreeAgreement.value = true
+			if (pendingAction.value === 'register') {
+				doRegister()
+			}
+			pendingAction.value = ''
+		}
+
+		// 不同意隐私协议
+		const disagreePrivacy = () => {
+			showPrivacyPopup.value = false
+			pendingAction.value = ''
+		}
+
+
+		// 获取验证码
+		const getVerifyCode = () => {
+			if (!canGetVerify.value) return;
+			let params = {
+				phone: phoneNumber.value,
+				scene: 'register'
+			}
+			getSendCode(params).then(res => {
+				if (res.code === 200) {
+					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: '验证码发送失败',
+					title: err.msg || '网络异常',
 					icon: 'error'
 				});
+			})
+
+
+		};
+
+		// 处理注册逻辑
+		const handleRegister = () => {
+			if (!phoneNumber.value) {
+				uni.showToast({ title: '请输入手机号', icon: 'none' });
+				return;
 			}
-		}).catch(err => {
-			uni.showToast({
-				title: err.msg || '网络异常',
-				icon: 'error'
+			if (!/^1[3-9]\d{9}$/.test(phoneNumber.value)) {
+				uni.showToast({ title: '请输入正确的手机号', icon: 'none' });
+				return;
+			}
+			if (!verifyCode.value) {
+				uni.showToast({ title: '请输入验证码', icon: 'none' });
+				return;
+			}
+			if (!/^\d{6}$/.test(verifyCode.value)) {
+				uni.showToast({ title: '验证码为 6 位数字', icon: 'none' });
+				return;
+			}
+			if (!account.value) {
+				uni.showToast({ title: '请输入账号', icon: 'none' });
+				return;
+			}
+			if (account.value.length < 4 || account.value.length > 20) {
+				uni.showToast({ title: '账号长度需为 4-20 位', icon: 'none' });
+				return;
+			}
+			if (!password.value) {
+				uni.showToast({ title: '请输入密码', icon: 'none' });
+				return;
+			}
+			if (password.value.length < 6) {
+				uni.showToast({ title: '密码至少输入 6 位', icon: 'none' });
+				return;
+			}
+			if (password.value.length > 16) {
+				uni.showToast({ title: '密码不能超过 16 位', icon: 'none' });
+				return;
+			}
+			if (!agreeAgreement.value) {
+				openPrivacyPopup('register')
+				return;
+			}
+			doRegister()
+		};
+
+		const doRegister = () => {
+			uni.showLoading({
+				title: '注册中...',
+				mask: true
 			});
-		})
+			let params = {
+				phone: phoneNumber.value,
+				smsCode: verifyCode.value,
+				username: account.value,
+				password: password.value
+			}
+			getRegisterUser(params).then(res => {
+				if (res.code === 200) {
+					uni.hideLoading();
+					uni.showToast({
+						title: '注册成功',
+						icon: 'success'
+					});
+					setTimeout(() => {
+						uni.redirectTo({
+							url: '/pageSubPack/loginSub/pwd-login'
+						});
+					}, 1500);
 
-
-	};
-
-	// 处理注册逻辑
-	const handleRegister = () => {
-		if (!phoneNumber.value) {
-			uni.showToast({ title: '请输入手机号', icon: 'none' });
-			return;
-		}
-		if (!/^1[3-9]\d{9}$/.test(phoneNumber.value)) {
-			uni.showToast({ title: '请输入正确的手机号', icon: 'none' });
-			return;
-		}
-		if (!verifyCode.value) {
-			uni.showToast({ title: '请输入验证码', icon: 'none' });
-			return;
-		}
-		if (!/^\d{6}$/.test(verifyCode.value)) {
-			uni.showToast({ title: '验证码为 6 位数字', icon: 'none' });
-			return;
-		}
-		if (!account.value) {
-			uni.showToast({ title: '请输入账号', icon: 'none' });
-			return;
-		}
-		if (account.value.length < 4 || account.value.length > 20) {
-			uni.showToast({ title: '账号长度需为 4-20 位', icon: 'none' });
-			return;
-		}
-		if (!password.value) {
-			uni.showToast({ title: '请输入密码', icon: 'none' });
-			return;
-		}
-		if (password.value.length < 6) {
-			uni.showToast({ title: '密码至少输入 6 位', icon: 'none' });
-			return;
-		}
-		if (password.value.length > 16) {
-			uni.showToast({ title: '密码不能超过 16 位', icon: 'none' });
-			return;
-		}
-		if (!agreeAgreement.value) {
-			uni.showToast({ title: '请勾选协议', icon: 'none' });
-			return;
-		}
-		uni.showLoading({
-			title: '注册中...',
-			mask: true
-		});
-		let params = {
-			phone: phoneNumber.value,
-			smsCode: verifyCode.value,
-			username: account.value,
-			password: password.value
-		}
-		getRegisterUser(params).then(res => {
-			if (res.code === 200) {
+				} else {
+					uni.showToast({
+						title: '注册失败',
+						icon: 'error'
+					});
+				}
+			}).catch((err) => {
 				uni.hideLoading();
 				uni.showToast({
-					title: '注册成功',
-					icon: 'success'
-				});
-				setTimeout(() => {
-					uni.redirectTo({
-						url: '/pageSubPack/loginSub/pwd-login'
-					});
-				}, 1500);
-
-			} else {
-				uni.showToast({
-					title: '注册失败',
+					title: err.msg || '网络异常',
 					icon: 'error'
 				});
+			})
+		};
+
+		// ========== 生命周期 ==========
+		// 页面卸载时清除定时器
+		onUnmounted(() => {
+			if (timer) {
+				clearInterval(timer);
 			}
-		}).catch((err) => {
-			uni.hideLoading();
-			uni.showToast({
-				title: err.msg || '网络异常',
-				icon: 'error'
-			});
-		})
-		// 注册成功后跳转到登录页
-		// uni.redirectTo({
-		//   url: '/pages/login/pwd-login'
-		// });
+		});
+	</script>
 
-		// setTimeout(() => { 
-
-		// }, 1500);
-	};
-
-	// ========== 生命周期 ==========
-	// 页面卸载时清除定时器
-	onUnmounted(() => {
-		if (timer) {
-			clearInterval(timer);
+	<style scoped>
+		/* 页面容器 */
+		.register-page {
+			padding: 20rpx 40rpx 40rpx;
+			/* background-color: #f8f9fa; */
+			min-height: 100vh;
+			background: repeating-linear-gradient(180deg, #E2F0FF, #F6FAFF);
 		}
-	});
-</script>
 
-<style scoped>
-	/* 页面容器 */
-	.register-page {
-		padding: 20rpx 40rpx 40rpx;
-		/* background-color: #f8f9fa; */
-		min-height: 100vh;
-		background: repeating-linear-gradient(180deg, #E2F0FF, #F6FAFF);
-	}
+		.status_bar {
+			height: 46px;
+			width: 100%;
+		}
 
-	.status_bar {
-		height: 46px;
-		width: 100%;
-	}
+		/* 顶部导航栏 */
+		.nav-bar {
+			display: flex;
+			align-items: center;
+			/* height: 88rpx; */
+			margin-bottom: 70rpx;
+		}
 
-	/* 顶部导航栏 */
-	.nav-bar {
-		display: flex;
-		align-items: center;
-		/* height: 88rpx; */
-		margin-bottom: 70rpx;
-	}
+		.nav-title {
+			flex: 1;
+			text-align: center;
+			font-size: 36rpx;
+			font-weight: 500;
+			color: #333;
+			margin-right: 100rpx;
+		}
 
-	.nav-title {
-		flex: 1;
-		text-align: center;
-		font-size: 36rpx;
-		font-weight: 500;
-		color: #333;
-		margin-right: 100rpx;
-	}
+		/* 注册标题 */
+		.register-title {
+			font-size: 40rpx;
+			font-weight: 600;
+			color: #333;
+			margin-bottom: 60rpx;
+		}
 
-	/* 注册标题 */
-	.register-title {
-		font-size: 40rpx;
-		font-weight: 600;
-		color: #333;
-		margin-bottom: 60rpx;
-	}
+		/* 输入框通用样式 */
+		.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-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);
-	}
+		/* 验证码输入项特殊布局 */
+		.verify-item {
+			position: relative;
+			padding-right: 220rpx;
+		}
 
-	/* 验证码输入项特殊布局 */
-	.verify-item {
-		position: relative;
-		padding-right: 220rpx;
-	}
+		/* 输入框图标 */
+		.input-icon {
+			margin-right: 20rpx;
+			color: #999;
+			width: 50rpx;
+			height: 50rpx;
+		}
 
-	/* 输入框图标 */
-	.input-icon {
-		margin-right: 20rpx;
-		color: #999;
-		width: 50rpx;
-		height: 50rpx;
-	}
+		/* 输入框内容 */
+		.input-content {
+			flex: 1;
+			font-size: 32rpx;
+			color: #333;
+			height: 100%;
+		}
 
-	/* 输入框内容 */
-	.input-content {
-		flex: 1;
-		font-size: 32rpx;
-		color: #333;
-		height: 100%;
-	}
+		/* 深度覆盖 uni-easyinput 内部默认样式，解决高度偏移 */
+		.input-content :deep(.uni-easyinput__content) {
+			height: 100% !important;
+			min-height: unset !important;
+			padding: 0 !important;
+			background-color: transparent !important;
+		}
 
-	/* 深度覆盖 uni-easyinput 内部默认样式，解决高度偏移 */
-	.input-content :deep(.uni-easyinput__content) {
-		height: 100% !important;
-		min-height: unset !important;
-		padding: 0 !important;
-		background-color: transparent !important;
-	}
+		.input-content :deep(.uni-easyinput__content-input) {
+			height: 100% !important;
+			min-height: unset !important;
+			padding: 0 !important;
+			line-height: 88rpx;
+		}
 
-	.input-content :deep(.uni-easyinput__content-input) {
-		height: 100% !important;
-		min-height: unset !important;
-		padding: 0 !important;
-		line-height: 88rpx;
-	}
+		.verify-input {
+			padding-right: 20rpx;
+		}
 
-	.verify-input {
-		padding-right: 20rpx;
-	}
+		/* 获取验证码按钮 */
+		.get-verify-btn {
+			position: absolute;
+			right: 10rpx;
+			top: 50%;
+			transform: translateY(-50%);
+			width: 200rpx;
+			height: 70rpx;
+			line-height: 70rpx;
+			background-color: #007aff;
+			color: #fff;
+			border-radius: 35rpx;
+			font-size: 26rpx;
+			padding: 0;
+			margin: 0;
+		}
 
-	/* 获取验证码按钮 */
-	.get-verify-btn {
-		position: absolute;
-		right: 10rpx;
-		top: 50%;
-		transform: translateY(-50%);
-		width: 200rpx;
-		height: 70rpx;
-		line-height: 70rpx;
-		background-color: #007aff;
-		color: #fff;
-		border-radius: 35rpx;
-		font-size: 26rpx;
-		padding: 0;
-		margin: 0;
-	}
+		.get-verify-btn:disabled {
+			background-color: #ccc;
+			color: #fff;
+		}
 
-	.get-verify-btn:disabled {
-		background-color: #ccc;
-		color: #fff;
-	}
+		.get-verify-btn::after {
+			border-radius: 50px;
+		}
 
-	.get-verify-btn::after {
-		border-radius: 50px;
-	}
+		/* 协议勾选项 */
+		.agreement-item {
+			display: flex;
+			align-items: center;
+			margin: 70rpx 0 28rpx 0;
+			padding-left: 10rpx;
+		}
 
-	/* 协议勾选项 */
-	.agreement-item {
-		display: flex;
-		align-items: center;
-		margin: 70rpx 0 28rpx 0;
-		padding-left: 10rpx;
-	}
+		.agreement-text {
+			font-size: 24rpx;
+			color: #666;
+			margin-left: 10rpx;
+		}
 
-	.agreement-text {
-		font-size: 24rpx;
-		color: #666;
-		margin-left: 10rpx;
-	}
+		.agreePrivacy {
+			color: #2F77FD;
+		}
 
-	.agreePrivacy {
-		color: #2F77FD;
-	}
+		/* 立即注册按钮 */
+		.register-btn {
+			width: 100%;
+			height: 88rpx;
+			line-height: 88rpx;
+			background-color: #007aff;
+			color: #fff;
+			border-radius: 8rpx;
+			font-size: 28rpx;
+			margin-bottom: 40rpx;
+		}
 
-	/* 立即注册按钮 */
-	.register-btn {
-		width: 100%;
-		height: 88rpx;
-		line-height: 88rpx;
-		background-color: #007aff;
-		color: #fff;
-		border-radius: 8rpx;
-		font-size: 28rpx;
-		margin-bottom: 40rpx;
-	}
+		button:after {
+			border-radius: 8px;
+		}
 
-	button:after {
-		border-radius: 8px;
-	}
+		.register-btn:disabled {
+			background-color: #99c8ff;
+			color: #fff;
+		}
 
-	.register-btn:disabled {
-		background-color: #99c8ff;
-		color: #fff;
-	}
+		/* 跳转登录链接 */
+		.login-link {
+			text-align: center;
+		}
 
-	/* 跳转登录链接 */
-	.login-link {
-		text-align: center;
-	}
-
-	.link-item {
-		font-size: 28rpx;
-		color: #007aff;
-		text-decoration: none;
-	}
-</style>
\ No newline at end of file
+		.link-item {
+			font-size: 28rpx;
+			color: #007aff;
+			text-decoration: none;
+		}
+	</style>
diff --git a/property-uniapp-project/pageSubPack/my/myCarIndex.vue b/property-uniapp-project/pageSubPack/my/myCarIndex.vue
index a3d8459..70546a8 100644
--- a/property-uniapp-project/pageSubPack/my/myCarIndex.vue
+++ b/property-uniapp-project/pageSubPack/my/myCarIndex.vue
@@ -20,10 +20,10 @@
 					<view class="car-bindParkingSpace">{{ item.bindParkingSpace }}</view>
 				</view>
 				<!-- certificationStatus -->
-				<view class="status-tag"
+				<!-- <view class="status-tag"
 					:class="{ underReview: item.certificationStatus === '审核中', unbound: item.certificationStatus === '未绑定', bounded: item.certificationStatus === ''}">
 					{{ item.certificationStatus }}
-				</view>
+				</view> -->
 			</view>
 		</scroll-view>
 		<view class="bottom-btn">
diff --git a/property-uniapp-project/pageSubPack/service-list/questionnaireFillout.vue b/property-uniapp-project/pageSubPack/service-list/questionnaireFillout.vue
index b588605..737a39d 100644
--- a/property-uniapp-project/pageSubPack/service-list/questionnaireFillout.vue
+++ b/property-uniapp-project/pageSubPack/service-list/questionnaireFillout.vue
@@ -88,10 +88,11 @@
 
 <script setup>
 import { ref, computed } from 'vue'
-import { onLoad } from '@dcloudio/uni-app'
+import { onLoad, onShow } from '@dcloudio/uni-app'
 import { getQuestionnaireDetail, submitQuestionnair } from '../api/apiSub.js'
 
 const detailItem = ref({})
+const questionnaireId = ref('') // 保存问卷ID，用于 onShow 重新获取
 
 const questionList = computed(() => {
 	const content = detailItem.value?.content
@@ -108,7 +109,10 @@ const answers = ref({})
 // 获取问卷调查
 const getDetailData = async (id) => {
 	try {
-		const res = await getQuestionnaireDetail({ id })
+		let params = {
+			villageId:uni.getStorageSync('currentVillageId')
+		}
+		const res = await getQuestionnaireDetail(id,params)
 		// console.log('接口返回:', JSON.stringify(res))
 		if (res.code === 200) {
 			const data = Array.isArray(res.data) ? res.data[0] : res.data
@@ -123,12 +127,20 @@ const getDetailData = async (id) => {
 
 onLoad((option) => {
 	if (option.id) {
+		questionnaireId.value = option.id
 		getDetailData(option.id)
 	} else {
 		uni.showToast({ title: '缺少问卷ID', icon: 'none' })
 	}
 })
 
+// 切换小区后返回页面时，重新获取数据
+onShow(() => {
+	if (questionnaireId.value) {
+		getDetailData(questionnaireId.value)
+	}
+})
+
 const selectRadio = (cid, label) => {
 	answers.value[cid] = label
 }
@@ -170,10 +182,13 @@ const handleSubmit = async () => {
 			answerList.push({ cid: q.cid, value: val })
 		}
 	}
-
-	uni.showLoading({ title: '提交中...', mask: true })
+	uni.showLoading({ title: "提交中...", mask: true })
 	try {
-		const res = await submitQuestionnair(detailItem.value.questionnaireId, answerList)
+		let params = {
+			answerList,
+			villageId: uni.getStorageSync("currentVillageId") 
+		}
+		const res = await submitQuestionnair(detailItem.value.id,params)
 		uni.hideLoading()
 		if (res.code === 200) {
 			uni.showToast({ title: '提交成功', icon: 'success' })