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/constants/api.js

@@ -279,4 +279,7 @@ export const API_BUILDINGSPECIALROOM_BUILDING_LIST = resolvePath('buildingSpecia
 export const API_VIDEO_DETAIL = resolvePath('detail')
 
 // 客服热线
-export const API_FEEDBACK_SETTING = resolvePath('/searchHouse/setting')
+export const API_FEEDBACK_SETTING = resolvePath('searchHouse/setting')
+
+// 系统参数
+export const API_SYSTEM_PARAM = resolvePath('sysOrgParams')

src/pages/index/activityDetail/CountDown.jsx

@@ -0,0 +1,21 @@
+import React from 'react'
+import useCountDown from '@/utils/hooks/useCountDown'
+
+export default (props) => {
+  const { endTime } = props
+  const CountDown = useCountDown(endTime, new Date())
+
+  return (
+    <view className='CountDown'>
+      <text>距离结束还有</text>
+      <text className='Red'>{CountDown[1]||0}</text>
+      <text>天</text>
+      <text className='Number' style={{ marginLeft: '40rpx' }}>{CountDown[2]||0}</text>
+      <text className='active'>时</text>
+      <text className='Number'>{CountDown[3]||0}</text>
+      <text className='active'>分</text>
+      <text className='Number'>{CountDown[4]||0}</text>
+      <text className='active'>秒</text>
+    </view>
+  )
+}

src/pages/index/activityDetail/index.config.js

@@ -1,3 +1,4 @@
 export default {
-  navigationBarTitleText: '活动详情'
+  navigationBarTitleText: '活动详情',
+  enableShareAppMessage: true
 }

src/pages/index/activityDetail/index.jsx

@@ -24,6 +24,7 @@ import useShare from "@/utils/hooks/useShare";
 import useFavor from "@/utils/hooks/useFavor";
 import { times } from "@/utils/tools";
 import useStatus from './useStatus'
+import CountDown from './CountDown'
 
 import "./index.scss";
 
@@ -113,53 +114,6 @@ export default withLayout((props) => {
     }
   }, [id])
 
-  const [CountDown, setCountDown] = useState({
-    day: 0,
-    hours: 0,
-    minutes: 0,
-    seconds: 0,
-  })
-
-  useEffect(() => {
-    if(detail.title) {
-      const CountsTime = new Date(detail.enlistEnd).getTime() - Date.now()
-      if(CountsTime > 0) {
-        SetCountsDown(CountsTime)
-      }
-    }
-  }, [detail])
-
-  const SetCountsDown = (counts) => {
-    let Num = counts - 0
-    let Timer = setInterval(() => {
-      if(Num) {
-        Num -= 1000
-        let Time = Num
-        let day = Math.floor(Time / 1000 / 60 / 60 / 24)
-        Time = Time % (1000 * 60 * 60 * 24) 
-        let hours = Math.floor(Time / 1000 / 60 / 60)
-        Time = Time % (1000 * 60 * 60) 
-        let minutes = Math.floor(Time / 1000 / 60)
-        Time = Time % (1000 * 60) 
-        let seconds = Math.floor(Time / 1000)
-        setCountDown({
-          day,
-          hours,
-          minutes,
-          seconds
-        })
-      } else {
-        clearInterval(Timer)
-        setCountDown({
-          day: 0,
-          hours: 0,
-          minutes: 0,
-          seconds: 0,
-        })
-      }
-    }, 1000)
-  }
-
   const handleSignup = () => {
     setCanChoose("block");
   };
@@ -268,17 +222,7 @@ export default withLayout((props) => {
         </view>
       </view>
 
-      <view className='CountDown'>
-        <text>距离结束还有</text>
-        <text className='Red'>{CountDown.day}</text>
-        <text>天</text>
-        <text className='Number' style={{ marginLeft: '40rpx' }}>{CountDown.hours}</text>
-        <text className='active'>时</text>
-        <text className='Number'>{CountDown.minutes}</text>
-        <text className='active'>分</text>
-        <text className='Number'>{CountDown.seconds}</text>
-        <text className='active'>秒</text>
-      </view>
+      <CountDown endTime={detail?.enlistEnd} />
 
       <view className='Apply flex-h'>
         <view className='Collect' onClick={handleFavor}>

src/pages/index/components/Menu/index.jsx

@@ -1,9 +1,14 @@
-import { useState } from 'react'
+import { useState, useEffect, useRef } from 'react'
 import { Swiper, SwiperItem, Image } from '@tarojs/components'
 import Taro from '@tarojs/taro'
+import { getSystemParsm } from '@/services/common'
 import './index.scss'
 
+const MINI_KANGYANG = 'MINI_KANGYANG'
+
 export default function Menu () {
+  const kangyangRef = useRef()
+
   const List = [
     { name: '全部楼盘', id: 1, icon: require('@/assets/index-icon9.png'), router: '/pages/index/buildingList/index' },
     { name: '品牌地产', id: 2, icon: require('@/assets/index-icon8.png'), router: '/pages/index/brandList/index' },
@@ -14,12 +19,13 @@ export default function Menu () {
     { name: '活动信息', id: 7, icon: require('@/assets/index-icon5.png'), router: '/pages/index/activityList/index?type=dymic' },
     { name: '团房信息', id: 8, icon: require('@/assets/index-icon12.png'), router: '/pages/index/activityList/index?type=house' },
     { name: '特价房', id: 9, icon: require('@/assets/index-icon11.png'), router: '/pages/index/specialPriceHouse/index' },
-    { name: '康养', id: 10, icon: require('@/assets/index-icon7.png'), router: '/pages/index/recovered/index' },
+    { name: '康养', id: 10, icon: require('@/assets/index-icon7.png'), miniapp: MINI_KANGYANG },
     { name: '文旅商办', id: 11, icon: require('@/assets/index-icon13.png'), router: `/pages/index/buildingList/index?isCommerce=1` },
     { name: '新闻资讯', id: 12, icon: require('@/assets/index-icon15.png'), router: '/pages/index/newsList/index' },
     { name: '购房百科', id: 13, icon: require('@/assets/index-icon4.png'), router: '/pages/index/encyclopediasOfBuyHouse/index' },
     { name: '房贷计算', id: 14, icon: require('@/assets/index-icon3.png'), router: '/pages/index/mortgageCalculation/index' }
   ]
+
   let Arr = []
   List.map((item) => {
     if (Arr.length) {
@@ -38,9 +44,23 @@ export default function Menu () {
     return () => {
       if (item.router) {
         Taro.navigateTo({ url: item.router })
+      } else if (item.miniapp === MINI_KANGYANG) {
+        if (kangyangRef.current) {
+          // 跳转到康养小程序
+          Taro.navigateToMiniProgram(kangyangRef.current)
+        }
       }
     }
   }
+  
+  useEffect(() => {
+    // 获取康养小程序相关
+    getSystemParsm(MINI_KANGYANG).then((res) => {
+      if (res && res.paramValue) {
+        kangyangRef.current = JSON.parse(res.paramValue)
+      }
+    })
+  }, [])
 
   return (
     <view className='components Menu'>

src/pages/index/helpToFindHouse/index.jsx

@@ -6,7 +6,7 @@ import { API_HELP_FIND_HOUSE_SUBMIT } from '@/constants/api'
 import '@/assets/css/iconfont.css'
 import { useSelector } from 'react-redux'
 import AreaPickerView from '@/components/AreaPickerView/index'
-import { getFeedbackSetting } from '@/services/common'
+import { getFeedbackSetting } from '@/services/feedback'
 import './index.scss'
 import BuyHouse from './components/BuyHouse/index'
 import RentingHouse from './components/RentingHouse/index'

src/pages/index/index.config.js

@@ -1,3 +1,4 @@
 export default {
-  navigationBarTitleText: '新联宝'
+  navigationBarTitleText: '新联宝',
+  enableShareAppMessage: true
 }

src/pages/index/index.jsx

@@ -6,39 +6,48 @@ import withLayout from '@/layout'
 import ProjectListItem from '@/components/ProjectListItem/index'
 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 Location from './components/Location/index'
 import Banner from './components/Banner/index'
 import Menu from './components/Menu/index'
 import HotRecommend from './components/HotRecommend/index'
 import LiveSale from './components/LiveSale/index'
 import ColumnTitle from './components/ColumnTitle/index'
+import useIndexShareContent from './useIndexShareContent'
 
 import './index.scss'
 
-export default withLayout(() => {
-
-  const city = useSelector(state => state.city)
+export default withLayout((props) => {
+  const { city, router, person, trackData, page } = props
+  
+  // 本页面分享或者海报参数
+  const paramsRef = useParams({person, from: `${page.type}_share`})
+  const { miniApp } = useSelector(s => s.user.userInfo)
   const [BannerList, setBannerList] = useState([])
   const [ProjectList, setProjectList] = useState([])
   const [ShowHotRecommend, setShowHotRecommend] = useState(false)
   const [ShowLive, setShowLive] = useState(false)
+  const shareContent = useIndexShareContent(miniApp, paramsRef, router)
+
+  // 分享
+  useShare(shareContent, trackData)
 
   useEffect(() => {
-    if (city.curCity.name) {
+    if (city?.id) {
       GetBanner()
       GetProjectList()
     }
-  }, [city])
+  }, [city?.id])
 
   const GetBanner = () => { // 获取banner
-    fetch({ url: `${API_BANNER_LIST}/banner`, method: 'get', payload: { cityId: city.curCity.id, showPosition: 'index' } }).then((res) => {
+    fetch({ url: `${API_BANNER_LIST}/banner`, method: 'get', payload: { cityId: city.id, showPosition: 'index' } }).then((res) => {
       setBannerList(res || [])
     })
   }
 
   const GetProjectList = () => { // 获取项目列表
-    fetch({ url: API_INDEX_PROJECTS, method: 'get', payload: { cityId: city.curCity.id, pageNum: 1, pageSize: 10 } }).then((res) => {
+    fetch({ url: API_INDEX_PROJECTS, method: 'get', payload: { cityId: city.id, pageNum: 1, pageSize: 10 } }).then((res) => {
       setProjectList(res.records || [])
     })
   }

src/pages/index/useIndexShareContent.js

@@ -0,0 +1,31 @@
+import { useRef, useEffect } from 'react'
+import { getIndexShare } from '@/services/user'
+import { getImgURL } from '@/utils/image'
+
+export default function useIndexShareContent(miniApp, paramsRef, router) {
+  const shareImg = useRef()
+  const shareTitle = useRef()
+
+  useEffect(() => {
+    shareTitle.current = `欢迎访问 ${miniApp.name}`
+
+    // 获取首页分享信息
+    getIndexShare().then((res) => {
+      const setting = (res || []).filter(x => x.imgType === 'index')[0]
+      if (setting) {
+        if (setting.imgUrl) {
+          shareImg.current = getImgURL(setting.imgUrl)
+        }
+        if (setting.imgDocument) {
+          shareTitle.current = setting.imgDocument
+        }
+      }
+    })
+  }, [miniApp.name])
+
+  return {
+    title: shareTitle.current,
+    path: `${router.path}?${paramsRef.current}`,
+    image: shareImg.current,
+  }
+}

src/services/common.js

@@ -10,7 +10,7 @@ import {
   API_BRAND_LIST,
   API_BRAND_INFO,
   API_INDEX_ICONS,
-  API_FEEDBACK_SETTING,
+  API_SYSTEM_PARAM,
 } from "@/constants/api";
 
 /**
@@ -105,4 +105,9 @@ export const queryBrandList = (params) => fetch({ url: API_BRAND_LIST, params })
  */
 export const queryBrandInfo = (id) => fetch({ url: `${API_BRAND_INFO}/${id}`});
 
-export const getFeedbackSetting = () => fetch({ url: API_FEEDBACK_SETTING });
+/**
+ * 获取系统参数
+ * @param {*} code 
+ * @returns 
+ */
+export const getSystemParsm = (code) => fetch({ url: `${API_SYSTEM_PARAM}/${code}` })

src/services/feedback.js

@@ -1,6 +1,7 @@
 import { fetch } from '@/utils/request'
 import {
-  API_FEEDBACK_SUBMIT
+  API_FEEDBACK_SUBMIT,
+  API_FEEDBACK_SETTING,
 } from '@/constants/api'
 
 /**
@@ -8,3 +9,9 @@ import {
  * @param {*} payload 
  */
 export const submitFeedBack = payload => fetch({ url: API_FEEDBACK_SUBMIT, payload, method: 'POST' })
+
+/**
+ * 获取帮我找房的相关设置
+ * @returns 
+ */
+export const getFeedbackSetting = () => fetch({ url: API_FEEDBACK_SETTING });

src/utils/chatDate.js

@@ -1,15 +1,20 @@
-/**
-* 对Date的扩展，将 Date 转化为指定格式的String。
-*
-*  月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
-*  年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)。
-*
-*  【示例】：
-*  common.formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss.S') ==> 2006-07-02 08:09:04.423
-*  common.formatDate(new Date(), 'yyyy-M-d h:m:s.S')      ==> 2006-7-2 8:9:4.18
-*  common.formatDate(new Date(), 'hh:mm:ss.S')            ==> 08:09:04.423
-*  
-*/
+
+
+export const MILLISECONDS_A_SECOND = 1e3
+export const MILLISECONDS_A_MINUTE = 60 * MILLISECONDS_A_SECOND
+export const MILLISECONDS_A_HOUR = 60 * MILLISECONDS_A_MINUTE
+export const MILLISECONDS_A_DAY = 24 * MILLISECONDS_A_HOUR
+
+export const diff = (dt1, dt2) => {
+  if (!dt1 || !dt2) return [];
+
+  const bw = new Date(dt1) - new Date(dt2)
+  const day = Math.floor(bw / MILLISECONDS_A_DAY)
+  const hour = Math.floor(bw % MILLISECONDS_A_DAY / MILLISECONDS_A_HOUR)
+  const min = Math.floor(bw % MILLISECONDS_A_DAY % MILLISECONDS_A_HOUR / MILLISECONDS_A_MINUTE)
+  const sec = Math.floor(bw % MILLISECONDS_A_DAY % MILLISECONDS_A_HOUR % MILLISECONDS_A_MINUTE / MILLISECONDS_A_SECOND)
+  return [bw, day, hour, min, sec]
+}
 
 //例子 getDateFormat(new Date().valueOf(),true,'yyyy/M/d')
 export function formatDate(dt, fmt) {

src/utils/hooks/useCountDown.js

@@ -0,0 +1,18 @@
+import { useState } from "react"
+import { diff } from '@/utils/chatDate'
+import useInterval from './useInterval'
+
+/**
+ * 倒计时
+ * @param {*} date1 
+ * @param {*} date2 
+ */
+export default function useCountDown(date1, date2) {
+  const [countdown, setCountDown] = useState([])
+
+  useInterval(() => {
+    setCountDown(diff(date1, date2))
+  }, 1000)
+
+  return countdown
+}

src/utils/hooks/useInterval.js

@@ -0,0 +1,14 @@
+import { useEffect, useRef } from "react";
+
+/**
+ * 计时器
+ */
+export default function useInterval(fn, delay) {
+  const callbackRef = useRef()
+  callbackRef.current = fn;
+
+  useEffect(() => {
+    const ticker = setInterval(() => callbackRef.current(), delay)
+    return () => clearInterval(ticker)
+  }, [delay])
+}

src/utils/hooks/useParams.js

@@ -12,7 +12,7 @@ export default function useParams({id, buildingId, person, from}) {
   const paramsRef = useRef()
   paramsRef.current = useMemo(() => {
     return [
-      `id=${id}`,
+      id ? `id=${id}` : undefined, // 非详情页, 比如首页分享的时候, 没有 id
       `from=${from}`,
       `recommender=${person.personId}`,
       buildingId ? `buildingId=${buildingId}` : undefined,