feats

src/components/Adv/index.jsx → src/components/FirstScreen/index.jsx

@@ -1,29 +1,25 @@
 import { useState, useEffect } from 'react'
 import { Image } from '@tarojs/components'
+import { getImgURL } from '@/utils/image'
 import './style.scss'
 
 export default (props) => {
-
-  const { show = false } = props
-
-  const [ShowAdv, setShowAdv] = useState(show)
+  const { info, visible = false, onClose } = props
 
   const ImgClick = () => {
 
   }
 
-  const Close = () => {
-    setShowAdv(false)
-  }
+  console.log('---------info------>', info, visible)
 
   return (
-    <view className='components Adv' style={{display: ShowAdv ? 'block' : 'none'}}>
+    <view className='components Adv' style={{display: visible ? 'block' : 'none'}}>
       <view className='centerLabel'>
         <view>
           <view className='Img' onClick={ImgClick}>
-            <Image mode='scaleToFill' src={null}></Image>
+            <Image mode='scaleToFill' src={getImgURL(info?.image)}></Image>
           </view>
-          <text className='iconfont icon-guanbi' onClick={Close}></text>
+          <text className='iconfont icon-guanbi' onClick={onClose}></text>
         </view>
       </view>
     </view>

src/layout/index.js

@@ -8,6 +8,7 @@ import AuthAvatar from '@/components/Auth/AuthAvatar'
 import AuthPhone from '@/components/Auth/AuthPhone'
 import Spin from '@/components/Spin/Spin2'
 import FixedConsultant from '@/components/FixedConsultant'
+import FirstScreen from '@/components/FirstScreen'
 import { report as reportCustomer } from '@/utils/customer'
 import { ROLE_CODE } from '@/constants/user'
 import useAuth from './useAuth'
@@ -18,7 +19,7 @@ import './style.scss'
 
 export default (ChildComponent) => (props) => {
   const consultant = useSelector(s => s.system.consultant)
-  const city = useSelector(s => s.city)
+  const city = useSelector(s => s.city.curCity)
   const { spinning, userInfo } = useSelector(s => s.user)
   const { person, ...extInfo } = userInfo || {}
   const router = useRouter()
@@ -34,7 +35,7 @@ export default (ChildComponent) => (props) => {
   // 页面埋点
   const [trackData, setTrackData] = useState({})
   // 开屏广告
-  const [firstScreen, showScreen, toggleShowScreen] = useScreen(city.id, person)
+  const [screenInfo, screenVisible, toggleShowScreen] = useScreen(city.id, person)
 
   // 报备客户
   useEffect(() => {
@@ -105,6 +106,7 @@ export default (ChildComponent) => (props) => {
       {
         !!showConsultant && (<FixedConsultant consultant={consultant} />)
       }
+      <FirstScreen info={screenInfo} visible={screenVisible} onClose={toggleShowScreen} />
     </>
   )
 }

src/layout/useScreen.js

@@ -10,7 +10,7 @@ export default function useScreen(cityId, person) {
   const dispatch = useDispatch()
 
   const [firstScreen, setFirstScreen] = useState()
-  const show = useSelector(s => !s.system.firstScreen.filter(x => x === cityId)[0])
+  const canShow = useSelector(s => !s.system.firstScreen.filter(x => x === cityId)[0])
   const toggle = useCallback(
     () => dispatch({ type: 'TOGGLE_FIRSTSCREEN', payload: { cityId } }),
     [cityId, dispatch],
@@ -29,5 +29,9 @@ export default function useScreen(cityId, person) {
     }
   }, [cityId, toggle, person?.personId])
 
+  const show = canShow && firstScreen
+
+  console.log('------showshow--------->', show)
+
   return [firstScreen, show, toggle]
 }

src/pages/index/index.jsx

@@ -4,7 +4,6 @@ import Taro from '@tarojs/taro'
 import { ScrollView } from '@tarojs/components'
 import withLayout from '@/layout'
 import ProjectListItem from '@/components/ProjectListItem/index'
-import Adv from '@/components/Adv/index'
 import { fetch } from '@/utils/request'
 import { API_BANNER_LIST, API_INDEX_PROJECTS } from '@/constants/api'
 
@@ -54,9 +53,6 @@ export default withLayout(() => {
 
   return (
     <view className='Page Index'>
-
-      <Adv show></Adv>
-
       <ScrollView scroll-y>
         <view className='PageContent'>
 

src/utils/login.js

@@ -40,7 +40,7 @@ export default (payload) => {
 
           // 获取人员详细信息
           // eslint-disable-next-line no-unused-vars
-          queryUserInfo(person.personId).then(info => {
+          queryUserInfo().then(info => {
             // const { unReadNum } = info
 
             // 默认红点开始就有

src/utils/request.js

@@ -91,17 +91,19 @@ export function optionBuilder(options) {
   const recommender = Taro.getStorageSync('recommender') || ''
 
   // 去掉 null 跟 undefined 字段
-  const data = Object.keys(payload).reduce((acc, key) => {
-    const val = payload[key]
-    if (val === null || val === undefined) {
-      return acc;
-    }
+  const data = typeof payload === 'Object'
+    ? Object.keys(payload).reduce((acc, key) => {
+        const val = payload[key]
+        if (val === null || val === undefined) {
+          return acc;
+        }
 
-    return {
-      ...acc,
-      [key]: val,
-    }
-  }, {})
+        return {
+          ...acc,
+          [key]: val,
+        }
+      }, {})
+    : payload
   
   return [
     {