|
|
@@ -158,10 +158,13 @@ define(['app/app'], function (app) {
|
|
|
|
|
|
var loadData = function() {
|
|
|
Order.getIndividualOrder($scope.param, function(data) {
|
|
|
- $scope.AllOrderInfo = data;
|
|
|
- if($scope.childStatus ==''){
|
|
|
- $scope.AllOrderInfo[$scope.status] = data.totalElements;
|
|
|
- }
|
|
|
+ if ($scope.isSearch){
|
|
|
+ $scope.AllOrderInfo = data;
|
|
|
+ if($scope.childStatus ==''){
|
|
|
+ $scope.AllOrderInfo[$scope.status] = data.totalElements;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ $scope.isSearch = false;
|
|
|
$scope.currenctOrders = data.content;
|
|
|
angular.forEach($scope.currenctOrders, function(data){
|
|
|
data.ensurePrice = Number(NumberService.toCeil(data.ensurePrice, 2));
|
|
|
@@ -414,6 +417,7 @@ define(['app/app'], function (app) {
|
|
|
$scope.param.page = 1;
|
|
|
$scope.param.status = getState();
|
|
|
$scope.param.keyword = $scope.keyword;
|
|
|
+ $scope.isSearch = true;
|
|
|
|
|
|
loadData();
|
|
|
getCounts();
|