From 8e1549817be884ab54588544f20e287931f02928 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8F=B2=E9=B8=BD?= <1020103647@qq.com>
Date: Fri, 3 May 2024 14:53:11 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E8=AF=B7=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json               |  4 +--
 src/pages/index/request2.vue | 10 ++++--
 src/pages/index/upload2.vue  |  2 +-
 src/utils/http.ts            | 68 ++++++++++++++++--------------------
 4 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/src/pages.json b/src/pages.json
index cbcd14c..468dc66 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -65,7 +65,7 @@
       "type": "page",
       "layout": "demo",
       "style": {
-        "navigationBarTitleText": "请求"
+        "navigationBarTitleText": "请求-状态一体化"
       }
     },
     {
@@ -81,7 +81,7 @@
       "type": "page",
       "layout": "default",
       "style": {
-        "navigationBarTitleText": "上传"
+        "navigationBarTitleText": "上传-状态一体化"
       }
     }
   ],
diff --git a/src/pages/index/request2.vue b/src/pages/index/request2.vue
index df06848..0c66d8e 100644
--- a/src/pages/index/request2.vue
+++ b/src/pages/index/request2.vue
@@ -2,7 +2,7 @@
 {
   layout: 'demo',
   style: {
-    navigationBarTitleText: '请求',
+    navigationBarTitleText: '请求-状态一体化',
   },
 }
 </route>
@@ -20,8 +20,14 @@
 
 <script lang="ts" setup>
 import { getFooAPI, IFooItem } from '@/service/index/foo'
+import { httpGet } from '@/utils/http'
 
-const { loading, data, run } = useRequest<IFooItem>(() => getFooAPI('菲鸽'), { immediate: true })
+// 适合少部分全局性的接口————多个页面都需要的请求接口，额外编写一个 Service 层
+// const { loading, data, run } = useRequest<IFooItem>(() => getFooAPI('菲鸽'), { immediate: true })
+// 再次简化，一行代码搞定，方便一次性的请求，适用大部分请求
+const { loading, data, run } = useRequest<IFooItem>(() => httpGet('/foo', { name: '菲鸽' }), {
+  immediate: true,
+})
 
 const getFoo = () => run()
 const reset = () => {
diff --git a/src/pages/index/upload2.vue b/src/pages/index/upload2.vue
index c9e576e..42c54f4 100644
--- a/src/pages/index/upload2.vue
+++ b/src/pages/index/upload2.vue
@@ -2,7 +2,7 @@
 {
   layout: 'default',
   style: {
-    navigationBarTitleText: '上传',
+    navigationBarTitleText: '上传-状态一体化',
   },
 }
 </route>
diff --git a/src/utils/http.ts b/src/utils/http.ts
index b275bc2..db4c6aa 100644
--- a/src/utils/http.ts
+++ b/src/utils/http.ts
@@ -41,42 +41,36 @@ export const http = <T>(options: CustomRequestOptions) => {
     })
   })
 }
-
-// uni.uploadFile封装
-export const uniFileUpload = <T>(options: CustomRequestOptions) => {
-  // 1. 返回 Promise 对象
-  return new Promise<IResData<T>>((resolve, reject) => {
-    uni.uploadFile({
-      ...options,
-      // 响应成功
-      success(res) {
-        // 状态码 2xx，参考 axios 的设计
-        if (res.statusCode >= 200 && res.statusCode < 300) {
-          // 文件上传接口的rea.data的类型为string，这里转一下
-          const resData = JSON.parse(res.data) as IResData<T>
-          resolve(resData)
-        } else if (res.statusCode === 401) {
-          // 401错误  -> 清理用户信息，跳转到登录页
-          // userStore.clearUserInfo()
-          // uni.navigateTo({ url: '/pages/login/login' })
-          reject(res)
-        } else {
-          // 其他错误 -> 根据后端错误信息轻提示
-          uni.showToast({
-            icon: 'none',
-            title: '文件上传错误',
-          })
-          reject(res)
-        }
-      },
-      // 响应失败
-      fail(err) {
-        uni.showToast({
-          icon: 'none',
-          title: '网络错误，换个网络试试',
-        })
-        reject(err)
-      },
-    })
+/**
+ * GET 请求
+ * @param url 后台地址
+ * @param query 请求query参数
+ * @returns
+ */
+export const httpGet = <T>(url: string, query?: Record<string, any>) => {
+  return http<T>({
+    url,
+    query,
+    method: 'GET',
+  })
+}
+
+/**
+ * POST 请求
+ * @param url 后台地址
+ * @param data 请求body参数
+ * @param query 请求query参数，post请求也支持query，很多微信接口都需要
+ * @returns
+ */
+export const httpPost = <T>(
+  url: string,
+  data?: Record<string, any>,
+  query?: Record<string, any>,
+) => {
+  return http<T>({
+    url,
+    query,
+    data,
+    method: 'POST',
   })
 }