Explorar el Código

品牌选择模态框样式调整

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@9859 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
hejq hace 8 años
padre
commit
0e341ab019

+ 2 - 1
src/main/webapp/resources/js/index/app.js

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

+ 1 - 1
src/main/webapp/resources/tpl/index/purc/modal/product_brandChoose_modal.html

@@ -1,6 +1,6 @@
 <style>
 .modal-dialog {
-    width: 520px;
+    width: 900px;
     margin: 30px auto;
 }