1 file committed: 1、代采订单详情增加品牌信息。

2、招标、询价、代采订单、采购订单（新增统一改为图标加文字显示）

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

src/main/webapp/resources/tpl/index/purc/deputyOrder.html

@@ -179,10 +179,10 @@
             		            共<span class="text-num">{{total}}</span>
                     </div>-->
                 </div>
-                <div class="col-xs-2 pull-right" style="padding-left: 0;padding-right: 15px; border-left: 16px solid #f5f5f5;">
+                <div class="col-xs-2 pull-right" style="width: 140px;">
                     <a ui-sref="purc.newdeputy" type="button" title="新增代采订单" class="btn btn-tender">
-                        <img src="static/img/deputyOrder/caigou.png">
-                        <span class="f16" style="color: #327EBE;">代采订单</span>
+                        <img src="static/img/icon/add.png">
+                        <span class="f14" style="color: #5078cb;line-height: 25px;">代采订单</span>
                     </a>
                 </div>
             </div>

src/main/webapp/resources/tpl/index/purc/inquiry.html

@@ -280,6 +280,9 @@ margin-left: 55px;
 	float: left;
 	margin-left: 15px;
 }
+.inquiry-cz a img{
+	margin-right: 3px;
+}
 </style>
 <link rel="stylesheet" href="static/css/public.css">
 <div class="block" id="public">
@@ -288,7 +291,7 @@ margin-left: 55px;
 	</div>
 	<div class="menu condition block">
 		<div class="row">
-			<div class="col-xs-10">
+			<div class="col-xs-9">
 				<div class="btn-group btn-group-sm btn-group-justified">
 					<div class="btn-group btn-group-sm">
 						<button type="button" class="btn btn-default btn-line"
@@ -308,9 +311,9 @@ margin-left: 55px;
 					</div>
 				</div>
 			</div>
-			<div class="inquiry-cz col-xs-1">
-				<a id="add" ui-sref="purc.inquiry_unapply" title="待提交"><img src="static/img/icon/wait.png"/></a>
-				<a id="add" ui-sref="purc.inquiry_new" title="新增"><img src="static/img/icon/add.png"/></a>
+			<div class="inquiry-cz col-xs-2">
+				<a ui-sref="purc.inquiry_unapply" title="待提交"><img src="static/img/icon/wait.png"/>待提交</a>
+				<a ui-sref="purc.inquiry_new" title="新增询价单"><img src="static/img/icon/add.png"/>询价单</a>
 			</div>
 		</div>
 	</div>

src/main/webapp/resources/tpl/index/purc/order.html

@@ -137,13 +137,16 @@
 .buy-cart{
 	font-size: 14px;
 	padding: 0;
-	margin-left: 55px;
+	margin-left: 50px;
 }
 .buy-cart a{
 	color: #5078cb;
 	float: left;
 	margin-left: 15px;
 }
+.buy-cart a img{
+	margin-right: 3px;
+}
 </style>
 <link rel="stylesheet" href="static/css/public.css">
 <div class="block" id="public">
@@ -152,7 +155,7 @@
 </div>
 <div class="menu condition block">
 		<div class="row">
-			<div class="col-xs-10">
+			<div class="col-xs-9">
 				<div class="btn-group btn-group-sm btn-group-justified">
 					<div class="btn-group btn-group-sm">
 						<button type="button" class="btn btn-default btn-line"
@@ -176,9 +179,9 @@
 					</div>
 				</div>
 			</div>
-			<div class="buy-cart col-xs-1">
-				<a id="add" ui-sref="purc.newOrder" title="新增采购单"><img src="static/img/icon/add.png"/></a>
-				<a id="add" ui-sref="purc.cart" title="购物车"><img src="static/img/icon/cart.png"/></a>
+			<div class="buy-cart col-xs-2">
+				<a ui-sref="purc.newOrder" title="新增采购单"><img src="static/img/icon/add.png"/>采购单</a>
+				<a ui-sref="purc.cart" title="购物车"><img src="static/img/icon/cart.png"/>购物车</a>
 			</div>
 		</div>
 	</div>

src/main/webapp/resources/tpl/index/purc/tenderlist.html

@@ -181,11 +181,10 @@
                 <!--<div class="col-xs-2 toggle">
                     <a ng-click="condition.$open=!condition.$open" class="text-simple"><span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span><i class="fa fa-fw" ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i></a>
                 </div>-->
-                <div class="col-xs-2 pull-right"
-                     style="padding-left: 0;padding-right: 15px; border-left: 16px solid #f5f5f5;">
+                <div class="col-xs-2 pull-right" style="width: 125px;">
                     <a ui-sref="purc.tender" type="button" title="新增招标单" class="btn btn-tender">
-                        <img src="static/img/tender/zhaobiao.png">
-                        <span class="f16" style="color: #327EBE;">招标单</span>
+                        <img src="static/img/icon/add.png">
+                        <span class="f14" style="color: #5078cb; line-height: 25px;">招标单</span>
                     </a>
                 </div>
             </div>