1、公共询价、招标详情调整，加入录入人、时间等信息。

2、统一导航处背景图片。
3、底部二维码、联系方式等居中显示。

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

src/main/webapp/WEB-INF/views/normal/index.html

@@ -176,8 +176,8 @@
 	<!-- footer Start -->
 	<div class="navbar navbar-static-bottom" id="footer">
 		<div class="container">
-			<div class="row">
-				<div class="col-sm-3 col-sm-offset-2">
+			<div class="row" style="margin-top: 15px;">
+				<div class="col-sm-3 margin-left">
 					<div class="qrcode qrcode-uu">
 						<div class="qrcode-img pull-left">
 							<img src="static/img/qrcode/UU-Qr-Code.png" width="100px" height="100px"

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

@@ -2625,6 +2625,10 @@ input.ng-invalid.ng-dirty,textarea.ng-invalid.ng-dirty {
 	float: right;
 	bottom: 50px;
 	position: relative;
+	right: 90px;
+}
+#footer .margin-left{
+	margin-left: 8%;
 }
 .back-home:hover{
 	background: #3a89d1;

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

@@ -252,25 +252,25 @@ input[type="radio"], input[type="checkbox"] {
 }
 
 .tender-content>div>div.btn-publish>button {
-	background-color: #FF2E2F;
-	width: 150px;
-	height: 60px;
-	font-size: 16px;
+	background-color: #327ebe;
+	width: 90px;
+	height: 30px;
+	font-size: 14px;
 	color: #fff;
-	border-radius: 0;
+	border-radius: 4px;
 }
 
 .tender-content>div>div.btn-disabled>button {
-	background-color: #999;
-	width: 150px;
-	height: 60px;
-	font-size: 16px;
+    background-color: #327ebe;
+	width: 90px;
+	height: 30px;
+	font-size: 14px;
 	color: #fff;
-	border-radius: 0;
+	border-radius: 4px;
 }
 
 .tender-content>div>div.a-detail {
-	margin-top: 40px;
+	/*margin-top: 40px;*/
 }
 
 .tender-content>div>div.a-detail>a {
@@ -493,16 +493,34 @@ input[type="radio"], input[type="checkbox"] {
 	font-size: 14px;
 	padding-left: 15px;
 }
+   .purc-tender .col-xs-4 div:last-child{
+       color: #969595;
+   }
+    .p-right em{
+        font-style: normal;
+    }
+    .p-right .fr{
+        font-size: 14px;
+        color: #959595;
+        margin-right: 20px;
+    }
+    .p-right span.fr em {
+        margin-right: 50px;
+        font-size: 14px;
+    }
 </style>
 
 <div class="ng-scope" style="width: 1170px; margin-left: -240px;">
     <form name="tenderForm">
         <div class="purc-tender">
-            <div class="condition block" id="resultTop">
-                <strong>|&nbsp;&nbsp;&nbsp;公共询价单</strong>
+            <div class="pub-com_head">
+                <span>公共询价单</span>
+                <div class="p-right">
+                    <span class="fr"><em class="ng-binding">录入人：{{::inquiryItem.inquiry.recorder}}</em><time class="ng-binding">日期：{{::inquiryItem.inquiry.date | date :'yyyy-MM-dd HH:mm'}}</time></span>
+                </div>
             </div>
             <div class="tender-content ng-scope">
-                <div class="title-div" style="border-bottom: 1px dashed #327ebe;">
+                <div class="title-div" style="border-bottom: 1px dotted #327ebe;">
                     <span>询价信息</span>&nbsp;
                     <span style="color: rgb(211,37,38);">*</span>
                 </div>
@@ -537,7 +555,7 @@ input[type="radio"], input[type="checkbox"] {
                         <div ng-if="inquiryItem.inquiry.attachs == 0">无</div>
                     </div>
                 </div>
-				<div class="title-div" style="border-bottom: 1px dashed #327ebe;">
+				<div class="title-div" style="border-bottom: 1px dotted #327ebe;">
                     <span>物料信息</span>&nbsp;
                     <span style="color: rgb(211,37,38);">*</span>
                 </div>
@@ -554,7 +572,7 @@ input[type="radio"], input[type="checkbox"] {
                         <div class="tender-desc">物料品牌：</div>
                         <div ng-bind="::inquiryItem.product.brand"></div>
                     </div>
-                    <div class = "col-xs-12">
+                    <div class = "col-xs-4">
                         <div class="tender-desc">物料规格</div>
                         <div ng-bind="::inquiryItem.product.spec"></div>
                     </div>
@@ -571,7 +589,7 @@ input[type="radio"], input[type="checkbox"] {
                         <div ng-bind="::inquiryItem.toDate| date:'yyyy-MM-dd'"></div>
                     </div> -->
                 </div>
-                <div class="col-xs-12" style="padding: 30px;">
+                <div class="col-xs-12" style="padding: 50px 0;">
                     <div ng-show="!currentHasBid" class="col-xs-2 pull-right btn-publish">
                         <button class="btn" ng-click="transtoInquiry(inquiryItem.id)" ng-disabled="enterprise.uu == inquiryItem.inquiry.enterprise.uu || nowdate > inquiryItem.toDate" ng-hide="inquiryItem.overdue == 1" title="如果询价单已过期，将无法进入报价">我要报价</button>
                     </div>

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

@@ -139,8 +139,8 @@
     <!--<form name="tenderForm">-->
         <div class="purc-tender" id="tender-list">
             <div class="tender-label list-unstyled">
-                <div class="condition block" id="resultTop">
-                    <strong>|&nbsp;&nbsp;&nbsp;公共询价</strong>
+                <div class="pub-com_head">
+                    <span>公共询价</span>
                 </div>
                 <div class="tender-list-content">
                     <div class="container">

src/main/webapp/resources/tpl/index/sale/open_tender_detail.html

@@ -237,25 +237,24 @@
         border-radius: 0;
     }
     .tender-content>div>div.btn-publish>button {
-        background-color: #FF2E2F;
-        width: 150px;
-        height: 60px;
-        font-size: 16px;
+        background-color: #327ebe;
+        width: 90px;
+        height: 30px;
+        font-size: 14px;
         color: #fff;
-        border-radius: 0;
+        border-radius: 4px;
     }
 
     .tender-content>div>div.btn-disabled>button {
-        background-color: #999;
-        width: 150px;
-        height: 60px;
-        font-size: 16px;
+        background-color: #327ebe;
+        width: 90px;
+        height: 30px;
+        font-size: 14px;
         color: #fff;
-        border-radius: 0;
+        border-radius: 4px;
     }
-
     .tender-content>div>div.a-detail {
-        margin-top: 40px;
+       /* margin-top: 40px;*/
     }
 
     .tender-content>div>div.a-detail>a {
@@ -339,16 +338,34 @@
         font-size: 14px;
         padding-left: 15px;
     }
+    .purc-tender .col-xs-4 div:last-child,.purc-tender .col-xs-8 div:last-child{
+        color: #969595;
+    }
+    .p-right em{
+        font-style: normal;
+    }
+    .p-right .fr{
+        font-size: 14px;
+        color: #959595;
+        margin-right: 20px;
+    }
+    .p-right span.fr em {
+        margin-right: 50px;
+        font-size: 14px;
+    }
 </style>
 
 <div class="ng-scope" style="width: 1170px; margin-left: -240px;">
     <form name="tenderForm">
         <div class="purc-tender">
-            <div class="condition block" id="resultTop">
-                <strong>|&nbsp;&nbsp;&nbsp;公开招标单</strong>
+            <div class="pub-com_head">
+                <span>公开招标单</span>
+                <div class="p-right">
+                    <span class="fr"><em class="ng-binding">录入人：{{::tender.user}}</em><time class="ng-binding">日期：{{::tender.date | date :'yyyy-MM-dd HH:mm'}}</time></span>
+                </div>
             </div>
             <div class="tender-content ng-scope" ng-controller="OpenSaleTenderDetailCtrl">
-                <div class="title-div" style="border-bottom: 1px dashed #327ebe;">
+                <div class="title-div" style="border-bottom: 1px dotted #327ebe;">
                     <span>招标信息</span>&nbsp;
                     <span style="color: rgb(211,37,38);">*</span>
                 </div>
@@ -420,7 +437,7 @@
                         </div>
                     </div>
                 </div>
-                <div  class="title-div" style="border-bottom: 1px dashed #327ebe; margin-bottom: 15px;">
+                <div  class="title-div" style="border-bottom: 1px dotted #327ebe; margin-bottom: 15px;">
                     <span>招标要求</span>
                 </div>
                 <!--<div class="row vend-info">
@@ -531,11 +548,11 @@
                         </div>
                         <div class="col-xs-12">
                             <div class="tender-desc">收货地址：</div>
-                            <div ng-bind="tender.shipAddress"></div>
+                            <div ng-bind="tender.shipAddress" style="color: #959595;"></div>
                             </span>
                         </div>
                 </div>
-                <div class="col-xs-12" style="padding: 30px;">
+                <div class="col-xs-12" style="padding: 50px 0;">
                     <div ng-show="!currentHasBid" class="col-xs-2 pull-right btn-publish">
                         <button class="btn" ng-click="iWantToBid(tender.id)" ng-disabled="hasClick" ng-hide="tender.overdue == 1" title="如果招标单已过期，将无法进入投标">我要投标</button>
                     </div>

src/main/webapp/resources/tpl/index/sale/open_tender_list.html

@@ -195,8 +195,8 @@
     <!--<form name="tenderForm">-->
         <div class="purc-tender" id="tender-list" ng-controller="SaleOpenTenderCtrl">
             <div class="tender-label list-unstyled">
-                <div class="condition block" id="resultTop">
-                    <strong>|&nbsp;&nbsp;&nbsp;公共招标</strong>
+                <div class="pub-com_head">
+                    <span>公共招标</span>
                 </div>
                 <div class="tender-list-content">
                     <div class="container">

src/main/webapp/resources/tpl/index/search/search_result.html

@@ -148,12 +148,14 @@
 }
 
 #resultTop {
-	margin-top: -10px;
-	border-radius: 0px 20px 0px 0px;
-	box-shadow: 0 0 3px #ccc;
-	background: linear-gradient(to top, #e7e7e7 0%,#ffffff 100%);
+	width: 100%;
 	height: 40px;
+	line-height: 44px;
+	background: url(static/img/approvalFlow/comm_bg01.png) no-repeat left;
+	background-color: #f5f5f5;
+	background-size: 100% 100%;
 	font-size: 14px;
+	padding: 0 25px 0 30px;
 }
 
 .tip-body {
@@ -236,7 +238,7 @@
 		<i></i>
 	</div>
 	<div class="condition block open01" id="resultTop">
-		<strong class="f14" style="font-weight: bold;">| 企业信息 （<span class="f14 text-inverse" ng-bind="total"></span>）</strong>
+		<strong class="f14" style="font-weight: bold;">企业信息 （<span class="f14 text-inverse" ng-bind="total"></span>）</strong>
 		<a href="javascript:void(0);" ng-click="$open01 = !$open01"><span ng-bind="$open01 ? '展开':'收起'"></span><i class="fa fa-angle-down" ng-class="{'fa-angle-down':$open01, 'fa-angle-up': !$open01}"></i></a>
 	</div>
 	<div class="tab01" ng-class="{'active': $open01}">
@@ -302,7 +304,7 @@
 		<i></i>
 	</div>
 	<div class="condition block open02" id="resultTop">
-		<strong>| 产品信息 （<span class="text-inverse" ng-bind="prodtotal"></span>）</strong>
+		<strong>产品信息 （<span class="text-inverse" ng-bind="prodtotal"></span>）</strong>
 		<a href="javascript:void(0);" ng-click="$open02 = !$open02"><span ng-bind="$open02 ? '展开':'收起'"></span><i class="fa fa-angle-down" ng-class="{'fa-angle-down':$open02, 'fa-angle-up': !$open02}"></i></a>
 	</div>
 	<div class="tab02" ng-class="{'active': $open02}">

src/main/webapp/resources/tpl/start/index.html

@@ -66,7 +66,7 @@
 <div class="navbar navbar-static-bottom" id="footer">
     <div class="container">
         <div class="row">
-            <div class="col-sm-3 col-sm-offset-2">
+            <div class="col-sm-3 margin-left">
                 <div class="qrcode qrcode-uu">
                     <div class="qrcode-img pull-left">
                         <img src="../../img/qrcode/UU-Qr-Code.png" width="100px" height="100px"