编辑角色模态框样式微调

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

@@ -370,6 +370,13 @@ define(['app/app'], function(app) {
 			});
 		};
 
+		$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) {

src/main/webapp/resources/view/vendor/forstore/addExistUser.html

@@ -103,6 +103,7 @@
 				<label>查找用户：</label>
 				<input
 						type="text" class="form-control"
+						ng-keydown="onKeyDown($event, keyWord)"
 						ng-model="keyWord" placeholder="请输入UU号、手机号或邮箱" required/>
 				<a class="default-btn" ng-click="searchUser(keyWord)" ng-disabled="searchForm.$invalid">搜索</a>
 			</div>

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

@@ -236,13 +236,17 @@
 	}
 
 	.choose-inline>.item>ul>li.active {
-		background: #fff1d0;
+		background: #d3e3fd;
 	}
 
-	.choose-inline>.item>ul>li:hover a,.choose-inline>.item>ul>li.active a {
+	.choose-inline>.item>ul>li:hover {
+		background: #d3e3fd;
+		cursor: pointer;
+	}
+	/*.choose-inline>.item>ul>li:hover a,.choose-inline>.item>ul>li.active a {
 		color: #ff7300;
 		text-decoration: none;
-	}
+	}*/
 
 	.choose-inline>.item>ul>li>a {
 		color: #666666;
@@ -265,15 +269,22 @@
 		margin-top:	0;
 		cursor: pointer;
 	}
+	.roleForm .modal-body .form-group >label {
+		font-weight: bold;
+	}
+	.modal-footer {
+		padding-top: 0;
+		text-align: center;
+		border: none;
+	}
 </style>
 
 <div class="modal-header">
 	<h3 class="modal-title">
-		<i class="fa fa-user fa-fw text-default"></i><span
-			ng-bind="role.id?'编辑角色':'添加自定义角色'"></span>
+		<span ng-bind="role.id?'编辑角色':'添加自定义角色'"></span>
 	</h3>
 </div>
-<form name="roleForm" novalidate ng-submit="save()">
+<form name="roleForm" class="roleForm" novalidate ng-submit="save()">
 	<div class="modal-body">
 		<div class="form-group">
 			<label>角色名称</label> <input type="text" name="desc"
@@ -298,10 +309,7 @@
 		</div>
 		<div class="form-group role-resources" ng-if="role.issys != 1">
 			<label>权限分配</label>
-			<p class="help-block">
-				给角色分配允许操作的资源<span class="pull-right"><input type="checkbox"
-					checked="checked" disabled>勾选表示允许操作</span>
-			</p>
+			<p class="help-block">给角色分配允许操作的资源</p>
 			<div>
 				<div class="choose-inline">
 					<div class="item">
@@ -325,9 +333,6 @@
 		</div>
 	</div>
 	<div class="modal-footer" ng-if="role.issys != 1">
-		<p class="pull-left text-muted" ng-show="role.isdefault == 1">
-			<i class="fa fa-fw fa-warning"></i>默认角色不允许删除，只能修改权限分配
-		</p>
 		<button class="btn btn-primary" type="submit"
 			ng-disabled="roleForm.$invalid || !isChanged(role)">确认</button>
 		<button class="btn btn-default" type="button"