企业圈修改样式。

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@10491 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/webapp/resources/css/index.css

@@ -1709,7 +1709,7 @@ ul>li.item-link>a {
 }
 
 .form-group.form-group-sm {
-	margin-bottom: 10px
+	/*margin-bottom: 10px*/
 }
 
 .form-group .form-group {
@@ -4108,7 +4108,8 @@ input[required]:invalid, input:focus:invalid, textarea[required]:invalid, textar
 	right: 0;
 }
 .form-input.search-bg{
-	margin-top: 15px;
+	margin-top: 20px;
+	margin-bottom: 15px;
 }
 .filter-list{
 	height: 30px;

src/main/webapp/resources/tpl/index/baseInfo/customersInfo.html

@@ -98,6 +98,20 @@
 	margin-left: 0;
 	line-height: 30px;
 }
+.order-table .company-list tr .first{
+	border-bottom: #e8e8e8 1px solid;
+}
+#customer-tab tbody tr.height16{
+	height: 16px;
+	border-left: #f5f5f5 2px solid;
+	border-right: #f5f5f5 2px solid;
+}
+#customer-tab tbody tr.height16 td{
+	background: #f5f5f5;
+}
+#myquest-public .customer-tab tbody{
+	border-bottom: none;
+}
 </style>
 <div style="margin-left: -240px; width: 1170px; background: #fff;" id="myquest-public">
 <div ng-include src="'static/tpl/index/baseInfo/vendorAndCustomer.html'"></div>
@@ -176,6 +190,9 @@
 							<a ng-if="vendor.vendswitch == 1" ng-click="purcByEn(vendor.vendorEnterprise.enBussinessCode)" class="btn02">下采购单</a>
 						</td>
 					</tr>
+					<tr class="height16">
+						<td colspan="5"></td>
+					</tr>
 			</tbody>
 			<tbody ng-if="customerParams.total() == 0" class="no-record-tab">
 				<tr>

src/main/webapp/resources/tpl/index/baseInfo/invitation.html

@@ -104,6 +104,20 @@
 #myquest-public  .all-btn a{
 	margin-left: 0;
 }
+.order-table .company-list tr .first{
+	border-bottom: #e8e8e8 1px solid;
+}
+#customer-tab tbody tr.height16{
+	height: 16px;
+	border-left: #f5f5f5 2px solid;
+	border-right: #f5f5f5 2px solid;
+}
+#customer-tab tbody tr.height16 td{
+	background: #f5f5f5;
+}
+#myquest-public .customer-tab tbody{
+	border-bottom: none;
+}
 </style>
 <div style="margin-left: -240px; width: 1170px; background: #fff;" id="myquest-public">
 <div ng-include src="'static/tpl/index/baseInfo/addPartnerAndRecord.html'"></div>
@@ -162,6 +176,9 @@
 							<a ng-click="reInvite(record.id)" class="btn" ng-if="record.active == 0" style="padding: 0; background: #327ebe; color: #fff;">再次邀请</a>
 						</td>
 					</tr>
+					<tr class="height16">
+						<td colspan="5"></td>
+					</tr>
 			</tbody>
 			<tbody ng-if="tableParams.total() == 0" class="no-record-tab">
 				<tr>

src/main/webapp/resources/tpl/index/baseInfo/myRequest.html

@@ -192,7 +192,8 @@
 	padding: 0;
 }
 .view-slide-in .search-bg {
-	margin-top: 15px;
+	margin-top: 10px;
+	margin-bottom: 15px;
 }
 #topSearch {
 	font-size: 18px;
@@ -315,6 +316,23 @@
 		margin-left: 0;
 		line-height: 32px;
 	}
+.order-table .company-list tr .first{
+	border-bottom: #e8e8e8 1px solid;
+}
+.order-table>tbody{
+	border-bottom: none !important;
+}
+.order-table>tbody .height16{
+	height: 16px;
+	border-left: #f5f5f5 2px solid;
+	border-right: #f5f5f5 2px solid;
+}
+.order-table>tbody .height16 td{
+	background: #f5f5f5;
+}
+.ng-table-pager{
+	/*background: #f5f5f5;*/
+}
 </style>
 <div class="block" style="margin-left: -240px; width: 1170px;" id="myquest-public">
 <div class="loading in" ng-class="{'in': loading}">
@@ -387,6 +405,9 @@
 				</p>
 			</td>
 		</tr>
+		<tr class="height16">
+			<td colspan="5"></td>
+		</tr>
 	</tbody>
 	<tbody ng-if="tableParams.total() == 0" class="no-record-tab">
 		<tr>

src/main/webapp/resources/tpl/index/baseInfo/newPartner.html

@@ -196,7 +196,7 @@
         padding: 0;
     }
     .view-slide-in .search-bg {
-        margin-top: 15px;
+        margin-top: 10px;
     }
     #topSearch {
         font-size: 18px;
@@ -317,6 +317,20 @@
     .order-table .company-list, .order-table .order-hd:first-child{
         border-top:#e8e8e8 1px solid;
     }
+    .order-table .company-list tr .first{
+        border-bottom: #e8e8e8 1px solid;
+    }
+    .order-table>tbody{
+        border-bottom: none !important;
+    }
+    .order-table>tbody .height16{
+        height: 16px;
+        border-left: #f5f5f5 2px solid;
+        border-right: #f5f5f5 2px solid;
+    }
+    .order-table>tbody .height16 td{
+        background: #f5f5f5;
+    }
 </style>
 <div class="block" style="margin-left: -240px; width: 1170px;" id="myquest-public">
     <div class="loading in" ng-class="{'in': loading}">
@@ -349,12 +363,16 @@
             </td>
         </tr>
         <tr class="height72 order-hd" ng-dblclick="order.$collapsed=!order.$collapsed" ng-class="{'text-bold': order.display>0}">
-            <td class="first" colspan="3">
+            <td class="first" colspan="4">
                 <div class="row">
                     <div class="col-md-3"><span class="text-muted">营业执照：</span><span ng-bind="::request.vendUID"></span></div>
                     <div class="col-md-3"><span class="text-muted">法定代表人：</span><span ng-bind="::request.enterprise.enCorporation"></span></div>
                     <div class="col-md-4"><span class="text-muted">企业UU：</span><span ng-bind="::request.enterprise.uu"></span></div>
                 </div>
+                <span class="text-icon" ng-if="request.statusCode==313 && request.method == 1">已通过</span>
+                <span class="text-icon" ng-if="request.statusCode==310 && request.method==1">未通过</span>
+                <span class="text-icon" ng-if="request.statusCode==313 && request.method == 0">已同意</span>
+                <span class="text-icon" ng-if="request.statusCode==310 && request.method==0">已拒绝</span>
                 <div class="row">
                     <div class="col-md-3"><span class="text-muted">联系人：</span><span ng-bind="::request.contact.userName"></span></div>
                     <div class="col-md-3"><span class="text-muted">联系电话：</span><span ng-bind="::request.contact.userTel"></span></div>
@@ -362,11 +380,6 @@
                 </div>
                 <div class="row col-md-12"><span class="text-muted">企业地址：</span><span ng-bind="::request.enterprise.enAddress"></span></div>
             </td>
-            <td>
-                <span class="text-icon" ng-if="request.statusCode==313 && request.method == 1">已通过</span>
-                <span class="text-icon" ng-if="request.statusCode==310 && request.method==1">未通过</span>
-                <span class="text-icon" ng-if="request.statusCode==313 && request.method == 0">已同意</span>
-                <span class="text-icon" ng-if="request.statusCode==310 && request.method==0">已拒绝</span>
             <td width="140" class="text-center">
               <p ng-if="request.statusCode==313 && request.vendor == 0"><a class="btn label-success white" ng-click="addSupplier(request.vendUID)">添加供应商 </a></p>
                 <p class="switch"  ng-if="request.statusCode==313 && request.vendor == 1">
@@ -400,6 +413,9 @@
                 <p ng-if="request.statusCode==310 && request.method==0"><span class="btn01 btn label-danger white" >已拒绝</span></p>
             </td>
         </tr>
+        <tr class="height16">
+            <td colspan="5"></td>
+        </tr>
         </tbody>
         <tbody ng-if="tableParams.total() == 0" class="no-record-tab">
         <tr>

src/main/webapp/resources/tpl/index/baseInfo/searchresult.html

@@ -178,7 +178,7 @@
 	padding: 0;
 }
 .view-slide-in .search-bg{
-	margin-top: 15px;
+	margin-top: 20px;
 	margin-bottom: 15px;
 }
 #topSearch{
@@ -216,7 +216,7 @@
 	border-bottom: #ddd 1px solid;
 }
 .enterprise-table .company-list,.enterprise-table .enterprise-bd{
-	border-bottom: #f5f5f5 20px solid;
+	/*border-bottom: #f5f5f5 20px solid;*/
 }
 .enterprise-table .enterprise-hd span:first-child{
 	margin-left: 20px;
@@ -290,6 +290,17 @@
 .enterprise-table .company-list, .enterprise-table .enterprise-hd{
 	border-top:#e8e8e8 1px solid;
 }
+.enterprise-table .company-list .product{
+	border-bottom: #e8e8e8 1px solid;
+}
+.enterprise-table .company-list .height16{
+	height: 16px;
+	border-left: #f5f5f5 2px solid;
+	border-right: #f5f5f5 2px solid;
+}
+.enterprise-table .company-list .height16 td{
+	background: #f5f5f5;
+}
 </style>
 <div class="block" style="margin-left: -240px; width: 1170px;border: #e8e8e8 1px solid;border-top: none;">
 <div class="loading in" ng-class="{'in': loading}">
@@ -367,6 +378,9 @@
 				<p class="line24" ng-if="enterprise.requestStatus==313"><span class="btn btn-primary" ng-click="view(enterprise.name)" >立即查看</span></p>
 			</td>
 		</tr>
+		<tr class="height16">
+			<td colspan="5"></td>
+		</tr>
 	</tbody>
 	<tbody ng-if="tableParams.total() == 0" class="no-record-tab">
 		<tr>

src/main/webapp/resources/tpl/index/baseInfo/vendorsInfo.html

@@ -115,6 +115,20 @@
 	margin-left: 0px;
 	line-height: 30px;
 }
+.order-table .company-list tr .first{
+	border-bottom: #e8e8e8 1px solid;
+}
+#customer-tab tbody tr.height16{
+	height: 16px;
+	border-left: #f5f5f5 2px solid;
+	border-right: #f5f5f5 2px solid;
+}
+#customer-tab tbody tr.height16 td{
+	background: #f5f5f5;
+}
+#myquest-public .customer-tab tbody{
+	border-bottom: none;
+}
 </style>
 <div style="margin-left: -240px; width: 1170px; background: #fff;" id="myquest-public">
 <div ng-include src="'static/tpl/index/baseInfo/vendorAndCustomer.html'"></div>
@@ -195,6 +209,9 @@
 							<a ng-if="vendor.vendswitch == 1" ng-click="purcByEn(vendor.vendorEnterprise.enBussinessCode)" class="btn02">下采购单</a>
 						</td>
 					</tr>
+					<tr class="height16">
+						<td colspan="5"></td>
+					</tr>
 			</tbody>
 			<tbody ng-if="customerParams.total() == 0" class="no-record-tab">
 				<tr>