修复首页选项卡问题

src/main/groovy/com/jd/brume/controller/UserController.groovy

@@ -155,7 +155,7 @@ class UserController {
 		if (StrUtil.isNotBlank(userVo.oldPass)) {
 			userVo.oldPass = SMUtil.sm2Encrypt(userVo.oldPass)
 		}
-		def count = userService.count(Wrappers.lambdaQuery().eq(UserFunc.userId(), userVo.userId).ne(UserFunc.password(), userVo.oldPass))
+		def count = userService.count(Wrappers.lambdaQuery().eq(UserFunc.userId(), userVo.userId).eq(UserFunc.password(), userVo.oldPass))
 		if (count < 1) return new Result().msg(100, '鏃у瘑鐮佽緭鍏ラ敊璇�')
 
 		UserEntity user = new UserEntity(userId: userVo.userId, password: userVo.password)
@@ -163,7 +163,7 @@ class UserController {
 	}
 
 	/**
-	 * 修改用户信息
+	 * 锟睫革拷锟矫伙拷锟斤拷息
 	 * @param userVo
 	 * @return
 	 */

src/main/resources/static/web/index.html

@@ -114,10 +114,10 @@
 			<div class="layui-card-body">
 				<form class="layui-form" action="">
 					<div class="layui-form-item">
-						<label class="layui-form-label">原密码</label>
+						<label class="layui-form-label">旧密码</label>
 						<div class="layui-input-block">
 							<input type="password" name="oldPwd" id="oldPwd" required lay-verify="required|pwd"
-								   placeholder="请输原密码" autocomplete="off" class="layui-input">
+								   placeholder="请输旧密码" autocomplete="off" class="layui-input">
 						</div>
 					</div>
 					<div class="layui-form-item">
@@ -136,7 +136,7 @@
 					</div>
 					<div class="layui-form-item">
 						<div class="layui-input-block">
-							<button class="layui-btn" lay-submit lay-filter="updatePwd">提交</button>
+							<button type="button" class="layui-btn" lay-submit lay-filter="updatePwd">提交</button>
 							<button type="reset" class="layui-btn layui-btn-primary">重置</button>
 						</div>
 					</div>
@@ -163,7 +163,7 @@
 					</div>
 					<div class="layui-form-item">
 						<div class="layui-input-block">
-							<button class="layui-btn" lay-submit lay-filter="updateTel">提交</button>
+							<button type="button" class="layui-btn" lay-submit lay-filter="updateTel">提交</button>
 						</div>
 					</div>
 				</form>

src/main/resources/static/web/js/index.js

@@ -62,7 +62,7 @@ layui.config({
 		},
 		phoneVal: function (value, item) {
 			var  mobile = /^1[3|4|5|6|7|8|9]\d{9}$/;
-			var flag = phone.test(value);
+			var flag = mobile.test(value);
 			if(!flag){
 				return '请输入正确手机号';
 			}
@@ -77,7 +77,11 @@ layui.config({
 				repeatPass : data.field.rePwd
 			},
 			(json) => {
-				layer.closeAll();
+				if(json.code == constants.SUCCESS_CODE){
+					setTimeout( () => {
+						layer.closeAll();
+					},1500)
+				}
 				customUtil.refush(json.code == constants.SUCCESS_CODE, '保存成功', json.msg)
 			}
 		)
@@ -91,9 +95,13 @@ layui.config({
 				phone : data.field.phone
 			},
 			(json) => {
-				layer.closeAll();
+				if(json.code == constants.SUCCESS_CODE){
+					setTimeout( () => {
+						layer.closeAll();
+					},1500)
+					sessionStorage.setItem('login-phone',data.field.phone);
+				}
 				customUtil.refush(json.code == constants.SUCCESS_CODE, '保存成功', json.msg)
-				sessionStorage.setItem('login-phone',data.field.phone);
 			}
 		)
 		return false