|
|
@@ -547,9 +547,6 @@ define(['app/app'], function(app) {
|
|
|
$scope.checkSuccess = false;
|
|
|
$scope.checkFailed = false;
|
|
|
//判断点击的是否在小键盘区域
|
|
|
- if($scope.showPassword){
|
|
|
- return;
|
|
|
- }
|
|
|
User.checkPassword({password: password}, function(){
|
|
|
$scope.checkSuccess = true;
|
|
|
$scope.checking = false;
|
|
|
@@ -565,9 +562,6 @@ define(['app/app'], function(app) {
|
|
|
$scope.checkSuccess1 = false;
|
|
|
$scope.checkFailed1 = false;
|
|
|
$scope.checkNewPassword = function (newPassword){
|
|
|
- if ($scope.showNewPassword) {
|
|
|
- return;
|
|
|
- }
|
|
|
var reg = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,20}$/;
|
|
|
if(newPassword==null || !reg.test(newPassword)){
|
|
|
//toaster.pop('error', '错误', '密码为8-20字符的英文、数字混合');
|
|
|
@@ -611,9 +605,6 @@ define(['app/app'], function(app) {
|
|
|
$scope.checkSuccess2 = false;
|
|
|
$scope.checkFailed2 = false;
|
|
|
$scope.checkNewPassword1 = function(){
|
|
|
- if ($scope.showPassword1) {
|
|
|
- return;
|
|
|
- }
|
|
|
if($scope.checkSuccess1==true && ($scope.user.newPassword == $scope.user.newPassword1)){
|
|
|
$scope.checkSuccess2 = true;
|
|
|
$scope.checkFailed2 = false;
|
|
|
@@ -922,10 +913,19 @@ define(['app/app'], function(app) {
|
|
|
$scope.reloadKeyboard = function (type) {
|
|
|
if (type === 'showNewUserPay') {
|
|
|
$scope.showNewUserPay = !$scope.showNewUserPay;
|
|
|
+ if (!$scope.showNewUserPay) {
|
|
|
+ $scope.checkNewUserPay($scope.user.newUserPay);
|
|
|
+ }
|
|
|
} else if (type === 'showUserPay') {
|
|
|
$scope.showUserPay = !$scope.showUserPay;
|
|
|
+ if (!$scope.showUserPay) {
|
|
|
+ $scope.checkUserPay($scope.user.userPay);
|
|
|
+ }
|
|
|
} else if (type === 'showNewUserPay1') {
|
|
|
$scope.showNewUserPay1 = !$scope.showNewUserPay1;
|
|
|
+ if (!$scope.showNewUserPay1) {
|
|
|
+ $scope.checkNewUserPay1($scope.user.userPay1);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
//验证是否设置密码
|