Merge branch '2025北京诚祥-家政版' of https://gogs.mtavip.com/wangguoyu/uniProject into 2025北京诚祥-家政版

pages/Login/clientIndex.vue

@@ -65,6 +65,10 @@
 	const store = useIsCanBack();
 
 	onLoad((options) => {
+		if (options.from === 'appcx') {
+			id.value = options.id
+			fromPage.value = options.from;
+		}
 		getAllImg();
 	})
 

pages/Login/test.vue

@@ -35,10 +35,9 @@
 					</view>
 				</view>
 
-				<button type="default" @click="handleLogin" :disabled="!isAgreed"
-					class="phone-green-btn login-btn">登录</button>
+				<button type="default" @click="handleLogin" class="phone-green-btn login-btn">登录</button>
 
-				<button @click="handleChangeYijiandenglu">
+				<button @click="handleChangeYijiandenglu" >
 				  切换微信一键登录
 				</button>
 			</view>
@@ -168,6 +167,11 @@
 			return
 		}
 
+		if (!isAgreed.value) {
+		  toast('请先阅读并同意用户协议和隐私政策')
+		  return // 直接返回，不执行后面的授权逻辑
+		}
+
 		const trimmedUserName = userName.value;
 		const trimmedPassword = password.value;