feats

src/app.js

@@ -16,11 +16,13 @@ class App extends Component {
         openid: fetchData.openid,
       })
 
+      const { fromType, recommender, scene : qrCodeId } = options.query
+
       // 登录获取人员信息
       Taro.login({
         success: (res) => {
           const { code } = res;
-          login({ code, personId: fetchData.personId })
+          login({ code, personId: fetchData.personId, fromType, recommender, qrCodeId })
         }
       })
     }).catch(() => {

src/utils/hooks/useTrackPage.js

@@ -1,6 +1,6 @@
 
 import { useRef } from 'react'
-import { useDidShow, useDidHide } from '@tarojs/taro'
+import Taro, { useDidShow, useDidHide } from '@tarojs/taro'
 import { trackPage, updateTrackPage } from '@/services/track'
 
 export default (payload) => {
@@ -9,11 +9,26 @@ export default (payload) => {
   payloadRef.current = payload
 
   useDidShow(() => {
-    trackPage(payloadRef.current).then((res) => {
-      resRef.current = res;
-    }).catch((err) => {
-      console.error(err);
-    })
+    let token = Taro.getStorageSync('token')
+    if (token) {
+      trackPage(payloadRef.current).then((res) => {
+        resRef.current = res;
+      }).catch((err) => {
+        console.error(err);
+      })
+    } else {
+      const t = setInterval(() => {
+        token = Taro.getStorageSync('token')
+        if (token) {
+          clearTimeout(t)
+          trackPage(payloadRef.current).then((res) => {
+            resRef.current = res;
+          }).catch((err) => {
+            console.error(err);
+          })
+        }
+      }, 500)
+    }
   })
 
   useDidHide(() => {

src/utils/index.js

@@ -37,8 +37,10 @@ export function getQueryString(params) {
   const keys = Object.keys(params)
   const arr = keys.map((key) => {
     const val = params[key]
+    if (val === null || val === undefined) return false;
+
     return `${key}=${encodeURIComponent(val)}`
   })
 
-  return arr.join('&')
+  return arr.filter(Boolean).join('&')
 }