From 65ea5f116bd981957294cb5aa2092ddf65a409de Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Tue, 14 Nov 2023 17:25:43 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=AE=B6=E5=BA=AD=E6=88=90?=
 =?UTF-8?q?=E5=91=98=20=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/register/register.vue                | 47 ++++++++++++-------
 pagesB/AddMembers/AddMembers.vue           | 52 +++++++++++++++-------
 pagesB/ExpertlookOrder/ExpertlookOrder.vue |  2 +-
 3 files changed, 66 insertions(+), 35 deletions(-)

diff --git a/pages/register/register.vue b/pages/register/register.vue
index 22bbd27..804a79c 100644
--- a/pages/register/register.vue
+++ b/pages/register/register.vue
@@ -397,25 +397,38 @@
 				}
 				that.$refs.uForm.validate(valid => {
 					if (valid) {
-						registerdata(that.query).then(res => {
-							if (res.code == 200) {
-								getCurrentUser(that.query.openid).then(res => {
-									uni.setStorageSync('patientId', res.data.id);
-									uni.setStorageSync('patientName', res.data.patientName);
-									uni.setStorageSync("userinfo", res.data)
-									that.$refs.uToast.show({
-										title: '注册成功',
-										type: 'success',
-										back: 1,
-									})
-								})
-							} else {
-								that.$refs.uToast.show({
-									title: res.msg,
-									type: 'error',
+						if (that.addresslength) {
+							if (that.addresslength.length > 2) {
+								registerdata(that.query).then(res => {
+									if (res.code == 200) {
+										getCurrentUser(that.query.openid).then(res => {
+											uni.setStorageSync('patientId', res.data.id);
+											uni.setStorageSync('patientName', res.data.patientName);
+											uni.setStorageSync("userinfo", res.data)
+											that.$refs.uToast.show({
+												title: '注册成功',
+												type: 'success',
+												back: 1,
+											})
+										})
+									} else {
+										that.$refs.uToast.show({
+											title: res.msg,
+											type: 'error',
+										})
+									}
 								})
 							}
-						})
+							else {
+								that.$refs.uToast.show({
+									title: '所属区域应选择所在的区或街道,请重新选择!',
+									type: 'error'
+								})
+							}
+
+
+						}
+
 					}
 				});
 			},
diff --git a/pagesB/AddMembers/AddMembers.vue b/pagesB/AddMembers/AddMembers.vue
index 1ef9635..e189b10 100644
--- a/pagesB/AddMembers/AddMembers.vue
+++ b/pagesB/AddMembers/AddMembers.vue
@@ -458,28 +458,46 @@
 						type: 'error'
 					})
 				}
-
+				if (_this.form.areaCode == "") {
+					_this.$refs.uToast.show({
+						title: '请选择所属区域',
+						type: 'error'
+					})
+				}
 				_this.$refs.uForm.validate(valid => {
 					if (valid) {
-						registerdata(_this.form).then(res => {
-							if (res.code == 500) {
-								_this.$refs.uToast.show({
-									title: res.msg,
-									type: 'error'
-								})
-							} else {
-								_this.$refs.uToast.show({
-									title: '添加成功',
-									type: 'success'
-								})
-								uni.navigateBack({
-									delta: 1
-								})
-								// this.back()
+							if (_this.addresslength) {
+								if (_this.addresslength.length > 2) {
+									registerdata(_this.form).then(res => {
+										if (res.code == 500) {
+											_this.$refs.uToast.show({
+												title: res.msg,
+												type: 'error'
+											})
+										} else {
+											_this.$refs.uToast.show({
+												title: '添加成功',
+												type: 'success'
+											})
+											uni.navigateBack({
+												delta: 1
+											})
+											// this.back()
+
+										}
+
+									})
+
+								}
+								else {
+									_this.$refs.uToast.show({
+										title: '所属区域应选择所在的区或街道,请重新选择!',
+										type: 'error'
+									})
+								}
 
 							}
 
-						})
 
 					}
 
diff --git a/pagesB/ExpertlookOrder/ExpertlookOrder.vue b/pagesB/ExpertlookOrder/ExpertlookOrder.vue
index 52666e1..749b1a8 100644
--- a/pagesB/ExpertlookOrder/ExpertlookOrder.vue
+++ b/pagesB/ExpertlookOrder/ExpertlookOrder.vue
@@ -209,7 +209,7 @@
 				baseurl: '', //url
 				orderlist: [], //商品订单list
 				total: 0, //list长度
-				show: false, //确认收获开关
+				// show: false, //确认收获开关
 				img: '', //确认收货页面图片
 				orderStatus: '', //
 				getCodeText: null,