Merge branch 'czr' into 'main'

个人资料屏幕适配

See merge request huang/thingskit-app!62

@@ -19,7 +19,7 @@
 				<u-form-item labelWidth="80px" label="手机号码" prop="phoneNumber" borderBottom ref="item1">
 					<u--input placeholder="请输入手机号码" v-model="myInfoModel.phoneNumber" border="none"></u--input>
 				</u-form-item>
-				<u-form-item  class="userName" labelWidth="80px" label="用户账号" prop="username" borderBottom ref="item1">
+				<u-form-item labelWidth="80px" label="用户账号" prop="username" borderBottom ref="item1">
 					<u--input disabled placeholder="请输入用户账号 " v-model="myInfoModel.username" border="none">
 					</u--input>
 				</u-form-item>
@@ -100,7 +100,7 @@
 							message: "请输入正确的手机号码",
 							trigger: "change",
 						}, {
-							pattern: /^1[0-9]{10}$/,
+							pattern: /^1[3-9][0-9]{9}$/,
 							message: "请输入正确的手机号码"
 						}
 
@@ -110,7 +110,7 @@
 							message: "请输入正确的邮箱号",
 							trigger: "change",
 						}, {
-							pattern: /^[0-9a-zA-Z]+@(([0-9a-zA-Z]+)[.])+[a-z]{2,4}$/,
+							pattern: /^[0-9a-zA-Z]+@(([0-9a-zA-Z]+)[.])+[a-z]{3}$/,
 							message: "请输入正确的邮箱号"
 						}
 

 .set-page {
 	padding: 0rpx 30rpx;
-	height: 100vh;
+	min-height: 100vh;
 	background-color: #f8f9fa;
 	.submit {
 		margin-top: 60rpx;