From 82e8632300fdc52d1fb5374aafd6f8a2927d82f0 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 24 Feb 2022 16:47:53 +0800
Subject: [PATCH] 注册调整

---
 pages/registerUser/idphoto.nvue     |    3 ++-
 pages/registerUser/registerUser.vue |   14 ++++++++------
 pages/business/business.vue         |   16 ++++++++++++----
 store/state.js                      |    7 +++----
 4 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/pages/business/business.vue b/pages/business/business.vue
index a0c0c9d..5d69ca1 100644
--- a/pages/business/business.vue
+++ b/pages/business/business.vue
@@ -124,6 +124,7 @@
 			//获取用户信息
 			getUser() {
 				var that = this;
+				debugger
 				uni.request({
 					url: that.$store.state.BaopiAPI + '/blade-user/detail',
 					method: 'GET',
@@ -133,10 +134,17 @@
 						status : 1,
 					},
 					success: (res) => {
-						var urls="http://223.82.109.183:2080/securityInfo.html?securityNumber="+res.data.data.securitynumber;
-						uni.navigateTo({
-							url: '../voting/information?url=' + urls
-						});
+						if(res.statusCode == "200"){
+							var urls="http://223.82.109.183:2080/securityInfo.html?securityNumber="+res.data.data.securitynumber;
+							uni.navigateTo({
+								url: '../voting/information?url=' + urls
+							});
+						}else{
+							this.$refs.uToast.show({
+								title: '暂无证件信息',
+								type: 'warning',
+							});
+						}
 					}
 				});
 			},
diff --git a/pages/registerUser/idphoto.nvue b/pages/registerUser/idphoto.nvue
index 57568d0..cb1f5a4 100644
--- a/pages/registerUser/idphoto.nvue
+++ b/pages/registerUser/idphoto.nvue
@@ -230,7 +230,8 @@
 						parentId: d.jsid,
 						jurisdiction: d.xqobjId,
 						cardid: d.carId,
-						address: d.address
+						address: d.address,
+						workunit: d.obj
 					}
 				uni.request({
 					url: url,
diff --git a/pages/registerUser/registerUser.vue b/pages/registerUser/registerUser.vue
index 8432134..94a19f1 100644
--- a/pages/registerUser/registerUser.vue
+++ b/pages/registerUser/registerUser.vue
@@ -10,15 +10,15 @@
 				<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="true">
+			<u-form-item label="工作单位" prop="obj" left-icon="home-fill" 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">
-				<u-input v-model="form.xq" type="select" placeholder="请选择辖区" :border="true" @click="regionClick" />
+				<u-input v-model="form.xq" type="select" placeholder="请选择所在地区" :border="true" @click="regionClick" />
 				<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="true">
+			<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">
@@ -74,14 +74,16 @@
 
 				if (value.length <= 11) {
 					if (phone.test(value)) {
+						this.form.phone = value;
 						return true
 					} else {
 						return callback(new Error('手机号格式不正确'));
 					}
 				}
 
-				if (value.length <= 18) {
+				if (value.length > 11) {
 					if (identity.test(value)) {
+						this.form.carId = value;
 						return true
 					} else {
 						return callback(new Error('身份证号格式不正确'));
@@ -248,13 +250,13 @@
 						trigger: ['change', 'blur'],
 					}],
 					obj: [{
-						required: true,
+						required: false,
 						message: '请输入工作单位',
 						// 可以单个或者同时写两个触发验证方式 
 						trigger: ['change', 'blur'],
 					}],
 					address: [{
-						required: true,
+						required: false,
 						message: '请输入详细地址',
 						// 可以单个或者同时写两个触发验证方式 
 						trigger: ['change', 'blur'],
diff --git a/store/state.js b/store/state.js
index 9e30d60..8ed4729 100644
--- a/store/state.js
+++ b/store/state.js
@@ -7,10 +7,9 @@
 		useName: '过客',
 	},
 	logPath: '',
-	//piAPI: apis.api,
-	// piAPI: 'http://223.82.109.183:2082/api/',
-	 piAPI: 'http://192.168.0.110:83/',
-	 BaopiAPI: 'http://223.82.109.183:2080/api/',
+	piAPI: apis.api,
+	//piAPI: 'http://223.82.109.183:2082/api/',
+	BaopiAPI: 'http://223.82.109.183:2080/api/',
 	puserName: '',
 	puserID: '',
 	puserIphone: '',

--
Gitblit v1.9.3