From 1192ea36806a0a413cc99d6214e4fce0e6a780ae Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Tue, 20 Dec 2022 21:01:56 +0800 Subject: [PATCH] * Modify page position. --- module/block/view/guide.html.php | 9 ++++++++- module/block/view/systemmodeswitch.html.php | 7 +++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/module/block/view/guide.html.php b/module/block/view/guide.html.php index 6444e243d9..785ae39149 100644 --- a/module/block/view/guide.html.php +++ b/module/block/view/guide.html.php @@ -59,8 +59,8 @@ $(function() } if($(this).attr('id') !== 'visionSwitch') removePosition('visionPosition'); - if($(this).attr('id') !== 'themeSwitch') removePosition('themePosition'); + if($(this).attr('id') !== 'systemModePosition') removePosition('systemModePosition'); }) if(localStorage.getItem('visionPosition') && Number(localStorage.getItem('visionPosition'))) @@ -77,6 +77,13 @@ $(function() $('#themeSwitch > a').click(); window.scrollTo(0, scrollTopNum); } + else if(localStorage.getItem('systemModePosition') && Number(localStorage.getItem('systemModePosition'))) + { + var scrollTopNum = Number(localStorage.getItem('systemModePosition')); + document.getElementById('guideBody').scrollTo = scrollTopNum; + $('#systemMode > a').click(); + window.scrollTo(0, scrollTopNum); + } else { $('#flowchart > a').click(); diff --git a/module/block/view/systemmodeswitch.html.php b/module/block/view/systemmodeswitch.html.php index 64dcd97b73..6ae4c3796a 100644 --- a/module/block/view/systemmodeswitch.html.php +++ b/module/block/view/systemmodeswitch.html.php @@ -2,7 +2,7 @@ .block-guide .tab-pane .mode-switch .dataTitle {padding: 14px 20px;} .block-guide .tab-pane .mode-switch .mode-block {background: #E6F0FF; margin-left: 10px; cursor: pointer;} .block-guide .tab-pane .mode-switch .mode-block:nth-child(2) {margin-left: 8%;} -.block-guide .tab-pane .mode-switch .mode-block.active {border: 2px solid #2E7FFF;} +.block-guide .tab-pane .mode-switch .mode-block:hover, .block-guide .tab-pane .mode-switch .mode-block.active {box-shadow: 0 0 0 2px #2E7FFF;} .block-guide .tab-pane .mode-switch .mode-desc {padding: 10px; font-size: 12px; color: #5E626D;} config->global, 'mode', 'light');?> @@ -70,7 +70,7 @@ $(function() if(selectedMode == 'light' && hasProgram) postData.program = $('#defaultProgram').val(); $.post(createLink('custom', 'mode'), postData, function(result) { - if(result.result == 'success') parent.location.reload(); + if(result.result == 'success') parent.location.reload(); }); } @@ -80,6 +80,9 @@ $(function() var selectedMode = $(this).data('mode'); if(selectedMode == usedMode) return; + var scrollTop = document.documentElement.scrollTop || window.pageYOffset || document.body.scrollTop || $('#guideBody').offset().top; + localStorage.setItem('systemModePosition', scrollTop); + if(selectedMode == 'light' && hasProgram) { $('#selectProgramModal').modal('show');