|
|
@@ -160,7 +160,8 @@
|
|
|
color: #969595;
|
|
|
}
|
|
|
.base-info .form-control{
|
|
|
- height: 34px;
|
|
|
+ margin-top: 10px;
|
|
|
+ height: 36px;
|
|
|
border: #bfbfbf 1px solid;
|
|
|
font-size: 14px;
|
|
|
margin-left: 5px;
|
|
|
@@ -178,6 +179,26 @@
|
|
|
right: 100%;
|
|
|
left: inherit;
|
|
|
}
|
|
|
+.search .input-group-addon{
|
|
|
+ width: 70px;
|
|
|
+ height: 36px;
|
|
|
+ display: inline-block;
|
|
|
+ background: #327ebe;
|
|
|
+ font-size: 16px;
|
|
|
+ text-align: center;
|
|
|
+ line-height: 36px;
|
|
|
+ color: #fff;
|
|
|
+ padding: 0;
|
|
|
+ border: none;
|
|
|
+ border-radius: 0;
|
|
|
+ position: absolute;
|
|
|
+ top: 0;
|
|
|
+ right: -4px;
|
|
|
+}
|
|
|
+.search .col-xs-6{
|
|
|
+ width: 40%;
|
|
|
+ padding: 0;
|
|
|
+}
|
|
|
</style>
|
|
|
<div class="loading in" ng-class="{'in': loading}">
|
|
|
<i></i>
|
|
|
@@ -188,13 +209,14 @@
|
|
|
<span class="f14">我的个人资料</span>
|
|
|
<div class="pull-right">
|
|
|
<a ng-disabled="userForm.$invalid" class="text-simple text-success"
|
|
|
- ng-show="editing" ng-click="saveUser()"><i
|
|
|
- class="fa fa-save fa-fw"></i>保存修改</a> <a class="text-simple"
|
|
|
- ng-show="editing" ng-click="editing=false"><i
|
|
|
- class="fa fa-reply-all fa-fw"></i>取消编辑</a> <a class="text-simple"
|
|
|
- ng-show="!editing" ng-click="editing=true"><i
|
|
|
- class="fa fa-pencil fa-fw"></i>编辑</a> <a class="text-simple text-danger"
|
|
|
- ng-click="updatePassword()"><i class="fa fa-lock fa-fw"></i>修改密码</a>
|
|
|
+ ng-show="editing" ng-click="saveUser()">
|
|
|
+ <i class="fa fa-save fa-fw"></i>保存修改</a>
|
|
|
+ <a class="text-simple" ng-show="editing" ng-click="editing=false">
|
|
|
+ <i class="fa fa-reply-all fa-fw"></i>取消编辑</a>
|
|
|
+ <a class="text-simple" ng-show="!editing" ng-click="editing=true">
|
|
|
+ <i class="fa fa-pencil fa-fw"></i>编辑</a>
|
|
|
+ <a class="text-simple text-danger" ng-click="updatePassword()">
|
|
|
+ <i class="fa fa-lock fa-fw"></i>修改密码</a>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="pane-body" style="padding-left: 30px;">
|
|
|
@@ -354,9 +376,8 @@
|
|
|
</div>
|
|
|
<div class="pane-body" id="order-detail-list">
|
|
|
<form name="newUserForm">
|
|
|
- <table class="block table table-default table-striped"
|
|
|
- ng-table="tableParams">
|
|
|
- <div class="search">
|
|
|
+ <table class="block table table-default table-striped" ng-table="tableParams">
|
|
|
+ <div class="search col-xs-6" style="float: right;">
|
|
|
<div class="form-group form-group-sm has-feedback">
|
|
|
<input type="search" class="form-control input-sm" ng-model="keyword"
|
|
|
ng-search="onSearch(keyword)" placeholder="输入人员姓名、电话号码、邮箱或UU号进行搜索" style="width: 100%"/>
|
hejq