修改手机号逻辑

11 months ago · 64ffaff15c
9 changed files with 41 additions and 17 deletions
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@ -111,17 +111,24 @@
 			if(!uni.getStorageSync('AccessToken')){
 				this.cont()
 			}
+			
+			if(uni.getStorageSync('AccessToken')){
+				if(!uni.getStorageSync('pucode')||!uni.getStorageSync('phone')){
+					uni.showToast({title: '请先绑定用户信息',icon: 'none'})
+					setTimeout(()=>{
+						uni.navigateTo({
+							url:"/pages/login/registerphone?id=0"
+						})
+					},2000)
+				}
+			}
+			
 			// this.getWxCode()
 		},
 		onShow() {
 			if(uni.getStorageSync('AccessToken')){
 				this.getUniversityList();
 			}
-			// if(!uni.getStorageSync('phone')){
-			// 	uni.navigateTo({
-			// 		url:"/pages/login/registerphone?id=0"
-			// 	})
-			// }
 			this.$nextTick(() => {
 				if(uni.getStorageSync('AccessToken')){
 					this.handleClose();
@ -177,7 +184,7 @@
 							uni.setStorageSync('phone', res.data.phone);
 							this.handleClose();
 							this.getUniversityList();
-							if(!res.data.phone){
+							if(!res.data.phone || !res.data.pucode){
 								uni.navigateTo({
 									url:"/pages/login/registerphone?id=0"
 								})
@ -276,11 +283,13 @@
 					this.showTokenExpiredPopup();
 					return
 				}
-				if(!uni.getStorageSync('phone')){
-					uni.showToast({title: '请先绑定手机号',icon: 'none'});
-					uni.navigateTo({
-						url:"/pages/login/registerphone?id=0"
-					})
+				if(!uni.getStorageSync('phone')||!uni.getStorageSync('pucode')){
+					uni.showToast({title: '请先绑定用户信息',icon: 'none'});
+					setTimeout(()=>{
+						uni.navigateTo({
+							url:"/pages/login/registerphone?id=0"
+						})
+					},2000)
 				}else{
 					uni.navigateTo({
 						url:'/pages/Invoicing/Invoicing'
--- a/pages/login/registerphone.vue
+++ b/pages/login/registerphone.vue
@ -13,7 +13,7 @@
 			<view><uni-easyinput prefixIcon="phone-filled" v-model="phone" @blur="onInput1" placeholder="请输入手机号"></uni-easyinput></view>
 			<view class="input">
 				<uni-easyinput v-model="smsCode" placeholder="请输入内容" style="width: 100px;margin-right: 10px;"></uni-easyinput>
-				<button class="mini-btn" type="primary" size="mini" :disabled="num > 0"> {{ num > 0 ? `${num}秒后重新获取` : '获取验证码' }}</button>
+				<button class="mini-btn" type="primary" size="mini" @click="toCode" :disabled="num > 0"> {{ num > 0 ? `${num}秒后重新获取` : '获取验证码' }}</button>
 			</view>
 			<view><button type="primary" style="width: 180px;margin-top: 20px;" @click="register">手机号登录</button></view>
 		</view>
@ -82,10 +82,24 @@
 					return
 				}
 				
+				if(!this.phone && this.id=='1'){
+					uni.showToast({title: '请输入手机号',icon: 'none'});
+					return
+				}
+				
+				const phonePattern1 = /^1[3-9]\d{9}$/;
+				if (!phonePattern1.test(this.phone) && this.id=='1') {
+					uni.showToast({
+						title: '您输入的手机号格式有误',
+						icon: 'none'
+					});
+					return
+				}
+				
 				this.num = 60; // 设置倒计时总时间
 				localStorage.setItem('countdownNum', this.num);
 				this.intervalId = setInterval(this.countDownTimer, 1000);
-				let data = {mobile:this.mobile}
+				let data = this.id=='0'? {mobile:this.mobile} : {mobile:this.phone}
 				API.sendSms(data, res => {
 					uni.showToast({title: res.msg,icon: 'none'});
 				})
@ -142,6 +156,7 @@
 				API.request(url,data, res => {
 					if(res.code==1){
 						uni.setStorageSync('AccessToken', res.data.token);
+						uni.setStorageSync('pucode', res.data.pucode);
 						if(this.id=='0'){
 							uni.setStorageSync('phone', this.mobile);
 							uni.showToast({title: '手机号绑定成功',icon: 'none'})
--- a/unpackage/dist/build/web/Waterinvoice_H5.zip
+++ b/unpackage/dist/build/web/Waterinvoice_H5.zip
--- a/unpackage/dist/build/web/index.html
+++ b/unpackage/dist/build/web/index.html
@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>Waterinvoice_uiapp</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=./static/index.2da1efab.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=./static/js/chunk-vendors.0e233154.js></script><script src=./static/js/index.17e96e36.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=./static/index.2da1efab.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=./static/js/chunk-vendors.0e233154.js></script><script src=./static/js/index.b5ea2761.js></script></body></html>
--- a/unpackage/dist/build/web/static/js/index.b5ea2761.js
+++ b/unpackage/dist/build/web/static/js/index.b5ea2761.js
--- a/unpackage/dist/build/web/static/js/pages-index-index.05ac8be6.js
+++ b/unpackage/dist/build/web/static/js/pages-index-index.05ac8be6.js
--- a/unpackage/dist/build/web/static/js/pages-index-index.81d9dd23.js
+++ b/unpackage/dist/build/web/static/js/pages-index-index.81d9dd23.js
--- a/unpackage/dist/build/web/static/js/pages-login-registerphone.916de98f.js
+++ b/unpackage/dist/build/web/static/js/pages-login-registerphone.916de98f.js
--- a/unpackage/dist/build/web/static/js/pages-login-registerphone.936f5d8c.js
+++ b/unpackage/dist/build/web/static/js/pages-login-registerphone.936f5d8c.js