处理BUG

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

@@ -256,12 +256,6 @@
     .ticket_record_list{
         background: none;
     }
-    .oder01 ul li.new-account a{
-        color: #5078cb;
-    }
-    .oder01 ul li.new-account a:hover{
-        border-bottom: none;
-    }
     a[disabled] {
         cursor: not-allowed;
     }
@@ -621,34 +615,6 @@
     div.ng-table-pager a.page-a{
         color:#fff!important;
     }
-    .oder01 ul li{
-        margin-left: 0px;
-        position: relative;
-    }
-    .oder01 ul li.active a{
-        border-bottom: #fff;
-        background: #5078cb;
-        border: 0px;
-        color: #fff !important;
-    }
-    .oder01 ul {
-        border-bottom: 0px
-    }
-    .oder01 ul li::after{
-
-        width: 11px;
-        height: 6px;
-        position: absolute;
-        bottom: 0px;
-        left: 50%;
-        content: ' ';
-        margin-left: -5px;
-        display: none;
-        background: url('static/img/vendor/images/downicon.png');
-    }
-    .oder01 ul li.active:after{
-        display: block
-    }
     .check-filter {
         height: 80px;
         line-height: 30px;
@@ -682,7 +648,7 @@
 <div class="user_right fr" id="pay_center">
     <!--支付中心-->
     <div class="pay_record oder">
-        <div class="oder01">
+        <div class="com_tab">
             <ul>
                 <li ng-if="tab != 'accountTab'"><a ui-sref="fa_apCheck" href="javascript:void(0)">B2B</a></li>
                 <li ng-if="tab != 'accountTab'" ng-class="{'active' : tab == 'paymentRecord'}"><a href="javascript:void(0)">优软商城</a></li>
@@ -694,7 +660,7 @@
             <!-- 交易记录-->
             <div class="tab" ng-show="tab == 'paymentRecord'" style="display: inline-block">
                 <!--搜索时间筛选-->
-                <div class="screen check-filter" style="background: #f5f8fe;margin-bottom: 15px;margin-top: 5px;padding-top: 4px;padding-right: 11px;">
+                <div class="screen check-filter" style="background: #f5f8fe;margin-bottom: 10px;padding-right: 11px;">
                     <div class="radio-block" style="display: block;">
                         交易方式：
                         <label class="com-check-radio">

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

@@ -151,7 +151,7 @@
     <div class="com_tab">
       <ul class="fl" style="width: 100%" ng-if="!isPcbStore">
         <li ng-class="{'active': tab == 'bathOn'}"><a ui-sref="vendor_upload">导入产品</a></li>
-        <li ng-class="{'active': tab == 'single_entry'}"><a >单个录入</a></li>
+        <li ng-class="{'active': tab == 'single_entry'}"><a >录入产品</a></li>
         <!--<li ng-class="{'active': $$productOn.tab == 'bathOn'}" ng-click="toggleActive('bathOn')"><a href="">导入产品并上架</a></li>-->
         <!--<li ng-class="{'active': $$productOn.tab == 'bathOnPerson'}" ng-click="toggleActive('bathOnPerson')"><a href="">导入产品</a></li>-->
       </ul>

src/main/webapp/resources/view/vendor/forstore/vendor-invoice.html

@@ -245,10 +245,9 @@
     }
     .invoice-search{
         width: 1000px;
-        margin: 0 auto;
+        margin: 10px auto;
         background: #f5f8fe;
         height: 40px;
-        margin-top: 16px;
     }
     .invoice-search div.fr{
         width: 388px;
@@ -577,7 +576,7 @@
     </div>
     <!--开票记录-->
     <div class="vendor-invoice" ng-if="active == 'apply_record'">
-        <div class="invoice-search" style="margin-top: 5px;margin-bottom: 16px; width: 100%">
+        <div class="invoice-search">
             <div class="fr">
                 <input type="text" ng-keydown="enterEvent($event, keyword)"  class="form-control" ng-model="keyword" placeholder="买家/订单号/收票人/联系电话"/>
                 <button ng-click="searchByKey(keyword)">搜索</button>

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

@@ -1137,7 +1137,7 @@
 				<li ng-class="{'active': storeType=='mall'}"><a ng-click="setStoreType('mall')">库存寄售</a></li>
 			</ul>
 		</div>
-		<div class="com_tab tab_top" style="margin-bottom: 0px">
+		<div class="com_tab tab_top">
 			<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>
@@ -1166,8 +1166,7 @@
 		<!--</div>-->
 		<!--</div>-->
 		<!--搜索时间筛选-->
-		<p class="height16">&nbsp;</p>
-		<div class="screen">
+		<div class="screen" style="margin-bottom:10px;">
 			<div class="sreach fr">
 				<div class="date fl">
 					<div class="data-input">
@@ -1204,7 +1203,6 @@
 				</div>
 			</div>
 		</div>
-		<p class="height16">&nbsp;</p>
 		<div class="oder_list" style="margin-top: 0px;">
 			<!--所有订单-->
 			<dl style="display: inline-block;" class="all_oder">
@@ -1246,7 +1244,7 @@
 					</span>
 					<span>交易操作</span>
 				</dt>
-				<p class="height16">&nbsp</p>
+				<p class="height16" style="height:10px;">&nbsp</p>
 				<!--点击发货-->
 				<div class="purchase border-bt-16" ng-repeat="purchase in purchases">
 					<dd class="line01">

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

@@ -532,7 +532,7 @@
         <div class="com_tab">
             <ul class="fl" style="width: 100%" ng-if="!isPcbStore">
                 <li ng-class="{'active': $$productOn.tab == 'bathOn'}"><a>导入产品</a></li>
-                <li ng-class="{'active': $$productOn.tab == 'single_entry'}"><a ui-sref="single_entry">单个录入</a></li>
+                <li ng-class="{'active': $$productOn.tab == 'single_entry'}"><a ui-sref="single_entry">录入产品</a></li>
                 <!--<li ng-class="{'active': $$productOn.tab == 'bathOn'}" ng-click="toggleActive('bathOn')"><a href="">导入产品并上架</a></li>-->
                 <!--<li ng-class="{'active': $$productOn.tab == 'bathOnPerson'}" ng-click="toggleActive('bathOnPerson')"><a href="">导入产品</a></li>-->
             </ul>

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

@@ -66,7 +66,7 @@
 			</li>
 			<li ng-class="{'active' : active == 'vendor_sample'}"><span  ui-sref="sale_sample">打样管理</span></li>
 			<li ng-class="{'active' : active == 'sale_customer'}"><span ui-sref="sale_customer">客户资料</span></li>
-			<li ng-class="{'active' : active == 'vendor_material'}"><span  ui-sref="vendor_material" ng-bind="isPcbStore ? 'PCB库存管理' : '库存管理'">库存管理</span></li>
+			<li ng-class="{'active' : active == 'vendor_material'}"><span  ui-sref="vendor_material" ng-bind="isPcbStore ? 'PCB库存管理' : '产品管理'">产品管理</span></li>
 			<!--	<li ng-class="{'active' : active == 'vendor_productOn'}"><span  ui-sref="vendor_productOn">产品导入</span></li>-->
 			<li ng-class="{'active' : active == 'vendor_productOn'}" ng-if="!isPcbStore"><span  ui-sref="vendor_upload">产品导入</span></li>
 	<!--	<li ng-class="{'active' : active == 'vendor_logistics'}"><span  ui-sref="vendor_logistics">物流管理</span></li>-->