feats

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.27-20210808"'
+    Version: '"V0.0.28-20210808"'
   },
   mini: {},
   h5: {

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/layout/index.js

@@ -21,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)
@@ -31,6 +34,7 @@ export default (ChildComponent) => (props) => {
   const [authPhone, authAvatar, authPage] = useAuth(person, page)
   const [shareTimelineVisible, setShareTimelineVisible] = useState(false)
 
+
   const { id } = router.params
   const showConsultant = page.shortcut && page.shortcut.consultant
 
@@ -60,18 +64,24 @@ export default (ChildComponent) => (props) => {
 
   // 报备客户
   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({
@@ -81,7 +91,7 @@ export default (ChildComponent) => (props) => {
       sharePersonId: person?.personId,
       targetId: id,
     })
-  }, [person, page, id])
+  }, [person, page, id, isSinglePage])
 
   // 主要用于埋点
   useEffect(() => {
@@ -101,24 +111,24 @@ export default (ChildComponent) => (props) => {
       </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} onClose={() => setShareTimelineVisible(false)} />
+      <ShareToCircle visible={shareTimelineVisible && !isSinglePage} onClose={() => setShareTimelineVisible(false)} />
 
       {/* 页面内容 */}
       <Spin size={32} spinning={spinning} />
@@ -130,6 +140,7 @@ export default (ChildComponent) => (props) => {
             consultant={consultant}
             page={page}
             city={city}
+            mode={mode}
             shareContent={shareContent}
             trackData={trackData}
             showShareTimeline={showShareTimeline}
@@ -148,7 +159,7 @@ export default (ChildComponent) => (props) => {
       {/* 开屏广告 */}
       <FirstScreen
         info={screenInfo}
-        visible={screenVisible}
+        visible={screenVisible && !isSinglePage}
         onClick={handleScreen}
         onClose={toggleShowScreen}
       />

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/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)
+  
   })
 }