Browse Source

修改密码校验是否与原密码相同

1004749546@qq.com 4 năm trước cách đây
mục cha
commit
83a04d96f9

+ 4 - 1
pages/userCenter/userInfo/changePayPwd.vue

@@ -2,7 +2,7 @@
 	<view class="changePayPwd-container">
 	<view class="changePayPwd-container">
 		<text class="pwd-describe">请输入当前支付密码</text>
 		<text class="pwd-describe">请输入当前支付密码</text>
 		<view class="pwd-item">
 		<view class="pwd-item">
-			<u-input v-model="oldPwd" border type="password" input-align="center" placeholder="请输入支付密码" :maxlength="30" class="inp-pwd" />
+			<input v-model="oldPwd" border type="password" placeholder="请输入支付密码" :maxlength="30" class="inp-pwd" />
 		</view>
 		</view>
 		<view class="btn-con">
 		<view class="btn-con">
 			<u-button class="handle-btn" type="info" size="medium" @click="cancel">取消</u-button>
 			<u-button class="handle-btn" type="info" size="medium" @click="cancel">取消</u-button>
@@ -76,6 +76,9 @@
 		}
 		}
 		.pwd-item{
 		.pwd-item{
 			.inp-pwd{
 			.inp-pwd{
+				padding: 10upx 0;
+				border: 1px solid #cacaca;
+				text-align: center;
 			}
 			}
 		}
 		}
 		.btn-con{
 		.btn-con{

+ 12 - 24
pages/userCenter/userInfo/paymentPwd.vue

@@ -4,10 +4,6 @@
 		<view class="sms-item" @tap="showKeyboard=!showKeyboard">
 		<view class="sms-item" @tap="showKeyboard=!showKeyboard">
 			<u-message-input mode="bottomLine" :maxlength="6" v-model="value" :dot-fill="true" :disabled-keyboard="true"></u-message-input>
 			<u-message-input mode="bottomLine" :maxlength="6" v-model="value" :dot-fill="true" :disabled-keyboard="true"></u-message-input>
 		</view>
 		</view>
-		<!-- <view class="btn-con">
-			<u-button class="handle-btn" type="info" size="medium" @click="cancel">取消</u-button>
-			<u-button class="handle-btn" type="primary" size="medium" @click="submit">确定</u-button>
-		</view> -->
 		<!-- 数字键盘 -->
 		<!-- 数字键盘 -->
 		<u-keyboard ref="uKeyboard" :dot-enabled="false" :mask="false" :tooltip="false" v-model="showKeyboard" @change="valChange" @backspace="backspace"></u-keyboard>
 		<u-keyboard ref="uKeyboard" :dot-enabled="false" :mask="false" :tooltip="false" v-model="showKeyboard" @change="valChange" @backspace="backspace"></u-keyboard>
 	</view>
 	</view>
@@ -48,13 +44,21 @@
 			// 监听输入框输入长度
 			// 监听输入框输入长度
 			 value: {
 			 value: {
 				handler(newVal) {
 				handler(newVal) {
-					console.log(newVal.length,'NNNNNNNNNNNN')
 					if(newVal.length==6) {
 					if(newVal.length==6) {
 						if(this.nowSetp == 1){
 						if(this.nowSetp == 1){
 							this.oPwd = this.value
 							this.oPwd = this.value
-							this.value = ''
-							this.nowSetp++
-							this.showKeyboard = true
+							if(this.oldPwd && this.oPwd === this.oldPwd) {
+								uni.showToast({
+									title: '新密码与原密码相同,请重新输入!',
+									icon: 'none'
+								})
+								this.value = ''
+								return false
+							} else {
+								this.value = ''
+								this.nowSetp++
+								this.showKeyboard = true
+							}
 						}else if(this.nowSetp == 2){
 						}else if(this.nowSetp == 2){
 							this.tPwd = this.value
 							this.tPwd = this.value
 							this.showKeyboard = false
 							this.showKeyboard = false
@@ -78,22 +82,6 @@
 				// 删除value的最后一个字符
 				// 删除value的最后一个字符
 				if(this.value.length) this.value = this.value.substr(0, this.value.length - 1)
 				if(this.value.length) this.value = this.value.substr(0, this.value.length - 1)
 			},
 			},
-			//  确定
-			submit(){
-				if(!this.value || this.value.length < 6){
-					uni.showToast({ title: '请输入6位数字支付密码', icon: 'none' })
-				}else{
-					if(this.nowSetp == 1){
-						this.oPwd = this.value
-						this.value = ''
-						this.nowSetp++
-						this.showKeyboard = true
-					}else if(this.nowSetp == 2){
-						this.tPwd = this.value
-						this.checkPwd()
-					}
-				}
-			},
 			//  密码校验
 			//  密码校验
 			checkPwd(){
 			checkPwd(){
 				if(this.oPwd == this.tPwd){
 				if(this.oPwd == this.tPwd){

+ 0 - 15
pages/userCenter/userInfo/smsVerification.vue

@@ -10,10 +10,6 @@
 				<text :class="['getcode-btn', isDisable ? 'grey-btn' : '']" @click="isDisable ? null : pageInit()">{{nowVal}}</text>
 				<text :class="['getcode-btn', isDisable ? 'grey-btn' : '']" @click="isDisable ? null : pageInit()">{{nowVal}}</text>
 			</view>
 			</view>
 		</view>
 		</view>
-		<!-- <view class="btn-con">
-			<u-button class="handle-btn" type="info" size="medium" @click="cancel">取消</u-button>
-			<u-button class="handle-btn" type="primary" size="medium" @click="submit">确定</u-button>
-		</view> -->
 		<!-- 数字键盘 -->
 		<!-- 数字键盘 -->
 		<u-keyboard ref="uKeyboard" :dot-enabled="false" :mask="false" :tooltip="false" v-model="showKeyboard" @change="valChange" @backspace="backspace"></u-keyboard>
 		<u-keyboard ref="uKeyboard" :dot-enabled="false" :mask="false" :tooltip="false" v-model="showKeyboard" @change="valChange" @backspace="backspace"></u-keyboard>
 		<!-- 图文验证码 -->
 		<!-- 图文验证码 -->
@@ -166,17 +162,6 @@
 				  }, 1000)
 				  }, 1000)
 				}
 				}
 			},
 			},
-			//  确定
-			submit(){
-				if(!this.value || this.value.length < 6){
-					uni.showToast({ title: '请输入6位数字验证码', icon: 'none' })
-				}else{
-					//  校验输入短信验证码是否正确
-					uni.redirectTo({
-						url: '/pages/userCenter/userInfo/paymentPwd'
-					})
-				}
-			},
 			//  取消
 			//  取消
 			cancel(){
 			cancel(){
 				uni.navigateBack({
 				uni.navigateBack({