Merge branch 'dev2' into dev

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

@@ -53,12 +53,12 @@ define([ 'app/app' ], function(app) {
                 $scope.modifyRule = data;
                 $scope.isModify = true;
                 $scope.isActive = $scope.modifyRule.active == 1;
+                $scope.fareArray = [];
                 if ($scope.modifyRule.fareType == 2){
                     $scope.fareArray = angular.fromJson($scope.modifyRule.fares);
                 }
                 $scope.currencySymbol = $scope.modifyRule.currencyName == "RMB" ? "￥" : "$";
-                if (!$scope.fareArray){
-                    $scope.fareArray = [];
+                if ($scope.fareArray.length == 0){
                     var firstFare = {
                         start : "0",
                         end : "",