From ea1de11eb56adea6fb02a2ece42ec276ebe6079e Mon Sep 17 00:00:00 2001
From: xuan <w1359774872@gmail.com>
Date: Tue, 13 Dec 2022 16:48:38 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(=E9=82=80=E8=AF=B7=E7=A0=81)?=
 =?UTF-8?q?:=20=E4=BF=AE=E5=A4=8D=E5=88=86=E9=A1=B5=E5=BC=95=E5=8F=91?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/use/useHttp.ts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/use/useHttp.ts b/src/use/useHttp.ts
index a1eadf5..520b7ac 100644
--- a/src/use/useHttp.ts
+++ b/src/use/useHttp.ts
@@ -5,6 +5,7 @@ import useUserInfo from './useUserInfo'
 import useLogin from './useLogin'
 import useLoginRequest from './useLoginRequest'
 import { BASE_URL, WX_APPID } from '@/common/constant'
+import { getFilterData } from '@/common/util'
 
 interface Params {
   code: string | null
@@ -133,12 +134,13 @@ export const useRequest = (
     stateRef.current.query = {
       ...sub_options,
       ...(options.pagination && {
-        page: stateRef.current.page,
-        size: stateRef.current.pageSize,
+        page: stateRef.current.page || '',
+        size: stateRef.current.pageSize || '',
       }),
       ...stateRef.current.filter,
       ...stateRef.current.sort,
     }
+    const query = getFilterData(stateRef.current.query)
     try {
       const token = Taro.getStorageSync('token')
       const q = {
@@ -152,10 +154,10 @@ export const useRequest = (
         },
         ...(options.method?.toUpperCase() == 'GET'
           ? {
-            data: stateRef.current.query,
+            data: query,
           }
           : {
-            data: options.type?.toUpperCase() == 'FORMDATA' ? qs.stringify(stateRef.current?.query) : stateRef.current.query,
+            data: options.type?.toUpperCase() == 'FORMDATA' ? qs.stringify(stateRef.current?.query) : query,
           }),
       }
       const result = await Taro.request(q as any)