From 242b5b5feeb77bb215a9a891e4cffb2792d8cb8d Mon Sep 17 00:00:00 2001
From: tk <szdot@live.com>
Date: Wed, 5 Jun 2024 18:14:46 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=B1=BB=09=E5=9E=8B=E3=80=91?=
 =?UTF-8?q?=EF=BC=9Arefactor=20=E3=80=90=E4=B8=BB=09=E9=A2=98=E3=80=91?=
 =?UTF-8?q?=EF=BC=9A=E8=AE=A2=E5=8D=95=E6=8F=90=E4=BA=A4=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=20=E5=88=A4=E6=96=AD=E6=89=8B=E6=9C=BA=E5=8F=B7=20=E3=80=90?=
 =?UTF-8?q?=E6=8F=8F=09=E8=BF=B0=E3=80=91=EF=BC=9A=20=09[=E5=8E=9F?=
 =?UTF-8?q?=E5=9B=A0]=EF=BC=9A=E6=94=B9=E4=B8=BA=E6=AD=A3=E5=88=99?=
 =?UTF-8?q?=E5=8C=B9=E9=85=8D=E5=88=A4=E6=96=AD=E6=89=8B=E6=9C=BA=E5=8F=B7?=
 =?UTF-8?q?=E5=90=88=E6=B3=95=E6=80=A7=20=20=E8=80=8C=E4=B8=8D=E6=98=AF?=
 =?UTF-8?q?=E5=80=BC=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=20=09[=E8=BF=87=E7=A8=8B]=EF=BC=9A=20=09[=E5=BD=B1=E5=93=8D]?=
 =?UTF-8?q?=EF=BC=9A=20=E3=80=90=E7=BB=93=09=E6=9D=9F=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# 类型 包含:
# feat：新功能（feature）
# fix：修补bug
# docs：文档（documentation）
# style： 格式（不影响代码运行的变动）
# refactor：重构（即不是新增功能，也不是修改bug的代码变动）
# test：增加测试
# chore：构建过程或辅助工具的变动
---
 pages/shop/list.vue | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/pages/shop/list.vue b/pages/shop/list.vue
index 5a2accf..d0af915 100644
--- a/pages/shop/list.vue
+++ b/pages/shop/list.vue
@@ -75,7 +75,8 @@
 						@click="$store.commit('setCartShow',!$store.state.cartShow)" />
 				</view>
 				<view class="fci fz36 flex1 flex msb">
-					<view class="flex1 p-l-12 flex column mc" @click="$store.commit('setCartShow',!$store.state.cartShow)">
+					<view class="flex1 p-l-12 flex column mc"
+						@click="$store.commit('setCartShow',!$store.state.cartShow)">
 						<view class="fz36 fb">¥{{total | formatPrice}}</view>
 						<view class="fz24" v-if="minimumOrderDifference>0">还差¥{{minimumOrderDifference | formatPrice}}起送
 						</view>
@@ -186,13 +187,13 @@
 						// 如果节点尚未生成，res值为null，循环调用执行
 						if (!res) {
 							setTimeout(() => {
-								this.getElRect(elClass);
+								this.getElRect(elClass)
 							}, 10)
 							return
 						}
-						this[dataVal] = res.height;
+						this[dataVal] = res.height
 						resolve()
-					}).exec();
+					}).exec()
 				})
 			},
 			// 观测元素相交状态
@@ -262,21 +263,22 @@
 						// 如果不存在height2，意味着数据循环已经到了最后一个，设置左边菜单为最后一项即可
 						if (!height2 || scrollHeight >= height1 && scrollHeight < height2) {
 							this.leftMenuStatus(i)
-							return;
+							return
 						}
 					}
 				}, 10)
 			},
 			//"选好了"执行
 			handleSeled() {
-				if (!this.$store.state.userInfo.tel) { //没有手机号 跳转到手机获取
-					uni.navigateTo({
-						url: '/pages/main/getTel'
-					})
-				} else { //跳转到 确认订单页面
-					uni.navigateTo({
+				const regex = /^(\+?\d{1,4}[\s-]?)?\d{3}\*{4}\d{4}$/
+				if (regex.test(this.$store.state.userInfo.tel)) { //手机号合法
+					uni.navigateTo({ //跳转到订单页面
 						url: '/pages/shop/order'
 					})
+				} else { //手机号不合法 获取为空
+					uni.navigateTo({ //跳转到获取手机号页面
+						url: '/pages/main/getTel'
+					})
 				}
 			}
 		},