小键盘输入校验逻辑

src/main/webapp/resources/js/usercenter/controllers/forstore/account_manager_ctrl.js

@@ -10,9 +10,11 @@ define(['app/app'], function(app) {
 		$scope.userInfoBackup = angular.copy($scope.userInfo);
 		$scope.canAddTotal = 20;
 		//手机号和邮箱号的部分隐藏
-	  $scope.userInfo.userTel = $scope.userInfo.userTel.substr(0, 3) + '****' + $scope.userInfo.userTel.substr(7);
-	  var userEmailTemp = $scope.userInfo.userEmail.indexOf("@");
-    $scope.userInfo.userEmail = $scope.userInfo.userEmail.substr(0,userEmailTemp-2)+"***"+$scope.userInfo.userEmail.substr(userEmailTemp);
+		$scope.userInfo.userTel = $scope.userInfo.userTel.substr(0, 3) + '****' + $scope.userInfo.userTel.substr(7);
+	  var userEmailTemp = $scope.userInfo.userEmail?$scope.userInfo.userEmail.indexOf("@"):'';
+		if(userEmailTemp != ''){
+			$scope.userInfo.userEmail = $scope.userInfo.userEmail.substr(0,userEmailTemp-2)+"***"+$scope.userInfo.userEmail.substr(userEmailTemp);
+		}
 		// 获取企业信息
 		if ($scope.userInfo.enterprise) {
 			Enterprise.getEnterpriseInfo({enuu : $scope.userInfo.enterprise.uu}, function(data) {
@@ -528,8 +530,14 @@ define(['app/app'], function(app) {
 				}
 			} else if (type === 'showNewPassword') {
 				$scope.showNewPassword = !$scope.showNewPassword;
+				if (!$scope.showNewPassword) {
+					$scope.checkNewPassword($scope.user.newPassword);
+				}
 			} else if (type === 'showPassword1') {
 				$scope.showPassword1 = !$scope.showPassword1;
+				if (!$scope.showNewPassword1) {
+					$scope.checkNewPassword1($scope.user.newPassword1);
+				}
 			}
 		}
 		$scope.reloadKeyboard();
@@ -557,6 +565,9 @@ 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字符的英文、数字混合');
@@ -568,6 +579,10 @@ define(['app/app'], function(app) {
           $scope.checkFailed1 = false;
 				}
 		}
+		
+		$scope.$watch('user.newPassword', function (newValue, oldValue) {
+			$scope.checkPasswordLevel(newValue);
+		});
 
 		//密码强度校验
 		$scope.secLevel = 0;
@@ -596,6 +611,9 @@ 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;

src/main/webapp/resources/lib/keyboard/js/softkeys-0.0.1.js

@@ -132,6 +132,7 @@
                     }
 
                     $(settings.target).focus().val(targetValue + character);
+                    $(settings.target).trigger('change');
                 });
             },
 

src/main/webapp/resources/view/vendor/modal/updatePassword.html

@@ -137,10 +137,10 @@
 		<div class="row new-password" ng-class="{'has-success': checkSuccess1, 'has-error': checkFailed1}">
 			<label class="col-md-3 col-sm-3 col text-right">新密码：</label>
 			<div class="col-md-8 col-sm-8 col">
-				<input ng-model="user.newPassword" name="newPassword" ng-keyup="checkPasswordLevel(user.newPassword)" ng-blur="checkNewPassword(user.newPassword)" class="form-control input-sm" type="password" required  placeholder="8~20位字母、数字、符号">
+				<input ng-model="user.newPassword" name="newPassword" ng-blur="checkNewPassword(user.newPassword)" class="form-control input-sm" type="password" required  placeholder="8~20位字母、数字、符号">
 				<!-- <div>密码复杂度</div> -->
 				<img src="static/img/user/images/keyboard.png" ng-click="reloadKeyboard('showNewPassword');" alt="">
-				<div ng-show="showNewPassword" class="softkeys softkeys2" data-target="input[name='newPassword']"></div>
+				<div ng-show="showNewPassword" style="top: 40px;" class="softkeys softkeys2" data-target="input[name='newPassword']"></div>
 			</div>
 			<div class="col">
 				<img ng-show="checkSuccess1" src="static/img/user/images/input-check-yes.png" alt="">
@@ -177,127 +177,50 @@
 	</div>
 </form>
 <script>
-	$('.softkeys1').softkeys({
-		target : $('.softkeys1').data('target'),
-		layout : [
-			[
-				['`','~'],
-				['1','!'],
-				['2','@'],
-				['3','#'],
-				['4','$'],
-				['5','%'],
-				['6','^'],
-				['7','&'],
-				['8','*'],
-				['9','('],
-				['0',')'],
-				['-', '_'],
-				['=','+'],
-				'delete'
-			],
-			[
-				'q','w','e','r','t','y','u','i','o','p',
-				['[','{'],
-				[']','}']
-			],
-			[
-				'capslock',
-				'a','s','d','f','g','h','j','k','l',
-				[';',':'],
-				["'",'"'],
-				['\\','|']
-			],
-			[
-				'shift',
-				'z','x','c','v','b','n','m',
-				[',','<'],
-				['.','>'],
-				['/','?'],
-				['@']
+	function resetKeyboard(str) {
+		$(str).softkeys({
+			target : $(str).data('target'),
+			layout : [
+				[
+					['`','~'],
+					['1','!'],
+					['2','@'],
+					['3','#'],
+					['4','$'],
+					['5','%'],
+					['6','^'],
+					['7','&'],
+					['8','*'],
+					['9','('],
+					['0',')'],
+					['-', '_'],
+					['=','+'],
+					'delete'
+				],
+				[
+					'q','w','e','r','t','y','u','i','o','p',
+					['[','{'],
+					[']','}']
+				],
+				[
+					'capslock',
+					'a','s','d','f','g','h','j','k','l',
+					[';',':'],
+					["'",'"'],
+					['\\','|']
+				],
+				[
+					'shift',
+					'z','x','c','v','b','n','m',
+					[',','<'],
+					['.','>'],
+					['/','?'],
+					['@']
+				]
 			]
-		]
-	});
-	$('.softkeys2').softkeys({
-		target : $('.softkeys2').data('target'),
-		layout : [
-			[
-				['`','~'],
-				['1','!'],
-				['2','@'],
-				['3','#'],
-				['4','$'],
-				['5','%'],
-				['6','^'],
-				['7','&'],
-				['8','*'],
-				['9','('],
-				['0',')'],
-				['-', '_'],
-				['=','+'],
-				'delete'
-			],
-			[
-				'q','w','e','r','t','y','u','i','o','p',
-				['[','{'],
-				[']','}']
-			],
-			[
-				'capslock',
-				'a','s','d','f','g','h','j','k','l',
-				[';',':'],
-				["'",'"'],
-				['\\','|']
-			],
-			[
-				'shift',
-				'z','x','c','v','b','n','m',
-				[',','<'],
-				['.','>'],
-				['/','?'],
-				['@']
-			]
-		]
-	});
-	$('.softkeys3').softkeys({
-		target : $('.softkeys3').data('target'),
-		layout : [
-			[
-				['`','~'],
-				['1','!'],
-				['2','@'],
-				['3','#'],
-				['4','$'],
-				['5','%'],
-				['6','^'],
-				['7','&'],
-				['8','*'],
-				['9','('],
-				['0',')'],
-				['-', '_'],
-				['=','+'],
-				'delete'
-			],
-			[
-				'q','w','e','r','t','y','u','i','o','p',
-				['[','{'],
-				[']','}']
-			],
-			[
-				'capslock',
-				'a','s','d','f','g','h','j','k','l',
-				[';',':'],
-				["'",'"'],
-				['\\','|']
-			],
-			[
-				'shift',
-				'z','x','c','v','b','n','m',
-				[',','<'],
-				['.','>'],
-				['/','?'],
-				['@']
-			]
-		]
-	});
+		});
+	}
+	resetKeyboard('.softkeys1');
+	resetKeyboard('.softkeys2');
+	resetKeyboard('.softkeys3');
 </script>

src/main/webapp/resources/view/vendor/modal/updateUserPay.html

@@ -142,127 +142,50 @@
     </div>
 </form>
 <script>
-    $('.softkeys1').softkeys({
-        target : $('.softkeys1').data('target'),
-        layout : [
-            [
-                ['`','~'],
-                ['1','!'],
-                ['2','@'],
-                ['3','#'],
-                ['4','$'],
-                ['5','%'],
-                ['6','^'],
-                ['7','&'],
-                ['8','*'],
-                ['9','('],
-                ['0',')'],
-                ['-', '_'],
-                ['=','+'],
-                'delete'
-            ],
-            [
-                'q','w','e','r','t','y','u','i','o','p',
-                ['[','{'],
-                [']','}']
-            ],
-            [
-                'capslock',
-                'a','s','d','f','g','h','j','k','l',
-                [';',':'],
-                ["'",'"'],
-                ['\\','|']
-            ],
-            [
-                'shift',
-                'z','x','c','v','b','n','m',
-                [',','<'],
-                ['.','>'],
-                ['/','?'],
-                ['@']
+    function resetKeyboard(str) {
+        $(str).softkeys({
+            target : $(str).data('target'),
+            layout : [
+                [
+                    ['`','~'],
+                    ['1','!'],
+                    ['2','@'],
+                    ['3','#'],
+                    ['4','$'],
+                    ['5','%'],
+                    ['6','^'],
+                    ['7','&'],
+                    ['8','*'],
+                    ['9','('],
+                    ['0',')'],
+                    ['-', '_'],
+                    ['=','+'],
+                    'delete'
+                ],
+                [
+                    'q','w','e','r','t','y','u','i','o','p',
+                    ['[','{'],
+                    [']','}']
+                ],
+                [
+                    'capslock',
+                    'a','s','d','f','g','h','j','k','l',
+                    [';',':'],
+                    ["'",'"'],
+                    ['\\','|']
+                ],
+                [
+                    'shift',
+                    'z','x','c','v','b','n','m',
+                    [',','<'],
+                    ['.','>'],
+                    ['/','?'],
+                    ['@']
+                ]
             ]
-        ]
-    });
-    $('.softkeys2').softkeys({
-        target : $('.softkeys2').data('target'),
-        layout : [
-            [
-                ['`','~'],
-                ['1','!'],
-                ['2','@'],
-                ['3','#'],
-                ['4','$'],
-                ['5','%'],
-                ['6','^'],
-                ['7','&'],
-                ['8','*'],
-                ['9','('],
-                ['0',')'],
-                ['-', '_'],
-                ['=','+'],
-                'delete'
-            ],
-            [
-                'q','w','e','r','t','y','u','i','o','p',
-                ['[','{'],
-                [']','}']
-            ],
-            [
-                'capslock',
-                'a','s','d','f','g','h','j','k','l',
-                [';',':'],
-                ["'",'"'],
-                ['\\','|']
-            ],
-            [
-                'shift',
-                'z','x','c','v','b','n','m',
-                [',','<'],
-                ['.','>'],
-                ['/','?'],
-                ['@']
-            ]
-        ]
-    });
-    $('.softkeys3').softkeys({
-        target : $('.softkeys3').data('target'),
-        layout : [
-            [
-                ['`','~'],
-                ['1','!'],
-                ['2','@'],
-                ['3','#'],
-                ['4','$'],
-                ['5','%'],
-                ['6','^'],
-                ['7','&'],
-                ['8','*'],
-                ['9','('],
-                ['0',')'],
-                ['-', '_'],
-                ['=','+'],
-                'delete'
-            ],
-            [
-                'q','w','e','r','t','y','u','i','o','p',
-                ['[','{'],
-                [']','}']
-            ],
-            [
-                'capslock',
-                'a','s','d','f','g','h','j','k','l',
-                [';',':'],
-                ["'",'"'],
-                ['\\','|']
-            ],
-            [
-                'shift',
-                'z','x','c','v','b','n','m',
-                [',','<'],
-                ['.','>'],
-                ['/','?'],
-                ['@']
-            ]
-        ]
-    });
+        });
+    }
+    resetKeyboard('.softkeys1');
+    resetKeyboard('.softkeys2');
+    resetKeyboard('.softkeys3');
 </script>