对接完添加购物车
This commit is contained in:
+13
-3
@@ -3,12 +3,12 @@ import { WX_APPID } from "@/common/constant"
|
||||
import useUserInfo from "./useUserInfo"
|
||||
import Taro, { useRouter } from "@tarojs/taro"
|
||||
import { LoginApi } from "@/api/login"
|
||||
import { GetWxUserInfoApi } from "@/api/user"
|
||||
import { GetWxUserInfoApi, GetAdminUserInfoApi } from "@/api/user"
|
||||
import qs from 'qs';
|
||||
|
||||
export default () => {
|
||||
const {setToken, setSessionKey, setUserInfo, userInfo} = useUserInfo()
|
||||
|
||||
const {setToken, setSessionKey, setUserInfo, setAdminUserInfo, userInfo} = useUserInfo()
|
||||
|
||||
useEffect(() => {
|
||||
console.log('userInfo::',userInfo.token)
|
||||
}, [userInfo])
|
||||
@@ -16,6 +16,7 @@ export default () => {
|
||||
const router = useRouter()
|
||||
//登录请求
|
||||
const {fetchData} = LoginApi()
|
||||
|
||||
//微信登录
|
||||
const wxLogin = () => {
|
||||
return new Promise((reslove, reject) => {
|
||||
@@ -40,6 +41,9 @@ export default () => {
|
||||
url: router.path +'?' + qs.stringify(params)
|
||||
})
|
||||
}
|
||||
getAdminUserInfo()
|
||||
|
||||
//todo 删除本地授权用户信息,获取最新授权信息
|
||||
|
||||
} else {
|
||||
Taro.showToast({
|
||||
@@ -62,6 +66,12 @@ export default () => {
|
||||
|
||||
}
|
||||
|
||||
//获取用户信息
|
||||
const {fetchData: useFetchData} = GetAdminUserInfoApi()
|
||||
const getAdminUserInfo = async () => {
|
||||
let res = await useFetchData()
|
||||
setAdminUserInfo(res.data)
|
||||
}
|
||||
|
||||
//登录加checkLogin检查
|
||||
const checkLogin = () => {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { useDispatch, useSelector } from 'react-redux'
|
||||
import { CLEAR_SESSIONKEY, SET_USERINFO, SET_TOKEN, SET_SESSIONKEY, CLEAR_USERINFO, CLEAR_TOKEN} from '@/constants/userInfo'
|
||||
import {DataParam, UserParam} from '@/reducers/userInfo'
|
||||
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'
|
||||
export default () => {
|
||||
const userInfo = useSelector((state:DataParam) => state.userInfo) as DataParam
|
||||
const dispatch = useDispatch()
|
||||
@@ -17,6 +17,10 @@ export default () => {
|
||||
dispatch({type:SET_USERINFO, data:{userInfo}})
|
||||
}
|
||||
|
||||
const setAdminUserInfo = (adminUserInfo: UserAdminParam) => {
|
||||
dispatch({type:SET_ADMINUSERINFO, data:{adminUserInfo}})
|
||||
}
|
||||
|
||||
const removeUserInfo = () => {
|
||||
dispatch({type:CLEAR_USERINFO})
|
||||
}
|
||||
@@ -32,6 +36,7 @@ export default () => {
|
||||
return {
|
||||
setToken,
|
||||
setUserInfo,
|
||||
setAdminUserInfo,
|
||||
setSessionKey,
|
||||
removeUserInfo,
|
||||
removeToken,
|
||||
|
||||
Reference in New Issue
Block a user