修改买卖家中心的table样式

src/main/java/com/uas/platform/b2c/external/erp/product/service/impl/KindServiceImpl.java

@@ -109,37 +109,37 @@ public class KindServiceImpl implements KindService {
         return kindPropertyUas;
     }
 
-//    @Override
-//    public Map<String, List<KindUas>> getParentsByKindCode(String kindCode) {
-//        Map<Long, Kind> maps = new HashMap<>();
-//        // 第一步是模糊查询所有的叶子节点
-//        Map<String, List<KindUas>> kindMaps = new HashMap<>();
-//        List<Kind> kinds = kindDao.findByKindCode(kindCode);
-//        for (Kind kind : kinds) {
-//            List<Kind> list = getParentsByChildId(kind.getId());
-//            List<KindUas> kindUass = new ArrayList<>();
-//            for (Kind k : list) {
-//                kindUass.add(ModelConverter.convertUas(k));
-//            }
-//            if (kindMaps.size() > 0 && kindMaps.containsKey(list.get(0).getId())) {
-//                Map<Long, KindUas> map = new HashMap<>();
-//                for (KindUas k : kindUass) {
-//                    map.put(k.getId(), k);
-//                }
-//                List<KindUas> oldList = kindMaps.get(list.get(0).getId());
-//                for (KindUas k : oldList) {
-//                    map.put(k.getId(), k);
-//                }
-//                List<KindUas> newList = new ArrayList<>();
-//                for (KindUas k : map.values()) {
-//                    newList.add(k);
-//                }
-//                kindMaps.put(list.get(0).getId().toString(), newList);
-//            } else {
-//                kindMaps.put(list.get(0).getId().toString(), kindUass);
-//            }
-//        }
-//        return kindMaps;
-//    }
+    @Override
+    public Map<String, List<KindUas>> getParentsByKindCode(String kindCode) {
+        Map<Long, Kind> maps = new HashMap<>();
+        // 第一步是模糊查询所有的叶子节点
+        Map<String, List<KindUas>> kindMaps = new HashMap<>();
+        List<Kind> kinds = kindDao.findByKindCode(kindCode);
+        for (Kind kind : kinds) {
+            List<Kind> list = getParentsByChildId(kind.getId());
+            List<KindUas> kindUass = new ArrayList<>();
+            for (Kind k : list) {
+                kindUass.add(ModelConverter.convertUas(k));
+            }
+            if (kindMaps.size() > 0 && kindMaps.containsKey(list.get(0).getId())) {
+                Map<Long, KindUas> map = new HashMap<>();
+                for (KindUas k : kindUass) {
+                    map.put(k.getId(), k);
+                }
+                List<KindUas> oldList = kindMaps.get(list.get(0).getId());
+                for (KindUas k : oldList) {
+                    map.put(k.getId(), k);
+                }
+                List<KindUas> newList = new ArrayList<>();
+                for (KindUas k : map.values()) {
+                    newList.add(k);
+                }
+                kindMaps.put(list.get(0).getId().toString(), newList);
+            } else {
+                kindMaps.put(list.get(0).getId().toString(), kindUass);
+            }
+        }
+        return kindMaps;
+    }
 
 }

src/main/webapp/resources/css/vendor/sell.css

@@ -3453,7 +3453,7 @@ body {
     display: inline-block;
 }
 .com_tab ul li.active a {
-    color: #5078cb;
+    color: #f15601;
     border-bottom: 3px #5078cb solid;
 }
 .com_tab ul li:hover a {
@@ -3464,7 +3464,68 @@ body {
     color: #e64040;
 }
 .com_tab ul li.active a,.oder01 ul li.active a em {
-    color: #5078cb;
+    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('/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: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
+}
+
+
+
+.:nth-of-type(1) ul li.active:after{
+    display: block
 }
 .log_company dl span.wd01 {
     width:10%;

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_materialCtrl.js

@@ -3628,6 +3628,8 @@ define(['app/app', 'jquery-uploadify'], function(app) {
 
           });
         }, function(response) {
+          $scope.deleteModal = false;
+          $modalInstance.dismiss();
           toaster.pop('error', '错误', response.data);
         });
       }

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_store_maintain_ctrl.js

@@ -690,6 +690,7 @@ define(['app/app'], function (app) {
 			$scope.recommendProducts[$scope.selectedOneProductIndex] = { exist: false, order: $scope.selectedOneProductIndex + 1 };
 			cancelDeleteOneProduct();
 		}
+
 	}]);
 
 });

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

@@ -160,6 +160,29 @@
 	 .empty .empty-info i{
 		margin-right:5px;
 	}
+	.oder01 ul li{
+		margin-left: 0px;
+		position: relative;
+	}
+	.oder01 ul li.active a{
+		border-bottom: #fff;
+		background: #5078cb;
+		color: #fff;
+	}
+	.oder01 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;
+	}
+	.oder01 ul li.active:after{
+		display: block
+	}
 </style>
 <!--右侧主体部分-->
 <div class="user_right fr" id="account_manager">

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

@@ -546,6 +546,29 @@
 	.com-del-box .title i{
 		background: none;
 	}
+	.oder01 ul li{
+		margin-left: 0px;
+		position: relative;
+	}
+	.oder01 ul li.active a{
+		border-bottom: #fff;
+		background: #5078cb;
+		color: #fff;
+	}
+	.oder01 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;
+	}
+	.oder01 ul li.active:after{
+		display: block
+	}
 </style>
 <div class="user_right fr" id="buyer_cart">
 	<!--订单中心-->

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

@@ -472,6 +472,29 @@
     .ticket_record .empty .empty-info i{
         margin-right:5px;
     }
+    .oder01 ul li{
+        margin-left: 0px;
+        position: relative;
+    }
+    .oder01 ul li.active a{
+        border-bottom: #fff;
+        background: #5078cb;
+        color: #fff;
+    }
+    .oder01 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;
+    }
+    .oder01 ul li.active:after{
+        display: block
+    }
 </style>
 <!--右侧主体部分-->
 <div class="user_right fr u_c_invoice">
@@ -479,7 +502,7 @@
     <div class="ticket_record oder">
         <div class="oder01">
             <ul ng-class="{'active': changeBillStatusFlag}">
-                <li ng-class="{'active': tab == 'buyer_invoice' && !changeBillStatusFlag}" style="margin-left: 15px;"><a ng-click="changeBillStatusFlag = false" ui-sref="buyer_invoice">开票信息</a></li>
+                <li ng-class="{'active': tab == 'buyer_invoice' && !changeBillStatusFlag}"><a ng-click="changeBillStatusFlag = false" ui-sref="buyer_invoice">开票信息</a></li>
                 <li ng-class="{'active': tab == 'buyer_no_invoice'}"><a ui-sref="buyer_no_invoice">未开票</a></li>
                 <li ng-class="{'active': tab == 'buyer_invoice-record'}"><a ui-sref="buyer_invoice-record">开票记录</a></li>
             </ul>

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

@@ -122,6 +122,29 @@
     .ng-table-pagination .page-a:hover {
         background: #5078cb!important;
     }
+    .oder01 ul li{
+        margin-left: 0px;
+        position: relative;
+    }
+    .oder01 ul li.active a{
+        border-bottom: #fff;
+        background: #5078cb;
+        color: #fff;
+    }
+    .oder01 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;
+    }
+    .oder01 ul li.active:after{
+        display: block
+    }
 </style>
 <!--右侧主体部分-->
 <div class="user_right fr u_c_invoice">

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

@@ -181,6 +181,29 @@ body div.ng-table-pager a.page-a {
 .no-invoice .no-invoice-content .empty .empty-info i{
     margin-right:5px;
 }
+.oder01 ul li{
+    margin-left: 0px;
+    position: relative;
+}
+.oder01 ul li.active a{
+    border-bottom: #fff;
+    background: #5078cb;
+    color: #fff;
+}
+.oder01 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;
+}
+.oder01 ul li.active:after{
+    display: block
+}
 </style>
 <!--右侧主体部分-->
 <div class="user_right fr u_c_invoice">

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

@@ -433,6 +433,13 @@
 	}
 
 	/*搜索时间筛选*/
+	.screen{
+		background: #fff;
+		padding-top: 16px;
+		padding-bottom: 16px;
+		height: 66px;
+		margin: 16px 0px;
+	}
 	.screen .sreach input{
 		border: #dfdfdf 1px solid;
 		height: 34px;
@@ -702,12 +709,40 @@
 		font-size: 13px;
 		font-weight: bold;
 	}
-
+	.oder01 ul li{
+		margin-left: 0px;
+		position: relative;
+	}
+	.oder01 ul li.active a{
+		border-bottom: #fff;
+		background: #5078cb;
+		color: #fff;
+	}
+	.oder01 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;
+	}
+	.oder01 ul li.active:after{
+		display: block
+	}
+	.oder01 ul li.active a, .oder01 ul li.active a em {
+		color: #fff !important;
+	}
+	.oder01 ul li:hover a em {
+		color: #5078cb !important;
+	}
 </style>
 <div class="user_right fr">
 	<!--订单中心-->
 	<div class="oder">
-		<div class="oder01" style="margin-bottom: 16px;">
+		<div class="oder01" style="margin-bottom: 0px;">
 			<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/pay_center.html

@@ -385,6 +385,29 @@
 		display: inline;
 		float: left;
 	}
+	.oder01 ul li{
+		margin-left: 0px;
+		position: relative;
+	}
+	.oder01 ul li.active a{
+		border-bottom: #fff;
+		background: #5078cb;
+		color: #fff;
+	}
+	.oder01 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;
+	}
+	.oder01 ul li.active:after{
+		display: block
+	}
 </style>
 <!--右侧主体部分-->
 <div class="user_right fr" id="pay_center">

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

@@ -773,11 +773,64 @@
         margin: 15px auto;
         margin-bottom: 10px
     }
+    .oder011 ul li{
+        margin-left: 0px;
+        position: relative;
+    }
+    .oder011 ul li.active a{
+        border-bottom: #fff;
+        background: #5078cb;
+        color: #fff;
+    }
+    .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;
+    }
 </style>
 <div class="user_right fr seek-purchase">
     <!--求购询价-->
     <div class="oder" style="margin-top: 10px;">
-        <div class="oder01">
+        <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>
@@ -785,14 +838,14 @@
         </div>
     </div>
     <div class="oder" style="margin-top: 10px;" ng-show="activeType == 'seekManage'">
-        <div class="oder01">
+        <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>
-    <div class="seek-purchase-content" ng-show="activeType == 'seekManage'">
+    <div class="seek-purchase-content" ng-show="activeType == 'seekManage'" style="margin-top:0px">
         <div class="publish-purchase">
             <div class="fl">
                 <p>单个发布</p>

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

@@ -602,6 +602,29 @@
     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;
+        color: #fff;
+    }
+    .oder01 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;
+    }
+    .oder01 ul li.active:after{
+        display: block
+    }
 </style>
 <!--右侧主体部分-->
 <div class="user_right fr" id="pay_center">

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

@@ -538,6 +538,29 @@
         color: #999;
         margin-left: 10px;
     }
+    .oder01 ul li{
+        margin-left: 0px;
+        position: relative;
+    }
+    .oder01 ul li.active a{
+        border-bottom: #fff;
+        background: #5078cb;
+        color: #fff;
+    }
+    .oder01 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;
+    }
+    .oder01 ul li.active:after{
+        display: block
+    }
 </style>
 <div class="user_right fr seek-purchase">
     <!--求购询价-->

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

@@ -569,6 +569,29 @@
         margin: 18px 0 13px 0;
         border-radius: 2px;
     }
+    .oder01 ul li{
+        margin-left: 0px;
+        position: relative;
+    }
+    .oder01 ul li.active a{
+        border-bottom: #fff;
+        background: #5078cb;
+        color: #fff;
+    }
+    .oder01 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;
+    }
+    .oder01 ul li.active:after{
+        display: block
+    }
 </style>
 <div class="user_right fr seek-purchase">
     <!--求购询价-->

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

@@ -254,6 +254,29 @@
     #checkAll[disabled] + label {
         cursor: not-allowed;
     }
+    .com_tab ul li{
+        margin-left: 0px;
+        position: relative;
+    }
+    .com_tab ul li.active a{
+        border-bottom: #fff;
+        background: #5078cb;
+        color: #fff;
+    }
+    .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
+    }
 </style>
 <div class="count user_right fr">
     <div class="count_center">

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

@@ -360,6 +360,29 @@
     background: #fef2f2;
     border: 1px solid #faaebe;
   }
+  .com_tab ul li{
+    margin-left: 0px;
+    position: relative;
+  }
+  .com_tab ul li.active a{
+    border-bottom: #fff;
+    background: #5078cb;
+    color: #fff;
+  }
+  .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
+  }
 </style>
 <!--右侧主体部分-->
 <div class="count user_right fr">

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

@@ -99,6 +99,29 @@
     .brand .add_brand .choose_list div.fr p:hover{
         cursor: pointer;
     }
+    .com_tab ul li{
+        margin-left: 0px;
+        position: relative;
+    }
+    .com_tab ul li.active a{
+        border-bottom: #fff;
+        background: #5078cb;
+        color: #fff;
+    }
+    .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
+    }
 </style>
 <!--右侧主体部分-->
 <div class="user_right fr">

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

@@ -66,6 +66,29 @@
         position: relative;
         top: 7px;
     }
+    .com_tab ul li{
+        margin-left: 0px;
+        position: relative;
+    }
+    .com_tab ul li.active a{
+        border-bottom: #fff;
+        background: #5078cb;
+        color: #fff;
+    }
+    .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
+    }
 </style>
 <div class="user_right fr">
     <div class="brand wanted">

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

@@ -98,6 +98,29 @@
         margin-right: 5px;
         font-size: 16px;
     }
+    .com_tab ul li{
+        margin-left: 0px;
+        position: relative;
+    }
+    .com_tab ul li.active a{
+        border-bottom: #fff;
+        background: #5078cb;
+        color: #fff;
+    }
+    .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
+    }
 </style>
 <!--右侧主体部分-->
 <div class="user_right fr">

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

@@ -35,6 +35,61 @@
     .table .tr-default th{
         color: #555;
     }
+    .com_tab ul li{
+        margin-left: 0px;
+        position: relative;
+    }
+    .com_tab ul li.active a{
+        border-bottom: #fff;
+        background: #5078cb;
+        color: #fff;
+    }
+    .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_tab2 ul li {
+        margin-left: 10px
+    }
+    .com_tab2 ul li:nth-child(1){
+        margin-left:0px
+    }
+    .com_tab2 ul li a,.com_tab2 ul li a:active{
+        border-top: 3px solid #fff;
+    }
+    .com_tab ul li.active:after{
+        display: block
+    }
+    .com_tab2 ul li::after{
+        background: url('');
+    }
+    .com_tab2 ul li a:hover{
+        color: #f15601
+    }
+    .com_tab2 ul li.active a{
+        border-top: 3px solid #f15601;
+        border-left: 1px solid #f15601;
+        border-right: 1px solid #f15601;
+        background: #fff;
+        color: #f15601
+    }
+    .com_tab2 ul li.active:hover a{
+        color: #f15601;
+    }
+    .com_tab2 ul{
+        /*border-top: 3px solid #f15601;*/
+        border-bottom: 1px solid #f15601;
+    }
+    .com_tab2 ul li::after{
+        background: url('');
+    }
 </style>
 <div class="user_right fr">
     <!--器件申请-->
@@ -46,7 +101,7 @@
                 <li class="active"><a ui-sref="vendor_component_applylist">申请记录</a></li>
             </ul>
         </div>
-        <div class="com_tab">
+        <div class="com_tab com_tab2" style="margin-bottom: 0px">
             <ul class="fl" style="width: 100%">
                 <li class="active"><a ui-sref="vendor_component_applylist">单个申请记录</a></li>
                 <li><a ui-sref="vendor_component_batchapplylist">批量申请记录</a></li>

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

@@ -32,6 +32,30 @@
         color: #999;
         line-height: 20px;
     }
+    .com_tab ul li{
+        margin-left: 0px;
+        position: relative;
+    }
+    .com_tab ul li.active a{
+        border-bottom: #fff;
+        background: #5078cb;
+        color: #fff;
+    }
+    .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
+    }
+
 </style>
 
 <div class="user_right fr">

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

@@ -26,6 +26,61 @@
     .table .tr-default th{
         color: #555;
     }
+    .com_tab ul li{
+        margin-left: 0px;
+        position: relative;
+    }
+    .com_tab ul li.active a{
+        border-bottom: #fff;
+        background: #5078cb;
+        color: #fff;
+    }
+    .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_tab2 ul li::after{
+        background: url('');
+    }
+    .com_tab2 ul li.active a{
+        border-top: 3px solid #fff;
+    }
+    .com_tab2 ul li a:hover{
+        color: #f15601
+    }
+    .com_tab2 ul li.active a{
+        border-top: 3px solid #f15601;
+        border-left: 1px solid #f15601;
+        border-right: 1px solid #f15601;
+        background: #fff;
+        color: #f15601
+    }
+    .com_tab2 ul li.active:hover a{
+        color: #f15601;
+    }
+    .com_tab2 ul{
+        /*border-top: 3px solid #f15601;*/
+        border-bottom: 1px solid #f15601;
+    }
+    .com_tab2 ul li {
+        margin-left: 10px
+    }
+    .com_tab2 ul li:nth-child(1){
+        margin-left:0px
+    }
+    .com_tab2 ul li a{
+        border-top: 3px solid #fff
+    }
 </style>
 <div class="user_right fr">
     <!--器件申请-->
@@ -37,7 +92,7 @@
                 <li class="active"><a ui-sref="vendor_component_applylist">申请记录</a></li>
             </ul>
         </div>
-        <div class="com_tab" style="margin-bottom: 0;">
+        <div class="com_tab com_tab2" style="margin-bottom: 0;">
             <ul class="fl" style="width: 100%">
                 <li><a ui-sref="vendor_component_applylist">单个申请记录</a></li>
                 <li class="active"><a ui-sref="vendor_component_batchapplylist">批量申请记录</a></li>

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

@@ -468,6 +468,29 @@
 	.no-record-list .empty .empty-info i{
 		margin-right:5px;
 	}
+	.com_tab ul li{
+		margin-left: 0px;
+		position: relative;
+	}
+	.com_tab ul li.active a{
+		border-bottom: #fff;
+		background: #5078cb;
+		color: #fff;
+	}
+	.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
+	}
 </style>
 <script src="static/lib/ui-tour/tour.js"></script>
 <!--右侧主体部分-->

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

@@ -171,6 +171,29 @@
 	.distributor-content .empty .empty-info i{
 		margin-right:5px;
 	}
+	.com_tab ul li{
+		margin-left: 0px;
+		position: relative;
+	}
+	.com_tab ul li.active a{
+		border-bottom: #fff;
+		background: #5078cb;
+		color: #fff;
+	}
+	.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
+	}
 </style>
 <!--右侧主体部分-->
 <div class="count user_right fr">

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

@@ -38,6 +38,29 @@
 	.logistic-content .empty .empty-info i{
 		margin-right:5px;
 	}
+	.com_tab ul li{
+		margin-left: 0px;
+		position: relative;
+	}
+	.com_tab ul li.active a{
+		border-bottom: #fff;
+		background: #5078cb;
+		color: #fff;
+	}
+	.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
+	}
 </style>
 <!--右侧主体部分-->
 <div class="count user_right fr">

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

@@ -30,6 +30,37 @@
 	label[disabled] {
 		cursor: not-allowed;
 	}
+	.pro_management .com_tab ul li {
+		margin-left: 0px;
+		position: relative
+	}
+	.pro_management .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;
+	}
+	.pro_management .com_tab ul li.active:after{
+		display: block
+	}
+	.pro_management .com_tab ul li.active a {
+		border-bottom: #fff;
+		background: #5078cb;
+		color: #fff
+	}
+	.pro_management .com_tab2 ul li.active a {
+		background: #fff;
+		color: #666
+	}
+	.pro_management .com_tab ul.distance li {
+		margin-left: 0px;
+		color: #fff
+	}
 	.com_tab ul li.down-goods span:hover {
 		cursor: pointer;
 		text-decoration: underline;
@@ -910,8 +941,8 @@
 		/*background: #c7ebfd*/
 	}
 	/*限制非标和标准数量显示过多换行的问题*/
-	.com_tab ul.distance li {
-		width: 100px;
+	.com_tab2 ul.distance li {
+		width: 120px;
 		height: 40px;
 		line-height: 12px;
 		text-align: center;
@@ -920,28 +951,47 @@
 		margin-left: 25px;
 	}
 	.com_tab ul.distance li:first-child {
-		margin-right: 20px;
+		margin-right: 0px;
 	}
 	.com_tab ul.distance li a.standard{
-		padding-top: 15px;
-		width: 112px;
+		width: 120px;
 		color: #666;
+		line-height: 40px;
+		border-top: 3px solid #fff
 	}
 	.com_tab ul.distance li a.standard em{
-		display: inline-block;
 		max-width: 45px;
 		overflow: hidden;
 		text-overflow: ellipsis;
 		white-space: nowrap;
 		color: #666;
 	}
-	.com_tab ul.distance li:hover a.standard em.count,.com_tab ul.distance li.active a.standard em.count{
-		color: #5078cb;
+	.com_tab ul.distance li:hover a.standard em.count{
+		color: #f15601;
 	}
-	.com_tab ul.distance li.active a.standard,.com_tab ul.distance li:hover a.standard{
-		padding-top: 15px;
-		width: 112px;
-		color: #5078cb;
+	.com_tab ul.distance li.active a.standard em.count,.com_tab ul.distance li.active a.standard{
+		color: #fff;
+	}
+	.com_tab2 ul.distance li.active a.standard em.count, .com_tab2 ul.distance li.active a.standard{
+		color: #f15601
+	}
+	.com_tab2 ul.distance li.active a.standard{
+		border-top: 3px solid #f15601;
+		border-left: 1px solid #f15601;
+		border-right: 1px solid #f15601;
+	}
+	.com_tab ul.distance li.active:hover a.standard{
+		color: #f15601;
+
+	}
+	.com_tab2 ul.distance{
+		/*border-top: 3px solid #f15601;*/
+		border-bottom: 1px solid #f15601;
+	}
+	.com_tab ul.distance li:hover a.standard{
+		/*padding-top: 15px;*/
+		/*width: 112px;*/
+		color: #f15601;
 	}
 	.wanted_list01 .tab table tr.gre-bg{
 		width: 100%;
@@ -1781,7 +1831,7 @@
 <div class="user_right fr">
 	<!--货品管理-->
 	<div class="pro_management device">
-		<div class="com_tab">
+		<div class="com_tab" style="margin-bottom: 10px">
 			<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>
@@ -1789,7 +1839,7 @@
 				<li ng-class="{'active': tab == 'undercarriage'}"><a ui-sref="vendor_undercarriage">上下架历史</a></li>
 			</ul>
 		</div>
-		<div class="com_tab">
+		<div class="com_tab com_tab2" style="margin-bottom: 0px">
 			<ul class="fl distance" style="width: 100%">
 				<li ng-class="{active : standard_tab == 'unstandard'}"  ng-click="toggleStandard('unstandard')" title="非标产品({{nCount}})"><a href="" class="standard">非标产品(<em class="count">{{nCount}}</em>)</a></li>
 				<li ng-class="{active : standard_tab =='standard'}" ng-click="toggleStandard('standard')" title="标准产品({{sCount}})"><a href="" class="standard">标准产品(<em class="count">{{sCount}}</em>)</a></li>

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

@@ -34,6 +34,29 @@
 		cursor: pointer;
 		text-decoration: underline;
 	}
+	.com_tab ul li{
+		margin-left: 0px;
+		position: relative;
+	}
+	.pro_management .com_tab ul li.active a{
+		border-bottom: #fff;
+		background: #5078cb;
+		color: #fff;
+	}
+	.pro_management .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;
+	}
+	.pro_management .com_tab ul li.active:after{
+		display: block
+	}
 	.materrial-list span.length01{
 		width: 10% !important;
 	}
@@ -824,7 +847,7 @@
 		margin-left: 25px;
 	}
 	.com_tab ul.distance li:first-child {
-		margin-right: 20px;
+		margin-right: 0px;
 	}
 	.com_tab ul.distance li a.standard{
 		padding-top: 15px;
@@ -1837,7 +1860,7 @@
 						<th width="180">操作</th>
 					</tr>
 					</thead>
-					<tbody class="bg-show">
+					<tbody class="bg-show" style="line-height:35px">
                     <div class="result" ng-if="resultTip"><span class="fl"><em>*</em>创建您的个人产品库，可为您精准推送客户需求</span>
                         <a href="help/helpDetail/56" target="_blank" class="operate-introduce">操作说明</a>
                         <a ng-click="closeTip()" class="fr">&times;</a>

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

@@ -835,6 +835,29 @@
         line-height: 40px;
         text-align: center;
     }
+    .com_tab ul li{
+        margin-left: 0px;
+        position: relative;
+    }
+    .pro_management .com_tab ul li.active a{
+        border-bottom: #fff;
+        background: #5078cb;
+        color: #fff;
+    }
+    .pro_management .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;
+    }
+    .pro_management .com_tab ul li.active:after{
+        display: block
+    }
 </style>
 <div class="user_right fr">
     <!--货品管理-->

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

@@ -1111,19 +1111,77 @@
 	.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;
 	}
-	.oder01 ul li {
-		margin-left: 20px;
+
+	.com_tab ul li {
+		margin-left: 0px;
+		position: relative
+	}
+
+	.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*/
+	}
+	.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
+	}
+	.oder01 ul li:hover a em {
+		color: #5078cb
+	}
+	.screen{
+		background: #fff;
+		padding-top: 16px;
+		padding-bottom: 16px;
+		height: 66px;
+		margin: 16px 0px;
 	}
 </style>
 <div class="user_right fr">
 	<!--订单中心-->
 	<div class="sellOder oder" id="sellOder">
-		<div class="com_tab">
+		<div class="com_tab" style="margin-bottom: 10px">
 			<ul class="fl" style="width: 100%">
 				<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>
@@ -1140,13 +1198,13 @@
 		<div class="oder01">
 			<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>
-				<li ng-class="{'active': status=='comfirmed'}" ng-click="setActive('comfirmed')"><a>待发货（<em ng-class="{'color-black': !counts['comfirmed']}" ng-bind="counts['comfirmed'] || 0"></em>）</a></li>
-				<li ng-class="{'active': status=='inbound'}" ng-click="setActive('inbound')"><a>待买家收货（<em ng-class="{'color-black': !counts['inbound']}" ng-bind="counts['inbound'] || 0"></em>）</a></li>
-				<li ng-class="{'active': status=='tobepaid'}" ng-click="setActive('tobepaid')"><a>待收款（<em ng-class="{'color-black': !counts['tobepaid']}" ng-bind="counts['tobepaid'] || 0"></em>）</a></li>
-				<li ng-class="{'active': status=='completed'}" ng-click="setActive('completed')"><a>成功的订单（<em ng-class="{'color-black': !counts['completed']}" ng-bind="counts['completed'] || 0"></em>）</a></li>
-				<li ng-class="{'active': status=='unavailable'}" ng-click="setActive('unavailable')"><a>取消的订单（<em ng-class="{'color-black': !counts['unavailable']}" ng-bind="counts['unavailable'] || 0"></em>）</a></li>
-				<li ng-class="{'active': status=='toBeReviewed'}" ng-click="setActive('toBeReviewed')"><a>售后中（<em ng-class="{'color-black': !counts['toBeReviewed']}" ng-bind="counts['toBeReviewed'] || 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>
+				<li ng-class="{'active': status=='comfirmed'}" ng-click="setActive('comfirmed')"><a>待发货(<em ng-class="{'color-black': !counts['comfirmed']}" ng-bind="counts['comfirmed'] || 0"></em>)</a></li>
+				<li ng-class="{'active': status=='inbound'}" ng-click="setActive('inbound')"><a>待买家收货(<em ng-class="{'color-black': !counts['inbound']}" ng-bind="counts['inbound'] || 0"></em>)</a></li>
+				<li ng-class="{'active': status=='tobepaid'}" ng-click="setActive('tobepaid')"><a>待收款(<em ng-class="{'color-black': !counts['tobepaid']}" ng-bind="counts['tobepaid'] || 0"></em>)</a></li>
+				<li ng-class="{'active': status=='completed'}" ng-click="setActive('completed')"><a>成功的订单(<em ng-class="{'color-black': !counts['completed']}" ng-bind="counts['completed'] || 0"></em>)</a></li>
+				<li ng-class="{'active': status=='unavailable'}" ng-click="setActive('unavailable')"><a>取消的订单(<em ng-class="{'color-black': !counts['unavailable']}" ng-bind="counts['unavailable'] || 0"></em>)</a></li>
+				<li ng-class="{'active': status=='toBeReviewed'}" ng-click="setActive('toBeReviewed')"><a>售后中(<em ng-class="{'color-black': !counts['toBeReviewed']}" ng-bind="counts['toBeReviewed'] || 0"></em>)</a></li>
 			</ul>
 		</div>
 		<!--<div class="screen">-->

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

@@ -395,6 +395,7 @@
 	}
 	.result span {
 		margin-left: 160px;
+		line-height: 30px
 	}
 </style>
 <div class="container vendor_store_apply user_right">

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

@@ -736,8 +736,7 @@
 				<div class="col-md-10 custom_col">
 					<input type="text" class="form-control" style="border-radius: inherit;" title="enFax" ng-pattern="/^[\d-]{0,20}$/" ng-model="sampleStore.enterprise.enFax" maxlength="20"/>
 				</div>
-			</div>
-		</div><!-- 店铺基础信息输入 end -->
+			</div><!-- 店铺基础信息输入 end -->
 		<!-- 店铺基础信息展示 start -->
 		<div style="margin-bottom: 20px;" ng-if="!editBasicInfo" class="width120">
 			<div class="row com_row title_row">
@@ -819,8 +818,7 @@
 						{{sampleStore.enterprise.enFax || '暂无信息'}}
 					</div>
 				</div>
-			</div>
-		</div><!-- 店铺基础信息展示 end -->
+			</div><!-- 店铺基础信息展示 end -->
 	</div>
 	<!-- 资质证明输入 start -->
 	<div class="container vendor_store_maintain user_right" style="margin-top: 15px;padding: 0 15px;min-height: 280px;" ng-if="editQualifications">

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

@@ -235,6 +235,29 @@
 	.takeSelf .empty .empty-info i{
 		margin-right:5px;
 	}
+	.com_tab ul li{
+		margin-left: 0px;
+		position: relative;
+	}
+	.com_tab ul li.active a{
+		border-bottom: #fff;
+		background: #5078cb;
+		color: #fff;
+	}
+	.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
+	}
 </style>
 <!--右侧主体部分-->
 <div class="count user_right fr">

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

@@ -547,6 +547,29 @@
     .device .wanted_list01 a.page-a:hover{
         color: #fff!important;
     }
+    .com_tab ul li{
+        margin-left: 0px;
+        position: relative;
+    }
+    .pro_management .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;
+    }
+    .pro_management .com_tab ul li.active:after{
+        display: block
+    }
+    .pro_management .com_tab ul li.active a{
+        border-bottom: #fff;
+        background: #5078cb;
+        color: #fff;
+    }
 </style>
 <div class="user_right fr">
     <!--货品管理-->

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

@@ -494,6 +494,29 @@
         border: 1px solid #337ab7 !important;
         border-bottom: none !important;
     }
+    .com_tab ul li{
+        margin-left: 0px;
+        position: relative;
+    }
+    .com_tab ul li.active a{
+        border-bottom: #fff;
+        background: #5078cb;
+        color: #fff;
+    }
+    .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
+    }
 </style>
 <div class="user_right fr">
     <!--货品管理-->