Merge remote-tracking branch 'origin/liusw-seekpurchase-v1.0.12.12' into liusw-seekpurchase-v1.0.12.12

# Conflicts:
#	src/main/webapp/resources/js/usercenter/controllers/forstore/seek_purchase_ctrl.js
#	src/main/webapp/resources/view/usercenter/forstore/seekPurchase.html

src/main/webapp/resources/js/usercenter/controllers/forstore/seek_purchase_ctrl.js

@@ -8,33 +8,68 @@ define(['app/app'], function(app) {
         $rootScope.active = 'seek_purchase';
         document.title = '我的求购-优软商城';
 
+
+        $scope.applyObj = {
+          code: '',
+          brand: '',
+          unitPrice: '',
+          currency: 'RMB',
+          encapsulation: '',
+          produceDate: '',
+          amount: '',
+          deadline: ''
+        };
+        $scope.validObj = {
+          code: true,
+          brand: true,
+          unitPrice: true,
+          amount: true,
+          deadline: true
+        };
+
+        $scope.checkCode = function () {
+          $scope.validObj.code = $scope.applyObj.code && $scope.applyObj.code !== '';
+          return this.validObj.code;
+        }
+            $scope.checkBrand = function () {
+              $scope.validObj.brand = $scope.applyObj.brand && $scope.applyObj.brand !== '';
+          return $scope.validObj.brand;
+        }
+        $scope.checkUnitPrice = function () {
+          $scope.validObj.unitPrice = $scope.applyObj.unitPrice === '' ? true : $scope.applyObj.unitPrice > 0 && $scope.applyObj.unitPrice < 100000000;
+          return $scope.validObj.unitPrice;
+        }
+        $scope.checkAmount = function () {
+          $scope.validObj.amount = $scope.applyObj.amount === '' ? true : $scope.applyObj.amount > 0 && $scope.applyObj.amount < 100000000;
+          return $scope.validObj.amount;
+        }
+        $scope.checkAll = function () {
+          return $scope.checkCode() && $scope.checkBrand() && $scope.checkUnitPrice() && $scope.checkAmount() && $scope.checkDeadline();
+        }
+        $scope.checkDeadline = function () {
+          $scope.validObj.deadline = $scope.applyObj.deadline && $scope.applyObj.deadline !== '';
+          return $scope.validObj.deadline;
+        }
+        $scope.emptyForm = function () {
+          for (var attr in $scope.applyObj) {
+            $scope.applyObj[attr] = attr === 'currency' ? 'RMB' : '';
+          }
+        }
         // 发布求购
         $scope.release = function() {
-          if (!$scope.seek.code) {
-            toaster.pop('error', "型号不能为空");
-            return;
-          }
-          if (!$scope.seek.brand) {
-            toaster.pop('error', "品牌不能为空");
-            return;
-          }
-          if (!$scope.seek.deadline) {
-            toaster.pop('error', "截止日期不能为空");
-            return;
-          }
-          if ($scope.seek.amount && $scope.seek.amount > 0 && $scope.seek.amount < 10000) {
-            toaster.pop('error', "请输入正确的数值");
-            return;
+            // 校验
+          if ($scope.checkAll()) {
+            seekPurchase.saveOneSeekPurchase($scope.applyObj, function (data) {
+              $scope.showUseFlag = false;
+              $scope.seekPurchaseTableParams.reload();
+              $scope.emptyForm();
+              toaster.pop('success', '求购发布成功');
+            }, function (res) {
+              toaster.pop('error', res.data);
+            });
+          } else {
+            toaster.pop('error', '请输入正确的信息');
           }
-          seekPurchase.saveOneSeekPurchase($scope.seek,function(data){
-            $scope.showUseFlag = false;
-            $scope.seek = null;
-            $scope.seek.currency='RMB';
-            $scope.seekPurchaseTableParams.reload();
-            toaster.pop('success', '求购发布成功');
-          }, function (res) {
-            toaster.pop('error', res.data);
-          });
         }
 
       // 买家求购列表

src/main/webapp/resources/view/usercenter/forstore/seekPurchase.html

@@ -48,6 +48,9 @@
         padding: 0 5px;
         margin: 0;
     }
+    .seek-purchase .seek-purchase-content .publish-purchase .fl .form-block input.error {
+        border-color: #f4645f !important;
+    }
     .seek-purchase .seek-purchase-content .publish-purchase .fl .form-block.single-price select {
         position: absolute;
         width: 32px;
@@ -390,17 +393,18 @@
                 <p>单个发布</p>
                 <div class="form-block">
                     <span><i>*</i>型号</span>
-                    <input type="text" class="form-group" ng-model="seek.code" maxlength="30" ng-class="{'has-success': checkSuccess, 'has-error': checkFailed}"/>
+                    <input type="text" class="form-group" ng-model="applyObj.code" maxlength="30" ng-class="{'error': !validObj.code}" ng-blur="checkCode()" >
                 </div>
                 <div class="form-block">
                     <span><i>*</i>品牌</span>
-                    <input type="text" class="form-group" ng-model="seek.brand" maxlength="20" ng-class="{'has-success': checkSuccess1, 'has-error': checkFailed1}">
+                    <input type="text" class="form-group" ng-class="{'error': !validObj.brand}" maxlength="20" ng-model="applyObj.brand" ng-blur="checkBrand()">
                 </div>
                 <div class="form-block">
                     <span><i>*</i>截止日期</span>
-                    <input type="text" ng-model="seek.deadline"
+                    <input type="text" ng-model="applyObj.deadline"
                            readonly
                            class="form-control select-adder" placeholder="截止日期"
+                           ng-class="{'error': !validObj.deadline}"
                            datepicker-popup="yyyy-MM-dd"
                            is-open="condition.deadlineOpen"
                            min-date="startDate" current-text="今天" clear-text="清除" close-text="关闭"
@@ -410,23 +414,23 @@
                 </div>
                 <div class="form-block">
                     <span>采购数量</span>
-                    <input type="number" class="form-group"  ng-model="seek.amount">
+                    <input type="number" class="form-group" ng-class="{'error': !validObj.amount}" ng-model="applyObj.amount" ng-blur="checkAmount" ng-change="onAmountInput()" >
                 </div>
                 <div class="form-block single-price">
                     <span>单价预算</span>
-                    <select  ng-model="seek.currency" ng-init="seek.currency='RMB'">
+                    <select  ng-model="applyObj.currency">
                         <option value="RMB">￥</option>
                         <option value="USD">$</option>
                     </select>
-                    <input type="number" class="form-group" ng-model="seek.unitPrice">
+                    <input type="number" class="form-group" ng-class="{'error': !validObj.unitPrice}" ng-model="applyObj.unitPrice" ng-blur="checkUnitPrice()" ng-change="onUnitPriceInput()" >
                 </div>
                 <div class="form-block">
                     <span>封装</span>
-                    <input type="text" class="form-group" ng-model="seek.encapsulation">
+                    <input type="text" class="form-group" ng-model="applyObj.encapsulation"  maxlength="20">
                 </div>
                 <div class="form-block">
                     <span>生产日期</span>
-                    <input type="text" class="form-group" ng-model="seek.produceDate" maxlength="20">
+                    <input type="text" class="form-group" ng-model="applyObj.produceDate">
                 </div>
                 <a href="javascript:void(0)" ng-click="release()">发布求购</a>
             </div>