diff --git a/resources/beike/shop/default/css/global.scss b/resources/beike/shop/default/css/global.scss index fb12bfc0..2660e59a 100644 --- a/resources/beike/shop/default/css/global.scss +++ b/resources/beike/shop/default/css/global.scss @@ -81,6 +81,15 @@ body[class^="page-account-"] { } } +.login-pop-box { + overflow: inherit; + + @media (max-width: 768px) { + width: 90% !important; + height: 80% !important; + } +} + .module-title { font-size: 1.5rem; text-align: center; diff --git a/resources/beike/shop/default/css/login.scss b/resources/beike/shop/default/css/login.scss index 9c16f225..7d2dd4b6 100644 --- a/resources/beike/shop/default/css/login.scss +++ b/resources/beike/shop/default/css/login.scss @@ -1,6 +1,10 @@ @charset "UTF-8"; body.page-login, body.page-forgotten { + @media (max-width: 768px) { + overflow-x: hidden; + } + .login-item-header { background: #f8f9fa; border-bottom: none; @@ -14,4 +18,11 @@ body.page-login, body.page-forgotten { .card { border: none; } + + .form-iframe { + @media (max-width: 768px) { + padding: 0; + margin-top: 0 !important; + } + } } diff --git a/resources/beike/shop/default/js/common.js b/resources/beike/shop/default/js/common.js index 5d0aecc6..3e7490b0 100644 --- a/resources/beike/shop/default/js/common.js +++ b/resources/beike/shop/default/js/common.js @@ -118,6 +118,7 @@ export default { title: '', shadeClose: true, area: ['900px', '600px'], + skin: 'login-pop-box', content: 'login?iframe=true' //iframe的url }); } diff --git a/themes/default/account/login.blade.php b/themes/default/account/login.blade.php index 2f2fd9a2..b07fc92b 100644 --- a/themes/default/account/login.blade.php +++ b/themes/default/account/login.blade.php @@ -10,7 +10,7 @@ @section('content') -
+
@if (!request('iframe'))

{{ __('shop/login.index') }}