diff --git a/app/admin/view/default/user/save_info.html b/app/admin/view/default/user/save_info.html index 09c2c1228..0d30ceb01 100755 --- a/app/admin/view/default/user/save_info.html +++ b/app/admin/view/default/user/save_info.html @@ -11,7 +11,7 @@
- +
diff --git a/app/service/UserService.php b/app/service/UserService.php index 3e0485e91..4a7eb1f53 100755 --- a/app/service/UserService.php +++ b/app/service/UserService.php @@ -357,7 +357,7 @@ class UserService // 更新数据 $data = [ - 'system_type' => empty($params['system_type']) ? 'default' : $params['system_type'], + 'system_type' => empty($params['system_type_name']) ? 'default' : $params['system_type_name'], 'username' => isset($params['username']) ? $params['username'] : '', 'nickname' => isset($params['nickname']) ? $params['nickname'] : '', 'mobile' => isset($params['mobile']) ? $params['mobile'] : '', @@ -404,12 +404,11 @@ class UserService if(!empty($params['id'])) { // 获取用户信息 - $user = self::UserInfo('id', intval($params['id']), 'id,integral'); + $user = Db::name('User')->where(['id'=>intval($params['id'])])->field('id,integral')->find(); if(empty($user)) { return DataReturn('用户信息不存在', -10); } - $ret = self::UserUpdateHandle($data, $params['id']); if($ret['code'] == 0) { diff --git a/public/static/common/js/common.js b/public/static/common/js/common.js index eda00f543..a5ea675d3 100755 --- a/public/static/common/js/common.js +++ b/public/static/common/js/common.js @@ -307,18 +307,25 @@ function FromInit(form_name) onInValid: function(validity) { var $this = this; - setTimeout(function() + var $field = $(validity.field); + var tag_name = $field.prop('tagName'); + if(tag_name == 'SELECT') { - - // 错误信息 - var $field = $(validity.field); - var value = $field.val(); - var msg = $field.data('validationMessage') || $this.getValidationMessage(validity); - if((value == '' || value == undefined) && $field.hasClass('am-field-error')) + setTimeout(function() { - Prompt(msg); - } - }, 100); + // 错误信息 + var $field = $(validity.field); + var value = $field.val(); + var msg = $field.data('validationMessage') || $this.getValidationMessage(validity); + if((value == '' || value == undefined) && $field.hasClass('am-field-error')) + { + Prompt(msg); + } + }, 100); + } else { + var msg = $field.data('validationMessage') || $this.getValidationMessage(validity); + Prompt(msg); + } }, // 提交