|
|
@@ -522,25 +522,76 @@ define(['app/app'], function(app) {
|
|
|
$scope.showPassword = false;
|
|
|
$scope.showNewPassword = false;
|
|
|
$scope.showPassword1 = false;
|
|
|
- $scope.reloadKeyboard = function (type) {
|
|
|
+ $scope.reloadKeyboard = function (type, $event) {
|
|
|
+ $event.stopPropagation();
|
|
|
if (type === 'showPassword') {
|
|
|
$scope.showPassword = !$scope.showPassword;
|
|
|
if(!$scope.showPassword){
|
|
|
- $scope.checkPassword($scope.user.password);
|
|
|
+ $scope.checkPassword($scope.user.password);
|
|
|
+ } else {
|
|
|
+ $scope.closeOtherKeyboard('showPassword');
|
|
|
}
|
|
|
} else if (type === 'showNewPassword') {
|
|
|
$scope.showNewPassword = !$scope.showNewPassword;
|
|
|
if (!$scope.showNewPassword) {
|
|
|
$scope.checkNewPassword($scope.user.newPassword);
|
|
|
+ } else {
|
|
|
+ $scope.closeOtherKeyboard('showNewPassword');
|
|
|
}
|
|
|
} else if (type === 'showPassword1') {
|
|
|
$scope.showPassword1 = !$scope.showPassword1;
|
|
|
if (!$scope.showNewPassword1) {
|
|
|
$scope.checkNewPassword1($scope.user.newPassword1);
|
|
|
+ } else {
|
|
|
+ $scope.closeOtherKeyboard('showPassword1');
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ function resetPassword() {
|
|
|
+ $scope.showPassword = false;
|
|
|
+ $scope.checkPassword($scope.user.password);
|
|
|
+ }
|
|
|
+ function resetNewPassword() {
|
|
|
+ $scope.showNewPassword = false;
|
|
|
+ $scope.checkNewPassword($scope.user.newPassword);
|
|
|
+ }
|
|
|
+ function resetPassword1() {
|
|
|
+ $scope.showPassword1 = false;
|
|
|
+ $scope.checkNewPassword1($scope.user.newPassword1);
|
|
|
+ }
|
|
|
+ $scope.closeOtherKeyboard = function (type) {
|
|
|
+ if (type == 'showPassword') {
|
|
|
+ if ($scope.showNewPassword) {
|
|
|
+ resetNewPassword();
|
|
|
+ } else if ($scope.showPassword1) {
|
|
|
+ resetPassword1();
|
|
|
+ }
|
|
|
+ } else if (type == 'showNewPassword') {
|
|
|
+ if ($scope.showPassword) {
|
|
|
+ resetPassword();
|
|
|
+ } else if ($scope.showPassword1) {
|
|
|
+ resetPassword1();
|
|
|
+ }
|
|
|
+ } else if (type == 'showPassword1') {
|
|
|
+ if ($scope.showPassword) {
|
|
|
+ resetPassword();
|
|
|
+ } else if ($scope.showNewPassword) {
|
|
|
+ resetNewPassword();
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- $scope.reloadKeyboard();
|
|
|
+ $scope.closeKeyboard = function () {
|
|
|
+ if ($scope.showPassword) {
|
|
|
+ $scope.showPassword = false;
|
|
|
+ $scope.checkPassword($scope.user.password);
|
|
|
+ } else if ($scope.showNewPassword) {
|
|
|
+ $scope.showNewPassword = false;
|
|
|
+ $scope.checkNewPassword($scope.user.newPassword);
|
|
|
+ } else if ($scope.showPassword1) {
|
|
|
+ $scope.showPassword1 = false;
|
|
|
+ $scope.checkNewPassword1($scope.user.newPassword1);
|
|
|
+ }
|
|
|
+ }
|
|
|
//输入原密码后验证原密码是否正确
|
|
|
$scope.checkPassword = function(password) {
|
|
|
$scope.checking = true;
|
|
|
@@ -650,6 +701,10 @@ define(['app/app'], function(app) {
|
|
|
$scope.cancel = function () {
|
|
|
$modalInstance.close();
|
|
|
};
|
|
|
+ $scope.hideKeyboard = function () {
|
|
|
+ $scope.closeKeyboard();
|
|
|
+ console.log(1);
|
|
|
+ }
|
|
|
}]);
|
|
|
|
|
|
|
|
|
@@ -910,24 +965,76 @@ define(['app/app'], function(app) {
|
|
|
$scope.showNewUserPay = false;
|
|
|
$scope.showUserPay = false;
|
|
|
$scope.showNewUserPay1 = false;
|
|
|
- $scope.reloadKeyboard = function (type) {
|
|
|
+ $scope.reloadKeyboard = function (type, $event) {
|
|
|
+ $event.stopPropagation();
|
|
|
if (type === 'showNewUserPay') {
|
|
|
$scope.showNewUserPay = !$scope.showNewUserPay;
|
|
|
if (!$scope.showNewUserPay) {
|
|
|
$scope.checkNewUserPay($scope.user.newUserPay);
|
|
|
+ } else {
|
|
|
+ $scope.closeOtherKeyboard('showNewUserPay');
|
|
|
}
|
|
|
} else if (type === 'showUserPay') {
|
|
|
$scope.showUserPay = !$scope.showUserPay;
|
|
|
if (!$scope.showUserPay) {
|
|
|
$scope.checkUserPay($scope.user.userPay);
|
|
|
+ } else {
|
|
|
+ $scope.closeOtherKeyboard('showUserPay');
|
|
|
}
|
|
|
} else if (type === 'showNewUserPay1') {
|
|
|
$scope.showNewUserPay1 = !$scope.showNewUserPay1;
|
|
|
if (!$scope.showNewUserPay1) {
|
|
|
- $scope.checkNewUserPay1($scope.user.userPay1);
|
|
|
+ $scope.checkNewUserPay1($scope.user.newUserPay1);
|
|
|
+ } else {
|
|
|
+ $scope.closeOtherKeyboard('showNewUserPay1');
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ function resetNewUserPay() {
|
|
|
+ $scope.showNewUserPay = false;
|
|
|
+ $scope.checkNewUserPay($scope.user.newUserPay);
|
|
|
+ }
|
|
|
+ function resetUserPay() {
|
|
|
+ $scope.showUserPay = false;
|
|
|
+ $scope.checkUserPay($scope.user.userPay);
|
|
|
+ }
|
|
|
+ function resetNewUserPay1() {
|
|
|
+ $scope.showNewUserPay1 = false;
|
|
|
+ $scope.checkNewUserPay1($scope.user.newUserPay1);
|
|
|
+ }
|
|
|
+ $scope.closeOtherKeyboard = function (type) {
|
|
|
+ if (type == 'showNewUserPay') {
|
|
|
+ if ($scope.showUserPay) {
|
|
|
+ resetUserPay();
|
|
|
+ } else if ($scope.showNewUserPay1) {
|
|
|
+ resetNewUserPay1();
|
|
|
+ }
|
|
|
+ } else if (type == 'showUserPay') {
|
|
|
+ if ($scope.showNewUserPay) {
|
|
|
+ resetNewUserPay();
|
|
|
+ } else if ($scope.showNewUserPay1) {
|
|
|
+ resetNewUserPay1();
|
|
|
+ }
|
|
|
+ } else if (type == 'showNewUserPay1') {
|
|
|
+ if ($scope.showNewUserPay) {
|
|
|
+ resetNewUserPay();
|
|
|
+ } else if ($scope.showUserPay) {
|
|
|
+ resetUserPay();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ $scope.closeKeyboard = function () {
|
|
|
+ if ($scope.showNewUserPay) {
|
|
|
+ $scope.showNewUserPay = false;
|
|
|
+ $scope.checkNewUserPay($scope.user.newUserPay);
|
|
|
+ } else if ($scope.showUserPay) {
|
|
|
+ $scope.showUserPay = false;
|
|
|
+ $scope.checkUserPay($scope.user.userPay);
|
|
|
+ } else if ($scope.showNewUserPay1) {
|
|
|
+ $scope.showNewUserPay1 = false;
|
|
|
+ $scope.checkNewUserPay1($scope.user.newUserPay1);
|
|
|
+ }
|
|
|
+ }
|
|
|
//验证是否设置密码
|
|
|
$scope.checkHaveUserPay=function(){
|
|
|
$scope.userPayHidden = false;
|