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

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

@@ -3793,11 +3793,9 @@ define(['app/app', 'jquery-uploadify'], function(app) {
 
         // $scope.productAddFragment($scope.productUpOff.goods.prices)
       }
-      if (!$scope.productUpOff.goods.prices) {
-        $scope.productUpOff.goods.prices = [{'start': $scope.productUpOff.minPackQty || 1, rMBPrice: ''}]
-      }
-      if ($scope.productUpOff.goods.prices.length === 0) {
-        $scope.productUpOff.goods.prices = [{'start': $scope.productUpOff.minPackQty || 1, rMBPrice: ''}]
+      if (!$scope.productUpOff.goods.prices || $scope.productUpOff.goods.prices.length === 0) {
+        // $scope.productUpOff.goods.prices = [{'start': $scope.productUpOff.minPackQty || 1, rMBPrice: ''}]
+        $scope.productUpOff.goods.prices = []
       }
       _item = $scope.productUpOff.goods.prices[0].start
       // $scope.productUpOff.goods.prices[0].start = $scope.productUpOff.minPackQty || 1
@@ -3911,14 +3909,25 @@ define(['app/app', 'jquery-uploadify'], function(app) {
       if (!flag) {
         return
       }
+
+        // 先判断是自营店铺 还是 寄售店铺
+        // var _selfSale = $scope.productUpOff.goods.selfSale
+        if ($scope.storeInfo.uuid) { // 如果是自营店铺
+            if ($scope.productUpOff.goods.dateArea === 'formMe') { // 用户选择了自营
+                $scope.productUpOff.goods.selfSale = 1
+            } else if ($scope.productUpOff.goods.dateArea === 'autoMonth') { // 用户选择了寄售
+                $scope.productUpOff.goods.selfSale = 0
+            }
+        }
+
       if ($scope.productUpOff.goods.prices.length === 1) {
-       if ($scope.store.enType === 'HK') {
-         $scope.productUpOff.goods.prices[0].uSDNTPrice = ''
-         $scope.productUpOff.goods.prices[0].end = '999999999'
-       }else {
-         $scope.productUpOff.goods.prices[0].rMBNTPrice = ''
-         $scope.productUpOff.goods.prices[0].end = '999999999'
-       }
+          if ($scope.store.enType === 'HK') {
+              $scope.productUpOff.goods.prices[0].uSDNTPrice = ''
+              $scope.productUpOff.goods.prices[0].end = '999999999'
+          }else {
+              $scope.productUpOff.goods.prices[0].rMBNTPrice = ''
+              $scope.productUpOff.goods.prices[0].end = '999999999'
+          }
       } else {
         for (var i = 0; i < $scope.productUpOff.goods.prices.length; i++) {
           if ($scope.store.enType === 'HK') {
@@ -3935,16 +3944,12 @@ define(['app/app', 'jquery-uploadify'], function(app) {
         }
       }
 
-      // 先判断是自营店铺 还是 寄售店铺
-      // var _selfSale = $scope.productUpOff.goods.selfSale
-      if ($scope.storeInfo.uuid) { // 如果是自营店铺
-        if ($scope.productUpOff.goods.dateArea === 'formMe') { // 用户选择了自营
-          $scope.productUpOff.goods.selfSale = 1
-        } else if ($scope.productUpOff.goods.dateArea === 'autoMonth') { // 用户选择了寄售
-          $scope.productUpOff.goods.selfSale = 0
+      var goodsData = angular.copy($scope.productUpOff.goods)
+        if (goodsData.prices.length === 1 && !(goodsData.prices[0].rMBPrice || goodsData.prices[0].uSDPrice)) {
+            goodsData.prices = []
         }
-      }
-      Goods.updateGoods(null, $scope.productUpOff.goods, function(data) {
+
+      Goods.updateGoods(null, goodsData, function(data) {
         if (data.code == 1) {
           toaster.pop('success', '保存成功');
           loadData()