Forráskód Böngészése

Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

zhuth 7 éve
szülő
commit
9652068c9b

+ 3 - 3
frontend/saas-web/app.json

@@ -278,8 +278,8 @@
     "builds": {
         "dev": {
             "server": {
-                "accountCenter":"http://192.168.0.181:8000",
-                "accountEnterprise":"http://192.168.0.181:8000/#/enterprise",
+                "accountCenter":"https://saas-dev.usoftchina.com:5443",
+                "accountEnterprise":"https://saas-dev.usoftchina.com:5443/#/enterprise",
                 "basePath": {
                     "https": "https://saas-api-dev.usoftchina.com:5443",
                     "http": "http://192.168.0.181:8560"
@@ -293,7 +293,7 @@
                 "accountEnterprise": "https://saas-test.usoftchina.com:5443/#/enterprise",
                 "basePath": {
                     "https": "https://saas-api-test.usoftchina.com:5443",
-                    "http": "http://192.168.0.181:8575"
+                    "http": "http://trade-test.usoftchina.com:5443"
                 },
                 "urlPattern": "^\/api\/"
             }

+ 1 - 1
frontend/saas-web/app/view/sys/account/DataList.js

@@ -248,7 +248,7 @@ Ext.define('saas.view.sys.account.DataList', {
             gridBodyBox = grid.body.dom.getBoundingClientRect(),
             gridBodyBoxHeight = gridBodyBox.height;
 
-            var pageSize = Math.floor(gridBodyBoxHeight / 32);
+            var pageSize = Math.floor(gridBodyBoxHeight / 35);
 
             store.setPageSize(pageSize);
         },

BIN
frontend/saas-web/resources/images/auth-background.jpg