flx：新增进入勾选隐私政策

pages/login/compatibleLogin.vue

@@ -20,6 +20,12 @@
 					<button type="primary" class="btn" @click="formSubmit">登录</button>
 				</view>
 			</u-form>
+			<view class="ischecked">
+				<label class="radio">
+					<radio @click="isCheckedFn" :checked="isChecked" />
+				</label>
+				您已阅读并同意<a href="http://42.180.188.17:9809/privacy/detail/%E6%99%BA%E6%85%A7%E5%AE%89%E5%85%A8%E9%9A%90%E7%A7%81%E6%94%BF%E7%AD%96.html">《隐私政策》</a>
+			</view>
 			<view class="between">
 				<view class="link" @click="forgetPassword">忘记密码</view>
 				<!-- <view class="link" @click="goToPage">{{ type == "user" ? "用户账号注册" : "供应商账号注册" }}</view> -->
@@ -54,7 +60,8 @@
 					account: '',
 					password: ''
 				},
-				deptList: []
+				deptList: [],
+				isChecked: false,
 			};
 		},
 		methods: {
@@ -80,6 +87,9 @@
 				}
 
 			},
+			isCheckedFn() {
+				this.isChecked = !this.isChecked;
+			},
 			getDeptList(data, status = false) {
 				// 获取改角色的部门
 				let params = {
@@ -106,11 +116,11 @@
 							})
 							return;
 						}
-					
+
 
 						this.showForm = false;
 						this.deptList = res.result;
-						if(this.deptList.length==1){
+						if (this.deptList.length == 1) {
 							this.clickDept(this.deptList[0]);
 						}
 						console.log(res);
@@ -128,6 +138,10 @@
 						title: "请输入密码",
 						icon: "none"
 					})
+					if (!this.isChecked) return uni.showToast({
+						title: "请勾选隐私政策",
+						icon: "none"
+					})
 					if (valid) {
 						// 验证成功
 						let timestamp = Date.now();
@@ -148,14 +162,14 @@
 								let {
 									accountType
 								} = res.result;
-								if(res.result.expire){
+								if (res.result.expire) {
 									this.userInfo = {
 										userId: res.result.userId,
 										account: res.result.account,
 										token: res.result.token,
 									};
 									let that = this;
-								   	
+
 									uni.showModal({
 										title: '提示',
 										content: '密码有效期已超过90天，为确保您的账号安全，请重新修改密码！',
@@ -164,7 +178,7 @@
 												uni.navigateTo({
 													url: `/pages/my/changePassword/changePassword?userInfo=${JSON.stringify(that.userInfo)}`,
 												});
-									
+
 											} else if (res.cancel) {
 												console.log('用户点击取消');
 											}
@@ -172,7 +186,7 @@
 									});
 									return
 								}
-					
+
 								if (accountType == 5 || accountType == 6 || accountType == 10) {
 									if (this.type == "user") {
 										// 用户端
@@ -278,6 +292,19 @@
 </script>
 
 <style lang="scss" scoped>
+	/deep/ uni-radio .uni-radio-input {
+		width: 36rpx;
+		height: 36rpx;
+	}
+	.ischecked {
+		display: flex;
+		align-items: center;
+	}
+	a {
+		text-decoration:none;
+		color: #5181F6;
+	}
+
 	.loginContent {
 		padding: 80rpx 30rpx;
 
@@ -385,4 +412,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages/personLocation/login/login.vue

@@ -28,6 +28,12 @@
 				</view>
 			</view>
 		</view>
+		<view class="ischecked">
+			<label class="radio">
+				<radio @click="isCheckedFn" :checked="isChecked" />
+			</label>
+			您已阅读并同意<a href="http://42.180.188.17:9809/privacy/detail/%E6%99%BA%E6%85%A7%E5%AE%89%E5%85%A8%E9%9A%90%E7%A7%81%E6%94%BF%E7%AD%96.html">《隐私政策》</a>
+		</view>
 		<view class="submit" @click="submit">同意协议并登录</view>
 		<!-- <view class="bottomTitle" @click="showModal=true">
 			云服务器设置
@@ -69,6 +75,7 @@
 					carNumber: ''
 				},
 				statusBarHeight:0,
+				isChecked: false,
 			}
 		},
 		onLoad() {
@@ -101,6 +108,9 @@
 					delta: 1
 				})
 			},
+			isCheckedFn() {
+				this.isChecked = !this.isChecked;
+			},
 			submit() {
 				// 登录
 				console.log(this.url_config);
@@ -137,6 +147,10 @@
 							type: 2
 						}
 					}
+					if (!this.isChecked) return uni.showToast({
+						title: "请勾选隐私政策",
+						icon: "none"
+					})
 					personLogin(params).then(result => {
 						console.log(result);
 						if (result.code == 200) {
@@ -188,6 +202,20 @@
 </script>
 
 <style lang="scss" scoped>
+	/deep/ uni-radio .uni-radio-input {
+		width: 36rpx;
+		height: 36rpx;
+	}
+	.ischecked {
+		display: flex;
+		align-items: center;
+		margin-top: 20rpx;
+		margin-left: 30rpx;
+	}
+	a {
+		text-decoration:none;
+		color: #5181F6;
+	}
 	.content {
 		padding: 80rpx 30rpx;
 		.title {