Merge remote-tracking branch 'origin/feature-201832-wangcz' into feature-201832-wangcz

# Conflicts:
#	src/main/webapp/resources/view/vendor/b2b/sale/sale_accept.html
#	src/main/webapp/resources/view/vendor/b2b/sale/sale_badOut.html
#	src/main/webapp/resources/view/vendor/b2b/sale/sale_make_accept.html
#	src/main/webapp/resources/view/vendor/b2b/sale/sale_make_returns.html
#	src/main/webapp/resources/view/vendor/b2b/sale/sale_returns.html

src/main/webapp/resources/css/common.css

@@ -37,7 +37,7 @@ a:hover {
 }
 
 dl a:hover,li>a:hover,p>a:hover {
-	color: #f50
+	/*color: #f50;*/
 }
 
 /* IE10 viewport bug workaround */
@@ -1148,97 +1148,54 @@ select {
 }
 
 /* 页面的tab切换样式和搜索部分样式 */
+.com_tab {
+	height:40px;
+	margin-bottom: 10px;
+}
 
- .tab_top{
-	 height: 40px;
-	 margin-bottom:10px;
- }
-.tab_top ul{
+.com_tab {
+	height:40px;
+	margin-bottom: 10px;
+}
+.com_tab ul {
+	width: 100%;
 	margin: 0 auto;
-	height: 40px;
-	line-height: 40px;
+	height:40px;
+	line-height:40px;
 	background: #fff;
 }
-.tab_top ul li{
-	margin-left: 0;
+.com_tab ul li {
 	position: relative;
-	height: 40px;
+	height:40px;
 	text-align: center;
 	float: left;
 }
-.tab_top ul li a {
-	font-size: 14px;
-	height: 40px;
+.com_tab ul li > a {
 	min-width: 110px;
+	font-size: 14px;
+	height:40px;
 	padding: 0 20px;
 	display: inline-block;
 }
-.tab_top ul li.active a {
-	border-bottom: #fff;
+.com_tab ul li.active > a {
 	background: #5078cb;
-	color: #fff !important;
-}
-.tab_top ul li.active:after {
-	display:block;
-}
-.tab_top ul li::after {
-	background: url(../img/vendor/images/downicon.png);
-	width: 11px;
-	height: 6px;
-	position: absolute;
-	bottom: 0px;
-	left: 50%;
-	content: ' ';
-	margin-left: -5px;
-	display: none;
-}
-
-.oder01 ul {
-	border-bottom: 1px solid #f15601
-}
-.oder01 ul li {
-	margin-left: 10px;
-}
-
-.oder01 ul li a{
-	font-size: 13px;
-	font-weight: bold;
-	border-top: 3px solid #fff;
-	min-width: 110px;
-}
-.oder01 ul li:nth-child(1){
-	margin-left: 0px
-}
-.oder01 ul li.active a{
-	border-top: 3px solid #f15601;
-	border-left: 1px solid #f15601;
-	border-right: 1px solid #f15601;
-	border-bottom: 1px solid #fff;
-	/*padding: 0 8px;*/
-	color: #f15601!important;
-}
-.oder01 ul li a em{
-	color: #323232
+	color: #fff;
 }
-.oder01 ul li.active a em{
-	color: #f15601 !important;
+.com_tab ul li:hover > a {
+	color: #5078cb;
 }
-.oder01 ul li:hover a em {
-	color: #5078cb !important;
+.com_tab ul li:hover > a em {
+	color: #5078cb;
 }
-.oder01 ul li.active:hover a em {
-	color: #f15601 !important;
+.com_tab ul li.active:hover > a {
+	color: #fff;
 }
-
-.com_tab ul li {
-	margin-left: 0px;
-	position: relative;
-	min-width: 110px
+.com_tab ul li.active:hover > a em {
+	color: #fff;
 }
-.com_tab ul li > a {
-	min-width: 110px
+.com_tab ul li > a em {
+	color: #e64040;
 }
-
 .com_tab ul li::after{
 	background: url('../img/vendor/images/downicon.png');
 	width: 11px;
@@ -1253,22 +1210,36 @@ select {
 .com_tab ul li.active:after{
 	display: block
 }
-.com_tab ul li.active > a {
-	border-bottom: #fff;
-	background: #5078cb;
-	color: #fff;
-}
 .com_tab ul li.down-purchase {
 	float: right;
 	margin-right: 24px;
 	font-size: 14px;
 	color: #5078cb;
 }
-
 .com_tab ul li.down-purchase span:hover {
 	cursor: pointer;
 	text-decoration: underline;
 }
+.tab_top ul {
+	border-bottom: 1px solid #f15601
+}
+.tab_top ul li > a {
+	padding:0;
+	font-weight: bold;
+}
+.tab_top ul li.active > a{
+	background: #fff;
+	border-top: 3px solid #f15601;
+	border-left: 1px solid #f15601;
+	border-right: 1px solid #f15601;
+	border-bottom: 1px solid #fff;
+	color: #f15601!important;
+	line-height: 34px;
+}
+.tab_top ul li.active > a em{
+	color: #f15601 !important;
+}
+
 
 .screen{
 	background: #fff;
@@ -1390,102 +1361,6 @@ i.must {
 	display: inline-block;
 	vertical-align: middle;
 }
-/*卖家中心补充的样式*/
-.com_tab {
-	height:40px;
-	margin-bottom: 16px;
-}
-.com_tab ul {
-	width: 100%;
-	margin: 0 auto;
-	height:40px;
-	line-height:40px;
-	background: #fff;
-}
-.com_tab ul li {
-	height:40px;
-	text-align: center;
-	float: left;
-	margin-left: 25px;
-}
-.com_tab ul li > a {
-	font-size: 14px;
-	height:40px;
-	padding: 0 20px;
-	display: inline-block;
-}
-.com_tab ul li.active > a {
-	color: #f15601;
-	border-bottom: 3px #5078cb solid;
-}
-.com_tab ul li:hover > a {
-	color: #5078cb;
-	/*border-bottom: 3px #5078cb solid;*/
-}
-.com_tab ul li > a em {
-	color: #e64040;
-}
-.com_tab ul li.active a,.oder01 ul li.active a em {
-	color: #f15601;
-}
-
-.com_tab:nth-of-type(1) ul li{
-	margin-left: 0px;
-	position: relative;
-}
-.com_tab:nth-of-type(1) ul li.active > a{
-	border-bottom: #fff;
-	background: #5078cb;
-	color: #fff !important;
-}
-.com_tab:nth-of-type(1) ul li::after{
-	background: url('../img/vendor/images/downicon.png');
-	width: 11px;
-	height: 6px;
-	position: absolute;
-	bottom: 0px;
-	left: 50%;
-	content: ' ';
-	margin-left: -5px;
-	display: none;
-}
-.com_tab ul li.active::after{
-	display: block;
-}
-.com_tab:nth-of-type(1) ul li.active:hover > a{
-	color: #fff !important;
-}
-.com_tab:nth-of-type(2) ul li a {
-	color: #666 !important;
-}
-.com_tab:nth-of-type(2) ul li.active a,.com_tab:nth-of-type(2) ul li.active > a em{
-	color: #f15601 !important;
-}
-.com_tab:nth-of-type(2) ul li:hover a,.com_tab:nth-of-type(2) ul li:hover > a em{
-	color: #f15601 !important;
-}
-.com_tab:nth-of-type(2) ul li > a{
-	border-top: 3px solid #fff;
-}
-.com_tab:nth-of-type(2) ul li.active > a{
-	border-top: 3px solid #f15601;
-	border-left: 1px solid #f15601;
-	border-right: 1px solid #f15601;
-	border-bottom: 1px solid #fff
-}
-.com_tab:nth-of-type(2) ul{
-	/*border-top: 3px solid #f15601;*/
-	border-bottom: 1px solid #f15601;
-}
-.com_tab:nth-of-type(2) ul li{
-	margin-left: 0px !important;
-}
-.com_tab:nth-of-type(2) ul li:first-child{
-	margin-left: 0px
-}
-.com_tab:nth-of-type(1) ul li.active:after{
-	display: block
-}
 
 /*开关按钮*/
 .switch .checkbox{

src/main/webapp/resources/js/usercenter/controllers/b2b/Purc/PurcInquiryCtrl.js

@@ -4,7 +4,7 @@ define(['app/app'], function(app) {
         function ($scope, PurchaseInquiry, toaster, BaseService, $upload, $filter, $modal, $rootScope, ngTableParams, PurcProduct, PurcProductNewest, $timeout, $http, ShipAddress, Search, ComponentActiveAPI, $state) {
             $scope.status = 'InquiryNew';
             $scope.active = 'all';
-          $rootScope.active = 'purc_haseinquiry'
+          $rootScope.active = 'seek_purchase'
             $rootScope.tenderVendor = null;// 清除掉已选择的
             $scope.searchMethod = false;
             var getService = function () {

src/main/webapp/resources/js/usercenter/controllers/b2b/Purc/inquiryInfo_detail.js

@@ -2,7 +2,7 @@ define(['app/app'], function(app) {
   // 询价单明细（发出）
   app.register.controller('PurcInquiryInfoDetailCtrl', ['BaseService', '$rootScope', '$scope', '$stateParams', 'B2bPurchaseInquiry', '$filter', 'toaster', 'B2bCurrentRole', function (BaseService, $rootScope, $scope, $stateParams, PurchaseInquiry, $filter, toaster, CurrentRole) {
     // 获取当前用户是否为普通用户
-    $rootScope.active = 'purc_haseinquiry'
+    $rootScope.active = 'seek_purchase'
     CurrentRole.isUser({}, {}, function (data) {
       $scope.isUser = data.isUser;
     });

src/main/webapp/resources/js/usercenter/controllers/b2b/Purc/inquiry_unapply.js

@@ -2,7 +2,7 @@ define(['app/app'], function(app) {
   // 平台询价单（未提交）
   app.register.controller('UnapplyInquiryCtrl', ['$scope', 'B2bPurchaseInquiry', 'ngTableParams', 'BaseService', 'toaster', '$rootScope', function ($scope, PurchaseInquiry, ngTableParams, BaseService, toaster, $rootScope) {
     BaseService.scrollBackToTop();
-    $rootScope.active = 'purc_haseinquiry'
+    $rootScope.active = 'seek_purchase'
     // if ($rootScope.active = 'done') {
     //   $scope.active = 'done';
     //   $rootScope.active = '';

src/main/webapp/resources/js/usercenter/controllers/b2b/Purc/purchaseInquiryCtrl.js

@@ -1,7 +1,7 @@
 define(['app/app'], function(app) {
   // 平台询价单(已提交)
   app.register.controller('PurchaseInquiryCtrl', ['$scope', '$filter', 'ngTableParams', 'toaster', 'BaseService', 'B2bPurchaseInquiry', '$rootScope', 'B2bCurrentRole', function ($scope, $filter, ngTableParams, toaster, BaseService, PurchaseInquiry, $rootScope, CurrentRole) {
-    $rootScope.active = 'purc_haseinquiry'
+    $rootScope.active = 'seek_purchase'
     $scope.status = 'InquirySubmit';
     BaseService.scrollBackToTop();
     // 获取当前用户是否为普通用户

src/main/webapp/resources/view/sso/rolePermission.html

@@ -904,7 +904,7 @@
 </style>
 <!--右侧主体部分-->
 <div class="count user_right fr" ng-click="hideList()">
-    <div class="tab_top" style="margin-bottom: 16px;">
+    <div class="com_tab">
         <ul>
             <li ng-class="{active: tab == 'b2c'}" ng-click="setTab('b2c')"><a href="javascript:void(0)">商城角色</a></li>
             <li ng-class="{active: tab == 'b2b'}" ng-click="setTab('b2b')"><a href="javascript:void(0)">B2B角色</a></li>

src/main/webapp/resources/view/usercenter/b2b/Purc/inquiry_unapply.html

@@ -281,73 +281,6 @@
   }
 </style>
 <style>
-  .com_tab {
-    height: 40px;
-    margin-bottom: 10px;
-  }
-  .com_tab ul {
-    width: 100%;
-    margin: 0 auto;
-    height: 40px;
-    line-height: 40px;
-    background: #fff;
-  }
-  .com_tab ul li {
-    height: 40px;
-    text-align: center;
-    float: left;
-    position: relative;
-    min-width: 110px;
-  }
-  .com_tab:nth-of-type(1) ul li.active > a {
-    border-bottom: #fff;
-    background: #5078cb;
-    color: #fff !important;
-  }
-  .com_tab ul li a {
-    min-width: 110px;
-  }
-  .com_tab ul li > a {
-    font-size: 14px;
-    height: 40px;
-    padding: 0 20px;
-    display: inline-block;
-  }
-  .com_tab:nth-of-type(1) ul li::after {
-    background:url('static/img/vendor/images/downicon.png');
-    width: 11px;
-    height: 6px;
-    position: absolute;
-    bottom: 0px;
-    left: 50%;
-    content: ' ';
-    margin-left: -5px;
-    display: none;
-  }
-  .com_tab ul li::after {
-    background:url('static/img/vendor/images/downicon.png');
-    width: 11px;
-    height: 6px;
-    position: absolute;
-    bottom: 0px;
-    left: 50%;
-    content: ' ';
-    margin-left: -5px;
-    display: none;
-  }
-  .com_tab ul li.active:after {
-    display: block;
-  }
-  .oder01 ul li.active a{
-    border-bottom: 1px solid #fff;
-    color: #f15601;
-  }
-  .oder01 ul li.active a em {
-    color: #f15601;
-  }
-  .oder01 ul li a em {
-    color: #323232
-  }
   .screen {
     background: #fff;
     padding-top: 10px;
@@ -642,9 +575,6 @@
     top: 50%;
     margin: -20px 0 0 -40px;
   }
-  .oder01 ul li {
-    margin-left: 0px
-  }
   .order-table .inquiry-bd .order-number {
     position: absolute;
     top: -1px;
@@ -661,7 +591,13 @@
 </style>
 <!--<link rel="stylesheet" href="static/css/public.css">-->
 <div class="user_right fr" style="position: relative">
-  <div class="com_tab" style="margin-bottom: 10px">
+  <div class="com_tab">
+    <ul class="fl" style="width: 100%">
+      <li class="active"><a ui-sref="purc_haseinquiry">定向询价</a></li>
+      <li><a ui-sref="buyerSeekPurchase">公共询价</a></li>
+    </ul>
+  </div>
+  <div class="com_tab">
     <ul class="fl" style="width: 100%">
       <li><a ui-sref="purc_haseinquiry">采购询价</a></li>
       <li class="active"><a>待发布</a></li>
@@ -671,7 +607,7 @@
 
     </ul>
   </div>
-  <div class="oder01" style="margin-bottom: 10px">
+  <div class="com_tab tab_top" style="margin-bottom: 0px">
     <ul>
       <li ng-class="{'active': active=='done'}" ng-click="setActive('done')"><a>已发布</a></li>
       <li ng-class="{'active': active=='todo'}" ng-click="setActive('todo')"><a>待发布</a></li>

src/main/webapp/resources/view/usercenter/b2b/Purc/purchaseInquiryCtrl.html

@@ -299,73 +299,6 @@
   }
 </style>
 <style>
-  .com_tab {
-    height: 40px;
-    margin-bottom: 10px;
-  }
-  .com_tab ul {
-    width: 100%;
-    margin: 0 auto;
-    height: 40px;
-    line-height: 40px;
-    background: #fff;
-  }
-  .com_tab ul li {
-    height: 40px;
-    text-align: center;
-    float: left;
-    position: relative;
-    min-width: 110px;
-  }
-  .com_tab:nth-of-type(1) ul li.active > a {
-    border-bottom: #fff;
-    background: #5078cb;
-    color: #fff !important;
-  }
-  .com_tab ul li a {
-    min-width: 110px;
-  }
-  .com_tab ul li > a {
-    font-size: 14px;
-    height: 40px;
-    padding: 0 20px;
-    display: inline-block;
-  }
-  .com_tab:nth-of-type(1) ul li::after {
-    background:url('static/img/vendor/images/downicon.png');
-    width: 11px;
-    height: 6px;
-    position: absolute;
-    bottom: 0px;
-    left: 50%;
-    content: ' ';
-    margin-left: -5px;
-    display: none;
-  }
-  .com_tab ul li::after {
-    background:url('static/img/vendor/images/downicon.png');
-    width: 11px;
-    height: 6px;
-    position: absolute;
-    bottom: 0px;
-    left: 50%;
-    content: ' ';
-    margin-left: -5px;
-    display: none;
-  }
-  .com_tab ul li.active:after {
-    display: block;
-  }
-  .oder01 ul li.active a{
-    border-bottom: 1px solid #fff;
-    color: #f15601;
-  }
-  .oder01 ul li.active a em {
-    color: #f15601;
-  }
-  .oder01 ul li a em {
-    color: #323232
-  }
   .screen {
     background: #fff;
     padding-top: 10px;
@@ -663,10 +596,15 @@
   }
 </style>
 <div class="user_right fr" style="position: relative">
-
-  <div class="com_tab" style="margin-bottom: 10px">
+  <div class="com_tab">
+    <ul class="fl" style="width: 100%">
+      <li class="active"><a ui-sref="purc_haseinquiry">定向询价</a></li>
+      <li><a ui-sref="buyerSeekPurchase">公共询价</a></li>
+    </ul>
+  </div>
+  <div class="com_tab">
     <ul class="fl" style="width: 100%">
-      <li class="active"><a >采购询价</a></li>
+      <li class="active"><a>采购询价</a></li>
       <li><a ui-sref="purc_inquiry_unapply">待发布</a></li>
       <li class="down-purchase" style="margin-right: 0;color: #fff;min-width: 80px">
         <a href="#" style="color: #5078cb;padding: 0;min-width: 80px" ng-click="exportXls()" target="_self" class="text-simple" title="导出Excel表格"><i style="color: #5078cb;" class="fa fa-file-text fa-fw"></i>导出</a>
@@ -680,7 +618,7 @@
 
     </ul>
   </div>
-  <div class="oder01" style="margin-bottom: 0px">
+  <div class="com_tab tab_top" style="margin-bottom: 0px">
     <ul>
       <li ng-class="{'active': active=='all'}" ng-click="setActive('all')"><a> 全部<span ng-if="unread.replied>0">(<em ng-class="{'color-black': !unread.replied }" ng-bind="unread.replied || 0"></em>)</span></a></li>
       <li ng-class="{'active': active=='done'}" ng-click="setActive('done')"><a>已报价<span  ng-if="unread.replied>0">(<em ng-class="{'color-black': !unread.replied }" ng-bind="unread.replied || 0"></em>)</span></a></li>

src/main/webapp/resources/view/usercenter/b2b/Purc/tender_answer_list.html

@@ -587,7 +587,7 @@
 </style>
 <div class="user_right fr" style="position: relative">
   <!-- 顶部导航及搜索框 -->
-  <div class="com_tab" style="margin-bottom: 10px">
+  <div class="com_tab">
     <ul class="fl" style="width: 100%">
       <li ><a ui-sref="purc_tenderlist">采购招标</a></li>
       <li class="active"><a >招标提问列表</a></li>
@@ -602,7 +602,7 @@
       <!--</li>-->
     </ul>
   </div>
-  <div class="oder01" style="margin-bottom: 0px">
+  <div class="com_tab tab_top" style="margin-bottom: 0px">
     <ul>
       <li ng-class="{'active': active=='all'}" ng-click="setActive('all')"><a> 全部</a></li>
       <li ng-class="{'active': active=='done'}" ng-click="setActive('done')"><a>已回复</a></li>

src/main/webapp/resources/view/usercenter/b2b/Purc/tenderlist.html

@@ -516,7 +516,7 @@
 <div class="user_right fr" style="position: relative">
   <!-- 顶部导航及搜索框 -->
   <div class="block main-content sellOder oder">
-    <div class="com_tab" style="margin-bottom: 10px">
+    <div class="com_tab">
       <ul class="fl" style="width: 100%">
         <li class="active"><a >采购招标</a></li>
         <li><a ui-sref="purc_tenderanswerlist">招标提问列表</a></li>
@@ -531,7 +531,7 @@
         <!--</li>-->
       </ul>
     </div>
-    <div class="oder01" style="margin-bottom: 0px">
+    <div class="com_tab tab_top" style="margin-bottom: 0px">
       <ul>
         <li ng-class="{'active': active=='all'}" ng-click="setActive('all')"><a> 全部(<em ng-class="{'color-black': !unread.all }" ng-bind="unread.all || 0"></em>)</a></li>
         <li ng-class="{'active': active=='done'}" ng-click="setActive('done')"><a>待评标(<em ng-class="{'color-black': !unread.notReply }" ng-bind="unread.notReply || 0"></em>)</a></li>

src/main/webapp/resources/view/usercenter/b2b/Purc/vendor.html

@@ -79,7 +79,7 @@
 	}
 </style>
 <div class="user_right fr">
-	<div class="com_tab" style="margin-bottom: 10px">
+	<div class="com_tab">
 		<ul class="fl">
 			<li class="active">
 				<a>供应商资料</a>

src/main/webapp/resources/view/usercenter/b2b/fa/arCheck.html

@@ -489,7 +489,7 @@
   }
 </style>
 <div class="user_right fr" style="position: relative">
-  <div class="com_tab" style="margin-bottom: 10px">
+  <div class="com_tab">
     <ul class="fl" style="width: 100%">
       <li class="active"><a href="javascript:void(0)">B2B</a></li>
       <li><a ui-sref="pay_center" href="javascript:void(0)">优软商城</a></li>

src/main/webapp/resources/view/usercenter/b2b/order/changeList.html

@@ -485,13 +485,13 @@
 			<!--<a href="#" ng-click="exportXls()" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-text fa-fw"></i>导出</a>-->
 		<!--</div>-->
 	<!--</div>-->
-	<div class="com_tab" style="margin-bottom: 10px">
+	<div class="com_tab">
 		<ul class="fl" style="width: 100%">
 			<li class="active"><a ui-sref="purc_usercenter_order" href="#/purc/order">B2B</a></li>
 			<li><a ui-sref="buyer_order" href="#/order">优软商城</a></li>
 		</ul>
 	</div>
-	<div class="com_tab" style="margin-bottom: 10px">
+	<div class="com_tab">
 		<ul style="width: 100%">
 			<li ng-class="{'active': storeType=='purcOrder'}"><a ui-sref="purc_usercenter_order">采购订单</a></li>
 			<li ng-class="{'active': storeType=='purcChange'}"><a ui-sref="purc_change_list">采购变更单</a></li>
@@ -511,7 +511,7 @@
 
 		</ul>
 	</div>
-	<div class="oder01">
+	<div class="com_tab tab_top">
 		<ul>
 			<li ng-class="{'active': active=='all'}" ng-click="setActive('all')"><a> 全部<span ng-if="unread.all>0">(<em ng-class="{'color-black': !unread.all }" ng-bind="unread.all || 0"></em>)</span></a></li>
 			<li ng-class="{'active': active=='done'}" ng-click="setActive('done')"><a>已处理<span  ng-if="unread.replied>0">(<em ng-class="{'color-black': !unread.replied }" ng-bind="unread.replied || 0"></em>)</span></a></li>

src/main/webapp/resources/view/usercenter/b2b/order/deputyOrder.html

@@ -578,13 +578,13 @@
 		<!--<a ui-sref="purc.deputylog" type="button" title="错误日志"><i class="fa fa-file-text"></i> 错误日志</a>-->
 	<!--</div>-->
 <!--</div>-->
-	<div class="com_tab" style="margin-bottom: 10px">
+	<div class="com_tab">
 		<ul class="fl" style="width: 100%">
 			<li class="active"><a ui-sref="purc_usercenter_order" href="#/purc/order">B2B</a></li>
 			<li><a ui-sref="buyer_order" href="#/order">优软商城</a></li>
 		</ul>
 	</div>
-	<div class="com_tab" style="margin-bottom: 10px">
+	<div class="com_tab">
 		<ul style="width: 100%">
 			<li ng-class="{'active': storeType=='purcOrder'}"><a ui-sref="purc_usercenter_order">采购订单</a></li>
 			<li ng-class="{'active': storeType=='purcChange'}"><a ui-sref="purc_change_list">采购变更单</a></li>
@@ -604,7 +604,7 @@
 		</ul>
 	</div>
 
-	<div class="oder01">
+	<div class="com_tab tab_top">
 		<ul>
 			<li ng-class="{'active': active=='all'}" ng-click="setActive('all')"><a> 全部</a></li>
 			<li ng-class="{'active': active=='todo'}" ng-click="setActive('todo')"><a>待提交</a></li>

src/main/webapp/resources/view/usercenter/b2b/order/outorder.html

@@ -480,14 +480,14 @@
 					<!--class="fa fa-file-text fa-fw"></i>导出</a>-->
 		<!--</div>-->
 	<!--</div>-->
-	<div class="com_tab" style="margin-bottom: 10px">
+	<div class="com_tab">
 		<ul class="fl" style="width: 100%">
 			<li class="active"><a ui-sref="purc_usercenter_order" href="#/purc/order">B2B</a></li>
 			<li><a ui-sref="buyer_order" href="#/order">优软商城</a></li>
 		</ul>
 	</div>
 
-	<div class="com_tab" style="margin-bottom: 10px">
+	<div class="com_tab">
 		<ul style="width: 100%">
 			<li ng-class="{'active': storeType=='purcOrder'}"><a ui-sref="purc_usercenter_order">采购订单</a></li>
 			<li ng-class="{'active': storeType=='purcChange'}"><a ui-sref="purc_change_list">采购变更单</a></li>
@@ -501,8 +501,6 @@
 					<input type="hidden" name="ids" ng-value="localInfo.ids">
 				</form>
 			</li>
-
-
 		</ul>
 	</div>
 

src/main/webapp/resources/view/usercenter/b2b/order/usercenter_order.html

@@ -567,14 +567,14 @@
 		<!--<a href="#" ng-click="exportXls()" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-text fa-fw"></i>导出</a>-->
 	<!--</div>-->
 <!--</div>-->
-	<div class="com_tab" style="margin-bottom: 10px">
+	<div class="com_tab">
 		<ul class="fl" style="width: 100%">
 			<li class="active"><a ui-sref="purc_usercenter_order" href="#/purc/order">B2B</a></li>
 			<li><a ui-sref="buyer_order" href="#/order">优软商城</a></li>
 		</ul>
 	</div>
 
-	<div class="com_tab" style="margin-bottom: 10px">
+	<div class="com_tab">
 		<ul style="width: 100%">
 			<li ng-class="{'active': storeType=='purcOrder'}"><a ui-sref="purc_usercenter_order">采购订单</a></li>
 			<li ng-class="{'active': storeType=='purcChange'}"><a ui-sref="purc_change_list">采购变更单</a></li>
@@ -616,7 +616,7 @@
 		<!--</ul>-->
 	<!--</div>-->
 
-	<div class="oder01">
+	<div class="com_tab tab_top">
 		<ul>
 			<li ng-class="{'active': active=='all'}" ng-click="setActive('all')"><a> 全部<span ng-if="unread.all>0">(<em ng-class="{'color-black': !unread.all }" ng-bind="unread.all || 0"></em>)</span></a></li>
 			<li ng-class="{'active': active=='done'}" ng-click="setActive('done')"><a>已回复<span  ng-if="unread.replied>0">(<em ng-class="{'color-black': !unread.replied }" ng-bind="unread.replied || 0"></em>)</span></a></li>

src/main/webapp/resources/view/usercenter/forstore/buyer_material.html

@@ -1056,7 +1056,7 @@
 <div class="user_right fr">
 	<!--货品管理-->
 	<div class="pro_management device">
-		<div class="com_tab" style="margin-bottom: 10px">
+		<div class="com_tab">
 			<ul class="fl" style="width: 100%">
 				<li ng-class="{'active': tab == 'material'}"><a ui-sref="vendor_material">产品库</a></li>
 				<!--<li ng-class="{'active': tab == 'storage'}"><a ui-sref="vendor_storage">出入库</a></li>-->

src/main/webapp/resources/view/usercenter/forstore/buyer_order.html

@@ -754,15 +754,15 @@
 	/*/*/
 </style>
 <div class="user_right fr">
-	<div class="com_tab" style="margin-bottom: 10px">
-		<ul class="fl" style="width: 100%">
+	<div class="com_tab">
+		<ul class="fl">
 			<li><a ui-sref="purc_usercenter_order" href="#/purc/order">B2B</a></li>
 			<li class="active"><a ui-sref="buyer_order" href="#/order">优软商城</a></li>
 		</ul>
 	</div>
 	<!--订单中心-->
 	<div class="oder">
-		<div class="oder01" style="margin-bottom: 0px;">
+		<div class="com_tab tab_top" style="margin-bottom: 0;">
 			<ul>
 				<li ng-class="{'active' : status == 'all'}" ng-click="toggleStatus('all')"><a> 所有订单(<em ng-class="{'color-black': !AllOrderInfo['all']}" ng-bind="AllOrderInfo['all'] || 0"></em>)</a></li>
 				<li ng-class="{'active' : status == 'tobepaid'}" ng-click="toggleStatus('tobepaid')"><a>待付款(<em ng-class="{'color-black': !AllOrderInfo['tobepaid']}" ng-bind="AllOrderInfo['tobepaid'] || 0"></em>)</a></li>

src/main/webapp/resources/view/usercenter/forstore/seekPurchase.html

@@ -856,64 +856,6 @@
         margin: 15px auto;
         margin-bottom: 10px
     }
-    .oder011 ul li{
-        margin-left: 0px;
-        position: relative;
-    }
-    .oder011 ul li.active a{
-
-        background: #5078cb;
-        color: #fff !important;
-        border:0px;
-        border-bottom: #fff;
-    }
-    .oder01 ul {
-        border-bottom: 0px
-    }
-    .oder011 ul li::after{
-        background: url('static/img/vendor/images/downicon.png');
-        width: 11px;
-        height: 6px;
-        position: absolute;
-        bottom: 0px;
-        left: 50%;
-        content: ' ';
-        margin-left: -5px;
-        display: none;
-    }
-    .oder011 ul li.active:after{
-        display: block
-    }
-    .oder012 ul li.active a{
-        border-top: 3px solid #f15601;
-        border-left: 1px solid #f15601;
-        border-right: 1px solid #f15601;
-    }
-    .oder012 ul li.active:hover a{
-        color: #f15601;
-    }
-    .oder012 ul{
-        /*border-top: 3px solid #f15601;*/
-        border-bottom: 1px solid #f15601;
-    }
-    .oder012 ul li:nth-child(1){
-        margin-left: 0px
-    }
-    .oder012 ul li:hover a{
-        /*padding-top: 15px;*/
-        /*width: 112px;*/
-        color: #f15601;
-    }
-    .oder012 ul li{
-        margin-left: 0px
-    }
-    .oder012 ul li a{
-        border-top: 3px solid rgba(0,0,0,0)
-    }
-    .oder012 ul li.active a{
-        color: #f15601;
-        border-bottom: 1px solid #fff;
-    }
     .vendor-type {
         display: inline-block;
         width: 111px;
@@ -956,29 +898,29 @@
 </style>
 <div class="user_right fr seek-purchase">
     <!--求购询价-->
-    <div class="oder" style="margin-top: 10px;">
-        <div class="oder01 oder011">
-            <ul>
-                <li ng-class="{'active': activeType == 'seekManage'}"><a href="javascript:void(0)" ng-click="toogleType('seekManage')">单个求购</a></li>
-                <li ng-class="{'active': activeType == 'bomManage'}"><a href="javascript:void(0)" ng-click="toogleType('bomManage')">BOM求购</a></li>
-            </ul>
-        </div>
+    <div class="com_tab">
+        <ul class="fl" style="width: 100%">
+            <li><a ui-sref="purc_haseinquiry">定向询价</a></li>
+            <li class="active"><a ui-sref="buyerSeekPurchase">公共询价</a></li>
+        </ul>
     </div>
-    <div class="oder" style="margin-top: 10px;" ng-show="activeType == 'seekManage'">
-        <div class="oder01 oder012">
-            <ul>
-                <li ng-class="{'active': tab == 'waitOffer'}"><a href="javascript:void(0)" ng-click="toogleTab('waitOffer')">待报价</a></li>
-                <li ng-class="{'active': tab == 'offered'}"><a href="javascript:void(0)" ng-click="toogleTab('offered')">已报价</a></li>
-            </ul>
-        </div>
+    <div class="com_tab">
+        <ul>
+            <li ng-class="{'active': activeType == 'seekManage'}"><a href="javascript:void(0)" ng-click="toogleType('seekManage')">单个求购</a></li>
+            <li ng-class="{'active': activeType == 'bomManage'}"><a href="javascript:void(0)" ng-click="toogleType('bomManage')">BOM求购</a></li>
+        </ul>
     </div>
-    <div class="oder" style="margin-top: 10px;" ng-show="activeType == 'bomManage'">
-        <div class="oder01 oder012">
-            <ul>
-                <li ng-class="{'active': bomTab == 'bomList'}"><a href="javascript:void(0)" ng-click="toogleBomTab('bomList')">BOM清单</a></li>
-                <li ng-class="{'active': bomTab == 'seekRecord'}"><a href="javascript:void(0)" ng-click="toogleBomTab('seekRecord')">求购记录</a></li>
-            </ul>
-        </div>
+    <div class="com_tab tab_top" ng-show="activeType == 'seekManage'">
+        <ul>
+            <li ng-class="{'active': tab == 'waitOffer'}"><a href="javascript:void(0)" ng-click="toogleTab('waitOffer')">待报价</a></li>
+            <li ng-class="{'active': tab == 'offered'}"><a href="javascript:void(0)" ng-click="toogleTab('offered')">已报价</a></li>
+        </ul>
+    </div>
+    <div class="com_tab tab_top" ng-show="activeType == 'bomManage'">
+        <ul>
+            <li ng-class="{'active': bomTab == 'bomList'}"><a href="javascript:void(0)" ng-click="toogleBomTab('bomList')">BOM清单</a></li>
+            <li ng-class="{'active': bomTab == 'seekRecord'}"><a href="javascript:void(0)" ng-click="toogleBomTab('seekRecord')">求购记录</a></li>
+        </ul>
     </div>
     <div class="seek-purchase-content" ng-show="activeType == 'seekManage'" style="margin-top:0px">
         <div class="publish-purchase">

src/main/webapp/resources/view/usercenter/left_nav.html

@@ -36,8 +36,8 @@
             <a href="user#/home"><p ng-class="{'active' : active == 'home'}"><span>买家中心</span></p></a>
             <ul>
                 <!--<li ng-class="{active: active == 'purc_vendorserve'}"><a ui-sref="purc_vendorserve">供应商服务</a></li>-->
-                <li ng-class="{'active' : active == 'seek_purchase'}"><a  ui-sref="buyerSeekPurchase">我的求购</a></li>
-                <li ng-class="{'active' : active == 'purc_haseinquiry'}"><a  ui-sref="purc_haseinquiry">定向询价</a></li>
+                <li ng-class="{'active' : active == 'seek_purchase'}"><a ui-sref="buyerSeekPurchase">采购询价</a></li>
+                <!--<li ng-class="{'active' : active == 'purc_haseinquiry'}"><a ui-sref="purc_haseinquiry">定向询价</a></li>-->
                 <li ng-class="{'active' : active == 'buyer_cart'}"><a  ui-sref="buyer_cart">购物车<em>(<span ng-bind="countCart || 0 | number"></span>)</em></a> </li>
                 <li ng-class="{'active' : active == 'buyer_order'}"><a  ui-sref="buyer_order">采购订单</a></li>
                 <li ng-class="{'active' : active == 'buyer_pay_center'}"><a  ui-sref="pay_center">应付对账</a></li>

src/main/webapp/resources/view/vendor/b2b/apBill.html

@@ -489,7 +489,7 @@
 </style>
 <!--<link rel="stylesheet" href="static/css/public.css">-->
 <div class="user_right fr" style="position: relative">
-  <div class="com_tab" style="margin-bottom: 10px">
+  <div class="com_tab">
     <ul class="fl" style="width: 100%">
       <li class="active"><a>B2B</a></li>
         <li><a ui-sref="vendorInvoice">优软商城</a></li>

src/main/webapp/resources/view/vendor/b2b/apCheck.html

@@ -499,8 +499,8 @@
 </style>
 <!--<link rel="stylesheet" href="static/css/public.css">-->
 <div class="user_right fr" style="position: relative">
-  <div class="com_tab" style="margin-bottom: 10px">
-    <ul class="fl" style="width: 100%">
+  <div class="com_tab">
+    <ul class="fl">
       <li class="active"><a  href="javascript:void(0)">B2B</a></li>
       <li><a ui-sref="pay_center" href="javascript:void(0)">优软商城</a></li>
       <li class="down-purchase" style="margin-right: 0;min-width: 80px">
@@ -514,7 +514,7 @@
 
     </ul>
   </div>
-  <div class="oder01" style="margin-bottom: 0px">
+  <div class="com_tab tab_top" style="margin-bottom: 0px">
     <ul>
       <li ng-class="{'active': active=='all'}" ng-click="setActive('all')"><a> 全部</a></li>
       <li ng-class="{'active': active=='done'}" ng-click="setActive('done')"><a>已确认(<em ng-class="{'color-black': !unread.replied }" ng-bind="unread.replied || 0"></em>)</a></li>

src/main/webapp/resources/view/vendor/b2b/sale/approval.html

@@ -318,14 +318,14 @@
   }
 </style>
 <div class="user_right fr" style="position: relative">
-  <div class="tab_top" style="margin-bottom: 10px">
+  <div class="com_tab">
     <ul class="fl" style="width: 100%">
       <li ng-class="{'active': storeType=='sample'}"><a ui-sref="sale_sample">客户打样申请</a></li>
       <li ng-class="{'active': storeType=='approval'}"><a >客户认定单</a></li>
       <li class="down-purchase" style="float:right;color: #5078cb;margin-right: 5px;cursor:pointer"><span ng-click="exportXls()"><i class="fa fa-file-excel-o fa-fw"></i>导出Excel</span></li>
     </ul>
   </div>
-  <div class="oder01" style="margin-bottom: 0px">
+  <div class="com_tab tab_top" style="margin-bottom: 0px">
     <ul>
       <li ng-class="{'active': active=='all'}" ng-click="setActive('all')"><a> 全部</a></li>
       <li ng-class="{'active': active=='agreed'}" ng-click="setActive('agreed');"><a>合格</a></li>

src/main/webapp/resources/view/vendor/b2b/sale/customer.html

@@ -110,18 +110,12 @@
 }
 </style>
 <div class="user_right fr">
-	<div class="pane base-info" style="/*max-height: 900px;overflow-y: auto; overflow-x: hidden;*/" id="customer-tab">
-		<div class="com_tab" style="margin-bottom: 10px">
+	<div class="pane base-info" id="customer-tab">
+		<div class="com_tab">
 			<ul class="fl">
-				<li class="active">
-					<a>客户资料</a>
-				</li>
-				<li>
-					<a ui-sref="sale_vendorPerformanceAssess">绩效考核</a>
-				</li>
-				<li class="export" style="cursor:pointer">
-					<a ng-click="exportXls()"><i class="fa fa-file-text fa-fw"></i>导出Excel</a>
-				</li>
+				<li class="active"><a>客户资料</a></li>
+				<li><a ui-sref="sale_vendorPerformanceAssess">绩效考核</a></li>
+				<li class="export" style="cursor:pointer"><a ng-click="exportXls()"><i class="fa fa-file-text fa-fw"></i>导出Excel</a></li>
 			</ul>
 		</div>
 		<div class="body-wrap">

src/main/webapp/resources/view/vendor/b2b/sale/sale_badIn.html

@@ -287,10 +287,10 @@
     bottom: 18px
   }
 </style>
-<div class="block fr user_right"  id="public" style=" position: relative">
+<div class="block fr user_right"  id="public" style="position: relative">
   <div class="pro_management device">
-    <div class="com_tab" style="margin-bottom: 10px">
-      <ul class="fl" style="width: 100%">
+    <div class="com_tab">
+      <ul class="fl">
         <li ng-class="{'active': tab == 'material'}"><a ui-sref="vendor_material">产品库</a></li>
         <li ng-class="{'active': tab == 'storage'}"><a ui-sref="vendor_storage">出入库</a></li>
         <li ng-class="{'active': tab == 'undercarriage'}"><a ui-sref="vendor_undercarriage">上下架记录</a></li>
@@ -307,8 +307,8 @@
       </ul>
     </div>
   </div>
-  <div class="tab_top" style="margin-bottom: 10px">
-    <ul class="fl" style="width: 100%">
+  <div class="com_tab tab_top">
+    <ul class="fl">
       <li ng-class="{'active': storeType=='badOut'}"><a ui-sref="sale_badOut">不良品出库单</a></li>
       <li ng-class="{'active': storeType=='badIn'}"><a ui-sref="sale_badIn">不良品入库单</a></li>
       <li ng-class="{'active': storeType=='accept'}"><a ui-sref="sale_accept">客户采购验收单</a></li>

src/main/webapp/resources/view/vendor/b2b/sale/sample.html

@@ -318,14 +318,14 @@
 </style>
 <div class="user_right fr" style="position: relative">
 
-  <div class="tab_top" style="margin-bottom: 10px">
+  <div class="com_tab">
     <ul class="fl" style="width: 100%">
       <li ng-class="{'active': storeType=='sample'}"><a>客户打样申请</a></li>
       <li ng-class="{'active': storeType=='approval'}"><a ui-sref="sale_approval">客户认定单</a></li>
       <li class="down-purchase" style="float:right;color: #5078cb;margin-right: 5px;cursor:pointer"><span ng-click="exportXls()"><i class="fa fa-file-excel-o fa-fw"></i>导出Excel</span></li>
     </ul>
   </div>
-  <div class="oder01" style="margin-bottom: 0px">
+  <div class="com_tab tab_top" style="margin-bottom: 0px">
     <ul>
       <li ng-class="{'active': active=='all'}" ng-click="setActive('all')"><a> 全部(<em ng-class="{'color-black': !unread.all }" ng-bind="unread.all || 0"></em>)</a></li>
       <li ng-class="{'active': active=='done'}" ng-click="setActive('done');"><a>已送样(<em ng-class="{'color-black': !unread.notReply }" ng-bind="unread.notReply || 0"></em>)</a></li>

src/main/webapp/resources/view/vendor/b2b/sale/vendorPerformanceAssess.html

@@ -110,18 +110,12 @@
 	</div>
 </div>
 <div class="user_right fr">
-	<div class="pane base-info" style="/*max-height: 900px;overflow-y: auto; overflow-x: hidden;*/" id="customer-tab">
-		<div class="com_tab" style="margin-bottom: 10px">
+	<div class="pane base-info" id="customer-tab">
+		<div class="com_tab">
 			<ul class="fl">
-				<li>
-					<a ui-sref="sale_customer">客户资料</a>
-				</li>
-				<li class="active">
-					<a>绩效考核</a>
-				</li>
-				<li class="export">
-					<a ng-click="exportXls()" target="_self" class="text-simple"><i class="fa fa-file-text fa-fw"></i>导出</a>
-				</li>
+				<li><a ui-sref="sale_customer">客户资料</a></li>
+				<li class="active"><a>绩效考核</a></li>
+				<li class="export"><a ng-click="exportXls()" target="_self" class="text-simple"><i class="fa fa-file-text fa-fw"></i>导出</a></li>
 			</ul>
 		</div>
 		<div class="body-wrap">

src/main/webapp/resources/view/vendor/b2b/sale_change.html

@@ -220,7 +220,7 @@
 <div class="user_right fr">
 	<!--订单中心-->
 	<div class="sellOder oder" id="sellOder">
-		<div class="com_tab" style="margin-bottom: 10px">
+		<div class="com_tab">
 			<ul class="fl" style="width: 100%">
 				<li class="active"><a ui-sref="saleOrder">B2B</a></li>
 				<li><a ui-sref="vendor_order">优软商城</a></li>
@@ -234,8 +234,8 @@
 				</li>
 			</ul>
 		</div>
-		<div class="tab_top" style="margin-bottom: 10px">
-			<ul class="fl" style="width: 100%">
+		<div class="com_tab">
+			<ul class="fl">
 				<li ng-class="{'active': storeType=='order'}"><a ui-sref="saleOrder">客户采购订单</a></li>
 				<li ng-class="{'active': storeType=='change'}"><a ui-sref="saleChange">客户采购变更单</a></li>
 				<li ng-class="{'active': storeType=='maketodo'}"><a ui-sref="saleMaketodo">客户委外单</a></li>
@@ -244,7 +244,7 @@
 				<li ng-class="{'active': storeType=='send'}"><a ui-sref="saleSend">发货单</a></li>
 			</ul>
 		</div>
-		<div class="oder01" style="margin-bottom: 0px">
+		<div class="com_tab tab_top" style="margin-bottom: 0px">
 			<ul>
 				<li ng-class="{'active': active=='all'}" ng-click="setActive('all')"><a> 全部(<em ng-class="{'color-black': !unread.all}" ng-bind="unread.all|| 0"></em>)</a></li>
 				<li ng-class="{'active': active=='done'}" ng-click="setActive('done')"><a>已处理(<em ng-class="{'color-black': !unread.replied}" ng-bind="unread.replied || 0"></em>)</a></li>

src/main/webapp/resources/view/vendor/b2b/sale_inquiry.html

@@ -614,7 +614,7 @@
 			<!--<a ng-click="exportXls()" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-text fa-fw"></i>导出</a>-->
 		<!--</div>-->
 	<!--</div>-->
-	<div class="tab_top" style="margin-bottom: 10px">
+	<div class="com_tab">
 		<ul class="fl" style="width: 100%">
 			<li ng-class="{'active': storeType=='seekPurchase'}"><a ui-sref="vendorSeekPurchase">公共询价</a></li>
 			<li ng-class="{'active': storeType=='purchase'}"><a ui-sref="saleInquiry">客户采购询价</a></li>
@@ -632,7 +632,7 @@
 			</li>
 		</ul>
 	</div>
-	<div class="oder01" style="margin-bottom: 0px">
+	<div class="com_tab tab_top" style="margin-bottom: 0px">
 		<ul>
 			<li ng-class="{'active': active=='all'}" ng-click="setActive('all')"><a> 全部(<em ng-class="{'color-black': !unread.all }" ng-bind="unread.all || 0"></em>)</a></li>
 			<li ng-class="{'active': active=='done'}" ng-click="setActive('done');setOrdersReadByState()"><a>已报价(<em ng-class="{'color-black': !unread.replied }" ng-bind="unread.replied || 0"></em>)</a></li>

src/main/webapp/resources/view/vendor/b2b/sale_inquiryMould.html

@@ -558,7 +558,7 @@
 			<!--<a href="#" ng-click="exportXls()" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-text fa-fw"></i>导出</a>-->
 		<!--</div>-->
 	<!--</div>-->
-	<div class="tab_top" style="margin-bottom: 10px">
+	<div class="com_tab">
 		<ul class="fl" style="width: 100%">
 			<li ng-class="{'active': storeType=='seekPurchase'}"><a ui-sref="vendorSeekPurchase">公共询价</a></li>
 			<li ng-class="{'active': storeType=='purchase'}"><a ui-sref="saleInquiry">客户采购询价</a></li>
@@ -576,7 +576,7 @@
 			</li>
 		</ul>
 	</div>
-	<div class="oder01" style="margin-bottom: 0px">
+	<div class="com_tab tab_top" style="margin-bottom: 0px">
 		<ul>
 			<li ng-class="{'active': active=='all'}" ng-click="setActive('all')"><a> 全部(<em ng-class="{'color-black': !unread.all }" ng-bind="unread.all || 0"></em>)</a></li>
 			<li ng-class="{'active': active=='done'}" ng-click="setActive('done');setOrdersReadByState()"><a>已报价(<em ng-class="{'color-black': !unread.replied }" ng-bind="unread.replied || 0"></em>)</a></li>

src/main/webapp/resources/view/vendor/b2b/sale_makechange.html

@@ -221,7 +221,7 @@
 <div class="user_right fr">
 	<!--订单中心-->
 	<div class="sellOder oder" id="sellOder">
-		<div class="com_tab" style="margin-bottom: 10px">
+		<div class="com_tab">
 			<ul class="fl" style="width: 100%">
 				<li class="active"><a ui-sref="saleOrder">B2B</a></li>
 				<li><a ui-sref="vendor_order">优软商城</a></li>
@@ -235,7 +235,7 @@
 				</li>
 			</ul>
 		</div>
-		<div class="tab_top" style="margin-bottom: 0px">
+		<div class="com_tab" style="margin-bottom: 0px">
 			<ul class="fl" style="width: 100%">
 				<li ng-class="{'active': storeType=='order'}"><a ui-sref="saleOrder">客户采购订单</a></li>
 				<li ng-class="{'active': storeType=='change'}"><a ui-sref="saleChange">客户采购变更单</a></li>

src/main/webapp/resources/view/vendor/b2b/sale_maketodo.html

@@ -1020,7 +1020,7 @@
 <div class="user_right fr">
 	<!--订单中心-->
 	<div class="sellOder oder" id="sellOder">
-		<div class="com_tab" style="margin-bottom: 10px">
+		<div class="com_tab">
 			<ul class="fl" style="width: 100%">
 				<li class="active"><a ui-sref="saleOrder">B2B</a></li>
 				<li><a ui-sref="vendor_order">优软商城</a></li>
@@ -1034,7 +1034,7 @@
 				</li>
 			</ul>
 		</div>
-		<div class="tab_top" style="margin-bottom: 10px">
+		<div class="com_tab">
 			<ul class="fl" style="width: 100%">
 				<li ng-class="{'active': tab=='order'}"><a ui-sref="saleOrder">客户采购订单</a></li>
 				<li ng-class="{'active': tab=='change'}"><a ui-sref="saleChange">客户采购变更单</a></li>
@@ -1044,7 +1044,7 @@
 				<li ng-class="{'active': tab=='send'}"><a ui-sref="saleSend">发货单</a></li>
 			</ul>
 		</div>
-		<div class="oder01" style="margin-bottom: 0px">
+		<div class="com_tab tab_top" style="margin-bottom: 0px">
 			<ul>
 				<li ng-class="{'active': active=='all'}" ng-click="setActive('all')"><a> 全部(<em ng-class="{'color-black': !unread['all']}" ng-bind="unread['all'] || 0"></em>)</a></li>
 				<li ng-class="{'active': active=='done'}" ng-click="setActive('done')"><a>已回复(<em ng-class="{'color-black': !unread['replied']}" ng-bind="unread['replied'] || 0"></em>)</a></li>

src/main/webapp/resources/view/vendor/b2b/sale_notice.html

@@ -408,8 +408,8 @@
 <div class="user_right fr">
 	<!--订单中心-->
 	<div class="sellOder oder" id="sellOder">
-		<div class="com_tab" style="margin-bottom: 10px">
-			<ul class="fl" style="width: 100%">
+		<div class="com_tab">
+			<ul class="fl">
 				<li class="active"><a ui-sref="saleOrder">B2B</a></li>
 				<li><a ui-sref="vendor_order">优软商城</a></li>
 				<li class="down-purchase">
@@ -422,8 +422,8 @@
 				</li>
 			</ul>
 		</div>
-		<div class="tab_top" style="margin-bottom: 10px">
-			<ul class="fl" style="width: 100%">
+		<div class="com_tab">
+			<ul class="fl">
 				<li ng-class="{'active': tab=='order'}"><a ui-sref="saleOrder">客户采购订单</a></li>
 				<li ng-class="{'active': tab=='change'}"><a ui-sref="saleChange">客户采购变更单</a></li>
 				<li ng-class="{'active': tab=='maketodo'}"><a ui-sref="saleMaketodo">客户委外单</a></li>
@@ -432,7 +432,7 @@
 				<li ng-class="{'active': tab=='send'}"><a ui-sref="saleSend">发货单</a></li>
 			</ul>
 		</div>
-		<div class="oder01" style="margin-bottom: 0px">
+		<div class="com_tab tab_top" style="margin-bottom: 0px">
 			<ul>
 				<li ng-class="{'active': active=='all'}" ng-click="setActive('all')"><a> 全部(<em ng-class="{'color-black': !unread['all']}" ng-bind="unread['all'] || 0"></em>)</a></li>
 				<li ng-class="{'active': active=='done'}" ng-click="setActive('done')"><a>已发货(<em ng-class="{'color-black': !unread['replied']}" ng-bind="unread['replied'] || 0"></em>)</a></li>

src/main/webapp/resources/view/vendor/b2b/sale_order.html

@@ -188,7 +188,7 @@
 <div class="user_right fr" style="position: relative">
 	<!--订单中心-->
 	<div class="sellOder oder" id="sellOder">
-		<div class="com_tab" style="margin-bottom: 10px">
+		<div class="com_tab">
 			<ul class="fl" style="width: 100%">
 				<li class="active"><a ui-sref="saleOrder">B2B</a></li>
 				<li><a ui-sref="vendor_order">优软商城</a></li>
@@ -202,7 +202,7 @@
 				</li>
 			</ul>
 		</div>
-		<div class="tab_top" style="margin-bottom: 10px">
+		<div class="com_tab">
 			<ul class="fl" style="width: 100%">
 				<li ng-class="{'active': storeType=='order'}"><a ui-sref="saleOrder">客户采购订单</a></li>
 				<li ng-class="{'active': storeType=='change'}"><a ui-sref="saleChange">客户采购变更单</a></li>
@@ -212,7 +212,7 @@
 				<li ng-class="{'active': storeType=='send'}"><a ui-sref="saleSend">发货单</a></li>
 			</ul>
 		</div>
-		<div class="oder01" style="margin-bottom: 0px">
+		<div class="com_tab tab_top" style="margin-bottom: 0px">
 			<ul ng-controller="SnapShotCtrl">
 				<li ng-class="{'active': active=='all'}" ng-click="setActive('all')"><a> 全部(<em ng-class="{'color-black': !unread.all }" ng-bind="unread.all || 0"></em>)</a></li>
 				<li ng-class="{'active': active=='done'}" ng-click="setActive('done');setOrdersReadByState()"><a>已回复(<em ng-class="{'color-black': !unread.replied }" ng-bind="unread.replied || 0"></em>)</a></li>

src/main/webapp/resources/view/vendor/b2b/sale_quotationList.html

@@ -560,7 +560,7 @@
 	<!--</div>-->
 <!--</div>-->
 <div class="block user_right fr"  id="public" style="position: relative">
-	<div class="tab_top" style="margin-bottom: 10px">
+	<div class="com_tab">
 		<ul class="fl" style="width: 100%">
 			<li ng-class="{'active': storeType=='seekPurchase'}"><a ui-sref="vendorSeekPurchase">公共询价</a></li>
 			<li ng-class="{'active': storeType=='purchase'}"><a ui-sref="saleInquiry">客户采购询价</a></li>
@@ -581,7 +581,7 @@
 			</li>
 		</ul>
 	</div>
-	<div class="oder01" style="margin-bottom: 0px">
+	<div class="com_tab tab_top" style="margin-bottom: 0px">
 		<ul>
 			<li ng-class="{'active': active=='all'}" ng-click="setActive('all')"><a> 全部</a></li>
 			<li ng-class="{'active': active=='done'}" ng-click="setActive('done');"><a>已报价</a></li>

src/main/webapp/resources/view/vendor/b2b/sale_send.html

@@ -224,7 +224,7 @@
 <div class="user_right fr">
 	<!--订单中心-->
 	<div class="sellOder oder" id="sellOder">
-		<div class="com_tab" style="margin-bottom: 10px">
+		<div class="com_tab">
 			<ul class="fl" style="width: 100%">
 				<li class="active"><a ui-sref="saleOrder">B2B</a></li>
 				<li><a ui-sref="vendor_order">优软商城</a></li>
@@ -238,8 +238,8 @@
 				</li>
 			</ul>
 		</div>
-		<div class="tab_top">
-			<ul class="fl" style="width: 100%">
+		<div class="com_tab">
+			<ul class="fl">
 				<li ng-class="{'active': storeType=='order'}"><a ui-sref="saleOrder">客户采购订单</a></li>
 				<li ng-class="{'active': storeType=='change'}"><a ui-sref="saleChange">客户采购变更单</a></li>
 				<li ng-class="{'active': storeType=='maketodo'}"><a ui-sref="saleMaketodo">客户委外单</a></li>
@@ -248,7 +248,7 @@
 				<li ng-class="{'active': storeType=='send'}"><a ui-sref="saleSend">发货单</a></li>
 			</ul>
 		</div>
-		<div class="oder01" style="margin-bottom: 0px">
+		<div class="com_tab tab_top" style="margin-bottom: 0px">
 			<ul>
 				<li ng-class="{'active': active=='all'}" ng-click="setActive('all')"><a> 全部</a></li>
 				<li ng-class="{'active': active=='done'}" ng-click="setActive('done')"><a>已收料</a></li>

src/main/webapp/resources/view/vendor/b2b/sale_tenderList.html

@@ -581,7 +581,7 @@
 			<!--<span ui-sref-active="active"><a ui-sref="saleTenderQuestionList">招标提问列表</a></span>-->
 		<!--</div>-->
 	<!--</div>-->
-	<div class="tab_top" style="margin-bottom: 10px">
+	<div class="com_tab">
 		<ul class="fl" style="width: 100%">
 			<li ng-class="{'active': storeType=='seekPurchase'}"><a ui-sref="vendorSeekPurchase">公共询价</a></li>
 			<li ng-class="{'active': storeType=='purchase'}"><a ui-sref="saleInquiry">客户采购询价</a></li>
@@ -594,7 +594,7 @@
 			</li>
 		</ul>
 	</div>
-	<div class="oder01" style="margin-bottom: 0px">
+	<div class="com_tab tab_top" style="margin-bottom: 0px">
 		<ul>
 			<li ng-class="{'active': active=='all'}" ng-click="setActive('all')"><a> 全部(<em ng-class="{'color-black': !unread.all }" ng-bind="unread.all || 0"></em>)</a></li>
 			<li ng-class="{'active': active=='end'}" ng-click="setActive('end');"><a>已结标</a></li>

src/main/webapp/resources/view/vendor/forstore/product_file.html

@@ -316,7 +316,7 @@
     <!--产品导入-->
     <div class="pro_management device">
         <div class="com_tab">
-            <ul class="fl" style="width: 100%">
+            <ul class="fl">
                 <li ng-class="{'active': $$productOn.leadIn == 'bathOn'}"><a href="javascript:void(0)">新产品建档</a></li>
                 <li ui-sref="product_repository"><a href="javascript:void(0)">产品库</a></li>
             </ul>

src/main/webapp/resources/view/vendor/forstore/purchasAttendtion.html

@@ -160,7 +160,7 @@
 
 </style>
 <div class="user_right fr seek-purchase">
-  <div class="tab_top" style="margin-bottom: 10px">
+  <div class="com_tab">
     <ul class="fl" style="width: 100%">
       <li ng-class="{'active': storeType=='seekPurchase'}"><a ui-sref="vendorSeekPurchase">公共询价</a></li>
       <li ng-class="{'active': storeType=='purchase'}"><a ui-sref="saleInquiry">客户采购询价</a></li>
@@ -171,13 +171,11 @@
     </ul>
   </div>
   <!--求购询价-->
-  <div class="oder oder01">
-    <div class="com_tab2" style="margin-bottom: 0px">
-      <ul class="fl distance" style="width: 100%">
-        <li ng-class="{active : Attend_tab == 'isAttend'}"  ng-click="toggleAttend('isAttend')" title="已关注"><a>已关注</a></li>
-        <li ng-class="{active : Attend_tab =='Attend'}" ng-click="toggleAttend('Attend')" title="未关注"><a>未关注</a></li>
-      </ul>
-    </div>
+  <div class="com_tab tab_top" style="margin-bottom: 0px">
+    <ul class="fl distance" style="width: 100%">
+      <li ng-class="{active : Attend_tab == 'isAttend'}"  ng-click="toggleAttend('isAttend')" title="已关注"><a>已关注</a></li>
+      <li ng-class="{active : Attend_tab =='Attend'}" ng-click="toggleAttend('Attend')" title="未关注"><a>未关注</a></li>
+    </ul>
   </div>
   <div class="seek-purchase-content">
     <div class="search-check">

src/main/webapp/resources/view/vendor/forstore/purchaseOffer.html

@@ -641,7 +641,7 @@
             </div>
         </div>
     </div>-->
-    <div class="tab_top" style="margin-bottom: 10px">
+    <div class="com_tab">
         <ul class="fl" style="width: 100%">
             <li ng-class="{'active': storeType=='seekPurchase'}"><a ui-sref="vendorSeekPurchase">公共询价</a></li>
             <li ng-class="{'active': storeType=='purchase'}"><a ui-sref="saleInquiry">客户采购询价</a></li>
@@ -651,15 +651,13 @@
             <li ng-class="{'active': storeType=='attend'}"><a ui-sref="purchasAttendtion">商机关注</a></li>
         </ul>
     </div>
-    <div class="oder">
-        <div class="oder01">
-            <ul>
-                <li><a href="javascript:void(0)" ui-sref="vendorSeekPurchase">待报价</a></li>
-                <li class="active"><a href="javascript:void(0)" ui-sref="vendorPurchaseOffer">已报价</a></li>
-                <!--<li><a href="javascript:void(0)" ui-sref="purchasAttendtion">商机关注</a></li>-->
-                <!--<li><a href="javascript:void(0)" ui-sref="vendorPurchaseAccept">已采纳</a></li>-->
-            </ul>
-        </div>
+    <div class="com_tab tab_top">
+        <ul>
+            <li><a href="javascript:void(0)" ui-sref="vendorSeekPurchase">待报价</a></li>
+            <li class="active"><a href="javascript:void(0)" ui-sref="vendorPurchaseOffer">已报价</a></li>
+            <!--<li><a href="javascript:void(0)" ui-sref="purchasAttendtion">商机关注</a></li>-->
+            <!--<li><a href="javascript:void(0)" ui-sref="vendorPurchaseAccept">已采纳</a></li>-->
+        </ul>
     </div>
     <div class="seek-purchase-content">
         <!--

src/main/webapp/resources/view/vendor/forstore/seekPurchase.html

@@ -815,7 +815,7 @@
             </div>
         </div>
     </div>-->
-    <div class="tab_top" style="margin-bottom: 10px">
+    <div class="com_tab">
         <ul class="fl" style="width: 100%">
             <li ng-class="{'active': storeType=='seekPurchase'}"><a ui-sref="vendorSeekPurchase">公共询价</a></li>
             <li ng-class="{'active': storeType=='purchase'}"><a ui-sref="saleInquiry">客户采购询价</a></li>
@@ -825,15 +825,13 @@
             <li ng-class="{'active': storeType=='attend'}"><a ui-sref="purchasAttendtion">商机关注</a></li>
         </ul>
     </div>
-    <div class="oder">
-        <div class="oder01">
-            <ul>
-                <li class="active"><a href="javascript:void(0)" ui-sref="vendorSeekPurchase">待报价</a></li>
-                <li><a href="javascript:void(0)" ui-sref="vendorPurchaseOffer">已报价</a></li>
-                <!--<li><a href="javascript:void(0)" ui-sref="purchasAttendtion">商机关注</a></li>-->
-                <!--<li><a href="javascript:void(0)" ui-sref="vendorPurchaseAccept">已采纳</a></li>-->
-            </ul>
-        </div>
+    <div class="com_tab tab_top">
+        <ul>
+            <li class="active"><a href="javascript:void(0)" ui-sref="vendorSeekPurchase">待报价</a></li>
+            <li><a href="javascript:void(0)" ui-sref="vendorPurchaseOffer">已报价</a></li>
+            <!--<li><a href="javascript:void(0)" ui-sref="purchasAttendtion">商机关注</a></li>-->
+            <!--<li><a href="javascript:void(0)" ui-sref="vendorPurchaseAccept">已采纳</a></li>-->
+        </ul>
     </div>
     <div class="seek-purchase-content">
         <!--搜索时间筛选-->

src/main/webapp/resources/view/vendor/forstore/vendor_component_apply.html

@@ -127,7 +127,7 @@
     <!--器件申请-->
     <div class="device">
         <div class="com_tab">
-            <ul class="fl" style="width: 100%">
+            <ul class="fl">
                 <li class="active"><a ui-sref="vendor_component_apply"> 单个上传</a></li>
                 <li><a ui-sref="vendor_component_batchapply">批量上传</a></li>
                 <li><a ui-sref="vendor_component_applylist">申请记录</a></li>

src/main/webapp/resources/view/vendor/forstore/vendor_component_applylist.html

@@ -95,14 +95,14 @@
     <!--器件申请-->
     <div class="device">
         <div class="com_tab">
-            <ul class="fl" style="width: 100%">
+            <ul class="fl">
                 <li><a ui-sref="vendor_component_apply"> 单个上传</a></li>
                 <li><a ui-sref="vendor_component_batchapply">批量上传</a></li>
                 <li class="active"><a ui-sref="vendor_component_applylist">申请记录</a></li>
             </ul>
         </div>
         <div class="com_tab com_tab2" style="margin-bottom: 0px">
-            <ul class="fl" style="width: 100%">
+            <ul class="fl">
                 <li class="active"><a ui-sref="vendor_component_applylist">单个申请记录</a></li>
                 <li><a ui-sref="vendor_component_batchapplylist">批量申请记录</a></li>
             </ul>

src/main/webapp/resources/view/vendor/forstore/vendor_component_batchapply.html

@@ -62,7 +62,7 @@
     <!--品牌申请-->
     <div class="device">
         <div class="com_tab">
-            <ul class="fl" style="width: 100%">
+            <ul class="fl">
                 <li><a ui-sref="vendor_component_apply"> 单个上传</a></li>
                 <li class="active"><a ui-sref="vendor_component_batchapply">批量上传</a></li>
                 <li><a ui-sref="vendor_component_applylist">申请记录</a></li>

src/main/webapp/resources/view/vendor/forstore/vendor_goods.html

@@ -325,7 +325,7 @@
 	<!--货品管理-->
 	<div class="pro_management device">
 		<div class="com_tab">
-			<ul class="fl" style="width: 100%">
+			<ul class="fl" >
 				<li ng-class="{'active': tab == 'onSale'}" ng-click="toggleActive('onSale')"><a href="javascript:void(0)">在售产品</a></li>
 				<li ng-class="{'active': tab == 'undercarriage'}" ng-click="toggleActive('undercarriage')"><a href="javascript:void(0)">下架产品</a></li>
 				<li ng-class="{'active': tab == 'bathOn'}" ng-click="toggleActive('bathOn')"><a href="javascript:void(0)">批量发布</a></li>

src/main/webapp/resources/view/vendor/forstore/vendor_material.html

@@ -1056,8 +1056,8 @@
 <div class="user_right fr">
 	<!--货品管理-->
 	<div class="pro_management device">
-		<div class="com_tab" style="margin-bottom: 10px">
-			<ul class="fl" style="width: 100%">
+		<div class="com_tab">
+			<ul class="fl">
 				<li ng-class="{'active': tab == 'material'}"><a ui-sref="vendor_material">产品库</a></li>
 				<li ng-class="{'active': tab == 'storage'}"><a ui-sref="vendor_storage">出库</a></li>
 				<li ng-class="{'active': tab == 'undercarriage'}"><a ui-sref="vendor_undercarriage">上下架记录</a></li>

src/main/webapp/resources/view/vendor/forstore/vendor_material_old.html

@@ -1991,7 +1991,7 @@
 <div class="user_right fr">
 	<!--货品管理-->
 	<div class="pro_management device">
-		<div class="com_tab" style="margin-bottom: 10px">
+		<div class="com_tab">
 			<ul class="fl" style="width: 100%">
 				<!--<li ng-class="{'active': tab == 'material'}"><a ui-sref="vendor_material">公司产品库</a></li>-->
 				<!--<li ng-class="{'active': tab == 'material_person'}"><a ui-sref="vendor_material_person">个人产品库</a></li>-->

src/main/webapp/resources/view/vendor/forstore/vendor_onSale.html

@@ -1009,7 +1009,7 @@
     <!--货品管理-->
     <div class="pro_management device">
         <div class="com_tab">
-            <ul class="fl" style="width: 100%">
+            <ul class="fl">
                 <li ng-class="{'active': tab == 'material'}"><a ui-sref="vendor_material">公司产品库</a></li>
                 <li ng-class="{'active': tab == 'material_person'}"><a ui-sref="vendor_material_person">个人产品库</a></li>
                 <li ng-class="{'active': tab == 'onSale'}"><a ui-sref="vendor_onSale">在售产品</a></li>

src/main/webapp/resources/view/vendor/forstore/vendor_order.html

@@ -81,17 +81,6 @@
 		display: block;
 	}
 
-	.com_tab ul li.down-purchase {
-		float: right;
-		margin-right: 24px;
-		font-size: 14px;
-		color: #5078cb;
-	}
-
-	.com_tab ul li.down-purchase span:hover {
-		cursor: pointer;
-		text-decoration: underline;
-	}
 	.color-black {
 		color: #323232!important;
 	}
@@ -1118,73 +1107,6 @@
 	.oder_list dl b.total{
 		margin-right: 0;
 	}
-	.oder01 ul {
-		border-bottom: 1px solid #f15601
-	}
-	.oder01 ul li {
-		margin-left: 10px;
-	}
-	.oder01 ul li a {
-		font-size: 13px;
-		font-weight: bold;
-	}
-
-	.com_tab ul li {
-		margin-left: 0px;
-		position: relative;
-		min-width: 110px
-	}
-	.com_tab ul li a {
-		min-width: 110px
-	}
-
-	.com_tab ul li::after{
-		background: url('static/img/vendor/images/downicon.png');
-		width: 11px;
-		height: 6px;
-		position: absolute;
-		bottom: 0px;
-		left: 50%;
-		content: ' ';
-		margin-left: -5px;
-		display: none;
-	}
-	.com_tab ul li.active:after{
-		display: block
-	}
-	.com_tab ul li.active a {
-		border-bottom: #fff;
-		background: #5078cb;
-		color: #fff;
-	}
-	.oder01 ul li a{
-		border-top: 3px solid #fff;
-		/*padding: 0 8px*/
-		min-width: 110px;
-	}
-	.oder01 ul li:nth-child(1){
-		margin-left: 0px
-	}
-	.oder01 ul li.active a{
-		border-top: 3px solid #f15601;
-		border-left: 1px solid #f15601;
-		border-right: 1px solid #f15601;
-		border-bottom: 1px solid #fff;
-		/*padding: 0 8px;*/
-		color: #f15601
-	}
-	.oder01 ul li a em{
-		color: #323232
-	}
-	.oder01 ul li.active a em{
-		color: #f15601 !important;
-	}
-	.oder01 ul li:hover a em {
-		color: #5078cb !important;
-	}
-	.oder01 ul li.active:hover a em {
-		color: #f15601 !important;
-	}
 	.screen{
 		background: #fff;
 		height: 40px;
@@ -1192,56 +1114,11 @@
 		padding-top: 4px;
 	}
 </style>
-<style>
-	.tab_top{
-		height: 40px;
-		margin-bottom:10px;
-	}
-	.tab_top ul{
-		margin: 0 auto;
-		height: 40px;
-		line-height: 40px;
-		background: #fff;
-	}
-	.tab_top ul li{
-		margin-left: 0;
-		position: relative;
-		height: 40px;
-		text-align: center;
-		float: left;
-	}
-	.tab_top ul li a {
-		font-size: 14px;
-		height: 40px;
-		min-width: 110px;
-		padding: 0 20px;
-		display: inline-block;
-	}
-	.tab_top ul li.active a {
-		border-bottom: #fff;
-		background: #5078cb;
-		color: #fff !important;
-	}
-	.tab_top ul li.active:after {
-		display:block;
-	}
-	.tab_top ul li::after {
-		background: url(static/img/vendor/images/downicon.png);
-		width: 11px;
-		height: 6px;
-		position: absolute;
-		bottom: 0px;
-		left: 50%;
-		content: ' ';
-		margin-left: -5px;
-		display: none;
-	}
-</style>
 <div class="user_right fr">
 	<!--订单中心-->
 	<div class="sellOder oder" id="sellOder">
-		<div class="com_tab" style="margin-bottom: 10px">
-			<ul class="fl" style="width: 100%">
+		<div class="com_tab">
+			<ul class="fl">
 				<li><a ui-sref="saleOrder">B2B</a></li>
 				<li class="active"><a ui-sref="vendor_order">优软商城</a></li>
 				<li class="down-purchase">
@@ -1254,13 +1131,13 @@
 				</li>
 			</ul>
 		</div>
-		<div class="tab_top" style="margin-bottom: 10px">
-			<ul class="fl" style="width: 100%">
+		<div class="com_tab">
+			<ul class="fl">
 				<li ng-class="{'active': storeType=='other'}" ng-if="!isYrscStore && !isCONSIGNMENT"><a ng-click="setStoreType('other')">自营店铺</a></li>
 				<li ng-class="{'active': storeType=='mall'}"><a ng-click="setStoreType('mall')">库存寄售</a></li>
 			</ul>
 		</div>
-		<div class="oder01" style="margin-bottom: 0px">
+		<div class="com_tab tab_top" style="margin-bottom: 0px">
 			<ul>
 				<li ng-class="{'active': status=='all'}" ng-click="setActive('all')"><a> 所有订单(<em ng-class="{'color-black': !counts['all']}" ng-bind="counts['all'] || 0"></em>)</a></li>
 				<li ng-class="{'active': status=='tobeconfirmed'}" ng-click="setActive('tobeconfirmed')"><a>待买家付款(<em ng-class="{'color-black': !counts['tobeconfirmed']}" ng-bind="counts['tobeconfirmed'] || 0"></em>)</a></li>

src/main/webapp/resources/view/vendor/forstore/vendor_proRepository.html

@@ -242,12 +242,12 @@
     <!--货品管理-->
     <div class="pro_management device">
         <div class="com_tab">
-            <ul class="fl" style="width: 100%">
+            <ul class="fl">
                 <li ui-sref="vendor_productOn"><a href="javascript:void(0)">新产品导入</a></li>
                 <li ng-class="{'active': $$productOn.leadIn == 'product_repository'}"><a href="javascript:void(0)">产品库</a></li>
             </ul>
         </div>
-        <div class="com_tab" style="position: relative;" ng-class="{'macth-act': $$productRepository.status == 'matchResult'}">
+        <div class="com_tab" style="position:relative;" ng-class="{'macth-act': $$productRepository.status == 'matchResult'}">
             <ul class="fl" style="width: 100%">
                 <li ng-class="{'active' : $$productRepository.status == 'all'}" ng-click="toggleStatus('all')"><a href="javascript:void(0)">全部</a></li>
                 <li ng-class="{'active' : $$productRepository.status == 'standard'}" ng-click="toggleStatus('standard')"><a href="javascript:void(0)">标准产品</a></li>

src/main/webapp/resources/view/vendor/forstore/vendor_productOn.html

@@ -370,7 +370,7 @@
     <!--货品管理-->
     <div class="pro_management device">
         <div class="com_tab">
-            <ul class="fl" style="width: 100%">
+            <ul class="fl">
                 <li ng-class="{'active': $$productOn.leadIn == 'bathOn'}"><a href="javascript:void(0)">新产品导入</a></li>
                 <li ui-sref="product_repository"><a href="javascript:void(0)">产品库</a></li>
             </ul>

src/main/webapp/resources/view/vendor/forstore/vendor_undercarriage.html

@@ -600,7 +600,7 @@
     <!--货品管理-->
     <div class="pro_management device">
         <div class="com_tab">
-            <ul class="fl" style="width: 100%">
+            <ul class="fl">
                 <!--<li ng-class="{'active': tab == 'vendor_material'}"><a ui-sref="vendor_material">公司产品库</a></li>-->
                 <!--<li ng-class="{'active': tab == 'material_person'}"><a ui-sref="vendor_material_person">个人产品库</a></li>-->
                 <!--<li ng-class="{'active': tab == 'onSale'}"><a ui-sref="vendor_onSale">在售产品</a></li>-->