diff --git a/app/lib/deploy/upyun.php b/app/lib/deploy/upyun.php index fd4b994..c6c684b 100644 --- a/app/lib/deploy/upyun.php +++ b/app/lib/deploy/upyun.php @@ -101,8 +101,8 @@ class upyun implements DeployInterface $result = json_decode($response['body'], true); if (isset($result['data']['result']) && $result['data']['result'] == true) { $cookie = ''; - if (isset($response['headers']['Set-Cookie'])) { - foreach ($response['headers']['Set-Cookie'] as $val) { + if (isset($response['headers']['set-cookie'])) { + foreach ($response['headers']['set-cookie'] as $val) { $arr = explode('=', $val); if ($arr[1] == '' || $arr[1] == 'deleted') continue; $cookie .= $val . '; '; diff --git a/app/view/domain/domain.html b/app/view/domain/domain.html index 7969e66..af2994f 100644 --- a/app/view/domain/domain.html +++ b/app/view/domain/domain.html @@ -170,7 +170,7 @@ var userLevel = "{:request()->user['level']}"; $(document).ready(function(){ updateToolbar(); - const defaultPageSize = 15; + const defaultPageSize = getCookie('domain_pagesize') ? getCookie('domain_pagesize') : 15; const pageNumber = typeof window.$_GET['pageNumber'] != 'undefined' ? parseInt(window.$_GET['pageNumber']) : 1; const pageSize = typeof window.$_GET['pageSize'] != 'undefined' ? parseInt(window.$_GET['pageSize']) : defaultPageSize; @@ -298,7 +298,13 @@ $(document).ready(function(){ ], onLoadSuccess: function(data) { $('[data-toggle="tooltip"]').tooltip() - } + }, + onPageChange: function(number, size){ + if(size != defaultPageSize){ + defaultPageSize = size; + setCookie('domain_pagesize', size); + } + }, }) $("#form-store select[name=aid]").change(function(){