Merge branch 'main' of http://git.ycjcjy.com/marketing/miniapp into main

config/dev.js

@@ -4,7 +4,7 @@ module.exports = {
   },
   defineConstants: {
     // HOST: '"https://xlk.njyz.tech"',
-    HOST: '"http://127.0.0.1:8567"',
+    HOST: '"http://127.0.0.1:8081"',
     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/"',

config/prod.js

@@ -10,7 +10,7 @@ module.exports = {
     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"',
-    Version: '"V0.0.26-20210808"'
+    Version: '"V0.0.28-20210808"'
   },
   mini: {},
   h5: {

project.config.json

@@ -2,7 +2,7 @@
 	"miniprogramRoot": "dist/",
 	"projectname": "miniapp",
 	"description": "",
-	"appid": "wxc96058d57e77f373",
+	"appid": "wxe44244d1a5ea3364",
 	"setting": {
 		"urlCheck": false,
 		"es6": false,

src/app.jsx

@@ -11,9 +11,10 @@ import './app.scss'
 
 class App extends Component {
   // 是否登录
-  logged;
+  logged = false;
+
   // 更新埋点
-  updateTracking;
+  updateTracking = () => undefined;
 
   componentDidMount () {}
 
@@ -46,6 +47,11 @@ class App extends Component {
   }
   
   onLaunch (options) {
+
+    console.log('【onLaunch】:', JSON.stringify(options))
+    const { mode } = options
+    Taro.setStorageSync('mode', mode)
+
     // 加载远程字体
     this.loadFontFace()
 
@@ -59,6 +65,7 @@ class App extends Component {
     getLocation().then((loc) => {
       getRouterParams(options).then(router => {
         Taro.setStorageSync('router', router)
+
         const { query: payload } = router
 
         payload.path = router.path
@@ -69,18 +76,37 @@ class App extends Component {
           payload.lat = loc.lat
         }
 
-        // login
-        login(payload).then((res) => {
-          const { person: { personId } } = res
-          
-          // 初始化 im
-          im.init(personId)
+        const { path, scene, ...params } = payload
 
-          this.logged = true
+        if (mode === 'singlePage') {
+          // 分享朋友圈的单页模式
+          params.singleMode = true
 
-          // 埋点
-          trackUserSource(options).then((x) => (this.updateTracking = x))
-        })
+          // login
+          login(params).then(() => {
+            this.logged = true
+          })
+        } else {
+          // 非单页模式
+          Taro.login({
+            success: ({ code }) => {
+              params.code = code
+
+              // login
+              login(params).then((res) => {
+                const { person: { personId } } = res
+                
+                // 初始化 im
+                im.init(personId)
+
+                this.logged = true
+
+                // 埋点
+                trackUserSource(options).then((x) => (this.updateTracking = x))
+              })
+            }
+          })
+        }
       })
     })
   }

src/components/ShareToCircle/index.jsx

@@ -1,14 +1,40 @@
+
+import { useEffect, useState } from 'react'
+import Taro from '@tarojs/taro'
 import classNames from 'classnames'
 import './style.scss'
 
 export default (props) => {
-  const { visible = false, close = () => {} } = props
+  const { visible = false, onClose = () => {} } = props
+  const [style, setStyle] = useState({ right: '50px' })
+
+  useEffect(() => {
+    Taro.nextTick(() => {
+      // https://developers.weixin.qq.com/miniprogram/dev/api/ui/menu/wx.getMenuButtonBoundingClientRect.html
+      const bound = Taro.getMenuButtonBoundingClientRect()
+
+      Taro.getStorage({
+        key: 'systemInfo',
+        success: (res) => {
+          const { screenWidth } = res.data
+          // 胶囊右边距
+          const marginRight = screenWidth - bound.right
+          // 提示的右边距
+          const right = bound.width / 2 + marginRight
+          //
+          setStyle({ right: `${right}px` })
+        }
+      }) || {};
+
+      // 需要依据 bound 来调整位置
+    })
+  }, [])
 
   return (
-    <view className={classNames('components', 'ShareToCircle', { show: visible })}>
-      <view>
+    <view className={classNames('components', 'ShareToCircle', { show: visible })} onClick={onClose}>
+      <view style={style}>
         <text>从这里“分享到朋友圈”~</text>
-        <text className='iconfont icon-guanbi1' onClick={close}></text>
+        <text className='iconfont icon-guanbi1' onClick={onClose}></text>
       </view>
     </view>
   )

src/layout/index.js

@@ -10,6 +10,7 @@ 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'
@@ -20,6 +21,9 @@ import { routes } from '../routes'
 import './style.scss'
 
 export default (ChildComponent) => (props) => {
+  const mode = Taro.getStorageSync('mode')
+  const isSinglePage = mode === 'singlePage'
+
   const consultant = useSelector(s => s.system.consultant)
   const city = useSelector(s => s.city.curCity)
   const { spinning, userInfo } = useSelector(s => s.user)
@@ -28,6 +32,8 @@ export default (ChildComponent) => (props) => {
   const page = routes.filter((r) => (router.path.indexOf(r.page) > -1))[0]
   const [loading, setLoading] = useState(false)
   const [authPhone, authAvatar, authPage] = useAuth(person, page)
+  const [shareTimelineVisible, setShareTimelineVisible] = useState(false)
+
 
   const { id } = router.params
   const showConsultant = page.shortcut && page.shortcut.consultant
@@ -44,20 +50,38 @@ export default (ChildComponent) => (props) => {
     nav2Target(screenInfo)
   }
 
+  // 分享朋友圈提示
+  const showShareTimeline = (visible) => setShareTimelineVisible(visible)
+
+  // 设置当前页标题
+  const setNavigationBarTitle = title => {
+    if (!title) return;
+
+    Taro.nextTick(() => {
+      Taro.setNavigationBarTitle({ title })
+    })
+  }
+
   // 报备客户
   useEffect(() => {
+    if (isSinglePage) return;
+
     reportCustomer(person, consultant, false).catch(() => {})
-  }, [person, consultant])
+  }, [person, consultant, isSinglePage])
 
   // 请求埋点设置
   useEffect(() => {
+    if (isSinglePage) return;
+
     if (id) {
       setShareContent({})
     }
-  } ,[id, page.type])
+  } ,[id, page.type, isSinglePage])
 
   // 埋点数据
   useEffect(() => {
+    if (isSinglePage) return;
+
     const consultantId = person?.personType === ROLE_CODE.CONSULTANT ? person.personId : undefined
 
     setTrackData({
@@ -67,7 +91,7 @@ export default (ChildComponent) => (props) => {
       sharePersonId: person?.personId,
       targetId: id,
     })
-  }, [person, page, id])
+  }, [person, page, id, isSinglePage])
 
   // 主要用于埋点
   useEffect(() => {
@@ -81,20 +105,32 @@ export default (ChildComponent) => (props) => {
 
   return (
     <>
+      {/* 菊花转 */}
       <Overlay visible={loading} style={{background: '#fff'}}>
         <Loading />
       </Overlay>
-      <Overlay visible={authPhone} aligin='bottom'>
+
+      {/* 授权手机 */}
+      <Overlay visible={authPhone && !isSinglePage} aligin='bottom'>
         <View className='auth-wrapper'>
           <AuthPhone consultant={consultant} router={router} page={page} />
         </View>
       </Overlay>
-      <Overlay visible={!authPhone && authAvatar} aligin='bottom'>
+
+      {/* 授权头像 */}
+      <Overlay visible={!authPhone && authAvatar && !isSinglePage} aligin='bottom'>
         <View className='auth-wrapper'>
           <AuthAvatar />
         </View>
       </Overlay>
-      { authPage && <AuthPage /> }
+
+      {/* 授权头像-全屏 */}
+      { authPage && !isSinglePage && <AuthPage /> }
+
+      {/* 显示分享朋友圈 */}
+      <ShareToCircle visible={shareTimelineVisible && !isSinglePage} onClose={() => setShareTimelineVisible(false)} />
+
+      {/* 页面内容 */}
       <Spin size={32} spinning={spinning} />
       {
         person && !!person.personId && (
@@ -104,19 +140,26 @@ export default (ChildComponent) => (props) => {
             consultant={consultant}
             page={page}
             city={city}
+            mode={mode}
             shareContent={shareContent}
             trackData={trackData}
+            showShareTimeline={showShareTimeline}
+            setNavigationBarTitle={setNavigationBarTitle}
             {...props}
             {...extInfo}
           />
         )
       }
+
+      {/* 当前置业顾问 */}
       {
         !!showConsultant && (<FixedConsultant consultant={consultant} />)
       }
+
+      {/* 开屏广告 */}
       <FirstScreen
         info={screenInfo}
-        visible={screenVisible}
+        visible={screenVisible && !isSinglePage}
         onClick={handleScreen}
         onClose={toggleShowScreen}
       />

src/pages/index/activityDetail/index.jsx

@@ -12,7 +12,6 @@ import {
   Button
 } from '@tarojs/components';
 import Disclaimer from '@/components/Disclaimer';
-import ShareToCircle from '@/components/ShareToCircle'
 import { useSelector } from 'react-redux';
 import {
   signupActivity,
@@ -53,7 +52,7 @@ const activityStatusDict = {
 };
 
 export default withLayout((props) => {
-  const { router, shareContent, trackData, person, page } = props;
+  const { router, shareContent, trackData, person, page, showShareTimeline, setNavigationBarTitle } = props;
   const { id } = router.params;
 
   const user = useSelector((state) => state.user);
@@ -64,8 +63,6 @@ export default withLayout((props) => {
   const [selectorChecked, setSelectorChecked] = useState('1');
   const [selector, setSelector] = useState('');
 
-  const [ShowShareLayer, setShowShareLayer] = useState(false)
-
   const buildingId = detail?.buildingId;
 
   const [btnText, btnDisabled] = useStatus(detail)
@@ -77,7 +74,8 @@ export default withLayout((props) => {
       const maxperson = 10
       setSelector(times(maxperson).map((_, i) => `${i + 1}`));
 
-      setDetail(res);
+      setDetail(res ||{});
+      setNavigationBarTitle(res?.title)
       Taro.hideLoading();
     });
   };
@@ -214,7 +212,7 @@ export default withLayout((props) => {
             <text>分享</text>
             <Button open-type='share' className='ShareBtn'>分享</Button>
           </view>
-          <view onClick={() => { setShowShareLayer(true) }}>
+          <view onClick={() => showShareTimeline(true)}>
             <text className='iconfont icon-pengyouquan1' style='font-size: 32rpx'></text>
             <text>朋友圈</text>
           </view>
@@ -242,7 +240,6 @@ export default withLayout((props) => {
     <>
       {detail && (
         <view className='Page activityDetail flex-v'>
-          <ShareToCircle visible={ShowShareLayer} close={() => { setShowShareLayer(false) }}></ShareToCircle>
           <view className='flex-item'>
             <view>
               <ScrollView scroll-y>

src/pages/index/buildingDetail/index.jsx

@@ -24,7 +24,7 @@ import Pictures from './components/Pictures/index'
 import './index.scss'
 
 export default withLayout((props) => {
-  const { router, person, shareContent, trackData, page } = props
+  const { router, person, shareContent, trackData, page, setNavigationBarTitle } = props
   const { id } = router.params
 
   const [showPoster, setShowPoster] = useState(false)
@@ -52,6 +52,7 @@ export default withLayout((props) => {
     // 获取楼盘信息
     fetch({ url: `${API_ITEMS_DETAIL}/${id}`, spin: true }).then((res) => {
       setDetailInfo(res || {})
+      setNavigationBarTitle(res?.buildingName)
       
       if (res?.buildingApartment) {
         const List = res.buildingApartment.filter(item => item.apartmentType === 'photo')

src/pages/index/encyDetail/index.jsx

@@ -9,14 +9,15 @@ import { queryPolicyDetail } from "@/services/policy";
 import { formatDate } from "@/utils/chatDate";
 
 export default withLayout((props) => {
-  const { router, shareContent, trackData, person, page } = props;
+  const { router, shareContent, trackData, person, page, setNavigationBarTitle } = props;
   const { id } = router.params;
   const [data, setData] = useState({});
 
   const getData = (params) => {
     Taro.showLoading();
     queryPolicyDetail(params).then((res) => {
-      setData(res);
+      setData(res||{});
+      setNavigationBarTitle(res?.title)
       Taro.hideLoading();
     });
   };

src/pages/index/encyclopediasOfBuyHouse/index.jsx

@@ -9,7 +9,7 @@ import { fetch } from "@/utils/request";
 import { queryPolicyTypeList, queryPolicyList } from "@/services/policy";
 
 const EncyItem = (props) => {
-  const city = useSelector(state => state.city)
+  const { city } = props
 
   const { item, index } = props;
   const [list, setList] = useState([]);
@@ -18,10 +18,10 @@ const EncyItem = (props) => {
     if (item.policyTypeId) {
       getPolicyListByType(item.policyTypeId);
     }
-  }, [item,city]);
+  }, [item,city?.id]);
 
   const getPolicyListByType = policyTypeId => {
-    queryPolicyList({ pageSize: 100,policyTypeId,cityId: city?.curCity?.id }).then((res) => {
+    queryPolicyList({ pageSize: 100, policyTypeId, cityId: city?.id }).then((res) => {
       setList(res.records);
     });
   };

src/pages/index/index.jsx

@@ -34,13 +34,6 @@ export default withLayout((props) => {
   // 分享
   useShare(shareContent, trackData)
 
-  useEffect(() => {
-    if (city?.id) {
-      GetBanner()
-      GetProjectList()
-    }
-  }, [city?.id])
-
   const GetBanner = () => { // 获取banner
     fetch({ url: `${API_BANNER_LIST}/banner`, method: 'get', payload: { cityId: city.id, showPosition: 'index' } }).then((res) => {
       setBannerList(res || [])
@@ -61,6 +54,14 @@ export default withLayout((props) => {
     setShowLive(e)
   }
 
+  useEffect(() => {
+    if (city?.id) {
+      GetBanner()
+      GetProjectList()
+    }
+  }, [city?.id])
+
+
   return (
     <view className='Page Index'>
       {/* <ShareToCircle visible></ShareToCircle> */}

src/pages/index/newsDetail/index.config.js

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

src/pages/index/newsDetail/index.jsx

@@ -2,19 +2,20 @@ import { useState, useEffect } from "react";
 import Taro from "@tarojs/taro";
 import withLayout from "@/layout";
 import { ScrollView, Image, RichText, WebView } from "@tarojs/components";
+import useParams from '@/utils/hooks/useParams'
 import useFavor from "@/utils/hooks/useFavor";
 import { queryNewsDetail } from "@/services/news";
 import { formatDate } from "@/utils/chatDate";
+import useShare from "@/utils/hooks/useShare";
 import "@/assets/css/iconfont.css";
 import "./index.scss";
 
 export default withLayout((props) => {
-  const { trackData } = props
+  const { router, shareContent, person, trackData, page, showShareTimeline, setNavigationBarTitle } = props
   const { id } = props.router.params;
 
+  const paramsRef = useParams({person, from: `${page.type}_share`})
   const [data, setData] = useState(null);
-  const [IsPull, setPull] = useState(false);
-  const [PullTimer, setPullTimer] = useState(null);
 
 
   const [isSave, handleFavor] = useFavor(data?.isSave, {
@@ -22,41 +23,28 @@ export default withLayout((props) => {
     buildingId: data?.buildingId,
     ...trackData,
   });
-
-  const PageRefresh = () => {
-    // 页面下拉刷新回调
-    setPull(true);
-  };
-
-  useEffect(() => {
-    // 下拉刷新触发
-    if (IsPull) {
-      clearTimeout(PullTimer);
-      setPullTimer(
-        setTimeout(() => {
-          setPull(false);
-        }, 2000)
-      );
-    }
-  }, [IsPull]);
+  
+  const fullTrackData = { ...trackData, buildingId: data?.buildingId };
+  
+  useShare(
+    {
+      title: shareContent.shareContentTitle || data?.newsName,
+      path: `${router.path}?${paramsRef.current}`,
+      image: shareContent.shareContentImg,
+    },
+    fullTrackData
+  );
 
   const getData = (params) => {
     Taro.showLoading();
     queryNewsDetail(params).then((res) => {
 
       setData(res);
+      setNavigationBarTitle(res?.newsName);
       Taro.hideLoading();
     });
   };
 
-  const shareTimeline = () => {
-    Taro.showToast({
-      title: '请点击右上角分享到朋友圈',
-      icon: 'none',
-      duration: 3000,
-    })
-  }
-
   useEffect(() => {
     if (id) {
       getData(id);
@@ -68,13 +56,7 @@ export default withLayout((props) => {
       {data && (data.newsDetailType === '0' ? <WebView src={data.newsDetail} /> : <>
         <view className='flex-item'>
           <view>
-            <ScrollView
-              scroll-y
-              refresher-enabled
-              refresher-triggered={IsPull}
-              onrefresherrefresh={PageRefresh}
-              refresher-background='#fff'
-            >
+            <ScrollView scrollY>
               <view className='PageContent'>
                 <view className='Info'>
                   <view>
@@ -99,9 +81,9 @@ export default withLayout((props) => {
           </view>
         </view>
         <view className='Bottom'>
-          <view>
-            <text onClick={shareTimeline} className='iconfont icon-pengyouquan1'></text>
-            <text onClick={shareTimeline}>分享朋友圈</text>
+          <view onClick={() => showShareTimeline(true)}>
+            <text className='iconfont icon-pengyouquan1'></text>
+            <text>分享朋友圈</text>
           </view>
           <view>
             <text className='iconfont icon-shoucang' style={isSave ? { color: 'red' } : undefined} onClick={handleFavor}></text>

src/pages/video/liveDetail/index.jsx

@@ -11,7 +11,7 @@ import "@/assets/css/iconfont.css";
 import "./index.scss";
 
 export default withLayout((props) => {
-  const { router, shareContent, trackData, person, page } = props;
+  const { router, shareContent, trackData, person, page, setNavigationBarTitle } = props;
   const { id } = router.params;
 
   const [data, setData] = useState({})
@@ -38,7 +38,8 @@ export default withLayout((props) => {
 
   const getData = () => {
     queryLiveDetail(id).then(res => {
-      setData(res)
+      setData(res||{})
+      setNavigationBarTitle(res?.name)
       if (res?.liveRoomParam) {
         const { livingid } = JSON.parse(res.liveRoomParam)
         getLivingCode(livingid).then((liveInfo) => {

src/pages/video/videoDetail/index.jsx

@@ -11,7 +11,7 @@ import "@/assets/css/iconfont.css";
 import "./index.scss";
 
 export default withLayout((props) => {
-  const { router, shareContent, trackData, person, page } = props;
+  const { router, shareContent, trackData, person, page, setNavigationBarTitle } = props;
   const { id } = router.params;
 
   const [data, setData] = useState({});
@@ -36,7 +36,8 @@ export default withLayout((props) => {
 
   const getData = () => {
     fetch({ url: `${API_VIDEO_DETAIL}/${id}` }).then(res=>{
-      setData(res)
+      setData(res||{})
+      setNavigationBarTitle(res?.name)
     });
   };
 

src/routes.js

@@ -29,6 +29,7 @@ const routes = [
     pkg: 'main',
     isTab: true,
     type: 'chat',
+    auth: ['page'],
   },
   {
     name: '我是',

src/utils/login.js

@@ -7,61 +7,53 @@ import { wxLogin } from '@/services/login'
 import { getCardDetail } from '@/services/card'
 import { queryUserInfo } from '@/services/user'
 
-export default (payload) => {
-  return new Promise((resolve, reject) => {
-    const { path, scene, ...params } = payload
-  
-    // 获取 code
-    Taro.login({
-      success: ({ code }) => {
-        params.code = code
-  
-        // 转换 undefined 为 ''
-        const loginParams = Object.keys(params).reduce((acc, k) => ({ ...acc, [`${k}`]: ifNull(params[k], '') }), {})
-  
-        // 远程登录获取人员
-        wxLogin(loginParams, false).then(data => {
-  
-          const { extraInfo, miniApp, person, city } = data
-          const { token, sessionKey } = miniApp
-          const { dispatch, getState } = store
-  
-          Taro.setStorageSync('token', token)
-          Taro.setStorageSync('sessionKey', sessionKey)
-  
-          dispatch({ type: USER_INFO, payload: { extraInfo, person, miniApp } })
-          const { city: { curCity } } = getState()
-  
-          if (!curCity || Object.keys(curCity).length == 0) {
-            if (city) {
-              dispatchCitySelected(city)(dispatch)
-            }
-          }
+export default (params) => {
+  return new Promise((resolve, reject) => {  
+    // 转换 undefined 为 ''
+    const loginParams = Object.keys(params).reduce((acc, k) => ({ ...acc, [`${k}`]: ifNull(params[k], '') }), {})
 
-          // 获取人员详细信息
-          // eslint-disable-next-line no-unused-vars
-          queryUserInfo().then(info => {
-            // const { unReadNum } = info
+    // 远程登录获取人员
+    wxLogin(loginParams, false).then(data => {
 
-            // 默认红点开始就有
-            dispatch({ type: ASSIGN_UNREADNUM, payload: true });
-            resolve(data)
-          }).catch(reject)
+      const { extraInfo, miniApp, person, city } = data
+      const { token, sessionKey } = miniApp
+      const { dispatch, getState } = store
 
-          // 如果有推荐人信息
-          if (loginParams.recommender && loginParams.recommender !== person.personId) {
-            getCardDetail(loginParams.recommender).then((res) => {
-              dispatch({ type: 'SYNC_RECOMMENDER', payload: res });
-              if (res.personType === ROLE_CODE.CONSULTANT) {
-                dispatch({ type: 'SYNC_CONSULTANT', payload: res });
-              }
-            })
-          }
+      Taro.setStorageSync('token', token)
+      Taro.setStorageSync('sessionKey', sessionKey)
 
-          // 如果通过扫码进入
+      dispatch({ type: USER_INFO, payload: { extraInfo, person, miniApp } })
+      const { city: { curCity } } = getState()
 
-        }).catch(reject)
+      if (!curCity || Object.keys(curCity).length == 0) {
+        if (city) {
+          dispatchCitySelected(city)(dispatch)
+        }
       }
-    })
+
+      // 获取人员详细信息
+      // eslint-disable-next-line no-unused-vars
+      queryUserInfo().then(info => {
+        // const { unReadNum } = info
+
+        // 默认红点开始就有
+        dispatch({ type: ASSIGN_UNREADNUM, payload: true });
+        resolve(data)
+      }).catch(reject)
+
+      // 如果有推荐人信息
+      if (loginParams.recommender && loginParams.recommender !== person.personId) {
+        getCardDetail(loginParams.recommender).then((res) => {
+          dispatch({ type: 'SYNC_RECOMMENDER', payload: res });
+          if (res.personType === ROLE_CODE.CONSULTANT) {
+            dispatch({ type: 'SYNC_CONSULTANT', payload: res });
+          }
+        })
+      }
+
+      // 如果通过扫码进入
+
+    }).catch(reject)
+  
   })
 }