新增已注册用户模态框调整

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

@@ -1,13 +1,87 @@
 <!--添加已注册用户 ，即绑定用户到企业-->
 <style>
-	.userinfo{
-		margin-top:20px;
-		margin-left:60px;
-		width:450px;
+	.modal-content {
+		width: 484px;
+	}
+	.add-register-user {
+		width: 484px;
+	}
+	.add-register-user .modal-header {
+		padding: 9px 15px;
 	}
 	.add-register-user .modal-header .modal-title {
+		margin-left: 15px;
+	}
+	.add-register-user .modal-body {
+		padding-bottom: 0;
+	}
+	.add-register-user .modal-body .user-search-area {
+		padding-left:27px;
+		padding-top: 5px;
+	}
+	.add-register-user .modal-body .user-search-area input {
+		width: 270px;
+		height: 32px;
+		line-height: 32px;
+		border-radius: 0;
+	}
+	.add-register-user .modal-body .user-search-area .default-btn {
+		color: #fff;
+		background: #5078cb;
+		height: 32px;
+		line-height: 32px;
+		width: 58px;
+		display: inline-block;
+		text-align: center;
+		font-size: 14px;
+		float: right;
+		position: relative;
+		top: 3px;
+	}
+	.add-register-user .modal-body .search-result-area {
+		min-height:30px;
+	}
+	.add-register-user .modal-body .search-result-area .search-result-text {
+		color:#5078cb;
 		height: 40px;
 		line-height: 40px;
+		display: block;
+	}
+	.add-register-user .modal-footer {
+		padding: 10px 40px 10px 0;
+	}
+	.add-register-user .modal-footer button {
+		border-radius: 0;
+	}
+	.add-register-user .modal-footer button:nth-child(1) {
+		background: #5078cb;
+	}
+	.add-register-user .modal-footer button:nth-child(2) {
+		background: #c8c6c6;
+	}
+	.add-register-user .modal-footer button.cancel {
+		border: none;
+		width: 64px;
+		height: 28px;
+		line-height: 18px;
+	}
+	.add-register-user .modal-footer button.bind {
+		width: 90px;
+		height: 28px;
+		line-height: 18px;
+		border: none;
+		float: right;
+		margin-left: 10px;
+	}
+	table.userinfo{
+		margin: 20px 0 0 26px;
+		width: 403px;
+	}
+	table.userinfo >tbody >tr >td:first-child {
+		text-align: center;
+	}
+	table.userinfo >tbody >tr:nth-of-type(odd) {
+		background-color: #f9fbfe;
 	}
 </style>
 
@@ -25,55 +99,55 @@
 
 	<div class="modal-body">
 		<form class="form-inline" name="searchForm">
-			<div class="form-group" style="padding-left:60px;padding-top: 15px;">
+			<div class="form-group user-search-area">
 				<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>
+						type="text" class="form-control"
+						ng-model="keyWord" placeholder="请输入UU号、手机号或邮箱" required/>
+				<a class="default-btn" ng-click="searchUser(keyWord)" ng-disabled="searchForm.$invalid">搜索</a>
 			</div>
 		</form>
 
 		<div ng-show="searching&&searchSuccess">
 			<table class="table table-bordered table-striped userinfo">
 				<tr>
-					<td>UU：</td>
+					<td>UU账号</td>
 					<td>{{user.userUU}}</td>
 				</tr>
 				<tr>
-					<td>姓名：</td>
+					<td>姓名</td>
 					<td>{{user.userName}}</td>
 				</tr>
 				<tr>
-					<td>性别：</td>
+					<td>性别</td>
 					<td>{{user.userSex == 'M' ? '男' : '女'}}</td>
 				</tr>
 				<tr>
-					<td>电话：</td>
+					<td>电话</td>
 					<td>{{user.userTel}}</td>
 				</tr>
 				<tr>
-					<td>邮箱：</td>
+					<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="search-result-area">
+			<div class="search-result-text" ng-show="searching && searchFailed" align="center">
+				<span>您查找的用户不存在！</span>
+			</div>
+			<div class="search-result-text" ng-show="searching && reBindError" align="center">
+				<span>该用户已绑定到当前企业，不可重复绑定！</span>
+			</div>
+			<div class="search-result-text" ng-show="searching && illegalError" align="center">
+				<span>不可对自己进行绑定！</span>
+			</div>
 		</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>
+		<button class="btn btn-primary bind" ng-disabled="okDisabled" ng-if="searchSuccess" ng-click="ok()">确认绑定</button>
+		<button class="btn btn-warning cancel" ng-click="cancel()" type="button">取消</button>
 	</div>
 </div>
 

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

@@ -395,7 +395,7 @@
     .auth-info-header .searchUser-group >div {
         background: #fff;
         display: inline-block;
-        height: 32px;
+        height: 30px;
         margin-right: 5px;
         vertical-align: middle;
     }