合并dev的 冲突处理

src/main/java/com/uas/platform/b2c/common/account/controller/AuthenticationController.java

@@ -38,6 +38,7 @@ public class AuthenticationController {
 		List<UserQuestion> userQuestion = userQuestionService.findUserQuestionByUserUUOrderBySortAsc(sysUser.getUserUU());
 		User user = userService.findUserByUserUU(sysUser.getUserUU());
 		user.setEnterprise(sysUser.getEnterprise());
+		user.setIssys(sysUser.getIssys());
 		UserInfo userInfo = new UserInfo(user);
 		if(userQuestion!=null){
 			if(userQuestion.size()>0){
@@ -80,6 +81,7 @@ public class AuthenticationController {
 		}else {
 			user.setCurrentEnterprise(enUU);
 		}
+		user.setIssys(userService.findUserByUserUU(user.getUserUU()).getIssys());
 	}
 
 }

src/main/java/com/uas/platform/b2c/core/filter/SSOInterceptor.java

@@ -154,9 +154,9 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
             if (user != null) {
                 user.setIp(AgentUtils.getIp(request));
                 request.getSession().setAttribute("user", user);
-                setGrantedAuthorities(user);
             }
         }
+        setGrantedAuthorities(user);
         if (user != null) {
             SystemSession.setUser(user);
             accessDecision(request, user);

src/main/java/com/uas/platform/b2c/external/erp/order/service/impl/OrderServiceImpl.java

@@ -183,9 +183,4 @@ public class OrderServiceImpl implements OrderService {
 		}
 		return true;
 	}
-
-	@Override
-	public Long findAdminuu() {
-		return null;
-	}
 }

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_account_management_ctrl.js

@@ -2,143 +2,160 @@
  * Created by yujia on 2017/3/24.
  *  原厂认证
  */
-define(['app/app'], function(app) {
+define(['app/app'], function (app) {
     "use strict";
-    app.register.controller('vendorAccountManagementCtrl', ['$scope', '$rootScope', 'Enterprise', 'User', 'toaster', '$modal','BaseService','ngTableParams','$http', 'AuthenticationService','$stateParams', function($scope, $rootScope, Enterprise, User, toaster, $modal, BaseService, ngTableParams, $http, AuthenticationService,$stateParams) {
+    app.register.controller('vendorAccountManagementCtrl', ['$scope', '$rootScope', 'Enterprise', 'User', 'toaster', '$modal', 'BaseService', 'ngTableParams', '$http', 'AuthenticationService', '$stateParams','AccountResource','AccountRole', function ($scope, $rootScope, Enterprise, User, toaster, $modal, BaseService, ngTableParams, $http, AuthenticationService, $stateParams, AccountResource, AccountRole) {
         $rootScope.active = 'vendor_account_management';
-		document.title = '账户管理-优软商城';
-		$scope.tab = 'base';
+        document.title = '账户管理-优软商城';
+        $scope.tab = 'base';
         $scope.addingUser = false;
         $scope.setAddingUser = function (status) {
             $scope.addingUser = status;
-			$scope.adding = false;
-		};
+            $scope.adding = false;
+        };
         $scope.userInfo = $rootScope.userInfo;
-		$scope.updateState = false;
+        $scope.updateState = false;
         // 获取企业信息
-        Enterprise.getEnterpriseInfo({enuu : $scope.userInfo.enterprise.uu}, function(data) {
-			$scope.enterpriseInfo = data;
-			$scope.enterpriseInfoBackup = angular.copy($scope.enterpriseInfo);
-			$scope.enAdminuu = $scope.enterpriseInfo.enAdminuu;
-			User.getUserByUU({uu: $scope.enAdminuu}, {}, function(data){
-		        	$scope.adminInfo = data;
-		        	console.log($scope.adminInfo);
-		        }, function(){
-		        	toaster.pop('error', '获取管理员信息失败');
-		        });
-		},function(response) {
-			toaster.pop('error', '获取企业信息失败');
-		});
-
-		$scope.tableParams = new ngTableParams({
-			page : 1, // show first page
-			count : 10 // count per page
-		}, {
-			total : 0,
-			getData : function($defer, params) {
-				var param = BaseService.parseParams(params.url());
-				param.enuu = $scope.userInfo.enterprise.uu;
-				if(!$scope.searchMthod) {
-					Enterprise.getAllUsersByEnuu(param, function (page) {
-						if (page) {
-							params.total(page.totalElements);
-							$defer.resolve(page.content);
-							$scope.users = page.content;
-						}
-					});
-				}
-				else {
-					param.keyword = $scope.keyword;
-					Enterprise.findUsersByKeyword(param,function (page) {
-						if (page) {
-							params.total(page.totalElements);
-							$defer.resolve(page.content);
-							$scope.users = page.content;
-						}
-					})
-				}
-			}
-		});
-
-		$scope.onSearch = function(keyword) {
-			if(keyword != null && keyword != '') {
-				$scope.searchMthod = true;
-				$scope.keyword = keyword;
-			} else {
-				$scope.searchMthod = false;
-			}
-			$scope.tableParams.page(1);
-			$scope.tableParams.reload();
-		};
-
-          $scope.newUser = {};
-
-		//弹出添加用户模态框
-		$scope.addExistUser = function () {
-			$scope.adding = false;
-			$scope.setAddingUser(false);
-			$scope.newUser = {};
-			var modalInstance = $modal.open({
-				animation: true,
-				templateUrl: $rootScope.rootPath +'/static/view/vendor/forstore/addExistUser.html',
-				controller: 'AddExistUserCtrl'
-			});
+        Enterprise.getEnterpriseInfo({enuu: $scope.userInfo.enterprise.uu}, function (data) {
+            $scope.enterpriseInfo = data;
+            $scope.enterpriseInfoBackup = angular.copy($scope.enterpriseInfo);
+            $scope.enAdminuu = $scope.enterpriseInfo.enAdminuu;
+            User.getUserByUU({uu: $scope.enAdminuu}, {}, function (data) {
+                $scope.adminInfo = data;
+                console.log($scope.adminInfo);
+            }, function () {
+                toaster.pop('error', '获取管理员信息失败');
+            });
+        }, function (response) {
+            toaster.pop('error', '获取企业信息失败');
+        });
+
+        $scope.pageParam = {};
+        $scope.tableParams = new ngTableParams({
+            page : 1, // show first page
+            count : 10 // count per page
+        }, {
+            total : 0,
+            getData : function($defer, params) {
+                var param = BaseService.parseParams(params.url());
+                param.enuu = $scope.userInfo.enterprise.uu;
+                if(!$scope.searchMthod) {
+                    Enterprise.getAllUsersByEnuu(param, function (page) {
+                        if (page) {
+                            $scope.pageParam.start = (page.number-1)*page.size+1;
+                            $scope.pageParam.end = $scope.pageParam.start + page.numberOfElements - 1;
+                            $scope.pageParam.all = page.totalElements;
+                            params.total(page.totalElements);
+                            $defer.resolve(page.content);
+                            $scope.users = page.content;
+                            $scope.reloadUserCheck(false);
+                        }
+                    });
+                }
+                else {
+                    param.keyword = $scope.keyword;
+                    if ($scope.filterRole !=='all'){
+                        param.roleId = $scope.filterRole;
+                    }
+                    Enterprise.findUsersByKeyword(param,function (page) {
+                        if (page) {
+                            $scope.pageParam.start = (page.number-1)*page.size+1;
+                            $scope.pageParam.end = $scope.pageParam.start + page.numberOfElements - 1;
+                            $scope.pageParam.all = page.totalElements;
+                            params.total(page.totalElements);
+                            $defer.resolve(page.content);
+                            $scope.users = page.content;
+                            $scope.reloadUserCheck(false);
+                        }
+                    })
+                }
+            }
+        });
+        $scope.filterRole = 'all';
+
+        $scope.onSearch = function (keyword) {
+            if (keyword != null && keyword != '') {
+                $scope.searchMthod = true;
+                $scope.keyword = keyword;
+            } else {
+                $scope.searchMthod = false;
+            }
+            $scope.tableParams.page(1);
+            $scope.tableParams.reload();
+        };
+
+        $scope.newUser = {};
+
+        //弹出添加用户模态框
+        $scope.addExistUser = function () {
+            $scope.adding = false;
+            $scope.setAddingUser(false);
+            $scope.newUser = {};
+            var modalInstance = $modal.open({
+                animation: true,
+                templateUrl: $rootScope.rootPath + '/static/view/vendor/forstore/addExistUser.html',
+                controller: 'AddExistUserCtrl'
+            });
 
             modalInstance.result.then(function () {
-              $scope.userTelSuccess = false;
-              $scope.userTelError = false;
-              $scope.tableParams.page(1);
-              $scope.tableParams.reload();
+                $scope.userTelSuccess = false;
+                $scope.userTelError = false;
+                $scope.tableParams.page(1);
+                $scope.tableParams.reload();
             }, function () {
 
             });
 
-		};
-		/**
-		 * 添加未注册用户
-		 */
-		$scope.addUser = function () {
-            if (!$scope.userEmailSuccess || !$scope.userTelSuccess){
+        };
+        /**
+         * 添加未注册用户
+         */
+        $scope.addUser = function () {
+            if (!$scope.userEmailSuccess || !$scope.userTelSuccess) {
                 toaster.pop('error', '请填写完信息后提交');
                 return;
             }
-			$scope.adding = true;
-			$scope.loading = true;
-			Enterprise.saveUser({}, $scope.newUser, function () {
-				$scope.loading = false;
-				toaster.pop('success', '提示', '增加用户成功：' + $scope.newUser.userName);
+            $scope.adding = true;
+            $scope.loading = true;
+            Enterprise.saveUser({}, $scope.newUser, function () {
+                $scope.loading = false;
+                toaster.pop('success', '提示', '增加用户成功：' + $scope.newUser.userName);
                 $scope.setAddingUser(false);
-				$scope.newUser = {userSex: 'M'};
-				$scope.tableParams.page(1);
-				$scope.tableParams.reload();
-				$scope.adding = false;
-				$scope.newUserForm.newUserTel.$setValidity('available', false);
-				$scope.newUserForm.newUserEmail.$setValidity('available', false);
-				$scope.userTelSuccess = false;
-				$scope.userTelError = false;
-				$scope.userEmailSuccess = false;
-				$scope.userEmailError = false;
-			}, function (response) {
-				$scope.loading = false;
-				toaster.pop('error', '错误', response.data);
-			});
-		};
-
-		/**
-		 * 删除用户
-		 */
-		$scope.removeUser = function (user) {
-
-			if (confirm('确定删除用户(' + user.userName + ')吗？')) {
-				Enterprise.removeUser({uu: user.userUU}, function () {
-					toaster.pop('success', '提示', '用户删除成功。');
-					$scope.tableParams.page(1);
-					$scope.tableParams.reload();
-				}, function (response) {
-					toaster.pop('error', '删除失败', response.data);
-				});
-			}
-		};
+                $scope.newUser = {userSex: 'M'};
+                $scope.tableParams.page(1);
+                $scope.tableParams.reload();
+                $scope.adding = false;
+                $scope.newUserForm.newUserTel.$setValidity('available', false);
+                $scope.newUserForm.newUserEmail.$setValidity('available', false);
+                $scope.userTelSuccess = false;
+                $scope.userTelError = false;
+                $scope.userEmailSuccess = false;
+                $scope.userEmailError = false;
+            }, function (response) {
+                $scope.loading = false;
+                toaster.pop('error', '错误', response.data);
+            });
+        };
+
+        $scope.adding = false;
+        $scope.setAdding = function (status) {
+            $scope.adding = status;
+        }
+        /**
+         * 删除用户
+         */
+        $scope.removeUser = function (user) {
+
+            if (confirm('确定删除用户(' + user.userName + ')吗？')) {
+                Enterprise.removeUser({uu: user.userUU}, function () {
+                    toaster.pop('success', '提示', '用户删除成功。');
+                    $scope.tableParams.page(1);
+                    $scope.tableParams.reload();
+                }, function (response) {
+                    toaster.pop('error', '删除失败', response.data);
+                });
+            }
+        };
         //用户删除确认框
         $scope.showDelUserFlag = false;
 
@@ -177,238 +194,247 @@ define(['app/app'], function(app) {
                 item.checked = flag;
             });
         }
-		/**
-		 * 验证手机号是否可用
-		 */
-		$scope.telValid = function (tel) {
-			if (tel) {
-				$http.get('basic/user/telEnable', {
-					params: {
-						tel: tel
-					}
-				}).success(function (data) {
-					data = eval(data);
-					if (data == true) {
-						$scope.newUserForm.newUserTel.$setValidity('available', true);
-						$scope.userTelSuccess = true;
-						$scope.userTelError = false;
-					} else {
-						$scope.newUserForm.newUserTel.$setValidity('available', false);
-						$scope.userTelError = true;
-						$scope.userTelSuccess = false;
-						if (tel.length == 11)
-							toaster.pop('error', '错误', '手机号 ' + tel + ' 已被注册');
-					}
-				}).error(function () {
-					$scope.userTelSuccess = false;
-					$scope.userTelError = true;
-				});
-			} else {
-				$scope.userTelSuccess = false;
-				$scope.userTelError = false;
-			}
-		};
-
-          /**
-           * 验证邮箱是否可用
-           */
-          $scope.emailValid = function (email) {
+        /**
+         * 验证手机号是否可用
+         */
+        $scope.telValid = function (tel) {
+            if (tel) {
+                $http.get('basic/user/telEnable', {
+                    params: {
+                        tel: tel
+                    }
+                }).success(function (data) {
+                    data = eval(data);
+                    if (data == true) {
+                        $scope.newUserForm.newUserTel.$setValidity('available', true);
+                        $scope.userTelSuccess = true;
+                        $scope.userTelError = false;
+                    } else {
+                        $scope.newUserForm.newUserTel.$setValidity('available', false);
+                        $scope.userTelError = true;
+                        $scope.userTelSuccess = false;
+                        if (tel.length == 11)
+                            toaster.pop('error', '错误', '手机号 ' + tel + ' 已被注册');
+                    }
+                }).error(function () {
+                    $scope.userTelSuccess = false;
+                    $scope.userTelError = true;
+                });
+            } else {
+                $scope.userTelSuccess = false;
+                $scope.userTelError = false;
+            }
+        };
+
+        /**
+         * 验证邮箱是否可用
+         */
+        $scope.emailValid = function (email) {
             if (email) {
-              $http.get('basic/user/emailEnable', {
-                params: {
-                  email: email
-                }
-              }).success(function (data) {
-                data = eval(data);
-                if (data == true) {
-                  $scope.newUserForm.newUserEmail.$setValidity('available',
-                      true);
-                  $scope.userEmailSuccess = true;
-                  $scope.userEmailError = false;
-                } else {
-                  $scope.newUserForm.newUserEmail.$setValidity('available',
-                      false);
-                  $scope.userEmailError = true;
-                  $scope.userEmailSuccess = false;
-                }
-              }).error(function () {
-                $scope.userEmailError = true;
-                $scope.userEmailSuccess = false;
-              });
+                $http.get('basic/user/emailEnable', {
+                    params: {
+                        email: email
+                    }
+                }).success(function (data) {
+                    data = eval(data);
+                    if (data == true) {
+                        $scope.newUserForm.newUserEmail.$setValidity('available',
+                            true);
+                        $scope.userEmailSuccess = true;
+                        $scope.userEmailError = false;
+                    } else {
+                        $scope.newUserForm.newUserEmail.$setValidity('available',
+                            false);
+                        $scope.userEmailError = true;
+                        $scope.userEmailSuccess = false;
+                    }
+                }).error(function () {
+                    $scope.userEmailError = true;
+                    $scope.userEmailSuccess = false;
+                });
             } else {
-              $scope.userEmailError = false;
-              $scope.userEmailSuccess = false;
+                $scope.userEmailError = false;
+                $scope.userEmailSuccess = false;
             }
-          };
+        };
 
-          /**
-           * 变更到更新状态
-           */
-          $scope.changeToUpdate = function (isUpdate) {
+        /**
+         * 变更到更新状态
+         */
+        $scope.changeToUpdate = function (isUpdate) {
             $scope.updateState = isUpdate;
             if ($scope.updateState == false) {
-              $scope.enterpriseInfo = angular.copy($scope.enterpriseInfoBackup);
+                $scope.enterpriseInfo = angular.copy($scope.enterpriseInfoBackup);
             }
-          };
+        };
 
-          /**
-           * 验证企业信息
-           */
-          function validateEnterpriseInfo() {
+        /**
+         * 验证企业信息
+         */
+        function validateEnterpriseInfo() {
             var props = ['enName', 'enShortname', 'enAddress', 'enUrl'];
 
             var flag = true;
             angular.forEach(props, function (prop) {
-              if ($scope.enterpriseInfo.hasOwnProperty(prop)) {
-                if (!$scope.enterpriseInfo[prop] || $scope.enterpriseInfo[prop]
-                    === '') {
-                  console.log(prop + '不能为空');
-                  // TODO 记录验证信息
-                  flag = false;
+                if ($scope.enterpriseInfo.hasOwnProperty(prop)) {
+                    if (!$scope.enterpriseInfo[prop] || $scope.enterpriseInfo[prop]
+                        === '') {
+                        console.log(prop + '不能为空');
+                        // TODO 记录验证信息
+                        flag = false;
+                    }
+                } else {
+                    console.log(prop + '不能为空');
+                    flag = false;
                 }
-              } else {
-                console.log(prop + '不能为空');
-                flag = false;
-              }
             });
             return flag;
-          }
+        }
 
-          /**
-           * 保存企业信息
-           */
-          $scope.saveUpdate = function () {
+        /**
+         * 保存企业信息
+         */
+        $scope.saveUpdate = function () {
             // 先检查信息是否为空
             if (angular.equals($scope.enterpriseInfo,
                     $scope.enterpriseInfoBackup)) {
-              toaster.pop('error', '未做任何修改');
-              $scope.updateState = false;
-              return;
+                toaster.pop('error', '未做任何修改');
+                $scope.updateState = false;
+                return;
             }
             var enterpriseInfoFlag = validateEnterpriseInfo();
             if (!enterpriseInfoFlag) {
-              toaster.pop('error', '请补充完信息后再次提交');
-              return;
+                toaster.pop('error', '请补充完信息后再次提交');
+                return;
             }
             Enterprise.updateEnterpriseInfo(
                 {enuu: $scope.userInfo.enterprise.uu}, $scope.enterpriseInfo,
                 function () {
-                  $scope.loading = false;
-                  toaster.pop('success', '提示', '企业信息修改成功');
-                  $scope.enterpriseInfoBackup = angular.copy(
-                      $scope.enterpriseInfo);
-                  $scope.updateState = false;
+                    $scope.loading = false;
+                    toaster.pop('success', '提示', '企业信息修改成功');
+                    $scope.enterpriseInfoBackup = angular.copy(
+                        $scope.enterpriseInfo);
+                    $scope.updateState = false;
 
                 }, function (response) {
-                  $scope.loading = false;
-                  toaster.pop('error', '修改失败', response.data);
+                    $scope.loading = false;
+                    toaster.pop('error', '修改失败', response.data);
                 });
-          };
+        };
 
-          // 切换tab
-          $scope.checkTab = function (t) {
+        // 切换tab
+        $scope.checkTab = function (t) {
             $scope.tab = t;
-          };
+        };
 
-          $scope.updatePassword = function () {
+        $scope.updatePassword = function () {
             var modalInstance = $modal.open({
-              animation: true,
-              templateUrl: $rootScope.rootPath
-              + '/static/view/vendor/modal/updatePassword.html',
-              controller: 'PasswordCtrl',
-              resolve: {
-                user: function () {
-                  return angular.copy($rootScope.userInfo);
+                animation: true,
+                templateUrl: $rootScope.rootPath
+                + '/static/view/vendor/modal/updatePassword.html',
+                controller: 'PasswordCtrl',
+                resolve: {
+                    user: function () {
+                        return angular.copy($rootScope.userInfo);
+                    }
                 }
-              }
             });
 
             modalInstance.result.then(function () {
             }, function () {
             });
-          };
+        };
 
-          $scope.updateUserEmail = function(){
+        $scope.updateUserEmail = function () {
             var modalInstance = $modal.open({
-              animation: true,
-              templateUrl: $rootScope.rootPath + '/static/view/vendor/modal/updateUserEmail.html',
-              controller: 'UserEmailCtrl',
-              resolve: {
-                user: function(){return angular.copy($rootScope.userInfo);}
-              }
+                animation: true,
+                templateUrl: $rootScope.rootPath + '/static/view/vendor/modal/updateUserEmail.html',
+                controller: 'UserEmailCtrl',
+                resolve: {
+                    user: function () {
+                        return angular.copy($rootScope.userInfo);
+                    }
+                }
             });
 
-			modalInstance.result.then(function(){
-			}, function(){
-			});
+            modalInstance.result.then(function () {
+            }, function () {
+            });
 
-		};
-        $scope.updateUserTel = function(){
+        };
+        $scope.updateUserTel = function () {
             var modalInstance = $modal.open({
                 animation: true,
                 templateUrl: $rootScope.rootPath + '/static/view/vendor/modal/updateUserTel.html',
                 controller: 'UserTelCtrl',
                 resolve: {
-                    user: function(){return angular.copy($rootScope.userInfo);}
+                    user: function () {
+                        return angular.copy($rootScope.userInfo);
+                    }
                 }
             });
 
-            modalInstance.result.then(function(){
-            }, function(){
+            modalInstance.result.then(function () {
+            }, function () {
             });
         };
 
-        $scope.updateUserPay = function(){
+        $scope.updateUserPay = function () {
             var modalInstance = $modal.open({
                 animation: true,
                 templateUrl: $rootScope.rootPath + '/static/view/vendor/modal/updateUserPay.html',
                 controller: 'UserPayCtrl',
                 resolve: {
-                    user: function(){return angular.copy($rootScope.userInfo);}
+                    user: function () {
+                        return angular.copy($rootScope.userInfo);
+                    }
                 }
             });
 
-            modalInstance.result.then(function(){
-            }, function(){
+            modalInstance.result.then(function () {
+            }, function () {
             });
         };
 
-        $scope.updateUserQuestion = function(){
+        $scope.updateUserQuestion = function () {
             var modalInstance = $modal.open({
                 animation: true,
                 templateUrl: $rootScope.rootPath + '/static/view/vendor/modal/updateUserQuestion.html',
                 controller: 'UserQuestionCtrl',
                 resolve: {
-                    user: function(){return angular.copy($rootScope.userInfo);}
+                    user: function () {
+                        return angular.copy($rootScope.userInfo);
+                    }
                 }
             });
 
-            modalInstance.result.then(function(){
-            }, function(){
+            modalInstance.result.then(function () {
+            }, function () {
             });
         };
 
-        $scope.updateRealAuth = function(){
+        $scope.updateRealAuth = function () {
             var modalInstance = $modal.open({
                 animation: true,
                 templateUrl: $rootScope.rootPath + '/static/view/vendor/modal/updateRealAuth.html',
                 controller: 'UserRealAuthCtrl',
                 resolve: {
-                    user: function(){return angular.copy($rootScope.userInfo);}
+                    user: function () {
+                        return angular.copy($rootScope.userInfo);
+                    }
                 }
             });
 
-            modalInstance.result.then(function(){
-            }, function(){
+            modalInstance.result.then(function () {
+            }, function () {
             });
         };
 
         //卖家中心 等级提示跳转
-        if($stateParams.op!=""){
-            var op =$stateParams.op;
+        if ($stateParams.op != "") {
+            var op = $stateParams.op;
             $scope.checkTab('safe');
-            switch(op)
-            {
+            switch (op) {
                 case 'pwd':
                     $scope.updatePassword();
                     break;
@@ -420,9 +446,7 @@ define(['app/app'], function(app) {
                     break;
             }
         }
-    }]);
-
-    //角色控制
+        //角色控制
         $scope.roles = {};
         AccountResource.query({}, function (data) {
             if (data && data.length > 0) {
@@ -460,1560 +484,1571 @@ define(['app/app'], function(app) {
         };
 
         $scope.editUserRole = function (user) {
-			var modalInstance = $modal.open({
-				animation: true,
-				templateUrl: $rootScope.rootPath + '/static/view/vendor/modal/edit_user_role.html',
-				controller: 'UserRoleEditCtrl',
-				resolve: {
-					user: function () {
-						return user;
-					}
-				}
-			});
-		};
-
-		$scope.inSelect = false;
-		$scope.setInSelect = function (status) {
-			$scope.inSelect = status;
-		}
-		$(document).on("click",function(){
-			$scope.$apply(function(){
-				if (!$scope.inSelect) {
-					$scope.setAdding(false);
-				}
-			})
-		})
-	}]);
-
-  /*
-   * 绑定用户到企业
-   */
-  app.register.controller('AddExistUserCtrl',
-      ['$scope', '$modalInstance', 'Enterprise', 'AuthenticationService',
-        '$timeout', 'toaster',
-        function ($scope, $modalInstance, Enterprise, AuthenticationService,
-            $timeout, toaster) {
-          $scope.searching = false;
-          //根据输入的内容查找用户
-          $scope.searchUser = function (keyWord) {
-            $scope.searching = true;
-            $scope.searchSuccess = false;
-            $scope.searchFailed = false;
-            $scope.illegalError = false;
-            $scope.reBindError = false;
-            $scope.okDisabled = false;
-            Enterprise.searchUser({keyWord: keyWord}, function (data) {
-              $scope.searchSuccess = true;
-              $scope.searchFailed = false;
-              $scope.user = data;		//查询到的用户
-            }, function (response) {
-              $scope.searchSuccess = false;
-              $scope.searchFailed = true;
+            var modalInstance = $modal.open({
+                animation: true,
+                templateUrl: $rootScope.rootPath + '/static/view/vendor/modal/edit_user_role.html',
+                controller: 'UserRoleEditCtrl',
+                resolve: {
+                    user: function () {
+                        return user;
+                    }
+                }
             });
-          };
-
-		$scope.onKeyDown = function (e, key) {
-			var keycode = window.event?e.keyCode:e.which;
-			if(keycode==13){
-				$scope.searchUser(key);
-			}
-		}
-
-		//确认绑定
-		$scope.ok = function (keyWord) {
-			AuthenticationService.getAuthentication().success(function (data) {
-				$scope.currentUser = data;	//当前登录的用户（管理员）
-				//不可自己绑定自己
-				if ($scope.currentUser.userUU == $scope.user.userUU) {
-					$scope.illegalError = true;
-					$scope.okDisabled = true;
-					return false;
-				}
-
-              //用户未绑定到任何企业时
-              if (!$scope.user.enterprises) {
-                //正常绑定
-                Enterprise.bindUserToMyEnterprise({userUU: $scope.user.userUU},
-                    function (data) {
-                      $scope.okDisabled = true;
-                      toaster.pop("success", "提示", "用户绑定成功");
-                      $modalInstance.close(true);
+        };
+
+        $scope.inSelect = false;
+        $scope.setInSelect = function (status) {
+            $scope.inSelect = status;
+        }
+        $(document).on("click", function () {
+            $scope.$apply(function () {
+                if (!$scope.inSelect) {
+                    $scope.setAdding(false);
+                }
+            })
+        })
+    }]);
+
+
+    /*
+     * 绑定用户到企业
+     */
+    app.register.controller('AddExistUserCtrl',
+        ['$scope', '$modalInstance', 'Enterprise', 'AuthenticationService',
+            '$timeout', 'toaster',
+            function ($scope, $modalInstance, Enterprise, AuthenticationService,
+                      $timeout, toaster) {
+                $scope.searching = false;
+                //根据输入的内容查找用户
+                $scope.searchUser = function (keyWord) {
+                    $scope.searching = true;
+                    $scope.searchSuccess = false;
+                    $scope.searchFailed = false;
+                    $scope.illegalError = false;
+                    $scope.reBindError = false;
+                    $scope.okDisabled = false;
+                    Enterprise.searchUser({keyWord: keyWord}, function (data) {
+                        $scope.searchSuccess = true;
+                        $scope.searchFailed = false;
+                        $scope.user = data;		//查询到的用户
                     }, function (response) {
+                        $scope.searchSuccess = false;
+                        $scope.searchFailed = true;
                     });
-                return true;
-              }
-
-              //用户已绑定到某些企业时
-              for (var i = 0; i < $scope.currentUser.enterprises.length; i++) {
-                if ($scope.currentUser.enterprises[i].current) {
-                  for (var j = 0; j < $scope.user.enterprises.length; j++) {
-                    //该用户已绑定到当前企业，不可重复绑定
-                    if ($scope.currentUser.enterprises[i].uu
-                        == $scope.user.enterprises[j].uu) {
-                      $scope.reBindError = true;
-                      $scope.okDisabled = true;
-                      return false;
-                    }
-                  }
-                  //该用户未绑定到当前企业，可以进行绑定
-                  Enterprise.bindUserToMyEnterprise(
-                      {userUU: $scope.user.userUU}, function (data) {
-                        $scope.okDisabled = true;
-                        toaster.pop("success", "提示", "用户绑定成功");
-                        $modalInstance.close(true);
-                      }, function (response) {
-                        console.log("绑定失败！");
-                      });
+                };
 
+                $scope.onKeyDown = function (e, key) {
+                    var keycode = window.event ? e.keyCode : e.which;
+                    if (keycode == 13) {
+                        $scope.searchUser(key);
+                    }
                 }
-              }
 
-            });
-          };
-
-          $scope.cancel = function () {
-            $modalInstance.dismiss();
-          };
-        }]);
-
-  // 修改密码Controller
-  app.register.controller('PasswordCtrl',
-      ['$scope', '$modalInstance', 'user', 'User', 'toaster','$state',
-        function ($scope, $modalInstance, user, User, toaster,$state) {
-          $scope.user = user;
-          $scope.checking = false;
-          $scope.showPassword = false;
-          $scope.showNewPassword = false;
-          $scope.showPassword1 = false;
-          $scope.reloadKeyboard = function (type, $event) {
-            $event.stopPropagation();
-            if (type === 'showPassword') {
-              $scope.showPassword = !$scope.showPassword;
-              if (!$scope.showPassword) {
-                $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.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.checkSuccess = false;
-          $scope.checkFailed = false;
-          $scope.checkPassword = function (password) {
-            $scope.checkSuccess = false;
-            $scope.checkFailed = false;
-            if(!password){
-              $scope.checkFailed = true;
-              $scope.checkSuccess = false;
-            }
-            User.checkPassword({password: password}, function () {
-              $scope.checkSuccess = true;
-              $scope.checkFailed = false;
-            }, function () {
-              $scope.checkFailed = true;
-              $scope.checkSuccess = false;
-            });
-          };
-
-          //对新密码进行校验
-          $scope.checkSuccess1 = false;
-          $scope.checkFailed1 = false;
-          $scope.checkNewPassword = function (newPassword) {
-            var reg = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,20}$/;
-            if (newPassword == null || !reg.test(newPassword)) {
-              //toaster.pop('error', '错误', '密码为8-20字符的英文、数字混合');
-              $scope.checkSuccess1 = false;
-              $scope.checkFailed1 = true;
-              return false;
-            } else {
-              $scope.checkSuccess1 = true;
-              $scope.checkFailed1 = false;
-            }
-          }
-
-          $scope.$watch('user.newPassword', function (newValue, oldValue) {
-            $scope.checkPasswordLevel(newValue);
-          });
-
-          //密码强度校验
-          $scope.secLevel = 0;
-          $scope.checkPasswordLevel = function (newPassword) {
-            $scope.checkFailed1 = false;
-            if (newPassword == null) {
-              $scope.secLevel = 0;
-              return false;
-            }
-            //不足8位，或仅有数字，或仅有英文
-            if (newPassword.length < 8 || /^[0-9]*$/.test(newPassword)
-                || /^[A-Za-z]*$/.test(newPassword)) {
-              $scope.secLevel = 1;
-              return false;
-            }
-            if (/^[A-Z0-9]{8,20}$/.test(newPassword) || /^[a-z0-9]{8,20}$/.test(
-                    newPassword)) {//达到8位，且 仅有数字+英文小写 或 仅有数字+英文大写
-              $scope.secLevel = 2;
-              return false;
-            }
-            if (/^(?=.*[0-9].*)(?=.*[A-Z].*)(?=.*[a-z].*).{8,20}$/.test(
-                    newPassword)) {
-              $scope.secLevel = 3;
-              return false;
-            }
-          }
-
-          //校验确认密码是否与新密码相同
-          $scope.checkSuccess2 = false;
-          $scope.checkFailed2 = false;
-          $scope.checkNewPassword1 = function () {
-            if ($scope.checkSuccess1 == true && ($scope.user.newPassword
-                    == $scope.user.newPassword1)) {
-              $scope.checkSuccess2 = true;
-              $scope.checkFailed2 = false;
-              return false;
-            }
-            $scope.checkSuccess2 = false;
-            $scope.checkFailed2 = true;
-          }
-
-          //修改密码
-          $scope.ok = function () {
-            //原密码校验
-            if(!$scope.checkSuccess){
-              $scope.checkPassword($scope.user.password);
-            }
-            //新密码校验
-            $scope.checkNewPassword($scope.user.newPassword);
-            //再次输入密码校验
-            $scope.checkNewPassword1();
-            if(!$scope.checkSuccess || !$scope.checkSuccess1 || !$scope.checkSuccess2){
-              return;
-            }
-            if ($scope.user.newPassword == $scope.user.password) {
-              toaster.pop('error', '错误', '新密码与原密码相同');
-              return;
-            }
-            if ($scope.secLevel <= 1) {
-              toaster.pop('error', '错误', '密码强度不够，请重新输入');
-              return;
-            }
-            if ($scope.user.newPassword == $scope.user.newPassword1) {//验证重复密码相等
-              User.updatePassword({
-                password: $scope.user.password,
-                newPassword: $scope.user.newPassword,
-                secLevel: $scope.secLevel
-              }, {}, function () {
-                toaster.pop('success', '成功', '修改密码成功，请牢记您的新密码。');
-                $scope.user.password = null;
-                $scope.user.newPassword = null;
-                $scope.user.newPassword1 = null;
+                //确认绑定
+                $scope.ok = function (keyWord) {
+                    AuthenticationService.getAuthentication().success(function (data) {
+                        $scope.currentUser = data;	//当前登录的用户（管理员）
+                        //不可自己绑定自己
+                        if ($scope.currentUser.userUU == $scope.user.userUU) {
+                            $scope.illegalError = true;
+                            $scope.okDisabled = true;
+                            return false;
+                        }
+
+                        //用户未绑定到任何企业时
+                        if (!$scope.user.enterprises) {
+                            //正常绑定
+                            Enterprise.bindUserToMyEnterprise({userUU: $scope.user.userUU},
+                                function (data) {
+                                    $scope.okDisabled = true;
+                                    toaster.pop("success", "提示", "用户绑定成功");
+                                    $modalInstance.close(true);
+                                }, function (response) {
+                                });
+                            return true;
+                        }
+
+                        //用户已绑定到某些企业时
+                        for (var i = 0; i < $scope.currentUser.enterprises.length; i++) {
+                            if ($scope.currentUser.enterprises[i].current) {
+                                for (var j = 0; j < $scope.user.enterprises.length; j++) {
+                                    //该用户已绑定到当前企业，不可重复绑定
+                                    if ($scope.currentUser.enterprises[i].uu
+                                        == $scope.user.enterprises[j].uu) {
+                                        $scope.reBindError = true;
+                                        $scope.okDisabled = true;
+                                        return false;
+                                    }
+                                }
+                                //该用户未绑定到当前企业，可以进行绑定
+                                Enterprise.bindUserToMyEnterprise(
+                                    {userUU: $scope.user.userUU}, function (data) {
+                                        $scope.okDisabled = true;
+                                        toaster.pop("success", "提示", "用户绑定成功");
+                                        $modalInstance.close(true);
+                                    }, function (response) {
+                                        console.log("绑定失败！");
+                                    });
+
+                            }
+                        }
+
+                    });
+                };
+
+                $scope.cancel = function () {
+                    $modalInstance.dismiss();
+                };
+    }]);
+
+// 修改密码Controller
+    app.register.controller('PasswordCtrl',
+        ['$scope', '$modalInstance', 'user', 'User', 'toaster', '$state',
+            function ($scope, $modalInstance, user, User, toaster, $state) {
+                $scope.user = user;
                 $scope.checking = false;
+                $scope.showPassword = false;
+                $scope.showNewPassword = false;
+                $scope.showPassword1 = false;
+                $scope.reloadKeyboard = function (type, $event) {
+                    $event.stopPropagation();
+                    if (type === 'showPassword') {
+                        $scope.showPassword = !$scope.showPassword;
+                        if (!$scope.showPassword) {
+                            $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.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.checkSuccess = false;
                 $scope.checkFailed = false;
+                $scope.checkPassword = function (password) {
+                    $scope.checkSuccess = false;
+                    $scope.checkFailed = false;
+                    if (!password) {
+                        $scope.checkFailed = true;
+                        $scope.checkSuccess = false;
+                    }
+                    User.checkPassword({password: password}, function () {
+                        $scope.checkSuccess = true;
+                        $scope.checkFailed = false;
+                    }, function () {
+                        $scope.checkFailed = true;
+                        $scope.checkSuccess = false;
+                    });
+                };
+
+                //对新密码进行校验
                 $scope.checkSuccess1 = false;
                 $scope.checkFailed1 = false;
+                $scope.checkNewPassword = function (newPassword) {
+                    var reg = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,20}$/;
+                    if (newPassword == null || !reg.test(newPassword)) {
+                        //toaster.pop('error', '错误', '密码为8-20字符的英文、数字混合');
+                        $scope.checkSuccess1 = false;
+                        $scope.checkFailed1 = true;
+                        return false;
+                    } else {
+                        $scope.checkSuccess1 = true;
+                        $scope.checkFailed1 = false;
+                    }
+                }
+
+                $scope.$watch('user.newPassword', function (newValue, oldValue) {
+                    $scope.checkPasswordLevel(newValue);
+                });
+
+                //密码强度校验
+                $scope.secLevel = 0;
+                $scope.checkPasswordLevel = function (newPassword) {
+                    $scope.checkFailed1 = false;
+                    if (newPassword == null) {
+                        $scope.secLevel = 0;
+                        return false;
+                    }
+                    //不足8位，或仅有数字，或仅有英文
+                    if (newPassword.length < 8 || /^[0-9]*$/.test(newPassword)
+                        || /^[A-Za-z]*$/.test(newPassword)) {
+                        $scope.secLevel = 1;
+                        return false;
+                    }
+                    if (/^[A-Z0-9]{8,20}$/.test(newPassword) || /^[a-z0-9]{8,20}$/.test(
+                            newPassword)) {//达到8位，且 仅有数字+英文小写 或 仅有数字+英文大写
+                        $scope.secLevel = 2;
+                        return false;
+                    }
+                    if (/^(?=.*[0-9].*)(?=.*[A-Z].*)(?=.*[a-z].*).{8,20}$/.test(
+                            newPassword)) {
+                        $scope.secLevel = 3;
+                        return false;
+                    }
+                }
+
+                //校验确认密码是否与新密码相同
                 $scope.checkSuccess2 = false;
                 $scope.checkFailed2 = false;
-                window.location.href = "vendor#/account/management/sec";
-                window.location.reload();
-                $modalInstance.close();
-              }, function (response) {
-                toaster.pop('error', '错误', response.data);
-                $modalInstance.close();
-              });
-            } else {
-              toaster.pop('error', '错误', '重复密码不一致');
-            }
-          };
+                $scope.checkNewPassword1 = function () {
+                    if ($scope.checkSuccess1 == true && ($scope.user.newPassword
+                            == $scope.user.newPassword1)) {
+                        $scope.checkSuccess2 = true;
+                        $scope.checkFailed2 = false;
+                        return false;
+                    }
+                    $scope.checkSuccess2 = false;
+                    $scope.checkFailed2 = true;
+                }
 
-          $scope.cancel = function () {
-            $modalInstance.close();
-          };
-          $scope.hideKeyboard = function () {
-            $scope.closeKeyboard();
-            console.log(1);
-          }
-        }]);
-
-  // 修改邮箱Controller
-  app.register.controller('UserEmailCtrl',
-      ['$scope', '$modalInstance', 'user', 'User', 'toaster', '$interval',
-        function ($scope, $modalInstance, user, User, toaster, $interval) {
-          $scope.user = user;
-          $scope.user.userEmail = null;
-          $scope.user.newUserEmail = null;
-          //验证用户输入的旧邮箱地址是否正确
-          $scope.checkUserEmail = function (userEmail) {
-            if (userEmail == null) {
-              $scope.checkFailed = true;
-              $scope.checkSuccess = false;
-              return false;
-            }
-            $scope.checkSuccess = false;
-            $scope.checkFailed = false;
-            User.checkUserEmail({userEmail: userEmail}, function () {
-              $scope.checkSuccess = true;
-              $scope.checkFailed = false;
-            }, function () {
-              $scope.checkFailed = true;
-              $scope.checkSuccess = false;
-            });
-          };
-          //如果之前未绑定
-          if($scope.userInfo.userEmail==null?true:false){
-            $scope.checkSuccess = true;
-          }
-
-          //验证用户新输入的邮箱是否可用
-          $scope.checkSuccess1 = false;
-          $scope.checkFailed1 = false;
-          $scope.checkFailed1_1 = false;
-          $scope.emailEnable = function (newUserEmail) {
-            //邮箱不可用
-            if ((newUserEmail == null || newUserEmail.length > 30)
-                || !/^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/.test(
-                    newUserEmail)) {
-              $scope.checkSuccess1 = false;
-              $scope.checkFailed1 = true;
-              $scope.sendSuccess = false;
-              $scope.checkFailed1_1 = false;
-              return false;
-            }
-            User.emailEnable({email: newUserEmail}, function (data) {
-              if (data.data == "true") {//邮箱可用
-                $scope.checkSuccess1 = true;
-                $scope.checkFailed1 = false;
-                $scope.sendSuccess = true;
-                $scope.checkFailed1_1 = false;
-              } else {//邮箱不可用
+                //修改密码
+                $scope.ok = function () {
+                    //原密码校验
+                    if (!$scope.checkSuccess) {
+                        $scope.checkPassword($scope.user.password);
+                    }
+                    //新密码校验
+                    $scope.checkNewPassword($scope.user.newPassword);
+                    //再次输入密码校验
+                    $scope.checkNewPassword1();
+                    if (!$scope.checkSuccess || !$scope.checkSuccess1 || !$scope.checkSuccess2) {
+                        return;
+                    }
+                    if ($scope.user.newPassword == $scope.user.password) {
+                        toaster.pop('error', '错误', '新密码与原密码相同');
+                        return;
+                    }
+                    if ($scope.secLevel <= 1) {
+                        toaster.pop('error', '错误', '密码强度不够，请重新输入');
+                        return;
+                    }
+                    if ($scope.user.newPassword == $scope.user.newPassword1) {//验证重复密码相等
+                        User.updatePassword({
+                            password: $scope.user.password,
+                            newPassword: $scope.user.newPassword,
+                            secLevel: $scope.secLevel
+                        }, {}, function () {
+                            toaster.pop('success', '成功', '修改密码成功，请牢记您的新密码。');
+                            $scope.user.password = null;
+                            $scope.user.newPassword = null;
+                            $scope.user.newPassword1 = null;
+                            $scope.checking = false;
+                            $scope.checkSuccess = false;
+                            $scope.checkFailed = false;
+                            $scope.checkSuccess1 = false;
+                            $scope.checkFailed1 = false;
+                            $scope.checkSuccess2 = false;
+                            $scope.checkFailed2 = false;
+                            window.location.href = "vendor#/account/management/sec";
+                            window.location.reload();
+                            $modalInstance.close();
+                        }, function (response) {
+                            toaster.pop('error', '错误', response.data);
+                            $modalInstance.close();
+                        });
+                    } else {
+                        toaster.pop('error', '错误', '重复密码不一致');
+                    }
+                };
+
+                $scope.cancel = function () {
+                    $modalInstance.close();
+                };
+                $scope.hideKeyboard = function () {
+                    $scope.closeKeyboard();
+                    console.log(1);
+                }
+            }]);
+
+// 修改邮箱Controller
+    app.register.controller('UserEmailCtrl',
+        ['$scope', '$modalInstance', 'user', 'User', 'toaster', '$interval',
+            function ($scope, $modalInstance, user, User, toaster, $interval) {
+                $scope.user = user;
+                $scope.user.userEmail = null;
+                $scope.user.newUserEmail = null;
+                //验证用户输入的旧邮箱地址是否正确
+                $scope.checkUserEmail = function (userEmail) {
+                    if (userEmail == null) {
+                        $scope.checkFailed = true;
+                        $scope.checkSuccess = false;
+                        return false;
+                    }
+                    $scope.checkSuccess = false;
+                    $scope.checkFailed = false;
+                    User.checkUserEmail({userEmail: userEmail}, function () {
+                        $scope.checkSuccess = true;
+                        $scope.checkFailed = false;
+                    }, function () {
+                        $scope.checkFailed = true;
+                        $scope.checkSuccess = false;
+                    });
+                };
+                //如果之前未绑定
+                if ($scope.userInfo.userEmail == null ? true : false) {
+                    $scope.checkSuccess = true;
+                }
+
+                //验证用户新输入的邮箱是否可用
                 $scope.checkSuccess1 = false;
                 $scope.checkFailed1 = false;
-                $scope.sendSuccess = false;
-                $scope.checkFailed1_1 = true;
-              }
-            }, function () {
-              $scope.checkSuccess1 = false;
-              $scope.checkFailed1 = true;
-              $scope.sendSuccess = false;
-              $scope.checkFailed1_1 = false;
-            });
-          };
-
-          $scope.codeSuccess = false;
-          //发送验证码
-          $scope.sendCheckCode = function (newUserEmail) {
-            User.sendCheckCode({newUserEmail: newUserEmail}, function () {
-              $scope.codeSuccess = true;
-              $interval.cancel(timePromise);
-              var second = 60,
-                  timePromise = $interval(function () {
-                    $scope.sendSuccess = false;
-                    if (second <= 0) {
-                      $interval.cancel(timePromise);
-                      second = 60;
-                    } else {
-                      second--;
-                      $scope.paracont = second + "秒后可重发";
-                      if (second == 0) {
-                        $scope.paracont = "重发验证码";
-                        $scope.sendSuccess = true;
-                      }
-                    }
-                  }, 1000, 60);
-            }, function () {
-              $scope.codeSuccess = false;
-            });
-          };
-
-          $scope.checkSuccess2 = false;
-          $scope.checkFailed2 = false;
-          //校验验证码
-          $scope.validCheckCode = function (checkCode) {
-            if(!checkCode){
-              $scope.checkSuccess2 = false;
-              $scope.checkFailed2 = true;
-              return false;
-            }
-            User.validCheckCode({checkCode: checkCode,newUserEmail:$scope.user.newUserEmail}, function (data) {
-              var status = data.status;
-              var message = data.message;
-              if (status == 1) {
-                $scope.checkSuccess2 = true;
-                $scope.checkFailed2 = false;
-              } else {
+                $scope.checkFailed1_1 = false;
+                $scope.emailEnable = function (newUserEmail) {
+                    //邮箱不可用
+                    if ((newUserEmail == null || newUserEmail.length > 30)
+                        || !/^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/.test(
+                            newUserEmail)) {
+                        $scope.checkSuccess1 = false;
+                        $scope.checkFailed1 = true;
+                        $scope.sendSuccess = false;
+                        $scope.checkFailed1_1 = false;
+                        return false;
+                    }
+                    User.emailEnable({email: newUserEmail}, function (data) {
+                        if (data.data == "true") {//邮箱可用
+                            $scope.checkSuccess1 = true;
+                            $scope.checkFailed1 = false;
+                            $scope.sendSuccess = true;
+                            $scope.checkFailed1_1 = false;
+                        } else {//邮箱不可用
+                            $scope.checkSuccess1 = false;
+                            $scope.checkFailed1 = false;
+                            $scope.sendSuccess = false;
+                            $scope.checkFailed1_1 = true;
+                        }
+                    }, function () {
+                        $scope.checkSuccess1 = false;
+                        $scope.checkFailed1 = true;
+                        $scope.sendSuccess = false;
+                        $scope.checkFailed1_1 = false;
+                    });
+                };
+
+                $scope.codeSuccess = false;
+                //发送验证码
+                $scope.sendCheckCode = function (newUserEmail) {
+                    User.sendCheckCode({newUserEmail: newUserEmail}, function () {
+                        $scope.codeSuccess = true;
+                        $interval.cancel(timePromise);
+                        var second = 60,
+                            timePromise = $interval(function () {
+                                $scope.sendSuccess = false;
+                                if (second <= 0) {
+                                    $interval.cancel(timePromise);
+                                    second = 60;
+                                } else {
+                                    second--;
+                                    $scope.paracont = second + "秒后可重发";
+                                    if (second == 0) {
+                                        $scope.paracont = "重发验证码";
+                                        $scope.sendSuccess = true;
+                                    }
+                                }
+                            }, 1000, 60);
+                    }, function () {
+                        $scope.codeSuccess = false;
+                    });
+                };
+
                 $scope.checkSuccess2 = false;
-                $scope.checkFailed2 = true;
-              }
-            });
-          };
+                $scope.checkFailed2 = false;
+                //校验验证码
+                $scope.validCheckCode = function (checkCode) {
+                    if (!checkCode) {
+                        $scope.checkSuccess2 = false;
+                        $scope.checkFailed2 = true;
+                        return false;
+                    }
+                    User.validCheckCode({
+                        checkCode: checkCode,
+                        newUserEmail: $scope.user.newUserEmail
+                    }, function (data) {
+                        var status = data.status;
+                        var message = data.message;
+                        if (status == 1) {
+                            $scope.checkSuccess2 = true;
+                            $scope.checkFailed2 = false;
+                        } else {
+                            $scope.checkSuccess2 = false;
+                            $scope.checkFailed2 = true;
+                        }
+                    });
+                };
 
-          //修改邮箱地址
-          $scope.ok = function () {
-            //原邮箱校验
-            if($scope.userInfo.userEmail && !$scope.checkSuccess ){
-              $scope.checkUserEmail($scope.user.userEmail);
-            }
-            //新邮箱校验
-            if(!$scope.checkSuccess1){
-              $scope.emailEnable($scope.user.newUserEmail);
-            }
-            //验证码
-            $scope.validCheckCode($scope.checkCode);
-            if((!$scope.checkSuccess && $scope.userInfo.userEmail)|| !$scope.checkSuccess1 || !$scope.checkSuccess2){
-              return;
-            }
-            var param = {
-              newUserEmail: $scope.user.newUserEmail,
-              checkCode:$scope.checkCode
-            };
-            if ($scope.user.userEmail!=null && $scope.user.newUserEmail == $scope.user.userEmail) {
-              toaster.pop('error', '错误', '新邮箱地址与旧邮箱地址相同');
-              return;
-            }else{
-              param["userEmail"]=$scope.user.userEmail;
-            }
+                //修改邮箱地址
+                $scope.ok = function () {
+                    //原邮箱校验
+                    if ($scope.userInfo.userEmail && !$scope.checkSuccess) {
+                        $scope.checkUserEmail($scope.user.userEmail);
+                    }
+                    //新邮箱校验
+                    if (!$scope.checkSuccess1) {
+                        $scope.emailEnable($scope.user.newUserEmail);
+                    }
+                    //验证码
+                    $scope.validCheckCode($scope.checkCode);
+                    if ((!$scope.checkSuccess && $scope.userInfo.userEmail) || !$scope.checkSuccess1 || !$scope.checkSuccess2) {
+                        return;
+                    }
+                    var param = {
+                        newUserEmail: $scope.user.newUserEmail,
+                        checkCode: $scope.checkCode
+                    };
+                    if ($scope.user.userEmail != null && $scope.user.newUserEmail == $scope.user.userEmail) {
+                        toaster.pop('error', '错误', '新邮箱地址与旧邮箱地址相同');
+                        return;
+                    } else {
+                        param["userEmail"] = $scope.user.userEmail;
+                    }
 
-            User.updateUserEmail(param, {}, function () {
-              toaster.pop('success', '成功', '修改邮箱成功。');
-              //修改userInfo里面的userEmail
-              $scope.userInfo.userEmail =$scope.user.newUserEmail.substr(
-                  0,1) + "***"
-                  + $scope.user.newUserEmail.substr($scope.user.newUserEmail.indexOf("@"));
-              $scope.user.userEmail = null;
-              $scope.user.newUserEmail = null;
-              $scope.checking = false;
-              $scope.checkSuccess = false;
-              $scope.checkFailed = false;
-              $scope.codeSuccess = false;
-              $scope.validSuccess = false;
-              $scope.checkSuccess1 = false;
-              $scope.checkFailed1 = false;
-              $scope.sendSuccess = false;
-              window.location.href = "vendor#/account/management/sec";
-              window.location.reload();
-              $modalInstance.close();
-            }, function (response) {
-              toaster.pop('error', '错误', response.data);
-              $modalInstance.close();
-            });
-          };
+                    User.updateUserEmail(param, {}, function () {
+                        toaster.pop('success', '成功', '修改邮箱成功。');
+                        //修改userInfo里面的userEmail
+                        $scope.userInfo.userEmail = $scope.user.newUserEmail.substr(
+                            0, 1) + "***"
+                            + $scope.user.newUserEmail.substr($scope.user.newUserEmail.indexOf("@"));
+                        $scope.user.userEmail = null;
+                        $scope.user.newUserEmail = null;
+                        $scope.checking = false;
+                        $scope.checkSuccess = false;
+                        $scope.checkFailed = false;
+                        $scope.codeSuccess = false;
+                        $scope.validSuccess = false;
+                        $scope.checkSuccess1 = false;
+                        $scope.checkFailed1 = false;
+                        $scope.sendSuccess = false;
+                        window.location.href = "vendor#/account/management/sec";
+                        window.location.reload();
+                        $modalInstance.close();
+                    }, function (response) {
+                        toaster.pop('error', '错误', response.data);
+                        $modalInstance.close();
+                    });
+                };
 
-          $scope.cancel = function () {
-            $modalInstance.close();
-          };
-        }]);
-
-  //手机验证Controller
-  app.register.controller('UserTelCtrl',
-      ['$scope', '$modalInstance', 'user', 'User', 'toaster', '$interval',
-        function ($scope, $modalInstance, user, User, toaster, $interval) {
-          User.getPageToken();
-          $scope.user = user;
-          $scope.user.userTel = null;
-          //原手机号校验
-          $scope.checking = false;
-          //验证用户输入的旧邮箱地址是否正确
-          $scope.checkUserTel = function (userTel) {
-            $scope.checking = true;
-            $scope.checkSuccess = false;
-            $scope.checkFailed = false;
-            User.checkUserTel({userTel: userTel}, function () {
-              $scope.checkSuccess = true;
-              $scope.checking = false;
-              $scope.checkFailed = false;
-            }, function () {
-              $scope.checkFailed = true;
-              $scope.checking = false;
-              $scope.checkSuccess = false;
-            });
-          };
-
-          //新手机号是否可用
-          $scope.sendSuccess = false;
-          $scope.checkFailed1 = false;
-          $scope.checkFailed1_1 = false;
-          $scope.checkSuccess1 = false;
-          $scope.telEnable = function (newUserTel) {
-            if (newUserTel == null || !/^[0-9]{8,11}$/.test(newUserTel)) {
-              $scope.checkFailed1 = true;
-              $scope.checkSuccess1 = false;
-              $scope.sendSuccess = false;
-              $scope.checkFailed1_1 = false;
-              return false;
-            }
-            $scope.checking1 = true;
-            $scope.checkSuccess1 = false;
-            $scope.checkFailed1 = false;
-            User.telEnable({tel: newUserTel}, function (data) {
-              if (data.data == "true") {//手机可用
-                $scope.checkSuccess1 = true;
+                $scope.cancel = function () {
+                    $modalInstance.close();
+                };
+            }]);
+
+//手机验证Controller
+    app.register.controller('UserTelCtrl',
+        ['$scope', '$modalInstance', 'user', 'User', 'toaster', '$interval',
+            function ($scope, $modalInstance, user, User, toaster, $interval) {
+                User.getPageToken();
+                $scope.user = user;
+                $scope.user.userTel = null;
+                //原手机号校验
+                $scope.checking = false;
+                //验证用户输入的旧邮箱地址是否正确
+                $scope.checkUserTel = function (userTel) {
+                    $scope.checking = true;
+                    $scope.checkSuccess = false;
+                    $scope.checkFailed = false;
+                    User.checkUserTel({userTel: userTel}, function () {
+                        $scope.checkSuccess = true;
+                        $scope.checking = false;
+                        $scope.checkFailed = false;
+                    }, function () {
+                        $scope.checkFailed = true;
+                        $scope.checking = false;
+                        $scope.checkSuccess = false;
+                    });
+                };
+
+                //新手机号是否可用
+                $scope.sendSuccess = false;
                 $scope.checkFailed1 = false;
-                $scope.sendSuccess = true;
                 $scope.checkFailed1_1 = false;
-              } else {//手机不可用
-                $scope.checkFailed1_1 = true;
-                $scope.checking1 = false;
                 $scope.checkSuccess1 = false;
-                $scope.sendSuccess = false;
-              }
-            }, function () {
-              $scope.checkFailed1 = true;
-              $scope.checking1 = false;
-              $scope.checkSuccess1 = false;
-              $scope.checkFailed1_1 = false;
-            });
-          };
-
-          //发送验证码
-          $scope.codeSuccess = false;
-          //发送验证码
-          $scope.sendTelCheckCode = function (newUserTel) {
-            User.sendTelCheckCode({newUserTel: newUserTel}, function () {
-              $scope.codeSuccess = true;
-              $interval.cancel(timePromise);
-              var second = 60,
-                  timePromise = $interval(function () {
-                    $scope.sendSuccess = false;
-                    if (second <= 0) {
-                      $interval.cancel(timePromise);
-                      second = 60;
-                    } else {
-                      second--;
-                      $scope.paracont = second + "秒后可重发";
-                      if (second == 0) {
-                        $scope.paracont = "重发验证码";
-                        $scope.sendSuccess = true;
-                      }
-                    }
-                  }, 1000, 60);
-            }, function () {
-              $scope.codeSuccess = false;
-            });
-          };
-
-          $scope.checkSuccess2 = false;
-          $scope.checkFailed2 = false;
-          //校验验证码
-          $scope.validTelCheckCode = function (telCheckCode) {
-            if(!telCheckCode){
-              $scope.checkSuccess2 = false;
-              $scope.checkFailed2 = true;
-              return false;
-            }
-            User.validTelCheckCode({telCheckCode: telCheckCode,newUserTel:$scope.user.newUserTel},
-                function (data) {
-                  var status = data.status;
-                  var message = data.message;
-                  if (status == 1) {
-                    $scope.checkSuccess2 = true;
-                    $scope.checkFailed2 = false;
-                  } else {
-                    $scope.checkSuccess2 = false;
-                    $scope.checkFailed2 = true;
-                  }
-                });
-          };
+                $scope.telEnable = function (newUserTel) {
+                    if (newUserTel == null || !/^[0-9]{8,11}$/.test(newUserTel)) {
+                        $scope.checkFailed1 = true;
+                        $scope.checkSuccess1 = false;
+                        $scope.sendSuccess = false;
+                        $scope.checkFailed1_1 = false;
+                        return false;
+                    }
+                    $scope.checking1 = true;
+                    $scope.checkSuccess1 = false;
+                    $scope.checkFailed1 = false;
+                    User.telEnable({tel: newUserTel}, function (data) {
+                        if (data.data == "true") {//手机可用
+                            $scope.checkSuccess1 = true;
+                            $scope.checkFailed1 = false;
+                            $scope.sendSuccess = true;
+                            $scope.checkFailed1_1 = false;
+                        } else {//手机不可用
+                            $scope.checkFailed1_1 = true;
+                            $scope.checking1 = false;
+                            $scope.checkSuccess1 = false;
+                            $scope.sendSuccess = false;
+                        }
+                    }, function () {
+                        $scope.checkFailed1 = true;
+                        $scope.checking1 = false;
+                        $scope.checkSuccess1 = false;
+                        $scope.checkFailed1_1 = false;
+                    });
+                };
 
-          //修改手机
-          $scope.ok = function () {
-            //原手机校验
-            if(!$scope.checkSuccess){
-              $scope.checkUserTel($scope.user.userTel);
-            }
-            //新手机校验
-            if(!$scope.checkSuccess1){
-              $scope.telEnable($scope.user.newUserTel);
-            }
-            //验证码校验
-            $scope.validTelCheckCode($scope.telCheckCode);
-            if(!$scope.checkSuccess || !$scope.checkSuccess1 || !$scope.checkSuccess2){
-              return;
-            }
-            if ($scope.user.newUserTel == $scope.user.userTel) {
-              toaster.pop('error', '错误', '新手机号与旧手机号相同');
-              return;
-            }
-            User.updateUserTel({
-              newUserTel: $scope.user.newUserTel,
-              userTel: $scope.user.userTel,
-              telCheckCode:$scope.telCheckCode
-            }, {}, function () {
-              toaster.pop('success', '成功', '手机修改成功。');
-              $scope.userInfo.userTel = $scope.user.newUserTel.substr(0, 3)
-                  + '****' + $scope.user.newUserTel.substr(7);
-              $scope.user.userTel = null;
-              $scope.user.newUserTel = null;
-              $scope.checking = false;
-              $scope.checkSuccess = false;
-              $scope.checkFailed = false;
-              $scope.checking1 = false;
-              $scope.checkSuccess1 = false;
-              $scope.checkFailed1 = false;
-              $scope.emailSuccess = false;
-              $scope.codeSuccess = false;
-              $scope.validSuccess = false;
-              window.location.href = "vendor#/account/management/sec";
-              window.location.reload();
-              $modalInstance.close();
-            }, function (response) {
-              toaster.pop('error', '错误', response.data);
-              //$modalInstance.close();
-            });
-          };
+                //发送验证码
+                $scope.codeSuccess = false;
+                //发送验证码
+                $scope.sendTelCheckCode = function (newUserTel) {
+                    User.sendTelCheckCode({newUserTel: newUserTel}, function () {
+                        $scope.codeSuccess = true;
+                        $interval.cancel(timePromise);
+                        var second = 60,
+                            timePromise = $interval(function () {
+                                $scope.sendSuccess = false;
+                                if (second <= 0) {
+                                    $interval.cancel(timePromise);
+                                    second = 60;
+                                } else {
+                                    second--;
+                                    $scope.paracont = second + "秒后可重发";
+                                    if (second == 0) {
+                                        $scope.paracont = "重发验证码";
+                                        $scope.sendSuccess = true;
+                                    }
+                                }
+                            }, 1000, 60);
+                    }, function () {
+                        $scope.codeSuccess = false;
+                    });
+                };
 
-          $scope.cancel = function () {
-            $modalInstance.close();
-          };
-        }]);
-
-  // 设置支付密码Controller
-  app.register.controller('UserPayCtrl',
-      ['$scope', '$modalInstance', 'user', 'User', 'toaster',
-        function ($scope, $modalInstance, user, User, toaster) {
-          //原密码框是否显示
-          $scope.user = angular.copy(user);
-          $scope.checking = true;
-          $scope.showNewUserPay = false;
-          $scope.showUserPay = false;
-          $scope.showNewUserPay1 = false;
-          $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.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.isNewSuccess = false;
-          $scope.isNewFailed = false;
-          $scope.checkHaveUserPay = function () {
-            $scope.isNewSuccess = false;
-            $scope.isNewFailed = true;
-            User.checkHaveUserPay(function (data) {
-              var flag = data.data;
-              if (flag == "false") {
-                //隐藏原密码输入框
-                angular.element(".oldUserPay").remove();
-                //修改新密码框内容
-                $scope.newUserPayLabel = "密码";
-                $scope.isNewSuccess = true;
+                $scope.checkSuccess2 = false;
+                $scope.checkFailed2 = false;
+                //校验验证码
+                $scope.validTelCheckCode = function (telCheckCode) {
+                    if (!telCheckCode) {
+                        $scope.checkSuccess2 = false;
+                        $scope.checkFailed2 = true;
+                        return false;
+                    }
+                    User.validTelCheckCode({telCheckCode: telCheckCode, newUserTel: $scope.user.newUserTel},
+                        function (data) {
+                            var status = data.status;
+                            var message = data.message;
+                            if (status == 1) {
+                                $scope.checkSuccess2 = true;
+                                $scope.checkFailed2 = false;
+                            } else {
+                                $scope.checkSuccess2 = false;
+                                $scope.checkFailed2 = true;
+                            }
+                        });
+                };
+
+                //修改手机
+                $scope.ok = function () {
+                    //原手机校验
+                    if (!$scope.checkSuccess) {
+                        $scope.checkUserTel($scope.user.userTel);
+                    }
+                    //新手机校验
+                    if (!$scope.checkSuccess1) {
+                        $scope.telEnable($scope.user.newUserTel);
+                    }
+                    //验证码校验
+                    $scope.validTelCheckCode($scope.telCheckCode);
+                    if (!$scope.checkSuccess || !$scope.checkSuccess1 || !$scope.checkSuccess2) {
+                        return;
+                    }
+                    if ($scope.user.newUserTel == $scope.user.userTel) {
+                        toaster.pop('error', '错误', '新手机号与旧手机号相同');
+                        return;
+                    }
+                    User.updateUserTel({
+                        newUserTel: $scope.user.newUserTel,
+                        userTel: $scope.user.userTel,
+                        telCheckCode: $scope.telCheckCode
+                    }, {}, function () {
+                        toaster.pop('success', '成功', '手机修改成功。');
+                        $scope.userInfo.userTel = $scope.user.newUserTel.substr(0, 3)
+                            + '****' + $scope.user.newUserTel.substr(7);
+                        $scope.user.userTel = null;
+                        $scope.user.newUserTel = null;
+                        $scope.checking = false;
+                        $scope.checkSuccess = false;
+                        $scope.checkFailed = false;
+                        $scope.checking1 = false;
+                        $scope.checkSuccess1 = false;
+                        $scope.checkFailed1 = false;
+                        $scope.emailSuccess = false;
+                        $scope.codeSuccess = false;
+                        $scope.validSuccess = false;
+                        window.location.href = "vendor#/account/management/sec";
+                        window.location.reload();
+                        $modalInstance.close();
+                    }, function (response) {
+                        toaster.pop('error', '错误', response.data);
+                        //$modalInstance.close();
+                    });
+                };
+
+                $scope.cancel = function () {
+                    $modalInstance.close();
+                };
+            }]);
+
+// 设置支付密码Controller
+    app.register.controller('UserPayCtrl',
+        ['$scope', '$modalInstance', 'user', 'User', 'toaster',
+            function ($scope, $modalInstance, user, User, toaster) {
+                //原密码框是否显示
+                $scope.user = angular.copy(user);
+                $scope.checking = true;
+                $scope.showNewUserPay = false;
+                $scope.showUserPay = false;
+                $scope.showNewUserPay1 = false;
+                $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.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.isNewSuccess = false;
                 $scope.isNewFailed = false;
-              }
-            });
-          }
-
-          //校验原密码是否正确
-          $scope.checkFailed = false;
-          $scope.checkSuccess = false;
-          $scope.checkUserPay = function (userPay) {
-            if (userPay == null) {
-              $scope.checkFailed = true;
-              $scope.checkSuccess = false;
-              return false;
-            }
-            $scope.checkSuccess = false;
-            $scope.checkFailed = false;
-            User.checkUserPay({userPay: userPay}, function () {
-              $scope.checkFailed = false;
-              $scope.checkSuccess = true;
-            }, function () {
-              $scope.checkFailed = true;
-              $scope.checkSuccess = false;
-            });
-          }
-
-          //输入新密码，进行校验
-          $scope.checkSuccess1 = false;
-          $scope.checkFailed1 = false;
-          $scope.checkNewUserPay = function (newUserPay) {
-            if (newUserPay == null) {
-              $scope.checkFailed1 = true;
-              $scope.checkSuccess1 = false;
-              return false;
-            }
-            //如果两者相同 则返回
-            if ($scope.checking && ($scope.user.userPay
-                    == $scope.user.newUserPay)) {
-              toaster.pop('error', '错误', '新密码与原密码相同');
-              $scope.checkFailed1 = true;
-              $scope.checkSuccess1 = false;
-              return false;
-            }
-            //正则校验
-            var reg = /^\d{6}$/;
-            if (!reg.test(newUserPay)) {
-              $scope.checkFailed1 = true;
-              $scope.checkSuccess1 = false;
-              return false;
-            }
-            $scope.checkFailed1 = false;
-            $scope.checkSuccess1 = true;
-          }
-
-
-          //校验确认密码是否与新密码相同
-          $scope.checkSuccess2 = false;
-          $scope.checkFailed2 = false;
-          $scope.checkNewUserPay1 = function () {
-            if($scope.user.newUserPay1 == null){
-              $scope.checkSuccess2 = false;
-              $scope.checkFailed2 = true;
-            }
-            if ($scope.user.newUserPay1 != null) {
-              //如果输入密码正确，并且输入密码=重新输入密码
-              if ($scope.checkSuccess1 && ($scope.user.newUserPay
-                      == $scope.user.newUserPay1)) {
-                $scope.checkSuccess2 = true;
+                $scope.checkHaveUserPay = function () {
+                    $scope.isNewSuccess = false;
+                    $scope.isNewFailed = true;
+                    User.checkHaveUserPay(function (data) {
+                        var flag = data.data;
+                        if (flag == "false") {
+                            //隐藏原密码输入框
+                            angular.element(".oldUserPay").remove();
+                            //修改新密码框内容
+                            $scope.newUserPayLabel = "密码";
+                            $scope.isNewSuccess = true;
+                            $scope.isNewFailed = false;
+                        }
+                    });
+                }
+
+                //校验原密码是否正确
+                $scope.checkFailed = false;
+                $scope.checkSuccess = false;
+                $scope.checkUserPay = function (userPay) {
+                    if (userPay == null) {
+                        $scope.checkFailed = true;
+                        $scope.checkSuccess = false;
+                        return false;
+                    }
+                    $scope.checkSuccess = false;
+                    $scope.checkFailed = false;
+                    User.checkUserPay({userPay: userPay}, function () {
+                        $scope.checkFailed = false;
+                        $scope.checkSuccess = true;
+                    }, function () {
+                        $scope.checkFailed = true;
+                        $scope.checkSuccess = false;
+                    });
+                }
+
+                //输入新密码，进行校验
+                $scope.checkSuccess1 = false;
+                $scope.checkFailed1 = false;
+                $scope.checkNewUserPay = function (newUserPay) {
+                    if (newUserPay == null) {
+                        $scope.checkFailed1 = true;
+                        $scope.checkSuccess1 = false;
+                        return false;
+                    }
+                    //如果两者相同 则返回
+                    if ($scope.checking && ($scope.user.userPay
+                            == $scope.user.newUserPay)) {
+                        toaster.pop('error', '错误', '新密码与原密码相同');
+                        $scope.checkFailed1 = true;
+                        $scope.checkSuccess1 = false;
+                        return false;
+                    }
+                    //正则校验
+                    var reg = /^\d{6}$/;
+                    if (!reg.test(newUserPay)) {
+                        $scope.checkFailed1 = true;
+                        $scope.checkSuccess1 = false;
+                        return false;
+                    }
+                    $scope.checkFailed1 = false;
+                    $scope.checkSuccess1 = true;
+                }
+
+
+                //校验确认密码是否与新密码相同
+                $scope.checkSuccess2 = false;
                 $scope.checkFailed2 = false;
-                return false;
-              }
-              $scope.checkSuccess2 = false;
-              $scope.checkFailed2 = true;
-            }
-          }
+                $scope.checkNewUserPay1 = function () {
+                    if ($scope.user.newUserPay1 == null) {
+                        $scope.checkSuccess2 = false;
+                        $scope.checkFailed2 = true;
+                    }
+                    if ($scope.user.newUserPay1 != null) {
+                        //如果输入密码正确，并且输入密码=重新输入密码
+                        if ($scope.checkSuccess1 && ($scope.user.newUserPay
+                                == $scope.user.newUserPay1)) {
+                            $scope.checkSuccess2 = true;
+                            $scope.checkFailed2 = false;
+                            return false;
+                        }
+                        $scope.checkSuccess2 = false;
+                        $scope.checkFailed2 = true;
+                    }
+                }
 
-          //支付密码
-          $scope.ok = function () {
-            //原密码校验
-            if(!$scope.checkSuccess && $scope.userInfo.havePayPwd){
-              $scope.checkUserPay($scope.user.userPay);
-            }
-            //新密码校验
-            $scope.checkNewUserPay($scope.user.newUserPay);
-            //密码确认
-            $scope.checkNewUserPay1();
-            if((!$scope.checkSuccess && $scope.userInfo.havePayPwd) || !$scope.checkSuccess1 || !$scope.checkSuccess2){
-              return;
-            }
-            if ($scope.checking && ($scope.user.newUserPay
-                    == $scope.user.userPay)) {
-              toaster.pop('error', '错误', '新密码与旧密码相同');
-              return;
-            }
-            User.updateUserPay({
-              newUserPay: $scope.user.newUserPay,
-              userPay: $scope.user.userPay
-            }, {}, function () {
-              toaster.pop('success', '成功', '支付密码设置成功。');
-              $scope.user.userPay = null;
-              $scope.user.newUserPay = null;
-              $scope.checkSuccess = false;
-              $scope.checkFailed = false;
-              $scope.checkSuccess1 = false;
-              $scope.checkFailed1 = false;
-              $scope.checkSuccess2 = false;
-              $scope.checkFailed2 = false;
-              $scope.checking = true;
-              window.location.href = "vendor#/account/management/sec";
-              window.location.reload();
-              $modalInstance.close();
-            }, function (response) {
-              toaster.pop('error', '错误', response.data);
-              $modalInstance.close();
-            });
-          };
+                //支付密码
+                $scope.ok = function () {
+                    //原密码校验
+                    if (!$scope.checkSuccess && $scope.userInfo.havePayPwd) {
+                        $scope.checkUserPay($scope.user.userPay);
+                    }
+                    //新密码校验
+                    $scope.checkNewUserPay($scope.user.newUserPay);
+                    //密码确认
+                    $scope.checkNewUserPay1();
+                    if ((!$scope.checkSuccess && $scope.userInfo.havePayPwd) || !$scope.checkSuccess1 || !$scope.checkSuccess2) {
+                        return;
+                    }
+                    if ($scope.checking && ($scope.user.newUserPay
+                            == $scope.user.userPay)) {
+                        toaster.pop('error', '错误', '新密码与旧密码相同');
+                        return;
+                    }
+                    User.updateUserPay({
+                        newUserPay: $scope.user.newUserPay,
+                        userPay: $scope.user.userPay
+                    }, {}, function () {
+                        toaster.pop('success', '成功', '支付密码设置成功。');
+                        $scope.user.userPay = null;
+                        $scope.user.newUserPay = null;
+                        $scope.checkSuccess = false;
+                        $scope.checkFailed = false;
+                        $scope.checkSuccess1 = false;
+                        $scope.checkFailed1 = false;
+                        $scope.checkSuccess2 = false;
+                        $scope.checkFailed2 = false;
+                        $scope.checking = true;
+                        window.location.href = "vendor#/account/management/sec";
+                        window.location.reload();
+                        $modalInstance.close();
+                    }, function (response) {
+                        toaster.pop('error', '错误', response.data);
+                        $modalInstance.close();
+                    });
+                };
 
-          $scope.cancel = function () {
-            $modalInstance.close();
-          };
-        }]);
-
-  // 设置密保问题Controller
-  app.register.controller('UserQuestionCtrl',
-      ['$scope', '$modalInstance', 'user', 'User', 'toaster','$timeout',
-        function ($scope, $modalInstance, user, User, toaster,$timeout) {
-          //查询所有的密保问题
-          $scope.pageInfo = {page: 1, count: 20};
-          User.getAllSecQuestion($scope.pageInfo, function (data) {
-            $scope.secQuestions = data.content;
-            //查询当前用户密保问题
-            User.getUserQuestion(function (data) {
-              $scope.uq[0] = data[0];
-              $scope.uq[1] = data[1];
-            });
-          });
-          //选择问题 校验
-          $scope.checkSuccess = false;
-          $scope.checkFailed = false;
-          $scope.checkSuccess2 = false;
-          $scope.checkFailed2 = false;
-          $scope.choose = function () {
-            if ($scope.uq[0]!=undefined && $scope.uq[0].question != undefined && $scope.uq[0].question!="") {
-              $scope.checkSuccess = true;
-              $scope.checkFailed = false;
-            } else {
-              $scope.checkSuccess = false;
-              $scope.checkFailed = true;
-            }
-          }
+                $scope.cancel = function () {
+                    $modalInstance.close();
+                };
+            }]);
+
+// 设置密保问题Controller
+    app.register.controller('UserQuestionCtrl',
+        ['$scope', '$modalInstance', 'user', 'User', 'toaster', '$timeout',
+            function ($scope, $modalInstance, user, User, toaster, $timeout) {
+                //查询所有的密保问题
+                $scope.pageInfo = {page: 1, count: 20};
+                User.getAllSecQuestion($scope.pageInfo, function (data) {
+                    $scope.secQuestions = data.content;
+                    //查询当前用户密保问题
+                    User.getUserQuestion(function (data) {
+                        $scope.uq[0] = data[0];
+                        $scope.uq[1] = data[1];
+                    });
+                });
+                //选择问题 校验
+                $scope.checkSuccess = false;
+                $scope.checkFailed = false;
+                $scope.checkSuccess2 = false;
+                $scope.checkFailed2 = false;
+                $scope.choose = function () {
+                    if ($scope.uq[0] != undefined && $scope.uq[0].question != undefined && $scope.uq[0].question != "") {
+                        $scope.checkSuccess = true;
+                        $scope.checkFailed = false;
+                    } else {
+                        $scope.checkSuccess = false;
+                        $scope.checkFailed = true;
+                    }
+                }
 
-          $scope.choose1 = function () {
-            if ($scope.uq[1]!=undefined && $scope.uq[1].question != undefined && $scope.uq[1].question!="") {
-              $scope.checkSuccess2 = true;
-              $scope.checkFailed2 = false;
-            } else {
-              $scope.checkSuccess2 = false;
-              $scope.checkFailed2 = true;
-            }
-          }
-
-          //答案校验 不超过30个字符
-          $scope.checkSuccess1 = false;
-          $scope.checkFailed1 = false;
-          $scope.checkFailed1_1 = false;
-          $scope.checkSuccess3 = false;
-          $scope.checkFailed3 = false;
-          $scope.checkFailed3_1 = false;
-          $scope.inputAnswer = function () {
-            if ($scope.uq[0]==undefined || $scope.uq[0].answer == undefined || $scope.uq[0].answer=="") {
-              $scope.checkSuccess1 = false;
-              $scope.checkFailed1 = true;
-              $scope.checkFailed1_1 = false;
-              return false;
-            }
-            if ($scope.uq[0].answer.length > 30) {
-              $scope.checkSuccess1 = false;
-              $scope.checkFailed1 = false;
-              $scope.checkFailed1_1 = true;
-              return false;
-            }
-            $scope.checkSuccess1 = true;
-            $scope.checkFailed1 = false;
-            $scope.checkFailed1_1 = false;
-          }
-
-          $scope.inputAnswer1 = function () {
-            if ($scope.uq[1]==undefined || $scope.uq[1].answer == undefined || $scope.uq[1].answer=="") {
-              $scope.checkSuccess3 = false;
-              $scope.checkFailed3 = true;
-              $scope.checkFailed3_1 = false;
-              return false;
-            }
-            if ($scope.uq[1].answer.length > 30) {
-              $scope.checkSuccess3 = false;
-              $scope.checkFailed3 = false;
-              $scope.checkFailed3_1 = true;
-              return false;
-            }
-            $scope.checkSuccess3 = true;
-            $scope.checkFailed3 = false;
-            $scope.checkFailed3_1 = false;
-          }
-
-          //保存密保
-          $scope.ok = function () {
-            //问题1校验
-            $scope.choose();
-            $scope.inputAnswer();
-            $scope.choose1();
-            $scope.inputAnswer1();
-            if(!$scope.checkSuccess || !$scope.checkSuccess1 || !$scope.checkSuccess2 || !$scope.checkSuccess3){
-              return;
-            }
-            var arr = [];
-            for (var key in $scope.uq) {
-              $scope.uq[key].sort = Number(key) + 1;
-              arr[key] = $scope.uq[key];
-            }
-            User.updateUserQuestion({}, arr, function () {
-              toaster.pop('success', '成功', '密保问题设置成功。');
-              $modalInstance.close();
-              $scope.uq = null;
-              $scope.checkSuccess = false;
-              $scope.checkFailed = false;
-              $scope.checkSuccess1 = false;
-              $scope.checkFailed1 = false;
-              $scope.checkSuccess2 = false;
-              $scope.checkFailed2 = false;
-              $scope.checkSuccess3 = false;
-              $scope.checkFailed3 = false;
-              $scope.checkFailed3_1 = false;
-              $scope.checkFailed1_1 = false;
-              window.location.href = "vendor#/account/management/sec";
-              window.location.reload();
-              $modalInstance.close();
-            }, function (response) {
-              toaster.pop('error', '错误', response.data);
-              $modalInstance.close();
-            });
-          };
-          $scope.cancel = function () {
-            $modalInstance.close();
-          };
-        }]);
-
-  // 实名认证Controller
-  app.register.controller('UserRealAuthCtrl',
-      ['$scope', '$modalInstance', 'user', 'User', 'toaster',
-        function ($scope, $modalInstance, user, User, toaster) {
-          $scope.user = user;
-          //姓名验证  不超过20个字符
-          $scope.checkSuccess = false;
-          $scope.checkFailed = false;
-          $scope.checkUserName = function (userName) {
-            if (!userName) {
-              //toaster.pop('error', '请输入您的真实姓名');
-              $scope.checkSuccess = false;
-              $scope.checkFailed = true;
-              return false;
-            } else if (userName.length > 20) {
-              //toaster.pop('error', '请勿超过20个字符');
-              $scope.checkSuccess = false;
-              $scope.checkFailed_1 = true;
-              return false;
-            } else {
-              $scope.checkSuccess = true;
-              $scope.checkFailed = false;
-              $scope.checkFailed_1 = false;
-            }
-          }
-
-          //检查身份证
-          $scope.checkSuccess1 = false;
-          $scope.checkFailed1 = false;
-          $scope.checkFailed1_1 = false;
-          $scope.checkUserIdcode = function (userIdcode) {
-            if (userIdcode == null) {
-              //toaster.pop('error', '请输入您的身份证号');
-              $scope.checkSuccess1 = false;
-              $scope.checkFailed1 = true;
-              $scope.checkFailed1_1 = false;
-              return false;
-            } else if (!(/^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/.test(userIdcode))) {
-              //toaster.pop('error', '请输入18位的身份证号');
-              $scope.checkSuccess1 = false;
-              $scope.checkFailed1 = false;
-              $scope.checkFailed1_1 = true;
-              return false;
+                $scope.choose1 = function () {
+                    if ($scope.uq[1] != undefined && $scope.uq[1].question != undefined && $scope.uq[1].question != "") {
+                        $scope.checkSuccess2 = true;
+                        $scope.checkFailed2 = false;
+                    } else {
+                        $scope.checkSuccess2 = false;
+                        $scope.checkFailed2 = true;
+                    }
+                }
+
+                //答案校验 不超过30个字符
+                $scope.checkSuccess1 = false;
+                $scope.checkFailed1 = false;
+                $scope.checkFailed1_1 = false;
+                $scope.checkSuccess3 = false;
+                $scope.checkFailed3 = false;
+                $scope.checkFailed3_1 = false;
+                $scope.inputAnswer = function () {
+                    if ($scope.uq[0] == undefined || $scope.uq[0].answer == undefined || $scope.uq[0].answer == "") {
+                        $scope.checkSuccess1 = false;
+                        $scope.checkFailed1 = true;
+                        $scope.checkFailed1_1 = false;
+                        return false;
+                    }
+                    if ($scope.uq[0].answer.length > 30) {
+                        $scope.checkSuccess1 = false;
+                        $scope.checkFailed1 = false;
+                        $scope.checkFailed1_1 = true;
+                        return false;
+                    }
+                    $scope.checkSuccess1 = true;
+                    $scope.checkFailed1 = false;
+                    $scope.checkFailed1_1 = false;
+                }
+
+                $scope.inputAnswer1 = function () {
+                    if ($scope.uq[1] == undefined || $scope.uq[1].answer == undefined || $scope.uq[1].answer == "") {
+                        $scope.checkSuccess3 = false;
+                        $scope.checkFailed3 = true;
+                        $scope.checkFailed3_1 = false;
+                        return false;
+                    }
+                    if ($scope.uq[1].answer.length > 30) {
+                        $scope.checkSuccess3 = false;
+                        $scope.checkFailed3 = false;
+                        $scope.checkFailed3_1 = true;
+                        return false;
+                    }
+                    $scope.checkSuccess3 = true;
+                    $scope.checkFailed3 = false;
+                    $scope.checkFailed3_1 = false;
+                }
+
+                //保存密保
+                $scope.ok = function () {
+                    //问题1校验
+                    $scope.choose();
+                    $scope.inputAnswer();
+                    $scope.choose1();
+                    $scope.inputAnswer1();
+                    if (!$scope.checkSuccess || !$scope.checkSuccess1 || !$scope.checkSuccess2 || !$scope.checkSuccess3) {
+                        return;
+                    }
+                    var arr = [];
+                    for (var key in $scope.uq) {
+                        $scope.uq[key].sort = Number(key) + 1;
+                        arr[key] = $scope.uq[key];
+                    }
+                    User.updateUserQuestion({}, arr, function () {
+                        toaster.pop('success', '成功', '密保问题设置成功。');
+                        $modalInstance.close();
+                        $scope.uq = null;
+                        $scope.checkSuccess = false;
+                        $scope.checkFailed = false;
+                        $scope.checkSuccess1 = false;
+                        $scope.checkFailed1 = false;
+                        $scope.checkSuccess2 = false;
+                        $scope.checkFailed2 = false;
+                        $scope.checkSuccess3 = false;
+                        $scope.checkFailed3 = false;
+                        $scope.checkFailed3_1 = false;
+                        $scope.checkFailed1_1 = false;
+                        window.location.href = "vendor#/account/management/sec";
+                        window.location.reload();
+                        $modalInstance.close();
+                    }, function (response) {
+                        toaster.pop('error', '错误', response.data);
+                        $modalInstance.close();
+                    });
+                };
+                $scope.cancel = function () {
+                    $modalInstance.close();
+                };
+            }]);
+
+// 实名认证Controller
+    app.register.controller('UserRealAuthCtrl',
+        ['$scope', '$modalInstance', 'user', 'User', 'toaster',
+            function ($scope, $modalInstance, user, User, toaster) {
+                $scope.user = user;
+                //姓名验证  不超过20个字符
+                $scope.checkSuccess = false;
+                $scope.checkFailed = false;
+                $scope.checkUserName = function (userName) {
+                    if (!userName) {
+                        //toaster.pop('error', '请输入您的真实姓名');
+                        $scope.checkSuccess = false;
+                        $scope.checkFailed = true;
+                        return false;
+                    } else if (userName.length > 20) {
+                        //toaster.pop('error', '请勿超过20个字符');
+                        $scope.checkSuccess = false;
+                        $scope.checkFailed_1 = true;
+                        return false;
+                    } else {
+                        $scope.checkSuccess = true;
+                        $scope.checkFailed = false;
+                        $scope.checkFailed_1 = false;
+                    }
+                }
+
+                //检查身份证
+                $scope.checkSuccess1 = false;
+                $scope.checkFailed1 = false;
+                $scope.checkFailed1_1 = false;
+                $scope.checkUserIdcode = function (userIdcode) {
+                    if (userIdcode == null) {
+                        //toaster.pop('error', '请输入您的身份证号');
+                        $scope.checkSuccess1 = false;
+                        $scope.checkFailed1 = true;
+                        $scope.checkFailed1_1 = false;
+                        return false;
+                    } else if (!(/^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/.test(userIdcode))) {
+                        //toaster.pop('error', '请输入18位的身份证号');
+                        $scope.checkSuccess1 = false;
+                        $scope.checkFailed1 = false;
+                        $scope.checkFailed1_1 = true;
+                        return false;
+                    } else {
+                        $scope.checkSuccess1 = true;
+                        $scope.checkFailed1 = false;
+                        $scope.checkFailed1_1 = false;
+                    }
+                }
+
+                //图片上传
+                $scope.checkSuccess2 = false;
+                $scope.onUploadID = function ($data) {
+                    if (!$data || !$data.path) {
+                        toaster.pop('error', '图片上传失败');
+                        return;
+                    }
+                    $scope.user.idImgUrl = $data.path;
+                    $scope.checkSuccess2 = true;
+                };
+
+                $scope.deleteImg = function () {
+                    $scope.user.idImgUrl = '';
+                    $scope.checkSuccess2 = false;
+                };
+
+                // 查看范例
+                $scope.showImg = function (imgUrl) {
+                    var src = imgUrl, box = $('#image-box'), modal = $('.modal-content');
+                    box.show();
+                    box.find('img').attr('src', src);
+                    box.find('a').click(function () {
+                        box.hide();
+                    });
+                    box.dblclick(function () {
+                        box.hide();
+                    });
+                };
+                //保存
+                $scope.ok = function () {
+                    //姓名
+                    $scope.checkUserName($scope.user.userName);
+                    //身份证
+                    $scope.checkUserIdcode($scope.user.userIdcode);
+                    //身份证
+                    if (!$scope.checkSuccess2) {
+                        toaster.pop('error', '错误', '请上传您的证件...');
+                        return;
+                    }
+                    if (!$scope.checkSuccess || !$scope.checkSuccess1 || !$scope.checkSuccess2) {
+                        return;
+                    }
+                    User.updateRealAuth({
+                        userName: $scope.user.userName,
+                        userIdcode: $scope.user.userIdcode,
+                        idImgUrl: $scope.user.idImgUrl
+                    }, {}, function () {
+                        toaster.pop('success', '成功', '身份信息提交成功。');
+                        $modalInstance.close();
+                        $scope.checkSuccess2 = false;
+                        $scope.checkSuccess1 = false;
+                        $scope.checkFailed1 = false;
+                        $scope.checkSuccess = false;
+                        $scope.checkFailed = false;
+                        window.location.href = "vendor#/account/management/sec";
+
+                        window.location.reload();
+                        $modalInstance.close();
+                    }, function (response) {
+                        toaster.pop('error', '错误', response.data);
+                        $modalInstance.close();
+                    });
+                };
+
+                $scope.cancel = function () {
+                    $modalInstance.close();
+                };
+            }]);
+//角色管理-编辑角色controller
+    app.register.controller('RoleEditCtrl', ['$scope', '$modalInstance', '$timeout', 'AccountResource', 'AccountRole', 'toaster', 'role', 'BaseService', function ($scope, $modalInstance, $timeout, AccountResource, AccountRole, toaster, role, BaseService) {
+        BaseService.scrollBackToTop();
+        $scope.role = role;
+        $scope.master = angular.copy($scope.role);
+        var isNew = role == null;
+        $scope.cancel = function () {
+            $modalInstance.close(false);
+        };
+
+        var getCheckRoleResource = function (data, rs) {
+            if (data.items.length > 0) {
+                var c = 0;
+                angular.forEach(data.items, function (item) {
+                    if (rs.indexOf(item.id) > -1) {
+                        item.$checked = true;
+                        c += 1;
+                    }
+                });
+                data.$checked = c == data.items.length;
             } else {
-              $scope.checkSuccess1 = true;
-              $scope.checkFailed1 = false;
-              $scope.checkFailed1_1 = false;
-            }
-          }
-
-          //图片上传
-          $scope.checkSuccess2 = false;
-          $scope.onUploadID = function ($data) {
-            if (!$data || !$data.path) {
-              toaster.pop('error', '图片上传失败');
-              return;
-            }
-            $scope.user.idImgUrl = $data.path;
-            $scope.checkSuccess2 = true;
-          };
-
-          $scope.deleteImg =function () {
-            $scope.user.idImgUrl = '';
-            $scope.checkSuccess2=false;
-          };
-
-          // 查看范例
-          $scope.showImg = function(imgUrl) {
-            var src = imgUrl, box = $('#image-box'), modal = $('.modal-content');
-            box.show();
-            box.find('img').attr('src', src);
-            box.find('a').click(function(){
-              box.hide();
-            });
-            box.dblclick(function(){
-              box.hide();
-            });
-          };
-          //保存
-          $scope.ok = function () {
-            //姓名
-            $scope.checkUserName($scope.user.userName);
-            //身份证
-            $scope.checkUserIdcode($scope.user.userIdcode);
-            //身份证
-            if(!$scope.checkSuccess2){
-              toaster.pop('error', '错误', '请上传您的证件...');
-              return;
-            }
-            if(!$scope.checkSuccess || !$scope.checkSuccess1 || !$scope.checkSuccess2){
-              return;
+                angular.forEach(data.children, function (item) {
+                    getCheckRoleResource(item, rs);
+                    var b = true;
+                    angular.forEach(data.children, function (item) {
+                        if (!item.$checked) {
+                            b = false;
+                        }
+                    });
+                    if (b) {
+                        data.$checked = true;
+                    }
+                });
             }
-            User.updateRealAuth({userName:$scope.user.userName,userIdcode:$scope.user.userIdcode,idImgUrl:$scope.user.idImgUrl},{},function(){
-              toaster.pop('success', '成功', '身份信息提交成功。');
-              $modalInstance.close();
-              $scope.checkSuccess2 = false;
-              $scope.checkSuccess1 = false;
-              $scope.checkFailed1 = false;
-              $scope.checkSuccess = false;
-              $scope.checkFailed = false;
-              window.location.href = "vendor#/account/management/sec";
-
-              window.location.reload();
-              $modalInstance.close();
-            }, function(response){
-              toaster.pop('error', '错误', response.data);
-              $modalInstance.close();
-            });
-          };
+        }
 
-          $scope.cancel = function () {
-            $modalInstance.close();
-          };
-        }]);
-//角色管理-编辑角色controller
-app.register.controller('RoleEditCtrl', ['$scope', '$modalInstance', '$timeout', 'AccountResource', 'AccountRole', 'toaster', 'role', 'BaseService', function ($scope, $modalInstance, $timeout, AccountResource, AccountRole, toaster, role, BaseService) {
-    BaseService.scrollBackToTop();
-    $scope.role = role;
-    $scope.master = angular.copy($scope.role);
-    var isNew = role == null;
-    $scope.cancel = function () {
-        $modalInstance.close(false);
-    };
-
-    var getCheckRoleResource = function (data, rs) {
-        if (data.items.length > 0) {
-            var c = 0;
-            angular.forEach(data.items, function (item) {
-                if (rs.indexOf(item.id) > -1) {
-                    item.$checked = true;
-                    c += 1;
+        AccountResource.query({}, function (data) {
+            if (data && data.length > 0) {
+                var rs = [];// 已分配的资源的id
+                if (role && role.resourceItems) {
+                    angular.forEach(role.resourceItems, function (item) {
+                        rs.push(item.id);
+                    });
                 }
-            });
-            data.$checked = c == data.items.length;
-        } else {
-            angular.forEach(data.children, function (item) {
-                getCheckRoleResource(item, rs);
-                var b = true;
-                angular.forEach(data.children,function (item) {
-                    if (!item.$checked){ b = false;}
+                angular.forEach(data, function (data2) {
+                    getCheckRoleResource(data2, rs);
+                })
+                $scope.resourceItems = data[0].items;
+                data[0].$active = true;
+            }
+            $scope.resources = data;
+            // if ($scope.role) {
+            // 	angular.forEach($scope.role.resourceItems,function (item) {
+            // 		angular.forEach($scope.resources, function (roleItem) {
+            // 			if (item.id == roleItem.id) {
+            // 				roleItem.$active = true;
+            // 			}
+            // 		})
+            // 	})
+            // }
+            $timeout(function () {
+                angular.forEach($scope.resources, function (resource) {
+                    var c = 0;
+                    angular.forEach(resource.items, function (item) {
+                        item.$checked && (c += 1);
+                    });
+                    angular.element(document.getElementById('check_' + resource.id)).prop('indeterminate', (c > 0 && !resource.$checked));
                 });
-                if(b){
-                    data.$checked = true;
+            }, 100);
+        });
+
+        $scope.onItemClick = function (resource) {
+            if (resource.items.length > 0) {
+                $scope.resourceItems = resource.items;
+            } else {
+                $scope.resourceItems = [];
+                if (!resource.activeLevel) {
+                    resource.activeLevel = true;
+                } else {
+                    resource.activeLevel = false;
                 }
-            });
-        }
-    }
-
-    AccountResource.query({}, function (data) {
-        if (data && data.length > 0) {
-            var rs = [];// 已分配的资源的id
-            if (role && role.resourceItems) {
-                angular.forEach(role.resourceItems, function (item) {
-                    rs.push(item.id);
-                });
             }
-            angular.forEach(data, function (data2) {
-                getCheckRoleResource(data2, rs);
-            })
-            $scope.resourceItems = data[0].items;
-            data[0].$active = true;
+            setNoActive($scope.resources);
+            resource.$active = true;
+        };
+        var setNoActive = function (obj) {
+            angular.forEach(obj, function (r) {
+                r.$active = false;
+                if (r.children) {
+                    setNoActive(r.children);
+                }
+            });
         }
-        $scope.resources = data;
-        // if ($scope.role) {
-        // 	angular.forEach($scope.role.resourceItems,function (item) {
-        // 		angular.forEach($scope.resources, function (roleItem) {
-        // 			if (item.id == roleItem.id) {
-        // 				roleItem.$active = true;
-        // 			}
-        // 		})
-        // 	})
-        // }
-        $timeout(function () {
+
+        var getChecked = function () {
+            var items = [];
             angular.forEach($scope.resources, function (resource) {
-                var c = 0;
+                pushCheckedResource(resource, items);
+            });
+            if ($scope.role) {
+                $scope.role.resourceItems = items;
+            }
+        };
+        var pushCheckedResource = function (resource, items) {
+            if (resource.items.length > 0) {
                 angular.forEach(resource.items, function (item) {
-                    item.$checked && (c += 1);
+                    item.$checked && (items.push(item));
                 });
-                angular.element(document.getElementById('check_' + resource.id)).prop('indeterminate', (c > 0 && !resource.$checked));
-            });
-        }, 100);
-    });
-
-    $scope.onItemClick = function (resource) {
-        if (resource.items.length>0) {
-            $scope.resourceItems = resource.items;
-        } else {
-            $scope.resourceItems = [];
-            if (!resource.activeLevel) {
-                resource.activeLevel = true;
             } else {
-                resource.activeLevel = false;
+                angular.forEach(resource.children, function (item) {
+                    pushCheckedResource(item, items);
+                })
             }
         }
-        setNoActive($scope.resources);
-        resource.$active = true;
-    };
-    var setNoActive = function (obj) {
-        angular.forEach(obj, function (r) {
-            r.$active = false;
-            if (r.children) {
-                setNoActive(r.children);
+        $scope.onResourceChange = function (resource) {
+            levelResourceChecked(resource);
+            getChecked();
+        };
+        var levelResourceChecked = function (resource) {
+            if (resource.items.length > 0) {
+                angular.forEach(resource.items, function (item) {
+                    item.$checked = resource.$checked;
+                });
+            } else {
+                angular.forEach(resource.children, function (item) {
+                    item.$checked = resource.$checked;
+                    levelResourceChecked(item);
+                });
             }
-        });
-    }
 
-    var getChecked = function () {
-        var items = [];
-        angular.forEach($scope.resources, function (resource) {
-            pushCheckedResource(resource, items);
-        });
-        if ($scope.role) {
-            $scope.role.resourceItems = items;
         }
-    };
-    var pushCheckedResource = function (resource, items) {
-        if (resource.items.length > 0) {
-            angular.forEach(resource.items, function (item) {
-                item.$checked && (items.push(item));
+
+        $scope.onItemChange = function () {
+            angular.forEach($scope.resources, function (resource) {
+                if (resource.$active) {
+                    var c = 0;
+                    angular.forEach(resource.items, function (item) {
+                        item.$checked && (c += 1);
+                    });
+                    resource.$checked = (c == resource.items.length);
+                    angular.element(document.getElementById('check_' + resource.id)).prop('indeterminate', (c > 0 && !resource.$checked));
+                }
             });
-        }else {
-            angular.forEach(resource.children, function (item) {
-                pushCheckedResource(item, items);
-            })
-        }
-    }
-    $scope.onResourceChange = function (resource) {
-        levelResourceChecked(resource);
-        getChecked();
-    };
-    var levelResourceChecked = function (resource) {
-        if (resource.items.length>0) {
-            angular.forEach(resource.items, function (item) {
-                item.$checked = resource.$checked;
+            getChecked();
+        };
+        $scope.isChanged = function (formData) {
+            if (!$scope.master)
+                return true;
+            return !angular.equals(formData, $scope.master);
+        };
+        $scope.save = function () {
+            $scope.master = angular.copy($scope.role);
+            if (!$scope.master.color || $scope.master.color == '') {
+                $scope.master.color = parseInt(Math.random() * 5) + 1 + '';
+            }
+            AccountRole.save($scope.master, function () {
+                toaster.pop('success', '提示', '角色：' + $scope.role.desc + ' 资料' + (isNew ? '添加' : '修改') + '成功');
+                $modalInstance.close(true);
+            }, function (response) {
+                toaster.pop('error', '错误', response.data);
             });
-        } else {
-            angular.forEach(resource.children, function (item) {
-                item.$checked = resource.$checked;
-                levelResourceChecked(item);
+        };
+        $scope.del = function () {
+            /*new ngAlert({
+                title: '提示',
+                content: '确定删除角色(' + $scope.role.desc + ')吗？'
+            }, function () {*/
+            AccountRole.remove({id: role.id}, function () {
+                toaster.pop('success', '提示', '角色：' + $scope.role.desc + ' 删除成功');
+                $modalInstance.close(true);
+            }, function (response) {
+                toaster.pop('error', '错误', response.data);
             });
-        }
+            //})
+        };
+    }]);
 
-    }
+    app.register.controller('UserRoleEditCtrl', ['$scope', '$modalInstance', '$timeout', 'AccountResource', 'toaster', 'user', 'BaseService', 'AccountRole', 'User', function ($scope, $modalInstance, $timeout, AccountResource, toaster, user, BaseService, AccountRole, User) {
 
-    $scope.onItemChange = function () {
-        angular.forEach($scope.resources, function (resource) {
-            if (resource.$active) {
-                var c = 0;
-                angular.forEach(resource.items, function (item) {
-                    item.$checked && (c += 1);
+        $scope.pages = [];
+
+        $scope.params = {
+            page: 1,
+            count: 6,
+            totalPage: 1,
+            currentPage: 1
+        };
+
+        var loadCurrentRoles = function () {
+            var start = ($scope.params.page - 1) * $scope.params.count;
+            var end = $scope.params.page * $scope.params.count;
+            $scope.currentRoles = $scope.rolesData.slice(start, end);
+        };
+
+        var init = function () {
+            $scope.user = angular.copy(user);
+            AccountRole.query({}, function (data) {
+                $scope.rolesData = data;
+                loadCurrentRoles();
+                $scope.params.totalPage = Math.ceil($scope.rolesData.length / 6);
+                $scope.acculatePages(1, $scope.params.totalPage);
+                angular.forEach($scope.rolesData, function (item) {
+                    item.checked = false;
+                    angular.forEach($scope.user.roles, function (userItem) {
+                        if (item.id === userItem.id) {
+                            item.checked = true;
+                        }
+                    });
                 });
-                resource.$checked = (c == resource.items.length);
-                angular.element(document.getElementById('check_' + resource.id)).prop('indeterminate', (c > 0 && !resource.$checked));
-            }
-        });
-        getChecked();
-    };
-    $scope.isChanged = function (formData) {
-        if (!$scope.master)
-            return true;
-        return !angular.equals(formData, $scope.master);
-    };
-    $scope.save = function () {
-        $scope.master = angular.copy($scope.role);
-        if (!$scope.master.color || $scope.master.color == '') {
-            $scope.master.color = parseInt(Math.random()*5) + 1 + '';
+            });
         }
-        AccountRole.save($scope.master, function () {
-            toaster.pop('success', '提示', '角色：' + $scope.role.desc + ' 资料' + (isNew ? '添加' : '修改') + '成功');
-            $modalInstance.close(true);
-        }, function (response) {
-            toaster.pop('error', '错误', response.data);
-        });
-    };
-    $scope.del = function () {
-        /*new ngAlert({
-            title: '提示',
-            content: '确定删除角色(' + $scope.role.desc + ')吗？'
-        }, function () {*/
-        AccountRole.remove({id: role.id}, function () {
-            toaster.pop('success', '提示', '角色：' + $scope.role.desc + ' 删除成功');
-            $modalInstance.close(true);
-        }, function (response) {
-            toaster.pop('error', '错误', response.data);
-        });
-        //})
-    };
-}]);
-
-app.register.controller('UserRoleEditCtrl', ['$scope', '$modalInstance', '$timeout', 'AccountResource', 'toaster', 'user', 'BaseService','AccountRole','User', function ($scope, $modalInstance, $timeout, AccountResource, toaster, user, BaseService, AccountRole, User) {
-
-    $scope.pages = [];
-
-    $scope.params = {
-        page : 1,
-        count : 6,
-        totalPage: 1,
-        currentPage: 1
-    };
-
-    var loadCurrentRoles = function () {
-        var start = ($scope.params.page -1) * $scope.params.count;
-        var end = $scope.params.page * $scope.params.count;
-        $scope.currentRoles = $scope.rolesData.slice(start, end);
-    };
-
-    var init = function () {
-        $scope.user = angular.copy(user);
-        AccountRole.query({},function (data) {
-            $scope.rolesData = data;
-            loadCurrentRoles();
-            $scope.params.totalPage = Math.ceil($scope.rolesData.length/6);
-            $scope.acculatePages(1, $scope.params.totalPage);
-            angular.forEach($scope.rolesData, function (item) {
-                item.checked = false;
-                angular.forEach($scope.user.roles, function (userItem) {
-                    if (item.id === userItem.id) {
-                        item.checked = true;
-                    }
-                });
+        init();
+
+        $scope.checked = [];
+        //勾选角色
+        $scope.checkRole = function (role) {
+            role.checked = !role.checked;
+        }
+
+        //关闭模态框
+        $scope.cancelModal = function () {
+            $modalInstance.close();
+        }
+        $scope.close = function (save) {
+            if (save) {
+                if (user.userUU) {
+                    angular.forEach($scope.rolesData, function (item) {
+                        if (item.checked) {
+                            delete item.checked;
+                            $scope.checked.push(item);
+                        }
+                    });
+                    $scope.user.roles = $scope.checked;
+                    User.update({}, $scope.user, function () {
+                        toaster.pop('success', '提示', '保存成功');
+                        user.roles = $scope.checked
+                        $modalInstance.close(true);
+                    }, function (response) {
+                        toaster.pop('error', '保存失败', response.data);
+                    });
+                } else {
+                    $modalInstance.close(true, $scope.checked);
+                }
+            } else {
+                $modalInstance.close(false);
+            }
+        };
+
+        // //初始化分页数据
+        // var initPages = function () {
+        // 	$scope.totalPages = Math.ceil = ($scope.rolesData.length/6);
+        // }
+        //初始化页数信息
+        $scope.initPages = function (totalElementPages) {
+            var pageNum = [];
+            if (totalElementPages == 1) {
+                return;
+            } else if (totalElementPages < 10) {
+                for (var i = 0; i < totalElementPages + 2; i++) {
+                    pageNum.push(i);
+                }
+            } else {
+                pageNum = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
+            }
+            angular.forEach(pageNum, function (number) {
+                var page = {active: true, type: 'page', number: number};
+                if (number == 0) {
+                    page.type = 'prev';
+                } else if (number == 1) {
+                    page.type = 'first';
+                } else if (number == pageNum.length - 2) {
+                    page.type = 'last';
+                    page.number = totalElementPages;
+                } else if (number == pageNum.length - 1) {
+                    page.type = 'next';
+                }
+                $scope.pages.push(page);
             });
-        });
-    }
-    init();
-
-    $scope.checked = [];
-    //勾选角色
-    $scope.checkRole = function (role) {
-        role.checked = !role.checked;
-    }
-
-    //关闭模态框
-    $scope.cancelModal = function () {
-        $modalInstance.close();
-    }
-    $scope.close = function (save) {
-        if (save) {
-            if (user.userUU) {
-                angular.forEach($scope.rolesData, function (item) {
-                    if (item.checked){
-                        delete item.checked;
-                        $scope.checked.push(item);
+        };
+
+        //当前页在后端计算方式
+        $scope.endSegment = function (currentPage, totalElementPages) {
+            if (totalElementPages > 8) {
+                angular.forEach($scope.pages, function (page) {
+                    switch (page.number) {
+                        case 2:
+                            page.active = false;
+                            page.type = 'more';
+                            break;
+                        case 10:
+                            if (currentPage == totalElementPages) {
+                                page.active = false;
+                            }
+                            break;
+                        case 0:
+                        case 1:
+                            break;
+                        default:
+                            if (page.number != totalElementPages) {
+                                page.number = totalElementPages - 9 + page.number;
+                            }
+                            page.current = (currentPage == page.number);
+                            break;
                     }
                 });
-                $scope.user.roles = $scope.checked;
-                User.update({}, $scope.user, function () {
-                    toaster.pop('success', '提示', '保存成功');
-                    user.roles = $scope.checked
-                    $modalInstance.close(true);
-                }, function (response) {
-                    toaster.pop('error', '保存失败', response.data);
-                });
-            } else {
-                $modalInstance.close(true, $scope.checked);
             }
-        } else {
-            $modalInstance.close(false);
-        }
-    };
-
-    // //初始化分页数据
-    // var initPages = function () {
-    // 	$scope.totalPages = Math.ceil = ($scope.rolesData.length/6);
-    // }
-    //初始化页数信息
-    $scope.initPages = function (totalElementPages) {
-        var pageNum = [];
-        if(totalElementPages == 1) {
-            return ;
-        }else if(totalElementPages < 10) {
-            for(var i = 0; i < totalElementPages + 2; i++) {
-                pageNum.push(i);
-            }
-        }else {
-            pageNum = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
-        }
-        angular.forEach(pageNum, function (number) {
-            var page = {active : true, type : 'page', number : number};
-            if(number == 0) {
-                page.type = 'prev';
-            }else if(number == 1) {
-                page.type = 'first';
-            }else if(number == pageNum.length - 2) {
-                page.type = 'last';
-                page.number = totalElementPages;
-            }else if(number == pageNum.length - 1){
-                page.type = 'next';
-            }
-            $scope.pages.push(page);
-        });
-    };
+        };
 
-    //当前页在后端计算方式
-    $scope.endSegment = function (currentPage, totalElementPages) {
-        if (totalElementPages > 8) {
+        //当前页在中间计算方式
+        $scope.middleSegment = function (currentPage) {
             angular.forEach($scope.pages, function (page) {
                 switch (page.number) {
                     case 2:
-                        page.active = false;
+                    case 8:
                         page.type = 'more';
+                        page.active = false;
                         break;
-                    case 10:
-                        if(currentPage == totalElementPages) {
-                            page.active = false;
-                        }
+                    case 3:
+                        page.number = currentPage - 2;
                         break;
-                    case 0:
-                    case 1:
+                    case 4:
+                        page.number = currentPage - 1;
                         break;
-                    default:
-                        if(page.number != totalElementPages) {
-                            page.number = totalElementPages - 9 + page.number;
-                        }
-                        page.current = (currentPage == page.number);
+                    case 5:
+                        page.number = currentPage;
+                        page.current = true;
+                        break;
+                    case 6:
+                        page.number = currentPage + 1;
+                        break;
+                    case 7:
+                        page.number = currentPage + 2;
                         break;
                 }
             });
-        }
-    };
-
-    //当前页在中间计算方式
-    $scope.middleSegment = function (currentPage) {
-        angular.forEach($scope.pages, function (page) {
-            switch (page.number) {
-                case 2:
-                case 8:
-                    page.type ='more';
-                    page.active = false;
-                    break;
-                case 3:
-                    page.number = currentPage - 2;
-                    break;
-                case 4:
-                    page.number = currentPage - 1;
-                    break;
-                case 5:
-                    page.number = currentPage;
-                    page.current = true;
-                    break;
-                case 6:
-                    page.number = currentPage + 1;
-                    break;
-                case 7:
-                    page.number = currentPage + 2;
-                    break;
-            }
-        });
-    };
+        };
 
-    //当前页在前段的计算方式
-    $scope.frontSegment = function (currentPage, totalElementPages) {
-        if (totalElementPages > 8) {
-            angular.forEach($scope.pages, function (page) {
-                switch (page.number) {
-                    case 8:
-                        page.type = 'more';
-                        page.active = false;
-                        break;
-                    case 0:
-                        if(currentPage == 1) {
+        //当前页在前段的计算方式
+        $scope.frontSegment = function (currentPage, totalElementPages) {
+            if (totalElementPages > 8) {
+                angular.forEach($scope.pages, function (page) {
+                    switch (page.number) {
+                        case 8:
+                            page.type = 'more';
                             page.active = false;
+                            break;
+                        case 0:
+                            if (currentPage == 1) {
+                                page.active = false;
+                            }
+                        default : {
+                            page.current = (currentPage == page.number);
                         }
-                    default : {
-                        page.current = (currentPage == page.number);
                     }
-                }
-            });
-        }
-    };
+                });
+            }
+        };
 
-    //输入框监听Enter事件
-    $scope.listenEnter = function () {
-        if(event.keyCode == 13) {
-            $scope.setPage("page", $scope.params.currentPage);
-        }
-    };
-    $scope.setPage = function(type, number) {
-        if(type != 'prev' &&  type != 'page' && type != 'next' && type != 'last' && type != 'first') {
-            return ;
+        //输入框监听Enter事件
+        $scope.listenEnter = function () {
+            if (event.keyCode == 13) {
+                $scope.setPage("page", $scope.params.currentPage);
+            }
         };
-        var page = -1;
-        switch (type) {
-            case "page":
-                if(number < 1) {
-                    page = 1;
-                }else if(number > $scope.params.totalPage) {
-                    page = $scope.params.totalPage;
-                }else {
-                    page = number;
-                };
-                break;
-            case "prev":
-                if($scope.params.page <= 1) {
+        $scope.setPage = function (type, number) {
+            if (type != 'prev' && type != 'page' && type != 'next' && type != 'last' && type != 'first') {
+                return;
+            }
+            ;
+            var page = -1;
+            switch (type) {
+                case "page":
+                    if (number < 1) {
+                        page = 1;
+                    } else if (number > $scope.params.totalPage) {
+                        page = $scope.params.totalPage;
+                    } else {
+                        page = number;
+                    }
+                    ;
+                    break;
+                case "prev":
+                    if ($scope.params.page <= 1) {
+                        page = 1;
+                    } else {
+                        page = $scope.params.page - 1;
+                    }
+                    ;
+                    break;
+                case "next":
+                    if ($scope.params.page >= $scope.params.totalPage) {
+                        page = $scope.params.totalPage;
+                    } else {
+                        page = $scope.params.page + 1;
+                    }
+                    break;
+                case "first":
                     page = 1;
-                }else {
-                    page =$scope.params.page - 1;
-                };
-                break;
-            case "next":
-                if($scope.params.page >= $scope.params.totalPage) {
+                    break;
+                case "last":
                     page = $scope.params.totalPage;
-                }else {
-                    page =$scope.params.page + 1;
-                }
-                break;
-            case "first":
-                page = 1;
-                break;
-            case "last":
-                page = $scope.params.totalPage;
-                break;
-        }
-        if(page == $scope.params.page || page < 1 || page > $scope.params.totalPage) {
-            $scope.params.currentPage = $scope.params.page;
-            return ;
-        }
-        $scope.params.page = page;
-        $scope.params.currentPage = page;
-        loadData();
-    };
-
-    //计算页数的方式。
-    $scope.acculatePages = function(currentPage, totalElementPages) {
-        $scope.pages = [];
-        if(totalElementPages < 1)  {
-            return ;
-        }
-        //初始化页面数据
-        $scope.initPages(totalElementPages);
-        if(currentPage < 6) {//当期页小于6
-            $scope.frontSegment(currentPage, totalElementPages);
-        }else if(currentPage > totalElementPages - 5) { //当期页在后面
-            $scope.endSegment(currentPage, totalElementPages);
-        }else { //当期页在中间
-            $scope.middleSegment(currentPage);
-        }
-    };
+                    break;
+            }
+            if (page == $scope.params.page || page < 1 || page > $scope.params.totalPage) {
+                $scope.params.currentPage = $scope.params.page;
+                return;
+            }
+            $scope.params.page = page;
+            $scope.params.currentPage = page;
+            loadData();
+        };
 
-    var loadData = function() {
-        loadCurrentRoles();
-        $scope.acculatePages($scope.params.page, $scope.params.totalPage);
-    };
-}]);
-});
+        //计算页数的方式。
+        $scope.acculatePages = function (currentPage, totalElementPages) {
+            $scope.pages = [];
+            if (totalElementPages < 1) {
+                return;
+            }
+            //初始化页面数据
+            $scope.initPages(totalElementPages);
+            if (currentPage < 6) {//当期页小于6
+                $scope.frontSegment(currentPage, totalElementPages);
+            } else if (currentPage > totalElementPages - 5) { //当期页在后面
+                $scope.endSegment(currentPage, totalElementPages);
+            } else { //当期页在中间
+                $scope.middleSegment(currentPage);
+            }
+        };
 
+        var loadData = function () {
+            loadCurrentRoles();
+            $scope.acculatePages($scope.params.page, $scope.params.totalPage);
+        };
+    }]);
 });