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