From f178ee3e10e9eff65231807970d15d647acc9e8d Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 25 Feb 2022 09:52:10 +0800
Subject: [PATCH] 注册页面更改

---
 pages/registerUser/registerUser.vue |   92 +++++++++++++++++++++++++++++----------------
 1 files changed, 59 insertions(+), 33 deletions(-)

diff --git a/pages/registerUser/registerUser.vue b/pages/registerUser/registerUser.vue
index 94a19f1..248cc96 100644
--- a/pages/registerUser/registerUser.vue
+++ b/pages/registerUser/registerUser.vue
@@ -10,7 +10,17 @@
 				<u-select v-model="show" mode="mutil-column-auto" :list="roleList" @confirm="radioGroupChange">
 				</u-select>
 			</u-form-item>
-			<u-form-item label="工作单位" prop="obj" left-icon="home-fill" label-width="200" :required="false">
+			<u-form-item v-show="form.role == '民警'" label=" " prop="warnNum" label-width="200" :required="true">
+				<u-input v-model="form.warnNum" placeholder="请输入警号" />
+			</u-form-item>
+			<u-form-item label="工作单位" left-icon="home-fill" label-width="200" :required="false">
+				<u-radio-group v-model="jobValue">
+					<u-radio v-for="(item, index) in jobList" :key="index" :name="item.name" :disabled="item.disabled">
+						{{item.name}}
+					</u-radio>
+				</u-radio-group>
+			</u-form-item>
+			<u-form-item v-show="jobValue == '有'" label=" " prop="obj" label-width="200" :required="false">
 				<u-input v-model="form.obj" placeholder="请输入工作单位" />
 			</u-form-item>
 			<u-form-item label="所在地区" prop="xq" left-icon="map-fill" label-width="200" :required="true">
@@ -18,8 +28,8 @@
 				<u-select v-model="regionShow" mode="mutil-column-auto" :list="regionList" @confirm="regionSelect">
 				</u-select>
 			</u-form-item>
-			<u-form-item label="详细地址" prop="address" left-icon="map" label-width="200" :required="false">
-				<u-input v-model="form.address" placeholder="详细地址" />
+			<u-form-item label="居住地" prop="address" left-icon="map" label-width="200" :required="false">
+				<u-input v-model="form.address" placeholder="居住地" />
 			</u-form-item>
 			<u-form-item label="性别" label-width="200" left-icon="man">
 				<u-radio-group v-model="form.sex">
@@ -38,11 +48,14 @@
 				(功能研发中)
 			</u-form-item>
 		</u-form>
+
 		<view class="agree">
-			注册即代表同意
-			<text class="a" @click="agreement(0)">《用户协议》</text>
-			和
-			<text class="a" @click="agreement(1)">《隐私政策》</text>
+			<u-checkbox v-model="userConsent" shape="circle">
+				我已阅读并同意
+				<text class="a" @click="agreement(0)">用户协议</text>
+				和
+				<text class="a" @click="agreement(1)">隐私政策</text>
+			</u-checkbox>
 		</view>
 		<div class="login-map-bc" v-if="mapShow">
 			<div @click="mapShow = false">
@@ -93,6 +106,17 @@
 			};
 
 			return {
+				userConsent: false,
+				jobValue: '无',
+				jobList: [{
+						name: '有',
+						disabled: false
+					},
+					{
+						name: '无',
+						disabled: false
+					}
+				],
 				regionName: '',
 				loginMapUrl: "",
 				radioList: [{
@@ -161,14 +185,14 @@
 						img: 'account',
 						froms: 'name',
 						requireds: true,
-						placeholder: '请输入姓名'
+						placeholder: '请输入真实姓名'
 					},
 					{
 						title: '手机号',
 						img: 'phone-fill',
 						froms: 'phone',
 						requireds: false,
-						placeholder: '请输入手机号'
+						placeholder: '请输入真实手机号'
 					},
 					// {
 					// 	title: '部门',
@@ -200,7 +224,8 @@
 					xq: '',
 					xqobjId: '',
 					jsid: '',
-					address: ''
+					address: '',
+					warnNum: '',
 				},
 				rules: {
 					user: [{
@@ -245,7 +270,7 @@
 					}],
 					name: [{
 						required: true,
-						message: '请输入姓名',
+						message: '请输入真实姓名',
 						// 可以单个或者同时写两个触发验证方式 
 						trigger: ['change', 'blur'],
 					}],
@@ -257,13 +282,19 @@
 					}],
 					address: [{
 						required: false,
-						message: '请输入详细地址',
+						message: '请输入居住地',
 						// 可以单个或者同时写两个触发验证方式 
 						trigger: ['change', 'blur'],
 					}],
 					role: [{
 						required: true,
 						message: '请选择角色',
+						// 可以单个或者同时写两个触发验证方式 
+						trigger: ['change', 'blur'],
+					}],
+					warnNum: [{
+						required: true,
+						message: '请输入警号',
 						// 可以单个或者同时写两个触发验证方式 
 						trigger: ['change', 'blur'],
 					}],
@@ -275,22 +306,10 @@
 					}],
 					depts: [{
 						required: true,
-						message: '请输入姓名',
+						message: '请输入真实姓名',
 						// 可以单个或者同时写两个触发验证方式 
 						trigger: ['change', 'blur'],
 					}],
-					// phone: [{
-					// 	required: false,
-					// 	message: '请输入手机号',
-					// 	// 可以单个或者同时写两个触发验证方式 
-					// 	trigger: ['change', 'blur'],
-					// }, {
-					// 	validator: (rule, value, callback) => {
-					// 		return this.$u.test.mobile(value);
-					// 	},
-					// 	message: '手机号码不正确',
-					// 	trigger: ['change', 'blur'],
-					// }],
 				},
 				showGetFace: false,
 				faceState: -2,
@@ -298,8 +317,8 @@
 				faceco: '#000',
 				faceMsg: '',
 				roleList: [{
-						label: '群众',
-						value: "1416225849858883585"
+						label: '平安志愿者',
+						value: "1416225906918195201"
 					}, {
 						label: '民警',
 						value: "1417092295132561409"
@@ -327,10 +346,6 @@
 					{
 						label: '警务辅助队伍',
 						value: "1495714378025480193"
-					},
-					{
-						label: '平安志愿者',
-						value: "1416225906918195201"
 					}
 				],
 				regionList: [{
@@ -401,6 +416,15 @@
 				this.regionShow = false;
 			},
 			zc() {
+				if (this.userConsent == false) {
+					uni.showToast({
+						title: "请先阅读并同意协议",
+						icon: 'none',
+						duration: 2000
+					});
+					
+					return
+				}
 				var that = this;
 				uni.request({
 					url: that.$store.state.piAPI + '/zc/inspect',
@@ -555,15 +579,17 @@
 	}
 
 	.agree {
-		margin: 27rpx 95rpx 0;
+		margin-top: 28rpx;
 		font-size: 22rpx;
 		font-family: Adobe Heiti Std;
 		font-weight: normal;
 		color: #cacaca;
 		line-height: 34rpx;
+		text-align: center;
 
 		.a {
-			color: #000000;
+			margin: 0 10rpx;
+			color: #103289;
 		}
 	}
 </style>

--
Gitblit v1.9.3