Merge remote-tracking branch 'origin/release-201827-wangcz' into release-201827-wangcz

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

@@ -3852,7 +3852,7 @@ define(['app/app', 'jquery-uploadify'], function(app) {
           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)) {
+        else 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;
@@ -3870,7 +3870,7 @@ define(['app/app', 'jquery-uploadify'], function(app) {
           $scope.productUpOff.goods.prices[i].end = '999999999'
           if ($scope.productUpOff.goods.prices[i + 1]) {
             $scope.productUpOff.goods.prices[i].end = parseInt(
-                $scope.productUpOff.goods.prices[i].start) - 1
+                $scope.productUpOff.goods.prices[i + 1].start) - 1
           }
         }
       }