|  | @@ -7,99 +7,98 @@ |  | @@ -7,99 +7,98 @@ | 
| 7 | </view> | 7 | </view> | 
| 8 | <view v-if="!nextStatus" style="margin-top: 40rpx;" class="f__login"> | 8 | <view v-if="!nextStatus" style="margin-top: 40rpx;" class="f__login"> | 
| 9 | <view class="loginPhone"> | 9 | <view class="loginPhone"> | 
| 10 | -				<view class="form-row"> |  |  | 
| 11 | -					<input class="input" type="number" v-model="phone" placeholder="请输入手机号码" |  |  | 
| 12 | -						placeholder-style="font-weight:normal"></input> |  |  | 
| 13 | -				</view> | 10 | +				<view class="form-row"><u-input v-model="phone" type="number" placeholder="请输入手机号码" border="bottom"></u-input></view> | 
| 14 | <view style="height: 25rpx;"></view> | 11 | <view style="height: 25rpx;"></view> | 
| 15 | <view class="form-row"> | 12 | <view class="form-row"> | 
| 16 | -					<input class="input" type="number" v-model="vCode" placeholder="请输入短信验证码" |  |  | 
| 17 | -						placeholder-style="font-weight:normal"></input> |  |  | 
| 18 | -					<view  class="getvcode" :class="{forhidden:readonly}" @click="getVcode">{{ codeText }}</view> | 13 | +					<u-input type="number" v-model="vCode" placeholder="请输入短信验证码" border="bottom"> | 
|  |  | 14 | +						<template slot="suffix" @click="getVcode"> | 
|  |  | 15 | +							<view class="getvcode">{{ codeText }}</view> | 
|  |  | 16 | +						</template> | 
|  |  | 17 | +					</u-input> | 
| 19 | </view> | 18 | </view> | 
| 20 | -				<button class="submit" size="default" @click="onNextSubmit"> |  |  | 
| 21 | -					<text style="color:#fff">下一步</text> |  |  | 
| 22 | -				</button> | 19 | +				<button class="submit" size="default" @click="onNextSubmit"><text style="color:#fff">下一步</text></button> | 
| 23 | </view> | 20 | </view> | 
| 24 | </view> | 21 | </view> | 
| 25 | <view v-else style="margin-top: 40rpx;" class="f__login"> | 22 | <view v-else style="margin-top: 40rpx;" class="f__login"> | 
| 26 | <view class="loginPhone"> | 23 | <view class="loginPhone"> | 
| 27 | -				<view style="margin-top:50rpx" class="form-row u-flex"> |  |  | 
| 28 | -					<view class="v-input"><input type="text" v-model="password" maxlength="32" placeholder="请设置6-20位新的登录密码" :password="!showPasswordF" /></view> |  |  | 
| 29 | -					<view class="v-password"><u-icon  size="25" @click="showPasswordModeF" :name="showPasswordF ? 'eye-fill' : 'eye-off'"></u-icon></view> |  |  | 
| 30 | -					<u-icon></u-icon> | 24 | +				<view class="form-row u-flex"> | 
|  |  | 25 | +					<u-input v-model="password" :password="showPasswordF" placeholder="请设置6-20位新的登录密码" border="bottom"> | 
|  |  | 26 | +						<template slot="suffix" @click="showPasswordModeF"> | 
|  |  | 27 | +							<view style="padding:20rpx"><u-icon :name="showPasswordF ? '/static/eye-hide.png' : '/static/eye.png'"></u-icon></view> | 
|  |  | 28 | +						</template> | 
|  |  | 29 | +					</u-input> | 
| 31 | </view> | 30 | </view> | 
| 32 | -				<view style="margin-top:70rpx" class="form-row u-flex"> |  |  | 
| 33 | -					<view class="v-input"><input type="text" v-model="rePassword" maxlength="32" placeholder="请再次输入新的登录密码" :password="!showPasswordS" /></view> |  |  | 
| 34 | -					<view class="v-password"><u-icon  size="25" @click="showPasswordModeS" :name="showPasswordS ? 'eye-fill' : 'eye-off'"></u-icon></view> |  |  | 
| 35 | -					<u-icon></u-icon> | 31 | +				<view class="form-row u-flex"> | 
|  |  | 32 | +					<u-input v-model="rePassword" :password="showPasswordS" placeholder="请再次输入新的登录密码" border="bottom"> | 
|  |  | 33 | +						<template slot="suffix" @click="showPasswordModeS"> | 
|  |  | 34 | +							<view style="padding:20rpx"><u-icon :name="showPasswordS ? '/static/eye-hide.png' : '/static/eye.png'"></u-icon></view> | 
|  |  | 35 | +						</template> | 
|  |  | 36 | +					</u-input> | 
| 36 | </view> | 37 | </view> | 
| 37 | -				<button class="submit" size="default" @click="onSubmit"> |  |  | 
| 38 | -					<text style="color:#fff">确定</text> |  |  | 
| 39 | -				</button> | 38 | +				<button class="submit" size="default" @click="onSubmit"><text style="color:#fff">确定</text></button> | 
| 40 | </view> | 39 | </view> | 
| 41 | </view> | 40 | </view> | 
| 42 | </view> | 41 | </view> | 
| 43 | </template> | 42 | </template> | 
| 44 |  | 43 |  | 
| 45 | <script> | 44 | <script> | 
| 46 | -	var clear; |  |  | 
| 47 | -	export default { |  |  | 
| 48 | -		data() { |  |  | 
| 49 | -			return { |  |  | 
| 50 | -				readonly: false, |  |  | 
| 51 | -				codeText: '发送验证码', |  |  | 
| 52 | -				phone: '', //号码 |  |  | 
| 53 | -				vCode: '', //验证码 |  |  | 
| 54 | -				nextStatus: false, |  |  | 
| 55 | -				password:'', |  |  | 
| 56 | -				rePassword:'', |  |  | 
| 57 | -				showPasswordF: false, |  |  | 
| 58 | -				showPasswordS: false, |  |  | 
| 59 | -			} |  |  | 
| 60 | -		}, |  |  | 
| 61 | -		methods: { |  |  | 
| 62 | -			//验证码按钮文字状态 |  |  | 
| 63 | -			getCodeState() { |  |  | 
| 64 | -				const _this = this; |  |  | 
| 65 | -				this.readonly = true; |  |  | 
| 66 | -				this.codeText = '60S后重新获取'; |  |  | 
| 67 | -				var s = 60; |  |  | 
| 68 | -				clear = setInterval(() => { |  |  | 
| 69 | -					s--; |  |  | 
| 70 | -					_this.codeText = s + 'S后重新获取'; |  |  | 
| 71 | -					if (s <= 0) { |  |  | 
| 72 | -						clearInterval(clear); |  |  | 
| 73 | -						_this.codeText = '发送验证码'; |  |  | 
| 74 | -						_this.readonly = false; |  |  | 
| 75 | -					} |  |  | 
| 76 | -				}, 1000); |  |  | 
| 77 | -			}, |  |  | 
| 78 | -			//获取验证码 |  |  | 
| 79 | -			getVcode() { |  |  | 
| 80 | -				if (this.readonly) { |  |  | 
| 81 | -					uni.showToast({ |  |  | 
| 82 | -						title: '验证码已发送~', |  |  | 
| 83 | -						icon: 'none' |  |  | 
| 84 | -					}); |  |  | 
| 85 | -					return; |  |  | 
| 86 | -				} |  |  | 
| 87 | -				if (this.phone == '') { |  |  | 
| 88 | -					uni.showToast({ |  |  | 
| 89 | -						title: '请输入手机号~', |  |  | 
| 90 | -						icon: 'none' |  |  | 
| 91 | -					}); |  |  | 
| 92 | -					return; |  |  | 
| 93 | -				} |  |  | 
| 94 | -				const phoneRegular = /^1\d{10}$/; |  |  | 
| 95 | -				if (!phoneRegular.test(this.phone)) { |  |  | 
| 96 | -					uni.showToast({ |  |  | 
| 97 | -						title: '手机号格式不正确~', |  |  | 
| 98 | -						icon: 'none' |  |  | 
| 99 | -					}); |  |  | 
| 100 | -					return; | 45 | +var clear; | 
|  |  | 46 | +export default { | 
|  |  | 47 | +	data() { | 
|  |  | 48 | +		return { | 
|  |  | 49 | +			readonly: false, | 
|  |  | 50 | +			codeText: '发送验证码', | 
|  |  | 51 | +			phone: '', //号码 | 
|  |  | 52 | +			vCode: '', //验证码 | 
|  |  | 53 | +			nextStatus: false, | 
|  |  | 54 | +			password: '', | 
|  |  | 55 | +			rePassword: '', | 
|  |  | 56 | +			showPasswordF: true, | 
|  |  | 57 | +			showPasswordS: true | 
|  |  | 58 | +		}; | 
|  |  | 59 | +	}, | 
|  |  | 60 | +	methods: { | 
|  |  | 61 | +		//验证码按钮文字状态 | 
|  |  | 62 | +		getCodeState() { | 
|  |  | 63 | +			const _this = this; | 
|  |  | 64 | +			this.readonly = true; | 
|  |  | 65 | +			this.codeText = '60s后重新获取'; | 
|  |  | 66 | +			var s = 60; | 
|  |  | 67 | +			clear = setInterval(() => { | 
|  |  | 68 | +				s--; | 
|  |  | 69 | +				_this.codeText = s + 's后重新获取'; | 
|  |  | 70 | +				if (s <= 0) { | 
|  |  | 71 | +					clearInterval(clear); | 
|  |  | 72 | +					_this.codeText = '发送验证码'; | 
|  |  | 73 | +					_this.readonly = false; | 
| 101 | } | 74 | } | 
| 102 | -				let httpData = {} | 75 | +			}, 1000); | 
|  |  | 76 | +		}, | 
|  |  | 77 | +		//获取验证码 | 
|  |  | 78 | +		getVcode() { | 
|  |  | 79 | +			if (this.readonly) { | 
|  |  | 80 | +				uni.showToast({ | 
|  |  | 81 | +					title: '验证码已发送~', | 
|  |  | 82 | +					icon: 'none' | 
|  |  | 83 | +				}); | 
|  |  | 84 | +				return; | 
|  |  | 85 | +			} | 
|  |  | 86 | +			if (this.phone == '') { | 
|  |  | 87 | +				uni.showToast({ | 
|  |  | 88 | +					title: '请输入手机号~', | 
|  |  | 89 | +					icon: 'none' | 
|  |  | 90 | +				}); | 
|  |  | 91 | +				return; | 
|  |  | 92 | +			} | 
|  |  | 93 | +			const phoneRegular = /^1\d{10}$/; | 
|  |  | 94 | +			if (!phoneRegular.test(this.phone)) { | 
|  |  | 95 | +				uni.showToast({ | 
|  |  | 96 | +					title: '手机号格式不正确~', | 
|  |  | 97 | +					icon: 'none' | 
|  |  | 98 | +				}); | 
|  |  | 99 | +				return; | 
|  |  | 100 | +			} | 
|  |  | 101 | +			let httpData = {}; | 
| 103 | // 获取验证码接口 | 102 | // 获取验证码接口 | 
| 104 | uni.$u.http.post(`/yt/noauth/resetCode/${this.phone}` ).then(res => { | 103 | uni.$u.http.post(`/yt/noauth/resetCode/${this.phone}` ).then(res => { | 
| 105 | this.getCodeState(); //开始倒计时 | 104 | this.getCodeState(); //开始倒计时 | 
|  | @@ -166,7 +165,7 @@ |  | @@ -166,7 +165,7 @@ | 
| 166 | icon: 'none' | 165 | icon: 'none' | 
| 167 | }).then(res=>{ | 166 | }).then(res=>{ | 
| 168 | uni.reLaunch({ | 167 | uni.reLaunch({ | 
| 169 | -								url: '/publicLoginSubPage/public/login' | 168 | +								url: '/pages/personal/personal' | 
| 170 | }); | 169 | }); | 
| 171 | /** | 170 | /** | 
| 172 | * 有些时候不起作用 | 171 | * 有些时候不起作用 |