张延森 3 years ago
parent
commit
f9dc62fa4f
2 changed files with 6 additions and 1 deletions
  1. 1
    0
      src/app.js
  2. 5
    1
      src/utils/hooks/useRouter.js

+ 1
- 0
src/app.js View File

16
     // 预拉取数据
16
     // 预拉取数据
17
     preFetchData().then((fetchData) => {
17
     preFetchData().then((fetchData) => {
18
       const { fromType, recommender, scene : qrCodeId } = options.query
18
       const { fromType, recommender, scene : qrCodeId } = options.query
19
+      Taro.setStorageSync({ key: 'scene', data: qrCodeId })
19
 
20
 
20
       // 登录获取人员信息
21
       // 登录获取人员信息
21
       Taro.login({
22
       Taro.login({

+ 5
- 1
src/utils/hooks/useRouter.js View File

13
   
13
   
14
   routerRef.current = router
14
   routerRef.current = router
15
   const scene = router?.params?.scene
15
   const scene = router?.params?.scene
16
+  const loginScene = Taro.getStorageSync('scene')
16
 
17
 
17
   useEffect(() => {
18
   useEffect(() => {
18
     // 扫码进入
19
     // 扫码进入
19
     if (scene) {
20
     if (scene) {
20
-      if (qrCode) {
21
+      if (scene === loginScene && qrCode) {
21
         const qrParams = parseQueryString(qrCode) || {}
22
         const qrParams = parseQueryString(qrCode) || {}
22
         routerRef.current.params = {
23
         routerRef.current.params = {
23
           ...routerRef.current.params || {},
24
           ...routerRef.current.params || {},
25
           parseQRFinished: true, 
26
           parseQRFinished: true, 
26
         }
27
         }
27
         setToggleRefresh(Math.random().toString())
28
         setToggleRefresh(Math.random().toString())
29
+        console.log('-----------qrCode---------------', qrCode)
28
       } else {
30
       } else {
31
+        console.log('-----------getQrcode---------------', scene)
29
         getQrcode(scene).then((res) => {
32
         getQrcode(scene).then((res) => {
30
           const qrParams = parseQueryString(res.scene) || {}
33
           const qrParams = parseQueryString(res.scene) || {}
31
           routerRef.current.params = {
34
           routerRef.current.params = {
39
     }
42
     }
40
   }, [qrCode, scene])
43
   }, [qrCode, scene])
41
 
44
 
45
+  console.log('-----------routerRef.current---------------', routerRef.current)
42
   return routerRef.current
46
   return routerRef.current
43
 }
47
 }