电子商城测试版v4

src/use/useHttp.ts

@@ -122,14 +122,12 @@ export const useRequest = (options:option = {
 
     const stateRef = useRef({...params})
     const [state, setState] = useState({...stateRef.current})
-    const {removeToken, removeSessionKey} = useUserInfo()
+    const {removeToken, removeSessionKey, removeUserInfo} = useUserInfo()
     const {login} = useLoginRequest()
     
-    useEffect(() => {
-        console.log('变化1::', state.loading)
-    }, [state.loading])
     // 请求函数  
     const fetchData = async (sub_options?:any) => {
+        
         stateRef.current.loading = true
         setState((e) => ({...e, loading:true}))
         stateRef.current.query = {
@@ -179,9 +177,11 @@ export const useRequest = (options:option = {
                     console.log('错误：：',msg)
                 }
             }else{
+                
                 if (statusCode === 401) {
                     removeToken()
                     removeSessionKey()
+                    removeUserInfo()
                     login()
                     //todo 登录数据刷新次数问题
                 } else {

src/use/useLogin.ts

@@ -1,19 +1,22 @@
 import useUserInfo from "./useUserInfo"
-import Taro, { useRouter } from "@tarojs/taro"
+import Taro, { useDidShow, useRouter } from "@tarojs/taro"
 import { GetWxUserInfoApi, GetAdminUserInfoApi, GetPhoneNumberApi, BindingCompanyApi } from "@/api/user"
 import useLoginRequest from "./useLoginRequest"
 import { SHARE_SCENE } from "@/common/enum"
 import { GetShortCodeApi } from "@/api/share"
 import { alert } from "@/common/common"
+import { LoginApi } from "@/api/login"
 
 export default () => {
     const {setUserInfo, setAdminUserInfo, setSortCode, userInfo} = useUserInfo()
 
-    //登录请求 (调用这个就不能再useHttp中使用，当前这个hook, 否则会死循环内存溢出)
-    // const {fetchData} = LoginApi()
+    useDidShow(() => {
+        checkLogin()
+    })
 
     //登录请求
     const {login} = useLoginRequest()
+    // const {fetchData:login} = LoginApi() 
     const wxLogin = async () => {
         try {
             await login()

src/use/useLoginRequest.ts

@@ -3,11 +3,15 @@ import Taro, { useRouter } from "@tarojs/taro"
 import { useRef, useState } from "react"
 import  qs from 'qs'
 import useUserInfo from "./useUserInfo"
+import useLogin from "./useLogin"
 
 //开这个hook 主要是为了让useHttp 能够调用
 
 type Param = {success: true|false, data: any, msg: string, code: null|number, loading: false|true}
+let loginStatus = false //登录状态，true登录中
+console.log('你不要过来啊')
 export default () => {
+       
         let initData = {
             success: false, 
             data: null, 
@@ -19,7 +23,7 @@ export default () => {
         const {setToken, setSessionKey} = useUserInfo()
         const router = useRouter()
         //微信登录请求v2
-        const fetchData = async (login_code) => {
+        const fetchDataLogin = async (login_code) => {
             const q = {
                 url: BASE_URL + '/v1/mall/login',
                 header: {
@@ -57,11 +61,13 @@ export default () => {
 
         //微信登录
         const login = () => {
+            if(loginStatus) return false
+            loginStatus = true
             return new Promise((reslove, reject) => {
                 Taro.login({
                     success:  async (res) => {
                         if (res.code) {
-                            const {data, success, msg} = await fetchData(res.code)
+                            const {data, success, msg} = await fetchDataLogin(res.code)
                             if(success) {
                                     setToken(data.token)
                                     setSessionKey(data.session_key)
@@ -88,10 +94,12 @@ export default () => {
                             console.log('登录失败！' + res.errMsg)
                             reject(res.errMsg)
                         }
+                        loginStatus = false
                     },
                     fail: function(e) {
                         console.log('登录失败！::',e)
                         reject(e)
+                        loginStatus = false
                     }
                 })
             })