处理B2B订单

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

@@ -109,7 +109,7 @@ body {
 }
 /* text */
 .text-theme {
-	color: #5078cb !important;
+	color: #3c7cf5 !important;
 }
 
 .text-deep-blue {
@@ -599,9 +599,7 @@ table th.before-blank:before, table th.before-blank:after {
 	font-size: 14px;
 	vertical-align: middle !important;
 }
-.public-tab.table>tbody+tbody{
-	border-top: none;
-}
+
 .public-tab.table>thead>tr{
 	height: 40px !important;
 }
@@ -612,10 +610,6 @@ table th.before-blank:before, table th.before-blank:after {
 .public-tab.table>thead>tr>th{
 	border-bottom: none !important;
 }
-.public-tab.table>tbody>tr>td{
-	border-top: none;
-	border-bottom: #e8e8e8 1px solid;
-}
 .public-tab.table>tbody>tr>td a{
 	margin: 0 10px;
 }
@@ -1360,4 +1354,24 @@ select {
 .com-check-radio label {
 	margin-bottom: 5px;
 }
-/* tab 和搜索部分 end*/
+/* tab 和搜索部分 end*/
+
+/* 部分图标样式调整 */
+.no-circle-icon{
+	display:inline-block;
+	padding:0 5px;
+	line-height: 20px;
+	height:20px;
+	color:#fff;
+	background: #ea5a60;
+	cursor:pointer;
+}
+.circle-icon{
+	display:inline-block;
+	padding:0 5px;
+	line-height: 20px;
+	height:20px;
+	color:#fff;
+	background: #15b262;
+	cursor:pointer;
+}

src/main/webapp/resources/js/vendor/controllers/b2b/saleOrderCtrl.js

@@ -14,7 +14,7 @@ define(['app/app'], function (app) {
         function ($scope, $filter, ngTableParams, toaster, BaseService, $timeout, $modal, SearchFilter, $http, $rootScope, B2bCommerce) {
             BaseService.scrollBackToTop();
             $rootScope.active = 'vendor_order';
-            $rootScope.dateArea = 'autoMonth';
+            $rootScope.autoMonth = false;
             $scope.storeType = 'order';
             $scope.active = 'todo';
             $scope.dateZoneText = '不限';