lwei 1 jaar geleden
bovenliggende
commit
e5a0568596
3 gewijzigde bestanden met toevoegingen van 9 en 3 verwijderingen
  1. 6 2
      src/Login2p/Login2p.tsx
  2. 1 0
      src/Login2p/Login2pContext.tsx
  3. 2 1
      src/Login2p/Login2pWechatLanding.tsx

+ 6 - 2
src/Login2p/Login2p.tsx

@@ -55,7 +55,9 @@ const Login2p: React.FC = () => {
         // wx.miniProgram.navigateBack()
         // wx.miniProgram.navigateBack()
       }
       }
     } else if (login2p.isWechat && !wechatToken) {
     } else if (login2p.isWechat && !wechatToken) {
-      login2p.loginWechatLaunch(`${process.env.REACT_APP_URL}login2p/wechat?next=${next ? next : '/'}`)
+      login2p.loginWechatLaunch(
+        `${process.env.REACT_APP_URL}login2p/wechat?next=${encodeURIComponent(next ? next : '/')}`
+      )
     }
     }
   }
   }
   const handleLoginegByCode = (value: any) => {
   const handleLoginegByCode = (value: any) => {
@@ -151,7 +153,9 @@ const Login2p: React.FC = () => {
               <Button
               <Button
                 icon={<WechatOutlined style={{ color: '#60C84D' }} />}
                 icon={<WechatOutlined style={{ color: '#60C84D' }} />}
                 onClick={() =>
                 onClick={() =>
-                  login2p.loginWechatLaunch(`${process.env.REACT_APP_URL}login2p/wechat?next=${next ? next : '/'}`)
+                  login2p.loginWechatLaunch(
+                    `${process.env.REACT_APP_URL}login2p/wechat?next=${encodeURIComponent(next ? next : '/')}`
+                  )
                 }
                 }
                 shape="circle"
                 shape="circle"
                 size="large"
                 size="large"

+ 1 - 0
src/Login2p/Login2pContext.tsx

@@ -110,6 +110,7 @@ const Login2pProvider: React.FC<ContextProviderProps> = ({ children }: ContextPr
       // 如果有邀请码
       // 如果有邀请码
       if (!!data.InviteShareCode) {
       if (!!data.InviteShareCode) {
         sessionStorage.setItem('invite_code', data.InviteShareCode)
         sessionStorage.setItem('invite_code', data.InviteShareCode)
+        console.log(window.location)
         history.replace(`${window.location.pathname}?invite_code=${data.InviteShareCode}`)
         history.replace(`${window.location.pathname}?invite_code=${data.InviteShareCode}`)
       }
       }
 
 

+ 2 - 1
src/Login2p/Login2pWechatLanding.tsx

@@ -8,10 +8,11 @@ import { useLogin2p } from './Login2pContext'
 const Login2pWechatLanding: React.FC = () => {
 const Login2pWechatLanding: React.FC = () => {
   const code = new URLSearchParams(useLocation().search).get('code')
   const code = new URLSearchParams(useLocation().search).get('code')
   const next = new URLSearchParams(useLocation().search).get('next')
   const next = new URLSearchParams(useLocation().search).get('next')
+  console.log(next)
   const login2p = useLogin2p()
   const login2p = useLogin2p()
   React.useEffect(() => {
   React.useEffect(() => {
     if (code) {
     if (code) {
-      login2p.loginWechat(code, next ? next : '/').then(r => console.log(r))
+      login2p.loginWechat(code, decodeURIComponent(next ? next : '/')).then(r => console.log(r))
     }
     }
   }, [])
   }, [])