配送规则分段价格调整

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

@@ -1,6 +1,6 @@
 define([ 'app/app' ], function(app) {
     'use strict';
-    app.register.controller('vendorDeliveryRuleCtrl', ['$scope', '$rootScope', 'ngTableParams', 'DistributionRule', 'BaseService', 'toaster', '$state', '$http', 'Enterprise', 'TreeData','$q', function ($scope, $rootScope, ngTableParams, DistributionRule, BaseService, toaster, $state, $http, Enterprise, TreeData,$q) {
+    app.register.controller('vendorDeliveryRuleCtrl', ['$scope', '$rootScope', 'ngTableParams', 'DistributionRule', 'BaseService', 'toaster', '$state', '$http', 'Enterprise', 'TreeData','$q','NumberService', function ($scope, $rootScope, ngTableParams, DistributionRule, BaseService, toaster, $state, $http, Enterprise, TreeData,$q,NumberService) {
         $rootScope.active = 'vendor_logistics';
         $scope.tab = 'deliverRule';
         $scope.title = '配送规则';
@@ -152,7 +152,7 @@ define([ 'app/app' ], function(app) {
             }
             if(Number(data.num) < 0 || Number(data.num) % 1 != 0) {
                 data.num = 1;
-                toaster.pop('warning', '提示', '运费必须是整数');
+                toaster.pop('warning', '提示', '请输入大于0的整数');
                 return false;
             }
             if(Number(data.num) > 100000){
@@ -266,11 +266,11 @@ define([ 'app/app' ], function(app) {
         };
 
         $scope.inputQtyFare = function (data, index) {
-            if(!data.start && !data.end) {
-                data.start = 1;
-                data.end = 1;
-                return false;
-            }
+            // if(!data.start && !data.end) {
+            //     data.start = 1;
+            //     data.end = 1;
+            //     return false;
+            // }
             if(isNaN(data.start) || isNaN(data.end)) {
                 data.end = data.start + 1;
                 $scope.fareArray[index+1].start = data.end;
@@ -288,7 +288,10 @@ define([ 'app/app' ], function(app) {
                 toaster.pop('warning', '提示', '金额必须大于0');
                 return false;
             }
-            if(Number(data.end) <= Number(data.start)){
+            if(data.end.length != 0 && Number(data.end) <= Number(data.start)){
+                data.end = data.start + 1;
+            }
+            if(data.end.length != 0 && Number(data.end) >= Number($scope.fareArray[index+1].end)){
                 data.end = data.start + 1;
             }
             if(Number(data.start) > 100000){
@@ -297,9 +300,18 @@ define([ 'app/app' ], function(app) {
             if(Number(data.end) > 100000){
                 data.end = 100000;
             }
-            data.start = Number(data.start);
-            data.end = Number(data.end);
-            $scope.fareArray[index+1].start = Number(data.end);
+            if (data.end.length != 0){
+                data.start = Number(NumberService.toCeil(data.start, 2));
+                data.end = Number(NumberService.toCeil(data.end, 2));
+                $scope.fareArray[index+1].start = data.end;
+            }
+        };
+
+        $scope.formatMoney = function (data) {
+            if (Number(data) > 100000){
+                data = 100000;
+            }
+            return Number(data);
         };
 
         /**

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

@@ -517,7 +517,7 @@
 								<p ng-if="$index == 0">
 									总价在
 									<i class="currency" ng-if="modifyRule.currencyName=='RMB'">￥</i>
-									<i class="currency" ng-if="modifyRule.currencyName=='USD'">$</i>{{data.end}}以下，
+									<i class="currency" ng-if="modifyRule.currencyName=='USD'">$</i><i class="input-text" ng-bind="data.end"></i>以下，
 									运费为
 									<i class="currency" ng-if="modifyRule.currencyName=='RMB'">￥</i>
 									<i class="currency" ng-if="modifyRule.currencyName=='USD'">$</i>{{data.fare}}
@@ -525,12 +525,12 @@
 								<p ng-if="$index != 0 && $index != fareArray.length - 1">
 									总价在
 									<i class="currency" ng-if="modifyRule.currencyName=='RMB'">￥</i>
-									<i class="currency" ng-if="modifyRule.currencyName=='USD'">$</i>{{data.start}}以上（含
+									<i class="currency" ng-if="modifyRule.currencyName=='USD'">$</i><i class="input-text">{{data.start}}</i>以上（含
 									<i class="currency" ng-if="modifyRule.currencyName=='RMB'">￥</i>
 									<i class="currency" ng-if="modifyRule.currencyName=='USD'">$</i>{{data.start}}
 									），
 									<i class="currency" ng-if="modifyRule.currencyName=='RMB'">￥</i>
-									<i class="currency" ng-if="modifyRule.currencyName=='USD'">$</i>{{data.end}}以下，
+									<i class="currency" ng-if="modifyRule.currencyName=='USD'">$</i><i class="input-text">{{data.end}}</i>以下，
 									运费为
 									<i class="currency" ng-if="modifyRule.currencyName=='RMB'">￥</i>
 									<i class="currency" ng-if="modifyRule.currencyName=='USD'">$</i>{{data.fare}}
@@ -538,7 +538,7 @@
 								<p ng-if="$index == fareArray.length-1">
 									总价在
 									<i class="currency" ng-if="modifyRule.currencyName=='RMB'">￥</i>
-									<i class="currency" ng-if="modifyRule.currencyName=='USD'">$</i>{{data.start}}以上（含
+									<i class="currency" ng-if="modifyRule.currencyName=='USD'">$</i><i class="input-text">{{data.start}}</i>以上（含
 									<i class="currency" ng-if="modifyRule.currencyName=='RMB'">￥</i>
 									<i class="currency" ng-if="modifyRule.currencyName=='USD'">$</i>{{data.start}}
 									），运费为
@@ -761,6 +761,18 @@
 	}
 	.rule-main .rule-content .common-style .price-input em i{
 		margin-right: 20px;
+		display: inline-block;
+		max-width: 60px;
+		float: left;
+		overflow: hidden;
+	}
+	.rule-main .rule-content .common-style.style-price .row .no-edit p i.input-text{
+		display: inline-block;
+		max-width: 60px;
+		overflow: hidden;
+		position: relative;
+		top: 8px;
+		margin-right: 5px;
 	}
 	.rule-main .rule-content .common-style .price-input i.currency{
 		width: 20px;