wangcz 7 лет назад
Родитель
Сommit
5786d08d8b

+ 13 - 13
src/main/webapp/resources/js/usercenter/controllers/forstore/buyer_materialCtrl.js

@@ -3897,19 +3897,19 @@ define(['app/app', 'jquery-uploadify'], function(app) {
       }
       var flag = true
       for (var i = 0; i < $scope.productUpOff.goods.prices.length; i++) {
-        if (!$scope.productUpOff.goods.prices[i].start
-            || !$scope.productUpOff.goods.prices[i].rMBPrice && $scope.store.enType !== 'HK' ) {
-          toaster.pop('warning', '提示', '价格梯度不能为空')
-          flag = false
-          break;
-        }
-        else if (!$scope.productUpOff.goods.prices[i].start
-              || !$scope.productUpOff.goods.prices[i].uSDPrice && $scope.store.enType === 'HK') {
-            toaster.pop('warning', '提示', '价格梯度不能为空')
-            flag = false
-            break;
-        }
-        else if ($scope.productUpOff.goods.prices[i + 1] && Number($scope.productUpOff.goods.prices[i].start) > Number($scope.productUpOff.goods.prices[i + 1].start)) {
+        // if (!$scope.productUpOff.goods.prices[i].start
+        //     || !$scope.productUpOff.goods.prices[i].rMBPrice && $scope.store.enType !== 'HK' ) {
+        //   toaster.pop('warning', '提示', '价格梯度不能为空')
+        //   flag = false
+        //   break;
+        // }
+        // else if (!$scope.productUpOff.goods.prices[i].start
+        //       || !$scope.productUpOff.goods.prices[i].uSDPrice && $scope.store.enType === 'HK') {
+        //     toaster.pop('warning', '提示', '价格梯度不能为空')
+        //     flag = false
+        //     break;
+        // }
+        if ($scope.productUpOff.goods.prices[i + 1] && Number($scope.productUpOff.goods.prices[i].start) > Number($scope.productUpOff.goods.prices[i + 1].start)) {
           toaster.pop('warning','提示','输入值会导致梯度重叠,请重新修改')
           flag = false
           break;

+ 13 - 13
src/main/webapp/resources/js/vendor/controllers/forstore/vendor_materialCtrl.js

@@ -3890,19 +3890,19 @@ define(['app/app', 'jquery-uploadify'], function(app) {
       }
       var flag = true
       for (var i = 0; i < $scope.productUpOff.goods.prices.length; i++) {
-        if (!$scope.productUpOff.goods.prices[i].start
-            || !$scope.productUpOff.goods.prices[i].rMBPrice && $scope.store.enType !== 'HK' ) {
-          toaster.pop('warning', '提示', '价格梯度不能为空')
-          flag = false
-          break;
-        }
-        else if (!$scope.productUpOff.goods.prices[i].start
-              || !$scope.productUpOff.goods.prices[i].uSDPrice && $scope.store.enType === 'HK') {
-            toaster.pop('warning', '提示', '价格梯度不能为空')
-            flag = false
-            break;
-        }
-        else if ($scope.productUpOff.goods.prices[i + 1] && Number($scope.productUpOff.goods.prices[i].start) > Number($scope.productUpOff.goods.prices[i + 1].start)) {
+        // if (!$scope.productUpOff.goods.prices[i].start
+        //     || !$scope.productUpOff.goods.prices[i].rMBPrice && $scope.store.enType !== 'HK' ) {
+        //   toaster.pop('warning', '提示', '价格梯度不能为空')
+        //   flag = false
+        //   break;
+        // }
+        // else if (!$scope.productUpOff.goods.prices[i].start
+        //       || !$scope.productUpOff.goods.prices[i].uSDPrice && $scope.store.enType === 'HK') {
+        //     toaster.pop('warning', '提示', '价格梯度不能为空')
+        //     flag = false
+        //     break;
+        // }
+        if ($scope.productUpOff.goods.prices[i + 1] && Number($scope.productUpOff.goods.prices[i].start) > Number($scope.productUpOff.goods.prices[i + 1].start)) {
           toaster.pop('warning','提示','输入值会导致梯度重叠,请重新修改')
           flag = false
           break;

+ 1 - 1
src/main/webapp/resources/view/common/site-nav.html

@@ -107,7 +107,7 @@
         border-right: 1px solid #999999;
         background: #ffffff;
         color: #333333;
-        z-index:11;
+        z-index:11111;
     }
     #site-nav .dropdown:hover .dropdown-menu {
         display: block;

+ 1 - 1
src/main/webapp/resources/view/common/store_site_nav.html

@@ -58,7 +58,7 @@
 		border-bottom: none;
 		background: #ffffff;
 		color: #333333;
-		z-index:11;
+		z-index:11111;
 	}
 	#site-nav .dropdown:hover .dropdown-menu {
 		display: block;