|
|
@@ -13117,7 +13117,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
BaseService.scrollBackToTop();
|
|
|
var loadAccount = function () {
|
|
|
AccountEnterprise.get({}, function (data) {
|
|
|
- $scope.loading = false;
|
|
|
$scope.enterprise = data;
|
|
|
$scope.saleStatus = $scope.enterprise.prodsale;
|
|
|
});
|
|
|
@@ -13154,6 +13153,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
var getService = function () {
|
|
|
return $scope.searchMethod ? GetProductInfo : GetProductInfoNewest;
|
|
|
};
|
|
|
+ $scope.loading = true;
|
|
|
|
|
|
$scope.tableParams = new ngTableParams({
|
|
|
page: 1,
|
|
|
@@ -13165,7 +13165,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
total: 0,
|
|
|
counts: [5, 10, 25, 50],
|
|
|
getData: function ($defer, params) {
|
|
|
- $scope.loading = true;
|
|
|
var pageParams = params.url();
|
|
|
pageParams.keyword = $scope.keyword;
|
|
|
pageParams.searchFilter = $scope.searchFilter;
|