diff --git a/src/pages/index.js b/src/pages/index.js
index b13dc5fbd..772fc766a 100644
--- a/src/pages/index.js
+++ b/src/pages/index.js
@@ -62,6 +62,7 @@ import CompAddTip from './home/comps/comp-addtip'
import CompFloatMenu from './home/comps/comp-floatmenu'
import './home/index.scss'
+import SpPoweredBy from '@/components/sp-powered-by'
const MCompAddTip = React.memo(CompAddTip)
const MSpSkuSelect = React.memo(SpSkuSelect)
@@ -280,14 +281,12 @@ function Home() {
className='page-index'
scrollToTopBtn
immersive={pageData?.base?.isImmersive}
- // renderNavigation={renderNavigation()}
showpoweredBy={false}
pageConfig={pageData?.base || {}}
nearbyText={nearbyText}
renderFloat={wgts.length > 0 && }
renderFooter={}
onScrollToTop={() => {
- console.log('onScrollToTop')
// 先设置为一个很小的非0值,确保触发滚动变化
setState((draft) => {
draft.backTopScrollTop = 0.1
@@ -301,7 +300,7 @@ function Home() {
}}
ref={pageRef}
navigateMantle={navigateMantle}
- onReady={({ gNavbarH,footerHeight }) => {
+ onReady={({ gNavbarH, footerHeight }) => {
setState((draft) => {
draft.bodyHeight = `calc(100vh - ${pageData?.base?.isImmersive ? 0 : gNavbarH}px - ${footerHeight})`
draft.navbarHeight = gNavbarH
@@ -315,7 +314,7 @@ function Home() {
pageRef.current.handlePageScroll(e?.detail)
}}
scrollIntoView={scrollIntoView}
- style={{ height: state.bodyHeight}}
+ style={{ height: state.bodyHeight }}
className={classNames('home-body', {
'has-home-header': isShowHomeHeader && isWeixin
})}
@@ -350,14 +349,7 @@ function Home() {
)}
{/* If you remove or alter Shopex brand identifiers, you must obtain a branding removal license from Shopex. Contact us at: http://www.shopex.cn to purchase a branding removal license. */}
- {/*
- Powered by
-
- */}
+
{/* 小程序收藏提示 */}
diff --git a/src/subpages/member/index.js b/src/subpages/member/index.js
index eaab75dd8..c3d6bf139 100644
--- a/src/subpages/member/index.js
+++ b/src/subpages/member/index.js
@@ -7,7 +7,7 @@ import { useState, useEffect } from 'react'
import { updateUserInfo, updateCheckChief } from '@/store/slices/user'
import { WgtsContext } from '@/pages/home/wgts/wgts-context'
import { platformTemplateName } from '@/utils/platform'
-import { View, Text } from '@tarojs/components'
+import { View, Text, ScrollView } from '@tarojs/components'
import { SG_APP_CONFIG } from '@/consts'
import { useSelector, useDispatch } from 'react-redux'
import HomeWgts from '@/pages/home/comps/home-wgts'
@@ -46,6 +46,7 @@ import { updateDeliveryPersonnel } from '@/store/slices/cart'
import CompMenu from './comps/comp-menu'
import './index.scss'
+import SpPoweredBy from '@/components/sp-powered-by'
const initialConfigState = {
banner: {
@@ -112,7 +113,8 @@ const initialState = {
shareInfo: {},
footerHeight: 0,
pageData: null,
- shareInfo: {}
+ shareInfo: {},
+ bodyHeight: 0
}
function MemberIndex(props) {
@@ -176,8 +178,8 @@ function MemberIndex(props) {
})
const url = `/pageparams/setting?${pathparams}`
const { config = [], share } = await req.get(url)
- console.log('🚀🚀🚀 ~ fetchWgts ~ config:', config, share)
const pageData = config.find((wgt) => wgt.name == 'page')
+ console.log('🚀🚀🚀 ~ fetchWgts ~ config:', config, share, pageData)
setState((draft) => {
draft.wgts = config
draft.pageData = pageData
@@ -450,8 +452,20 @@ function MemberIndex(props) {
}
return (
- } title='会员中心'>
-
+ }
+ title='会员中心'
+ onReady={({ gNavbarH, footerHeight }) => {
+ setState((draft) => {
+ draft.bodyHeight = `calc(100vh - ${state.pageData?.base?.isImmersive ? 0 : gNavbarH}px - ${footerHeight})`
+ })
+ }}
+ >
+
-
+ {/* If you remove or alter Shopex brand identifiers, you must obtain a branding removal license from Shopex. Contact us at: http://www.shopex.cn to purchase a branding removal license. */}
+
+
)
}