feats

config/prod.js

@@ -3,10 +3,10 @@ module.exports = {
     NODE_ENV: '"production"'
   },
   defineConstants: {
-    HOST: '"https://xlj.newlandsh.com"', //正式
-    WSS_HOST: '"wss://xlj.newlandsh.com"',
-    // HOST: '"https://xlk.njyz.tech"', //正式
-    // WSS_HOST: '"wss://xlk.njyz.tech"',
+    // HOST: '"https://xlj.newlandsh.com"', //正式
+    // WSS_HOST: '"wss://xlj.newlandsh.com"',
+    HOST: '"https://xlk.njyz.tech"', //正式
+    WSS_HOST: '"wss://xlk.njyz.tech"',
     OSS_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',
     OSS_FAST_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',
     ICON_FONT: '"https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/css/iconfont.ttf"',

src/components/FirstScreen/index.jsx

@@ -4,17 +4,13 @@ import { getImgURL } from '@/utils/image'
 import './style.scss'
 
 export default (props) => {
-  const { info, visible = false, onClose } = props
-
-  const ImgClick = () => {
-
-  }
+  const { info, visible = false, onClose, onClick } = props
 
   return (
     <view className='components Adv' style={{display: visible ? 'block' : 'none'}}>
       <view className='centerLabel'>
         <view>
-          <view className='Img' onClick={ImgClick}>
+          <view className='Img' onClick={onClick}>
             <Image mode='scaleToFill' src={getImgURL(info?.image)}></Image>
           </view>
           <text className='iconfont icon-guanbi' onClick={onClose}></text>

src/components/FirstScreen/style.scss

@@ -23,6 +23,9 @@
         >image {
           width: 100%;
           height: 100%;
+          position: absolute;
+          left: 0;
+          top: 0;
         }
       }
       >text {

src/layout/index.js

@@ -10,6 +10,7 @@ import Spin from '@/components/Spin/Spin2'
 import FixedConsultant from '@/components/FixedConsultant'
 import FirstScreen from '@/components/FirstScreen'
 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'
@@ -37,6 +38,11 @@ export default (ChildComponent) => (props) => {
   // 开屏广告
   const [screenInfo, screenVisible, toggleShowScreen] = useScreen(city.id, person)
 
+  const handleScreen = () => {
+    toggleShowScreen()
+    nav2Target(screenInfo)
+  }
+
   // 报备客户
   useEffect(() => {
     reportCustomer(person, consultant, false).catch(() => {})
@@ -106,7 +112,12 @@ export default (ChildComponent) => (props) => {
       {
         !!showConsultant && (<FixedConsultant consultant={consultant} />)
       }
-      <FirstScreen info={screenInfo} visible={screenVisible} onClose={toggleShowScreen} />
+      <FirstScreen
+        info={screenInfo}
+        visible={screenVisible}
+        onClick={handleScreen}
+        onClose={toggleShowScreen}
+      />
     </>
   )
 }

src/pages/index/components/Banner/index.jsx

@@ -2,6 +2,7 @@
 import { Swiper, SwiperItem, Image } from '@tarojs/components'
 import Taro from '@tarojs/taro'
 import { getImgURL } from '@/utils/image'
+import nav2Target from '@/utils/nav2Target'
 import './index.scss'
 
 export default function Banner (props) {
@@ -48,7 +49,7 @@ export default function Banner (props) {
 
   const handleBannerClick = (item) => {
     if (item.contentType && item.contentType != "nothing") {
-      redirectTo(item)
+      nav2Target(item)
     } 
   }
   return (

src/pages/index/components/HotRecommend/index.jsx

@@ -40,8 +40,7 @@ export default function HotRecommend (props) {
       setCurrentId(id)
     }
   }
-// x?type=dymic' },
-//     { name: '团房信息', id: 8, icon: require('../../../../assets/index-icon12.png'), router: '/pages/index/activityList/index?type=house'
+
   const ToMore = () => {
     Taro.navigateTo({url: `/pages/index/activityList/index?type=${CurrentId}`})
   }
@@ -51,7 +50,7 @@ export default function HotRecommend (props) {
       Taro.navigateTo({url: `/pages/index/activityDetail/index?id=${CurrentContentInfo.dynamicId}`})
     }
   }
-  // url: `/pages/index/activityDetail/index?id=${data.dynamicId}`
+
   return (
     <view className='components HotRecommend'>
       <view>

src/reducers/system.js

@@ -46,7 +46,7 @@ export default function(state = INITIAL_STATE, action) {
     case 'TOGGLE_FIRSTSCREEN': {
       const { cityId } = action.payload
       let cityState = state.firstScreen.filter(x => x.cityId === cityId)[0]
-console.log('---------cityState-------->', cityState)
+
       if (!cityState) {
         return {
           ...state,

src/utils/nav2Target.js

@@ -0,0 +1,42 @@
+import Taro from '@tarojs/taro'
+
+export default ({ targetId, contentType, buildingId } = {})=> {
+  if (!targetId && !buildingId) return;
+
+  switch (contentType) {
+    // 项目
+    case 'project':
+      Taro.navigateTo({
+        url: '/pages/index/buildingDetail/index?id=' + buildingId
+      })
+      return;
+
+    // 活动
+    case 'activity':
+      Taro.navigateTo({
+        url: '/pages/index/activityDetail/index?id=' + targetId
+      })
+      return;
+
+    // 资讯
+    case 'news':
+      Taro.navigateTo({
+        url: '/pages/index/newsDetail/index?id=' + targetId
+      })
+      return;
+
+    // live
+    case 'live':
+      Taro.navigateTo({
+        url: '/pages/video/liveDetail/index?id=' + targetId
+      })
+      return;
+
+
+    // 其他
+    case 'others':
+    default:
+      
+      return;
+  }
+}