样式微调

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

@@ -5,70 +5,76 @@
 		margin-left:60px;
 		width:450px;
 	}
+	.add-register-user .modal-header .modal-title {
+		height: 40px;
+		line-height: 40px;
+	}
 </style>
 
-<div class="modal-header">
-	<div class="row">
-		<h3 class="modal-title">
-			&nbsp;&nbsp;&nbsp;
-			<i class="fa fa-user-plus fa-fw"></i>&nbsp;添加已注册用户
-		 	<button style=" padding-right:20px; " type="button" class="close" data-dismiss="alert" ng-click="cancel()" aria-label="Close">
-		 		<span aria-hidden="true">&times;</span>
-		 	</button>
-	 	</h3>
-	 </div>
-</div>
+<div class="add-register-user">
+	<div class="modal-header">
+		<div class="row">
+			<h3 class="modal-title">
+				添加已注册用户
+				<button style="position: absolute;right: 7px;top: 7px;" type="button" class="close" data-dismiss="alert" ng-click="cancel()" aria-label="Close">
+					<span aria-hidden="true">&times;</span>
+				</button>
+			</h3>
+		</div>
+	</div>
 
-<div class="modal-body">
-	<form class="form-inline" name="searchForm">
-		<div class="form-group" style="padding-left:60px;padding-top: 15px;">
-			<label>查找用户：</label>
-			 <input
-				style="width: 300px;" type="text" class="form-control"
-				ng-model="keyWord" placeholder="请输入UU号、手机号或邮箱" required/> <span> <a
-				class="btn btn-default" ng-click="searchUser(keyWord)" ng-disabled="searchForm.$invalid"> <i class="fa fa-search"></i> 查找
+	<div class="modal-body">
+		<form class="form-inline" name="searchForm">
+			<div class="form-group" style="padding-left:60px;padding-top: 15px;">
+				<label>查找用户：</label>
+				<input
+						style="width: 300px;" type="text" class="form-control"
+						ng-model="keyWord" placeholder="请输入UU号、手机号或邮箱" required/> <span> <a
+					class="btn btn-default" ng-click="searchUser(keyWord)" ng-disabled="searchForm.$invalid"> <i class="fa fa-search"></i> 查找
 			</a>
 			</span>
+			</div>
+		</form>
+
+		<div ng-show="searching&&searchSuccess">
+			<table class="table table-bordered table-striped userinfo">
+				<tr>
+					<td>UU：</td>
+					<td>{{user.userUU}}</td>
+				</tr>
+				<tr>
+					<td>姓名：</td>
+					<td>{{user.userName}}</td>
+				</tr>
+				<tr>
+					<td>性别：</td>
+					<td>{{user.userSex == 'M' ? '男' : '女'}}</td>
+				</tr>
+				<tr>
+					<td>电话：</td>
+					<td>{{user.userTel}}</td>
+				</tr>
+				<tr>
+					<td>邮箱：</td>
+					<td>{{user.userEmail}}</td>
+				</tr>
+			</table>
+		</div>
+		<div ng-show="searching && searchFailed" align="center" style="color:red; margin-top:20px;">
+			<span>您查找的用户不存在！</span>
+		</div>
+		<div ng-show="searching && reBindError" align="center" style="color:red; margin-top:20px;">
+			<span>该用户已绑定到当前企业，不可重复绑定！</span>
+		</div>
+		<div ng-show="searching && illegalError" align="center" style="color:red; margin-top:20px;">
+			<span>不可对自己进行绑定！</span>
 		</div>
-	</form>
-	
-	<div ng-show="searching&&searchSuccess">
-		<table class="table table-bordered table-striped userinfo">  
-			<tr>
-				<td>UU：</td>
-				<td>{{user.userUU}}</td>
-			</tr>
-			<tr>
-				<td>姓名：</td>
-				<td>{{user.userName}}</td>
-			</tr>
-			<tr>
-				<td>性别：</td>
-				<td>{{user.userSex == 'M' ? '男' : '女'}}</td>
-			</tr>
-			<tr>
-				<td>电话：</td>
-				<td>{{user.userTel}}</td>
-			</tr>
-			<tr>
-				<td>邮箱：</td>
-				<td>{{user.userEmail}}</td>
-			</tr>
-		</table>
-	</div>
-	<div ng-show="searching && searchFailed" align="center" style="color:red; margin-top:20px;">
-		<span>您查找的用户不存在！</span>
-	</div>
-	<div ng-show="searching && reBindError" align="center" style="color:red; margin-top:20px;">
-		<span>该用户已绑定到当前企业，不可重复绑定！</span>
 	</div>
-	<div ng-show="searching && illegalError" align="center" style="color:red; margin-top:20px;">
-		<span>不可对自己进行绑定！</span>
+
+	<div class="modal-footer">
+		<button class="btn btn-primary" ng-disabled="okDisabled" ng-show="searchSuccess" ng-click="ok()">确认绑定</button>
+		<button class="btn btn-warning" ng-click="cancel()" type="button">取消</button>
 	</div>
 </div>
 
-<div class="modal-footer">
-	<button class="btn btn-primary" ng-disabled="okDisabled" ng-show="searchSuccess" ng-click="ok()">确认绑定</button>
-	<button class="btn btn-warning" ng-click="cancel()" type="button">取消</button>
-</div>
 

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

@@ -452,6 +452,7 @@
         vertical-align: middle;
         margin-right: 50px;
         margin-bottom: 20px;
+        border-radius: 3px;
     }
     .role-manage .default-role-box p {
         text-align: center;
@@ -471,7 +472,6 @@
         display: block;
     }
     .role-manage .define-role-area {
-        padding: 0 9px;
         margin-bottom: 28px;
     }
     .role-manage .define-role-area .add-role-box {
@@ -911,12 +911,12 @@
                             <p>{{role.desc}}</p>
                             <span>{{role.duty}}</span>
                         </div>
-                    </div>
-                    <div class="add-role-box default-role-box" ng-click="editRole()">
-                        <i>+</i>
-                        <div>
-                            <p>新增自定义角色</p>
-                            <span>某个角色的职责和默认角色差异较大时，可以自定义角色</span>
+                        <div class="add-role-box default-role-box" ng-click="editRole()">
+                            <i>+</i>
+                            <div>
+                                <p>新增自定义角色</p>
+                                <span>某个角色的职责和默认角色差异较大时，可以自定义角色</span>
+                            </div>
                         </div>
                     </div>
                 </div>

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

@@ -28,6 +28,7 @@
         margin-right: 6px;
         margin-bottom: 10px;
         position: relative;
+        border-radius: 3px;
     }
     .user-role-manage .default-role-box p {
         text-align: center;