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

src/main/webapp/resources/js/admin/controllers/statsDataCtrl.js

@@ -51,13 +51,13 @@ define([ 'app/app' ], function(app) {
                 var currentTime = _getClearDay(new Date());
                 var endDate = new Date(currentTime + 23 * 60 * 60 * 1000 + 59 * 60 * 1000 + 59 * 1000);
                 if (val == 'oneMonth') {
-                    $scope.startDate = new Date(currentTime - 30 * 24 * 60 * 60 * 1000 - 24 * 60 * 60 * 1000);
+                    $scope.startDate = new Date(currentTime - 30 * 24 * 60 * 60 * 1000);
                     $scope.endDate = endDate;
                 } else if (val == 'threeMonth') {
-                    $scope.startDate = new Date(currentTime - 3 * 30 * 24 * 60 * 60 * 1000 - 24 * 60 * 60 * 1000);
+                    $scope.startDate = new Date(currentTime - 3 * 30 * 24 * 60 * 60 * 1000);
                     $scope.endDate = endDate;
                 } else if (val == 'sixMonth') {
-                    $scope.startDate = new Date(currentTime - 6 * 30 * 24 * 60 * 60 * 1000 - 24 * 60 * 60 * 1000);
+                    $scope.startDate = new Date(currentTime - 6 * 30 * 24 * 60 * 60 * 1000);
                     $scope.endDate = endDate;
                 }
             }

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

@@ -694,18 +694,18 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
 
           $scope.offerCount = 0;
           $scope.goodsCount = 0;
-              $scope.replaceOfferCount = 0;
+          $scope.replaceOfferCount = 0;
           $scope.currentSeek = {};
           $scope.setSeekStatus = function (seek, status, isDisabled) {
               if (isDisabled) {
                   return;
               }
-              if (seek.id != $scope.currentSeek.id) {
-                  $scope.isInit = true;
+              // if (seek.id != $scope.currentSeek.id) {
+              //     $scope.isInit = true;
                   $scope.goodsCount = 0;
                   $scope.offerCount = 0;
                   $scope.replaceOfferCount = 0;
-              }
+              // }
             $scope.currentSeek = seek;
               if (!seek.$status || seek.$status != 1) {
                   seekPurchase.getMallGoodsList({code:seek.cmpCode, brand: seek.inbrand}, function (data) {
@@ -722,7 +722,7 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
                     } else {
                         $scope.offer = seek.qutations;
                         clearSeekStatus();
-                        if (seek.qutations && seek.qutations.length && $scope.isInit) {
+                        if (seek.qutations && seek.qutations.length) {
                             for (var i = 0; i < seek.qutations.length; i++) {
                                 if (seek.qutations[i].isReplace == 1) {
                                     $scope.replaceOfferCount++;
@@ -731,8 +731,7 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
                                 }
                             }
                         }
-                        seek.$status = $scope.isInit ? $scope.offerCount == 0 ? 3 : 2 : status;
-                        $scope.isInit = false;
+                        seek.$status = $scope.offerCount == 0 ? 3 : 2;
                     }
                 });
             } else if (status == 1 && $scope.goodsCount != 0) {// 查看现货
@@ -744,7 +743,7 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
             }
             $scope.selectAmount = 0;
             $scope.selectPrice = 0;
-          }
+          };
 
           $scope.condition = {
             endDateOpen: false,

src/main/webapp/resources/view/sso/b2b/searchresult.html

@@ -316,8 +316,8 @@
 				<div class="col-xs-9">
 					<div class="search">
 						<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
-							<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入企业名称等关键词进行搜索" />
-							<a class="btn input-group-addon" ng-click="onSearch()">搜索</a>
+							<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch(keyword)" placeholder="输入企业名称等关键词进行搜索" />
+							<a class="btn input-group-addon" ng-click="onSearch(keyword)">搜索</a>
 						</div>
 					</div>
 				</div>