修改我的车辆审核状态、问卷调查、登录添加用户隐私协议弹窗

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>

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) => {
+export const getQuestionnaireDetail = (id,data) => {
-	return get('/api/resident/questionnaire/myAnswers',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)
 }
 // =====投诉意见=======
 // 获取投诉类型

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 = {

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"
@@ -45,8 +45,9 @@
 			 ></uni-icons>
 		  </view>
 
-        <text class="agreement-text" @click.stop="goToPrivacy">我已阅读并同意
+        <text class="agreement-text" >我已阅读并同意
-			<text  class="agreePrivacy" >《用户隐私政策》</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({
+  uni.navigateTo({ url: "/pageSubPack/loginSub/privacy" })
-    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 = {
@@ -169,7 +204,6 @@ const handleLogin = () => {
 					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>

property-uniapp-project/pageSubPack/loginSub/register-new-user.vue

@@ -68,8 +68,13 @@
 					<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
+			<!-- 	<text class="agreement-text" @click.stop="goToPrivacy">我已阅读并同意<text
-					class="agreePrivacy">《用户隐私政策》</text></text>
+						class="agreePrivacy">《用户隐私政策》</text></text> -->
+				
+				<text class="agreement-text" >我已阅读并同意
+					<text class="agreePrivacy" @click.stop="">《用户协议》</text>和
+					<text class="agreePrivacy" @click.stop="goToPrivacy">《隐私政策》</text>
+				</text>
 			</view>
 
 
@@ -82,10 +87,13 @@
 			<view class="login-link">
 				<navigator class="link-item" url="/pageSubPack/loginSub/login">已有账号，去登录</navigator>
 			</view>
-	</view>
-</template>
 
-<script setup>
+			<!-- 隐私协议弹窗 -->
+			<privacy-popup v-model:show="showPrivacyPopup" @agree="agreePrivacy" @disagree="disagreePrivacy" @close="showPrivacyPopup = false" />
+		</view>
+	</template>
+
+	<script setup>
 		import {
 			ref,
 			computed,
@@ -95,6 +103,7 @@
 			getRegisterUser,
 			getSendCode
 		} from '../api/api.js'
+		import PrivacyPopup from '@/components/privacy-popup/privacy-popup.vue'
 
 		// ========== 响应式数据 ==========
 		// 表单数据
@@ -105,6 +114,9 @@
 		const placeholderStyle = ref('font-size:24rpx')
 		// 协议勾选
 		const agreeAgreement = ref(false);
+		// 隐私弹窗
+		const showPrivacyPopup = ref(false)
+		const pendingAction = ref('')
 		// 验证码倒计时
 		const countDown = ref(0);
 		let timer = null;
@@ -149,6 +161,28 @@
 		// 检查表单状态（实时更新按钮状态）
 		const checkForm = () => {};
 
+		// 打开隐私弹窗
+		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 = () => {
@@ -228,9 +262,13 @@
 				return;
 			}
 			if (!agreeAgreement.value) {
-			uni.showToast({ title: '请勾选协议', icon: 'none' });
+				openPrivacyPopup('register')
 				return;
 			}
+			doRegister()
+		};
+
+		const doRegister = () => {
 			uni.showLoading({
 				title: '注册中...',
 				mask: true
@@ -267,14 +305,6 @@
 					icon: 'error'
 				});
 			})
-		// 注册成功后跳转到登录页
-		// uni.redirectTo({
-		//   url: '/pages/login/pwd-login'
-		// });
-
-		// setTimeout(() => { 
-
-		// }, 1500);
 		};
 
 		// ========== 生命周期 ==========
@@ -284,9 +314,9 @@
 				clearInterval(timer);
 			}
 		});
-</script>
+	</script>
 
-<style scoped>
+	<style scoped>
 		/* 页面容器 */
 		.register-page {
 			padding: 20rpx 40rpx 40rpx;
@@ -453,4 +483,4 @@
 			color: #007aff;
 			text-decoration: none;
 		}
-</style>
+	</style>

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">

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' })