From ace7a451b1bf34eae5584d746a278f1313986033 Mon Sep 17 00:00:00 2001
From: dingtalk_umvbsp <m13724205240@163.com>
Date: Sat, 20 May 2023 00:53:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E9=A1=B5=E9=9D=A2=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E6=B3=A8=E5=86=8C=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F=E5=90=8E=E8=B7=B3=E8=BD=AC=E3=80=81=E5=9C=B0=E5=8C=BA?=
 =?UTF-8?q?=E5=AE=9A=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/register.vue | 22 +++++++++++-----------
 pages/massif/info.vue   |  1 -
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/pages/home/register.vue b/pages/home/register.vue
index 38f595f..2d4ecac 100644
--- a/pages/home/register.vue
+++ b/pages/home/register.vue
@@ -108,16 +108,6 @@ export default {
 			})
 			if(res.statu){
 				this.fields.type.columns=[res.data]
-				res.data.forEach(i=>{
-					if(i.label==this.adderss.city){
-						i.children.forEach(j=>{
-							if(j.label==this.adderss.district){
-								this.fields.areaCode.value=[i.value,j.value]
-								this.formData.areaCode=j.value
-							}
-						})
-					}
-				})
 			}else{
 				uni.showModal({
 					title:"提示",
@@ -129,6 +119,16 @@ export default {
 			var res=await request("/base/api/plantCompany/queryAreaList?code=530000000000")
 			if(res.statu){
 				this.fields.areaCode.columns=[res.data]
+				res.data.forEach(i=>{
+					if(i.label==this.adderss.city){
+						i.children.forEach(j=>{
+							if(j.label==this.adderss.district){
+								this.fields.areaCode.value=[i.value,j.value]
+								this.formData.areaCode=j.value
+							}
+						})
+					}
+				})
 			}else{
 				uni.showModal({
 					title:"提示",
@@ -148,7 +148,7 @@ export default {
 					if(res.statu){
 						uni.showToast({title:"注册成功！"})
 						setTimeout(()=>{
-							uni.reLaunch({url:`/?phone=${this.formData.connectPhone}`})
+							uni.reLaunch({url:`/pages/home/login?phone=${this.formData.connectPhone}`})
 						},1500)
 					}else{
 						uni.showModal({
diff --git a/pages/massif/info.vue b/pages/massif/info.vue
index f373eeb..339c36e 100644
--- a/pages/massif/info.vue
+++ b/pages/massif/info.vue
@@ -56,7 +56,6 @@ import request from '@/common/request'
 					address:"",
 				},
 				rules:{
-					// plantBaseInfoId:{required:true, message:"基地名称必填！", trigger:"change"},
 					// plotNumber:{required:false, message:"地块编号必填！", trigger:"blur"},
 					plotName:{required:true, message:"地块名称必填！", trigger:"blur"},
 					// drawArea:{required:true, type:'number', message:"！", trigger:"blur"},