异常bug处理

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

@@ -1,7 +1,7 @@
 define([ 'app/app', 'jquery-uploadify' ], function(app) {
 	'use strict';
 	app.register.controller('vendor_materialPersonCtrl', ['$scope', '$rootScope', 'Material', 'toaster', 'ComponentActive', 'Enterprise', '$q', 'NumberService', '$location', '$stateParams', 'Search', '$modal', 'ComponentActiveAPI', 'BrandSubmit', 'BrandActiveAPI', 'DistributionRule', 'prodRepositoryService', 'AuthenticationService', 'StoreInfo', 'ProductServiceQuery', 'StoreCms', 'ByteCountService', 'Goods', function ($scope, $rootScope, Material, toaster, ComponentActive, Enterprise, $q, NumberService, $location, $stateParams, Search, $modal, ComponentActiveAPI, BrandSubmit, BrandActiveAPI, DistributionRule, prodRepositoryService, AuthenticationService, StoreInfo, ProductServiceQuery, StoreCms, ByteCountService, Goods) {
-		$rootScope.active = 'vendor_material_person';
+		$rootScope.active = 'vendor_material';
 		document.title = '卖家产品库-优软商城';
 		$scope.tab = 'material_person';
 		$scope.standard_tab = $stateParams.standardParam ? $stateParams.standardParam : 'unstandard';
@@ -62,14 +62,6 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
 			loadData();
 		}
 
-		if ($location.$$path.endsWith('vendor_material_unstandard_erp')) {
-			$scope.tab = 'unstandard_material';
-			// $scope.standard_tab = 'unstandard';
-            $scope.param.type = "nStandard";
-            // $scope.param.sorting = {code : 'ASC'};
-            $scope.isBatch = false;
-		}
-
 		$scope.goods = { breakUp: 1, isSelfSupport: 1, prices: [{}] };
 		$scope.isSelfSupport = true;
 		$scope.showShelfArea = showShelfArea;

src/main/webapp/resources/view/common/modal/delivery_rule_modal.html

@@ -7,8 +7,6 @@
         background-color: white;
         top: 55%;
         left: 50%;
-        height: 155px;
-        width: 290px;
         margin: -145px 0 0 -77px;
     }
     .com-del-box{

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

@@ -485,9 +485,11 @@
     }
     .device .wanted_list01 .pagination > li > a:hover {
         border-bottom: 1px solid #ddd !important;
+        z-index: 0;
     }
-    .device .wanted_list01 .pagination > .active > a {
+    .device .wanted_list01 .pagination > li.active:hover > a {
         border: 1px solid #337ab7 !important;
+        border-bottom: none !important;
     }
 </style>
 <div class="user_right fr">