feats

src/layout/index.js

@@ -9,13 +9,10 @@ import AuthPhone from '@/components/Auth/AuthPhone'
 import AuthPage from '@/components/Auth/AuthPage'
 import Spin from '@/components/Spin/Spin2'
 import FixedConsultant from '@/components/FixedConsultant'
-import FirstScreen from '@/components/FirstScreen'
 import ShareToCircle from '@/components/ShareToCircle'
 import { report as reportCustomer } from '@/utils/customer'
-import nav2Target from '@/utils/nav2Target'
 import { ROLE_CODE } from '@/constants/user'
 import useAuth from './useAuth'
-import useScreen from './useScreen'
 import useFixedRouter from './useFixedRouter'
 import { routes } from '../routes'
 
@@ -43,13 +40,6 @@ export default (ChildComponent) => (props) => {
   const [shareContent, setShareContent] = useState({})
   // 页面埋点
   const [trackData, setTrackData] = useState({})
-  // 开屏广告
-  const [screenInfo, screenVisible, toggleShowScreen] = useScreen(city.id, person)
-
-  const handleScreen = () => {
-    toggleShowScreen()
-    nav2Target(screenInfo)
-  }
 
   // 分享朋友圈提示
   const showShareTimeline = (visible) => setShareTimelineVisible(visible)
@@ -157,13 +147,6 @@ export default (ChildComponent) => (props) => {
         !!showConsultant && (<FixedConsultant consultant={consultant} />)
       }
 
-      {/* 开屏广告 */}
-      <FirstScreen
-        info={screenInfo}
-        visible={screenVisible && !isSinglePage}
-        onClick={handleScreen}
-        onClose={toggleShowScreen}
-      />
     </>
   )
 }

src/pages/index/index.jsx

@@ -5,10 +5,13 @@ import { ScrollView } from '@tarojs/components'
 import withLayout from '@/layout'
 import ProjectListItem from '@/components/ProjectListItem/index'
 // import ShareToCircle from '@/components/ShareToCircle/index'
+import FirstScreen from '@/components/FirstScreen'
 import { fetch } from '@/utils/request'
 import { API_BANNER_LIST, API_INDEX_PROJECTS } from '@/constants/api'
 import useParams from '@/utils/hooks/useParams'
 import useShare from '@/utils/hooks/useShare'
+import useScreen from '@/utils/hooks/useScreen'
+import nav2Target from '@/utils/nav2Target'
 import ChatIcon from '@/components/ChatIcon/index'
 import Location from './components/Location/index'
 import Banner from './components/Banner/index'
@@ -21,7 +24,8 @@ import useIndexShareContent from './useIndexShareContent'
 import './index.scss'
 
 export default withLayout((props) => {
-  const { city, router, person, trackData, page } = props
+  const { city, router, person, trackData, page, mode } = props
+  const isSinglePage = mode === 'singlePage'
   
   // 本页面分享或者海报参数
   const paramsRef = useParams({person, from: `${page.type}_share`})
@@ -31,6 +35,9 @@ export default withLayout((props) => {
   const [ShowHotRecommend, setShowHotRecommend] = useState(false)
   const [ShowLive, setShowLive] = useState(false)
   const shareContent = useIndexShareContent(miniApp, paramsRef, router)
+  
+  // 开屏广告
+  const [screenInfo, screenVisible, toggleShowScreen] = useScreen(city.id, person)
 
   // 分享
   useShare(shareContent, trackData)
@@ -54,6 +61,12 @@ export default withLayout((props) => {
   const LiveChange = (e) => {
     setShowLive(e)
   }
+  
+  const handleScreen = () => {
+    toggleShowScreen()
+    nav2Target(screenInfo)
+  }
+
 
   useEffect(() => {
     if (city?.id) {
@@ -66,6 +79,14 @@ export default withLayout((props) => {
   return (
     <view className='Page Index'>
       <ChatIcon />
+      
+      {/* 开屏广告 */}
+      <FirstScreen
+        info={screenInfo}
+        visible={screenVisible && !isSinglePage}
+        onClick={handleScreen}
+        onClose={toggleShowScreen}
+      />
 
       <ScrollView scroll-y>
         <view className='PageContent'>