订单列表对接
This commit is contained in:
@@ -168,7 +168,6 @@ export const useRequest = (options:option = {
|
||||
msg,
|
||||
data
|
||||
} = result.data
|
||||
console.log(code, msg, data, statusCode);
|
||||
if (statusCode === 200) {
|
||||
stateRef.current.success = (code === 0 ? true : false)
|
||||
stateRef.current.code = code
|
||||
|
||||
+14
-11
@@ -1,18 +1,12 @@
|
||||
import { useEffect, useState } from "react"
|
||||
import {BASE_URL, WX_APPID } from "@/common/constant"
|
||||
import useUserInfo from "./useUserInfo"
|
||||
import Taro, { useRouter } from "@tarojs/taro"
|
||||
import { LoginApi } from "@/api/login"
|
||||
import { GetWxUserInfoApi, GetAdminUserInfoApi, GetPhoneNumberApi } from "@/api/user"
|
||||
import qs from 'qs';
|
||||
import useLoginRequest from "./useLoginRequest"
|
||||
import { SHARE_SCENE } from "@/common/enum"
|
||||
import { GetShortCodeApi } from "@/api/share"
|
||||
|
||||
export default () => {
|
||||
const {setUserInfo, setAdminUserInfo, userInfo} = useUserInfo()
|
||||
|
||||
useEffect(() => {
|
||||
console.log('userInfo::',userInfo.token)
|
||||
}, [userInfo])
|
||||
const {setUserInfo, setAdminUserInfo, setSortCode, userInfo} = useUserInfo()
|
||||
|
||||
//登录请求 (调用这个就不能再useHttp中使用,当前这个hook, 否则会死循环内存溢出)
|
||||
// const {fetchData} = LoginApi()
|
||||
@@ -33,6 +27,7 @@ export default () => {
|
||||
const getAdminUserInfo = async () => {
|
||||
let res = await useFetchData()
|
||||
setAdminUserInfo(res.data)
|
||||
getShortCode(res.data.user_id)
|
||||
}
|
||||
|
||||
//登录加checkLogin检查
|
||||
@@ -45,7 +40,7 @@ export default () => {
|
||||
Taro.checkSession({
|
||||
success: async () => {
|
||||
reslove(true)
|
||||
if(!userInfo.adminUserInfo) getAdminUserInfo()
|
||||
if(!userInfo.adminUserInfo) getAdminUserInfo()
|
||||
},
|
||||
fail: async () => {
|
||||
await wxLogin()
|
||||
@@ -84,7 +79,6 @@ export default () => {
|
||||
} else {
|
||||
reject(user_res.msg)
|
||||
}
|
||||
|
||||
},
|
||||
fail:(e) => {
|
||||
reject(e)
|
||||
@@ -115,6 +109,15 @@ export default () => {
|
||||
})
|
||||
}
|
||||
|
||||
//获取分享转码
|
||||
const {ShareDetail, SharePage} = SHARE_SCENE
|
||||
const {fetchData: fetchDataShortCode} = GetShortCodeApi()
|
||||
const getShortCode = async (user_id) => {
|
||||
const {data: resDetail} = await fetchDataShortCode({"share_user_id": user_id, type:ShareDetail.value})
|
||||
const {data: resPage} = await fetchDataShortCode({"share_user_id": user_id, type:SharePage.value})
|
||||
setSortCode({shareShortDetail: resDetail.md5_key, shareShortPage: resPage.md5_key})
|
||||
}
|
||||
|
||||
return {
|
||||
checkLogin,
|
||||
wxLogin,
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { useDispatch, useSelector } from 'react-redux'
|
||||
import { CLEAR_SESSIONKEY, SET_USERINFO, SET_TOKEN, SET_SESSIONKEY, CLEAR_USERINFO, CLEAR_TOKEN, SET_ADMINUSERINFO} from '@/constants/userInfo'
|
||||
import {DataParam, UserParam, UserAdminParam} from '@/reducers/userInfo'
|
||||
import { CLEAR_SESSIONKEY, SET_USERINFO, SET_TOKEN, SET_SESSIONKEY, CLEAR_USERINFO, CLEAR_TOKEN, SET_ADMINUSERINFO, SET_SORTCODE} from '@/constants/userInfo'
|
||||
import {DataParam, UserParam, UserAdminParam, SortCodeParam} from '@/reducers/userInfo'
|
||||
export default () => {
|
||||
const userInfo = useSelector((state:DataParam) => state.userInfo) as DataParam
|
||||
const dispatch = useDispatch()
|
||||
@@ -21,6 +21,10 @@ export default () => {
|
||||
dispatch({type:SET_ADMINUSERINFO, data:{adminUserInfo}})
|
||||
}
|
||||
|
||||
const setSortCode = (sortCode:SortCodeParam) => {
|
||||
dispatch({type:SET_SORTCODE, data:{sort_code:sortCode}})
|
||||
}
|
||||
|
||||
const removeUserInfo = () => {
|
||||
dispatch({type:CLEAR_USERINFO})
|
||||
}
|
||||
@@ -41,6 +45,7 @@ export default () => {
|
||||
removeUserInfo,
|
||||
removeToken,
|
||||
removeSessionKey,
|
||||
setSortCode,
|
||||
userInfo, //响应式数据返回
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user