yangc пре 8 година
родитељ
комит
9a823843b7

+ 12 - 11
src/main/webapp/resources/js/usercenter/controllers/forstore/seek_purchase_ctrl.js

@@ -81,8 +81,8 @@ define(['app/app'], function (app) {
             $scope.validObj.unitPrice = ($scope.applyObj.unitPrice === '' || !$scope.applyObj.unitPrice ) ? true
                 : $scope.applyObj.unitPrice > 0 && $scope.applyObj.unitPrice
                 < 100000000;
-            if (!$scope.validObj.unitPrice) {
-              toaster.pop('error', '请输入正确的数值');
+            if (!$scope.validObj.unitPrice || $scope.validObj.unitPrice <= 0) {
+              toaster.pop('error', '单价必须是大于0的数字');
             }
             return $scope.validObj.unitPrice;
           }
@@ -164,9 +164,8 @@ define(['app/app'], function (app) {
             return $scope.validObj.amount;
           }
           $scope.checkAll = function () {
-            return $scope.checkCode() && $scope.checkBrand()
-                && $scope.checkUnitPrice() && $scope.checkAmount()
-                && $scope.checkDeadline();
+            return $scope.checkCode() && $scope.checkBrand() && $scope.checkDeadline()
+                && $scope.checkUnitPrice() && $scope.checkAmount();
           }
           $scope.checkDeadline = function () {
             $scope.validObj.deadline = $scope.applyObj.deadline
@@ -192,13 +191,15 @@ define(['app/app'], function (app) {
                     toaster.pop('error', res.data);
                   });
             } else {
-              if (!$scope.validObj.code) {
-                toaster.pop('error', '型号不能为空');
-              } else if (!$scope.validObj.brand) {
-                toaster.pop('error', '品牌不能为空');
-              } else if (!$scope.validObj.deadline) {
+              // if (!$scope.validObj.code) {
+              //   // toaster.pop('error', '型号不能为空');
+              // } else if (!$scope.validObj.brand) {
+              //   // toaster.pop('error', '品牌不能为空');
+              if (!$scope.validObj.deadline) {
                 toaster.pop('error', '截止日期不能为空');
-              } else if (!$scope.validObj.amount || !$scope.validObj.unitPrice) {
+              } else if (!$scope.validObj.unitPrice) {
+                // toaster.pop('error', '单价必须是大于0的数字');
+              } else if (!$scope.validObj.amount) {
                 toaster.pop('error', '请输入正确的数值');
               }
             }