From acdc28c183aa5efc78f0a53702cd97704db74e82 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期一, 14 十月 2024 15:59:52 +0800
Subject: [PATCH] 1

---
 pages/login/supplier-login.vue |   43 ++++++++++++++++++++++++++++++-------------
 1 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/pages/login/supplier-login.vue b/pages/login/supplier-login.vue
index 36e6b17..e72c6bb 100644
--- a/pages/login/supplier-login.vue
+++ b/pages/login/supplier-login.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="main-container login-container img100 relative" style="margin-top: 0rpx;">
+	<view class="main-container login-container img100 relative" style="margin-top: 0rpx;min-height: 100vh;">
 		<!-- background-image:url('@/static/images/supplier/login/bg.png') -->
 
 		<image class="component-bg"
@@ -22,7 +22,7 @@
 					</view>
 					<view class="t-a input form-input" v-if="loginType=='pwd'">
 						<!-- <input type="text" name="userName" placeholder="请输入账号" v-model="userName" /> -->
-						<u-input placeholder="请输入账号" :border="false" v-model="userName"></u-input>
+						<u-input placeholder="请输入账号" :border="false" v-model="userName" @blur="validatePhoneNumber()"></u-input>
 
 					</view>
 					<view class="t-a input form-input" v-if="loginType=='pwd'">
@@ -31,7 +31,7 @@
 					<view class="t-a input form-input" v-if="loginType=='code'">
 
 
-						<u-input placeholder="请输入手机号" :border="false" v-model="phoneNumber">
+						<u-input placeholder="请输入手机号" :border="false" v-model="phoneNumber" @blur="validatePhoneNumber()">
 							<template slot="suffix">
 								<view class="get-code" :style="{'color':getCodeBtnColor}" @click.stop="getCode()">
 									{{ getCodeText }}
@@ -47,7 +47,7 @@
 					</view>
 
 					<view class="flex flex-wrap-normal" v-if="true">
-						<view :style="{'margin-top': '40rpx','margin-right': '12rpx','font-size':'24rpx'}"
+						<view :style="{'margin-top': '24rpx','margin-right': '12rpx','font-size':'24rpx'}"
 							@click="protocal=!protocal" class="component-radio" :class="[protocal?'cur':'']">
 
 						</view>
@@ -142,9 +142,9 @@
 			}
 			try {
 				if (!querydto.partnerUserId) {
-					if (options.query && options.query.scene) {
+					if (options.query && options.query.scene || options.scene) {
 						//说明是特殊小程序二维码扫码跳转的
-						var keyvalues = decodeURIComponent(options.query.scene).split("&")
+						var keyvalues = decodeURIComponent(options.query&&options.query.scene || options.scene).split("&")
 						for (var item of keyvalues) {
 							var tarr = item.split("=")
 							querydto[tarr[0]] = tarr[1]
@@ -305,7 +305,7 @@
 
 								}
 								uni.navigateTo({
-									url: `/pages/login/supplier-reg?partnerUserId=${querydto.partnerUserId}&partnerUserName=${querydto.partnerUserName}`
+									url: `/pages/login/supplier-reg?partnerUserId=${querydto.partnerUserId}&partnerUserName=${querydto.partnerUserName||''}`
 								})
 							}
 						} catch (e2) {
@@ -334,7 +334,7 @@
 					// 	url: `/sub_pages/customer/customer-info/customer-info?source=step&partnerUserId=${querydto.partnerUserId}&partnerUserName=${querydto.partnerUserName}`
 					// })
 					uni.navigateTo({
-						url: `/pages/login/supplier-reg?partnerUserId=${querydto.partnerUserId}&partnerUserName=${querydto.partnerUserName}`
+						url: `/pages/login/supplier-reg?partnerUserId=${querydto.partnerUserId}&partnerUserName=${querydto.partnerUserName||''}`
 					})
 				}
 
@@ -385,7 +385,7 @@
 				getCodeText: '获取验证码',
 				getCodeBtnColor: "#20613D",
 				getCodeisWaiting: false,
-				Timer: undefined,
+				Timer: undefined,
 				protocal:false,
 				// #ifdef PUB_SUPPLIER
 				apitype: 'loginSupplier',
@@ -400,6 +400,23 @@
 			};
 		},
 		methods: {
+            // 手机号码正则表达式校验
+            validatePhoneNumber() {
+
+                // 手机号码正则表达式,可以根据需要调整
+                const phoneRegex = /^[1][3-9][0-9]{9}$/;
+                if (this.loginType == 'pwd') {
+                    if (!phoneRegex.test(this.userName)) {
+                        this.$message.showToast('请填写正确手机号码')
+                    }
+                }
+                if (this.loginType == 'code') {
+                    if (!phoneRegex.test(this.phoneNumber)) {
+                        this.$message.showToast('请填写正确手机号码')
+                    }
+                }
+
+            },
 			async getCode() {
 				console.log('getCode')
 				uni.hideKeyboard() //隐藏已经显示的软键盘,如果软键盘没有显示则不做任何操作。
@@ -499,10 +516,10 @@
 			changeAll(e) {
 				this.pcfvalue = e.detail.value[0]
 			},
-			async login() {
-				if(!this.protocal){
-					this.$message.showToast('请同意用户协议')
-					return
+			async login() {
+				if(!this.protocal){
+					this.$message.showToast('请同意用户协议')
+					return
 				}
 				uni.showLoading({
 					title: '登陆中'

--
Gitblit v1.9.3