|
@@ -14567,6 +14567,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
// 打开品牌选择的模态框
|
|
// 打开品牌选择的模态框
|
|
|
$scope.selectBrand = function(prod){ //打开模态
|
|
$scope.selectBrand = function(prod){ //打开模态
|
|
|
var modalInstance = $modal.open({
|
|
var modalInstance = $modal.open({
|
|
|
|
|
+ size: 'lg',
|
|
|
templateUrl : 'static/tpl/index/purc/modal/product_brandChoose_modal.html', //指向上面创建的视图
|
|
templateUrl : 'static/tpl/index/purc/modal/product_brandChoose_modal.html', //指向上面创建的视图
|
|
|
controller : 'BrandModalInstanceCtrl' // 初始化模态范围
|
|
controller : 'BrandModalInstanceCtrl' // 初始化模态范围
|
|
|
});
|
|
});
|
|
@@ -15215,7 +15216,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
// param.keyword = $scope.filter.keyword;
|
|
// param.keyword = $scope.filter.keyword;
|
|
|
BrandActiveAPI.getSimpleInfoPage(param, {}, function(page) {
|
|
BrandActiveAPI.getSimpleInfoPage(param, {}, function(page) {
|
|
|
if (page) {
|
|
if (page) {
|
|
|
- params.total(page.totalElement);
|
|
|
|
|
|
|
+ params.total(page.totalElements);
|
|
|
$defer.resolve(page.content);
|
|
$defer.resolve(page.content);
|
|
|
}
|
|
}
|
|
|
}, function(){
|
|
}, function(){
|