huxz 9 лет назад
Родитель
Сommit
b7978eb216

+ 14 - 4
src/main/webapp/resources/view/admin/store_application_maintenance.html

@@ -22,9 +22,10 @@
 		text-align: right;
 	}
 	.record-stort{
-		line-height: 40px;
-		font-size: 14px;
+		line-height: 34px;
+		font-size: 12px;
 		margin-bottom: 0;
+		padding-right: 30px;
 	}
 	.record-stort em{
 		font-family: "Microsoft Yahei", "微软雅黑";
@@ -35,6 +36,7 @@
 	}
 	.menu .col-sm-8 ,.menu02 .col-sm-8{
 		padding: 0;
+		width: auto;
 	}
 	.menu{
 		width: 100%;
@@ -85,16 +87,21 @@
 	}
 	.menu .col-sm-3{
 		float: right;
-		margin-right: 4%;
+		margin-right: 100px;
+		width: 270px;
+		padding: 0;
 	}
 	.menu .sreach-input{
 		position: relative;
 		margin-top: 5px;
+		width: 270px;
+		height: 40px;
 	}
 	.menu .sreach-input .form-control{
 		height: 30px;
 		float: left;
 		border-radius: 0;
+		font-size: 12px;
 	}
 	.menu .sreach-input button{
 		width: 60px;
@@ -131,6 +138,9 @@
 		font-size: 12px;
 		border-radius: 2px;
 	}
+	.text-left{
+		text-align: left !important;
+	}
 	.application-tab table tbody tr .btn:hover{
 		background: #219ee6 ;
 	}
@@ -209,7 +219,7 @@
 			<tbody>
 			<tr ng-repeat="application in $data ">
 				<td ng-bind="$index + (applicationTableParams.page()-1 )* 10 + 1"></td>
-				<td ng-bind="application.storeName"></td>
+				<td ng-bind="application.storeName" class="text-left"></td>
 				<td ng-bind="application.storeShortName"></td>
 				<td ng-bind="application.type | storeType"></td>
 				<td>{{application.createTime | date: 'yyyy-MM-dd HH:mm:ss'}}</td>

+ 16 - 6
src/main/webapp/resources/view/admin/store_info_list.html

@@ -11,6 +11,7 @@
 	/*切换导航*/
 	.menu .col-sm-8{
 		padding: 0;
+		width: auto;
 	}
 	.menu{
 		width: 100%;
@@ -46,16 +47,21 @@
 	}
 	.menu .col-sm-3{
 		float: right;
-		margin-right: 4%;
+		margin-right: 100px;
+		width: 270px;
+		padding: 0;
 	}
 	.menu .sreach-input{
 		position: relative;
 		margin-top: 5px;
+		width: 270px;
+		height: 40px;
 	}
 	.menu .sreach-input .form-control{
 		height: 30px;
 		float: left;
 		border-radius: 0;
+		font-size: 12px;
 	}
 	.menu .sreach-input button{
 		width: 60px;
@@ -77,9 +83,10 @@
 		text-align: right;
 	}
 	.record-stort{
-		line-height: 40px;
-		font-size: 14px;
+		line-height: 34px;
+		font-size: 12px;
 		margin-bottom: 0;
+		padding-right: 30px;
 	}
 	.record-stort em{
 		font-family: "Microsoft Yahei", "微软雅黑";
@@ -119,6 +126,9 @@
 		font-size: 12px;
 		border-radius: 2px;
 	}
+	.text-left{
+		text-align: left !important;
+	}
 	.application-tab table tbody tr .btn:hover{
 		background: #219ee6 ;
 	}
@@ -215,8 +225,8 @@
 			<thead>
 			<tr>
 				<th width="140">店铺编号</th>
-				<th width="220">公司名称</th>
-				<th width="220">类型</th>
+				<th width="300">公司名称</th>
+				<th width="120">类型</th>
 				<th width="220">
 					<p ng-click="changeShorting()" style="margin: 0;">创建时间
 						<i class="fa fa-long-arrow-up" ng-if="isShow === 'ALL' || isShow == 'UP'"></i>
@@ -239,7 +249,7 @@
 			<tbody>
 			<tr ng-repeat="store in $data">
 				<td><a ng-href="{{'store/' + store.uuid}}" target="_blank"><span ng-bind="store.id | storeId"></span></a></td>
-				<td><span ng-bind="store.enterprise && store.enterprise.enName && store.enterprise.enName !== '' ? store.enterprise.enName : '暂无公司名称'"></span></td>
+				<td class="text-left"><span ng-bind="store.enterprise && store.enterprise.enName && store.enterprise.enName !== '' ? store.enterprise.enName : '暂无公司名称'"></span></td>
 				<td><span ng-bind="store.type | storeType"></span></td>
 				<td><span ng-bind="store.createTime | date : 'yyyy-MM-dd HH:mm:ss'"></span></td>
 				<td><span ng-bind="store.updateTime | date : 'yyyy-MM-dd HH:mm:ss'"></span></td>