|
@@ -258,7 +258,16 @@ const PageHeader = () => {
|
|
|
const getHeaderHeight = () => {
|
|
const getHeaderHeight = () => {
|
|
|
// console.log(document.querySelector('div.progressier-install-banner'))
|
|
// console.log(document.querySelector('div.progressier-install-banner'))
|
|
|
const header = document.querySelector('#appbar');
|
|
const header = document.querySelector('#appbar');
|
|
|
- if (header!=null)return `${header.offsetHeight || 0}px`
|
|
|
|
|
|
|
+ let offset = 0;
|
|
|
|
|
+ if (barRef){
|
|
|
|
|
+ const headerRoom=document.querySelector('#headerRoom');
|
|
|
|
|
+ if (headerRoom){
|
|
|
|
|
+ if (!barRef.showHeader){
|
|
|
|
|
+ offset=headerRoom.clientHeight;
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ if (header!=null)return `${(header.offsetHeight-offset) || 0}px`
|
|
|
else return '0px';
|
|
else return '0px';
|
|
|
}
|
|
}
|
|
|
const handleScroll=()=>{
|
|
const handleScroll=()=>{
|
|
@@ -464,6 +473,7 @@ const PageHeader = () => {
|
|
|
useEffect(()=>{
|
|
useEffect(()=>{
|
|
|
setShowMHeader(showHeader);
|
|
setShowMHeader(showHeader);
|
|
|
barRef.showHeader=showHeader;
|
|
barRef.showHeader=showHeader;
|
|
|
|
|
+ changeHeaderHeight();
|
|
|
},[showHeader]);
|
|
},[showHeader]);
|
|
|
|
|
|
|
|
useEffect(()=>{
|
|
useEffect(()=>{
|
|
@@ -490,7 +500,7 @@ const PageHeader = () => {
|
|
|
const renderHeaderRoom=()=>{
|
|
const renderHeaderRoom=()=>{
|
|
|
const active=styles.active;
|
|
const active=styles.active;
|
|
|
return (
|
|
return (
|
|
|
- <animated.div className={`${styles.header_room}`} style={headerAni}>
|
|
|
|
|
|
|
+ <animated.div id={'headerRoom'} className={`${styles.header_room}`} style={headerAni}>
|
|
|
<div className={`${styles['mobile-top-navigate-list']}`}>
|
|
<div className={`${styles['mobile-top-navigate-list']}`}>
|
|
|
<button className={`${styles['mb-top-navigate-item']} ${pathname==='/'?active:''}`} onClick={()=>{
|
|
<button className={`${styles['mb-top-navigate-item']} ${pathname==='/'?active:''}`} onClick={()=>{
|
|
|
changePath('/');
|
|
changePath('/');
|