From 5bdb29994d8b8cf24f4557900b2f72aeee764e35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8F=B2=E9=B8=BD?= <1020103647@qq.com>
Date: Wed, 15 May 2024 10:06:51 +0800
Subject: [PATCH 1/9] =?UTF-8?q?refactor:=20=E8=AF=B7=E6=B1=82=E7=AD=89?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/useUpload.ts                        | 60 ++++++--------
 src/hooks/useUpload2.ts                       | 82 -------------------
 src/manifest.json                             |  2 +-
 src/pages.json                                | 32 --------
 src/pages/index/about.vue                     | 33 ++------
 src/pages/index/components/request.vue        | 43 ++++++++++
 .../{upload2.vue => components/upload.vue}    |  9 +-
 src/pages/index/request.vue                   | 67 ---------------
 src/pages/index/request2.vue                  | 35 --------
 src/pages/index/upload.vue                    | 75 -----------------
 src/service/index/foo.ts                      | 18 ----
 src/types/auto-import.d.ts                    |  2 -
 src/types/uni-pages.d.ts                      |  6 +-
 13 files changed, 79 insertions(+), 385 deletions(-)
 delete mode 100644 src/hooks/useUpload2.ts
 create mode 100644 src/pages/index/components/request.vue
 rename src/pages/index/{upload2.vue => components/upload.vue} (59%)
 delete mode 100644 src/pages/index/request.vue
 delete mode 100644 src/pages/index/request2.vue
 delete mode 100644 src/pages/index/upload.vue

diff --git a/src/hooks/useUpload.ts b/src/hooks/useUpload.ts
index d14e1f1..469aef0 100644
--- a/src/hooks/useUpload.ts
+++ b/src/hooks/useUpload.ts
@@ -1,3 +1,6 @@
+// TODO: 别忘加更改环境变量的 VITE_UPLOAD_BASEURL 地址。
+const VITE_UPLOAD_BASEURL = import.meta.env.VITE_UPLOAD_BASEURL
+
 /**
  * useUpload 是一个定制化的请求钩子，用于处理上传图片。
  * @param formData 额外传递给后台的数据，如{name: '菲鸽'}。
@@ -7,7 +10,6 @@ export default function useUpload<T>(formData: Record<string, any> = {}) {
   const loading = ref(false)
   const error = ref(false)
   const data = ref<T>()
-  const url = import.meta.env.VITE_UPLOAD_BASEURL
   const run = () => {
     // #ifdef MP-WEIXIN
     // 微信小程序从基础库 2.21.0 开始， wx.chooseImage 停止维护，请使用 uni.chooseMedia 代替。
@@ -19,23 +21,7 @@ export default function useUpload<T>(formData: Record<string, any> = {}) {
         console.log(res)
         loading.value = true
         const tempFilePath = res.tempFiles[0].tempFilePath
-        uni.uploadFile({
-          url,
-          filePath: tempFilePath,
-          name: 'file',
-          formData,
-          success: (uploadFileRes) => {
-            console.log(uploadFileRes.data)
-            data.value = uploadFileRes.data as T
-          },
-          fail: (err) => {
-            console.log('uni.uploadFile err->', err)
-            error.value = true
-          },
-          complete: () => {
-            loading.value = false
-          },
-        })
+        uploadFile<T>({ tempFilePath, formData, data, error, loading })
       },
       fail: (err) => {
         console.log('uni.chooseMedia err->', err)
@@ -50,23 +36,7 @@ export default function useUpload<T>(formData: Record<string, any> = {}) {
         console.log(res)
         loading.value = true
         const tempFilePath = res.tempFilePaths[0]
-        uni.uploadFile({
-          url,
-          filePath: tempFilePath,
-          name: 'file',
-          formData,
-          success: (uploadFileRes) => {
-            console.log(uploadFileRes.data)
-            data.value = uploadFileRes.data as T
-          },
-          fail: (err) => {
-            console.log('uni.uploadFile err->', err)
-            error.value = true
-          },
-          complete: () => {
-            loading.value = false
-          },
-        })
+        uploadFile<T>({ tempFilePath, formData, data, error, loading })
       },
       fail: (err) => {
         console.log('uni.chooseImage err->', err)
@@ -78,3 +48,23 @@ export default function useUpload<T>(formData: Record<string, any> = {}) {
 
   return { loading, error, data, run }
 }
+
+function uploadFile<T>({ tempFilePath, formData, data, error, loading }) {
+  uni.uploadFile({
+    url: VITE_UPLOAD_BASEURL,
+    filePath: tempFilePath,
+    name: 'file',
+    formData,
+    success: (uploadFileRes) => {
+      console.log(uploadFileRes, typeof uploadFileRes.data)
+      data.value = JSON.parse(uploadFileRes.data) as T
+    },
+    fail: (err) => {
+      console.log('uni.uploadFile err->', err)
+      error.value = true
+    },
+    complete: () => {
+      loading.value = false
+    },
+  })
+}
diff --git a/src/hooks/useUpload2.ts b/src/hooks/useUpload2.ts
deleted file mode 100644
index b99e374..0000000
--- a/src/hooks/useUpload2.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * useUpload 是一个定制化的请求钩子，用于处理上传图片。
- * @param url 上传图片的后台地址，如 https://ukw0y1.laf.run/upload。
- * 如果上传地址是固定的，那就可以配置到 .env 里面，函数里面不需要再传了。
- * @param formData 额外传递给后台的数据，如{name: '菲鸽'}。
- * @returns 返回一个对象{loading, error, data, run}，包含请求的加载状态、错误信息、响应数据和手动触发请求的函数。
- */
-export default function useUpload<T>(url: string, formData: Record<string, any> = {}) {
-  const loading = ref(false)
-  const error = ref(false)
-  const data = ref<T>()
-
-  const run = () => {
-    // #ifdef MP-WEIXIN
-    // 微信小程序从基础库 2.21.0 开始， wx.chooseImage 停止维护，请使用 uni.chooseMedia 代替。
-    // 微信小程序在2023年10月17日之后，使用本API需要配置隐私协议
-    uni.chooseMedia({
-      count: 1,
-      mediaType: ['image'],
-      success: (res) => {
-        console.log(res)
-        loading.value = true
-        const tempFilePath = res.tempFiles[0].tempFilePath
-        uni.uploadFile({
-          url,
-          filePath: tempFilePath,
-          name: 'file',
-          formData,
-          success: (uploadFileRes) => {
-            console.log(uploadFileRes.data)
-            data.value = uploadFileRes.data as T
-          },
-          fail: (err) => {
-            console.log('uni.uploadFile err->', err)
-            error.value = true
-          },
-          complete: () => {
-            loading.value = false
-          },
-        })
-      },
-      fail: (err) => {
-        console.log('uni.chooseMedia err->', err)
-        error.value = true
-      },
-    })
-    // #endif
-    // #ifndef MP-WEIXIN
-    uni.chooseImage({
-      count: 1,
-      success: (res) => {
-        console.log(res)
-        loading.value = true
-        const tempFilePath = res.tempFilePaths[0]
-        uni.uploadFile({
-          url,
-          filePath: tempFilePath,
-          name: 'file',
-          formData,
-          success: (uploadFileRes) => {
-            console.log(uploadFileRes.data)
-            data.value = uploadFileRes.data as T
-          },
-          fail: (err) => {
-            console.log('uni.uploadFile err->', err)
-            error.value = true
-          },
-          complete: () => {
-            loading.value = false
-          },
-        })
-      },
-      fail: (err) => {
-        console.log('uni.chooseImage err->', err)
-        error.value = true
-      },
-    })
-    // #endif
-  }
-
-  return { loading, error, data, run }
-}
diff --git a/src/manifest.json b/src/manifest.json
index 0999421..bbd76ff 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,5 +1,5 @@
 {
-  "name": "unibest-base",
+  "name": "unibest",
   "appid": "H57F2ACE4",
   "description": "",
   "versionName": "1.0.0",
diff --git a/src/pages.json b/src/pages.json
index d62bd4a..4f69a5f 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -52,38 +52,6 @@
       "style": {
         "navigationBarTitleText": "关于"
       }
-    },
-    {
-      "path": "pages/index/request",
-      "type": "page",
-      "layout": "demo",
-      "style": {
-        "navigationBarTitleText": "请求"
-      }
-    },
-    {
-      "path": "pages/index/request2",
-      "type": "page",
-      "layout": "demo",
-      "style": {
-        "navigationBarTitleText": "请求-状态一体化"
-      }
-    },
-    {
-      "path": "pages/index/upload",
-      "type": "page",
-      "layout": "default",
-      "style": {
-        "navigationBarTitleText": "上传"
-      }
-    },
-    {
-      "path": "pages/index/upload2",
-      "type": "page",
-      "layout": "default",
-      "style": {
-        "navigationBarTitleText": "上传-状态一体化"
-      }
     }
   ],
   "subPackages": []
diff --git a/src/pages/index/about.vue b/src/pages/index/about.vue
index fe28eed..2ba2e3c 100644
--- a/src/pages/index/about.vue
+++ b/src/pages/index/about.vue
@@ -11,44 +11,21 @@
     class="bg-white overflow-hidden pt-2 px-4"
     :style="{ marginTop: safeAreaInsets?.top + 'px' }"
   >
-    <view class="text-center text-3xl mt-4 test-css">关于页面</view>
     <view class="text-center text-3xl mt-8">
       鸽友们好，我是
       <text class="text-red-500">菲鸽</text>
     </view>
-    <view class="text-center mt-8 text-#fff">
-      <wd-button type="primary" @click="gotoPage('request')">去请求页</wd-button>
-      <wd-button type="primary" @click="gotoPage('request2')" custom-class="ml-2">
-        去请求页2 (状态一体)
-      </wd-button>
-    </view>
-
-    <view class="text-center mt-8 text-#fff">
-      <wd-button type="primary" @click="gotoPage('upload')">上传demo</wd-button>
-      <wd-button type="primary" @click="gotoPage('upload2')" custom-class="ml-2">
-        上传demo2(状态一体)
-      </wd-button>
-    </view>
-    <view class="text-center mt-8">
-      <text class="mr-2">iconfont:</text>
-      <view class="inline-flex gap-2 text-red">
-        <view class="iconfont icon-my" />
-        <view class="iconfont icon-chat" />
-        <view class="iconfont icon-package" />
-      </view>
-    </view>
+    <RequestComp />
+    <UploadComp />
   </view>
 </template>
 
 <script lang="ts" setup>
+import RequestComp from './components/request.vue'
+import UploadComp from './components/upload.vue'
+
 // 获取屏幕边界到安全区域距离
 const { safeAreaInsets } = uni.getSystemInfoSync()
-
-const gotoPage = (page: string) => {
-  uni.navigateTo({
-    url: `/pages/index/${page}`,
-  })
-}
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/pages/index/components/request.vue b/src/pages/index/components/request.vue
new file mode 100644
index 0000000..d01be83
--- /dev/null
+++ b/src/pages/index/components/request.vue
@@ -0,0 +1,43 @@
+<route lang="json5">
+{
+  layout: 'demo',
+  style: {
+    navigationBarTitleText: '请求',
+  },
+}
+</route>
+
+<template>
+  <view class="p-6 text-center">
+    <view class="my-2">使用的是 laf 云后台</view>
+    <view class="text-green-400">我的推荐码，可以获得佣金</view>
+
+    <!-- #ifdef H5 -->
+    <view class="my-2">
+      <a class="my-2" :href="recommendUrl" target="_blank">{{ recommendUrl }}</a>
+    </view>
+    <!-- #endif -->
+
+    <!-- #ifndef H5 -->
+    <view class="my-2 text-left text-sm">{{ recommendUrl }}</view>
+    <!-- #endif -->
+
+    <!-- http://localhost:9000/#/pages/index/request -->
+    <button @click="run" class="my-6">发送请求</button>
+    <view class="text-xl">请求数据如下</view>
+    <view class="text-green h-6">{{ JSON.stringify(data) }}</view>
+    <button type="warn" @click="reset" class="my-6">清除数据</button>
+  </view>
+</template>
+
+<script lang="ts" setup>
+import { getFooAPI, postFooAPI, IFooItem } from '@/service/index/foo'
+
+const recommendUrl = ref('http://laf.run/signup?code=ohaOgIX')
+
+// 适合少部分全局性的接口————多个页面都需要的请求接口，额外编写一个 Service 层
+const { loading, error, data, run } = useRequest<IFooItem>(() => getFooAPI('菲鸽'))
+const reset = () => {
+  data.value = undefined
+}
+</script>
diff --git a/src/pages/index/upload2.vue b/src/pages/index/components/upload.vue
similarity index 59%
rename from src/pages/index/upload2.vue
rename to src/pages/index/components/upload.vue
index 42c54f4..fc76e04 100644
--- a/src/pages/index/upload2.vue
+++ b/src/pages/index/components/upload.vue
@@ -12,18 +12,17 @@
     <wd-button @click="run">选择图片并上传</wd-button>
     <view v-if="loading" class="text-blue h-10">上传...</view>
     <template v-else>
-      <view class="m-2">上传后返回的图片地址：</view>
-      <view class="m-2">{{ data }}</view>
+      <view class="m-2">上传后返回的接口数据：</view>
+      <view class="m-2">{{ JSON.stringify(data) }}</view>
       <view class="h-80 w-full">
-        <image v-if="data" :src="data" mode="scaleToFill" />
+        <image v-if="data" :src="data.url" mode="scaleToFill" />
       </view>
     </template>
   </view>
 </template>
 
 <script lang="ts" setup>
-// const { loading, data, run } = useUpload2<string>('https://ukw0y1.laf.run/upload', { user: '菲鸽' })
-const { loading, data, run } = useUpload<string>({ user: '菲鸽' })
+const { loading, data, run } = useUpload<any>({ user: '菲鸽' })
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/pages/index/request.vue b/src/pages/index/request.vue
deleted file mode 100644
index a818385..0000000
--- a/src/pages/index/request.vue
+++ /dev/null
@@ -1,67 +0,0 @@
-<route lang="json5">
-{
-  layout: 'demo',
-  style: {
-    navigationBarTitleText: '请求',
-  },
-}
-</route>
-
-<template>
-  <view class="p-6 text-center">
-    <view class="my-2">使用的是 laf 云后台</view>
-    <view class="text-green-400">我的推荐码，可以获得佣金</view>
-
-    <!-- #ifdef H5 -->
-    <view class="my-2">
-      <a class="my-2" :href="recommendUrl" target="_blank">{{ recommendUrl }}</a>
-    </view>
-    <!-- #endif -->
-
-    <!-- #ifndef H5 -->
-    <view class="my-2 text-left text-sm">{{ recommendUrl }}</view>
-    <!-- #endif -->
-
-    <!-- http://localhost:9000/#/pages/index/request -->
-    <button @click="getFoo" class="my-6">1.测试 GET 请求</button>
-    <view class="text-xl">请求数据如下</view>
-    <view class="text-green h-10">{{ JSON.stringify(data) }}</view>
-    <view class="text-xl">完整数据</view>
-    <view class="text-green h-16">{{ JSON.stringify(originalData) }}</view>
-    <button @click="postFoo" class="my-6">2.测试 POST 请求</button>
-    <view class="text-xl">请求数据如下</view>
-    <view class="text-green h-10">{{ JSON.stringify(data2) }}</view>
-    <button class="my-6" type="warn" @click="reset">3.一键清空数据</button>
-  </view>
-</template>
-
-<script lang="ts" setup>
-import { getFooAPI, postFooAPI, IFooItem } from '@/service/index/foo'
-
-const recommendUrl = ref('http://laf.run/signup?code=ohaOgIX')
-
-onLoad(() => {
-  getFoo()
-  postFoo()
-})
-
-const originalData = ref<IResData<IFooItem>>()
-const data = ref<IFooItem>()
-const getFoo = async () => {
-  const res = await getFooAPI('菲鸽')
-  data.value = res.data
-  originalData.value = res
-}
-
-const data2 = ref<IFooItem>()
-const postFoo = async () => {
-  const res = await postFooAPI('菲鸽2')
-  data2.value = res.data
-}
-
-const reset = () => {
-  data.value = undefined
-  data2.value = undefined
-  originalData.value = undefined
-}
-</script>
diff --git a/src/pages/index/request2.vue b/src/pages/index/request2.vue
deleted file mode 100644
index 3f63f9e..0000000
--- a/src/pages/index/request2.vue
+++ /dev/null
@@ -1,35 +0,0 @@
-<route lang="json5">
-{
-  layout: 'demo',
-  style: {
-    navigationBarTitleText: '请求-状态一体化',
-  },
-}
-</route>
-
-<template>
-  <view class="p-6 text-center">
-    <!-- http://localhost:9000/#/pages/index/request -->
-    <button @click="getFoo" class="my-6">测试 GET 请求</button>
-    <view class="text-xl">请求数据如下</view>
-    <view v-if="loading" class="text-blue h-10">加载中...</view>
-    <view v-if="error" class="text-red h-10">请求错误</view>
-    <view v-else class="text-green h-10">{{ JSON.stringify(data) }}</view>
-    <button class="my-6" type="warn" @click="reset">一键清空数据</button>
-  </view>
-</template>
-
-<script lang="ts" setup>
-import { getFooAPI2, IFooItem } from '@/service/index/foo'
-import { httpGet } from '@/utils/http'
-
-// 适合少部分全局性的接口————多个页面都需要的请求接口，额外编写一个 Service 层
-const { loading, error, data, run } = useRequest<IFooItem>(() => getFooAPI2('菲鸽'))
-// 再次简化，一行代码搞定，方便一次性的请求，适用大部分请求
-// const { loading, error, data, run } = useRequest<IFooItem>(() => httpGet('/foo', { name: '菲鸽' }))
-
-const getFoo = () => run()
-const reset = () => {
-  data.value = undefined
-}
-</script>
diff --git a/src/pages/index/upload.vue b/src/pages/index/upload.vue
deleted file mode 100644
index 43549c6..0000000
--- a/src/pages/index/upload.vue
+++ /dev/null
@@ -1,75 +0,0 @@
-<route lang="json5" type="page">
-{
-  layout: 'default',
-  style: {
-    navigationBarTitleText: '上传',
-  },
-}
-</route>
-
-<template>
-  <view class="p-4 text-center">
-    <wd-button @click="chooseImage">选择图片并上传</wd-button>
-    <view class="m-2">上传后返回的图片地址：</view>
-    <view class="m-2">{{ imgStr }}</view>
-    <view class="h-80 w-full">
-      <image v-if="imgStr" :src="imgStr" mode="scaleToFill" />
-    </view>
-  </view>
-</template>
-
-<script lang="ts" setup>
-const imgStr = ref('')
-
-const chooseImage = () => {
-  // #ifdef MP-WEIXIN
-  // 微信小程序从基础库 2.21.0 开始， wx.chooseImage 停止维护，请使用 uni.chooseMedia 代替。
-  // 微信小程序在2023年10月17日之后，使用本API需要配置隐私协议
-  uni.chooseMedia({
-    count: 1,
-    mediaType: ['image'],
-    success: (res) => {
-      console.log(res)
-      const tempFilePath = res.tempFiles[0].tempFilePath
-      uni.uploadFile({
-        url: 'https://ukw0y1.laf.run/upload',
-        filePath: tempFilePath,
-        name: 'file',
-        formData: {
-          user: '菲鸽',
-        },
-        success: (uploadFileRes) => {
-          console.log(uploadFileRes.data)
-          imgStr.value = uploadFileRes.data
-        },
-      })
-    },
-  })
-  // #endif
-  // #ifndef MP-WEIXIN
-  uni.chooseImage({
-    count: 1,
-    success: (res) => {
-      console.log(res)
-      const tempFilePath = res.tempFilePaths[0]
-      uni.uploadFile({
-        url: 'https://ukw0y1.laf.run/upload',
-        filePath: tempFilePath,
-        name: 'file',
-        formData: {
-          user: '菲鸽',
-        },
-        success: (uploadFileRes) => {
-          console.log(uploadFileRes.data)
-          imgStr.value = uploadFileRes.data
-        },
-      })
-    },
-  })
-  // #endif
-}
-</script>
-
-<style lang="scss" scoped>
-//
-</style>
diff --git a/src/service/index/foo.ts b/src/service/index/foo.ts
index dac3519..acf5aa8 100644
--- a/src/service/index/foo.ts
+++ b/src/service/index/foo.ts
@@ -6,28 +6,10 @@ export interface IFooItem {
 
 /** GET 请求 */
 export const getFooAPI = (name: string) => {
-  return http<IFooItem>({
-    url: `/foo`,
-    method: 'GET',
-    query: { name },
-  })
-}
-
-/** GET 请求 - 再次简化，看大家是否喜欢这种简化 */
-export const getFooAPI2 = (name: string) => {
   return http.get<IFooItem>('/foo', { name })
 }
 
 /** POST 请求 */
 export const postFooAPI = (name: string) => {
-  return http<IFooItem>({
-    url: `/foo`,
-    method: 'POST',
-    query: { name }, // post 请求也支持 query
-    data: { name },
-  })
-}
-/** POST 请求 - 再次简化，看大家是否喜欢这种简化 */
-export const postFooAPI2 = (name: string) => {
   return http.post<IFooItem>('/foo', { name }, { name })
 }
diff --git a/src/types/auto-import.d.ts b/src/types/auto-import.d.ts
index a822be5..6351212 100644
--- a/src/types/auto-import.d.ts
+++ b/src/types/auto-import.d.ts
@@ -170,7 +170,6 @@ declare module 'vue' {
     readonly useCssVars: UnwrapRef<typeof import('vue')['useCssVars']>
     readonly useRequest: UnwrapRef<typeof import('../hooks/useRequest')['default']>
     readonly useSlots: UnwrapRef<typeof import('vue')['useSlots']>
-    readonly useUpload2: UnwrapRef<typeof import('../hooks/useUpload2')['default']>
     readonly useUpload: UnwrapRef<typeof import('../hooks/useUpload')['default']>
     readonly watch: UnwrapRef<typeof import('vue')['watch']>
     readonly watchEffect: UnwrapRef<typeof import('vue')['watchEffect']>
@@ -254,7 +253,6 @@ declare module '@vue/runtime-core' {
     readonly useCssVars: UnwrapRef<typeof import('vue')['useCssVars']>
     readonly useRequest: UnwrapRef<typeof import('../hooks/useRequest')['default']>
     readonly useSlots: UnwrapRef<typeof import('vue')['useSlots']>
-    readonly useUpload2: UnwrapRef<typeof import('../hooks/useUpload2')['default']>
     readonly useUpload: UnwrapRef<typeof import('../hooks/useUpload')['default']>
     readonly watch: UnwrapRef<typeof import('vue')['watch']>
     readonly watchEffect: UnwrapRef<typeof import('vue')['watchEffect']>
diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts
index aea295e..3cf23ca 100644
--- a/src/types/uni-pages.d.ts
+++ b/src/types/uni-pages.d.ts
@@ -5,11 +5,7 @@
 
 interface NavigateToOptions {
   url: "/pages/index/index" |
-       "/pages/index/about" |
-       "/pages/index/request" |
-       "/pages/index/request2" |
-       "/pages/index/upload" |
-       "/pages/index/upload2";
+       "/pages/index/about";
 }
 interface RedirectToOptions extends NavigateToOptions {}
 

From 534d2cb12f43b9a43ad17e0fb556aba21cb0474b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8F=B2=E9=B8=BD?= <1020103647@qq.com>
Date: Wed, 15 May 2024 10:08:14 +0800
Subject: [PATCH 2/9] =?UTF-8?q?refactor:=20=E4=BD=BF=E7=94=A8=E7=8B=AC?=
 =?UTF-8?q?=E7=AB=8Babout=E6=96=87=E4=BB=B6=E5=A4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.config.ts                                   | 2 +-
 src/pages.json                                    | 4 ++--
 src/pages/{index => about}/about.vue              | 0
 src/pages/{index => about}/components/request.vue | 0
 src/pages/{index => about}/components/upload.vue  | 0
 src/types/uni-pages.d.ts                          | 4 ++--
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename src/pages/{index => about}/about.vue (100%)
 rename src/pages/{index => about}/components/request.vue (100%)
 rename src/pages/{index => about}/components/upload.vue (100%)

diff --git a/pages.config.ts b/pages.config.ts
index 9e3499f..1745eb0 100644
--- a/pages.config.ts
+++ b/pages.config.ts
@@ -35,7 +35,7 @@ export default defineUniPages({
       {
         iconPath: 'static/tabbar/example.png',
         selectedIconPath: 'static/tabbar/exampleHL.png',
-        pagePath: 'pages/index/about',
+        pagePath: 'pages/about/about',
         text: '关于',
       },
     ],
diff --git a/src/pages.json b/src/pages.json
index 4f69a5f..075e6aa 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -32,7 +32,7 @@
       {
         "iconPath": "static/tabbar/example.png",
         "selectedIconPath": "static/tabbar/exampleHL.png",
-        "pagePath": "pages/index/about",
+        "pagePath": "pages/about/about",
         "text": "关于"
       }
     ]
@@ -47,7 +47,7 @@
       }
     },
     {
-      "path": "pages/index/about",
+      "path": "pages/about/about",
       "type": "page",
       "style": {
         "navigationBarTitleText": "关于"
diff --git a/src/pages/index/about.vue b/src/pages/about/about.vue
similarity index 100%
rename from src/pages/index/about.vue
rename to src/pages/about/about.vue
diff --git a/src/pages/index/components/request.vue b/src/pages/about/components/request.vue
similarity index 100%
rename from src/pages/index/components/request.vue
rename to src/pages/about/components/request.vue
diff --git a/src/pages/index/components/upload.vue b/src/pages/about/components/upload.vue
similarity index 100%
rename from src/pages/index/components/upload.vue
rename to src/pages/about/components/upload.vue
diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts
index 3cf23ca..1644db7 100644
--- a/src/types/uni-pages.d.ts
+++ b/src/types/uni-pages.d.ts
@@ -5,12 +5,12 @@
 
 interface NavigateToOptions {
   url: "/pages/index/index" |
-       "/pages/index/about";
+       "/pages/about/about";
 }
 interface RedirectToOptions extends NavigateToOptions {}
 
 interface SwitchTabOptions {
-  url: "/pages/index/index" | "/pages/index/about"
+  url: "/pages/index/index" | "/pages/about/about"
 }
 
 type ReLaunchOptions = NavigateToOptions | SwitchTabOptions;

From 5b16ebe1fe29deb01b393335d0e3f8ec0a9bb9ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8F=B2=E9=B8=BD?= <1020103647@qq.com>
Date: Wed, 15 May 2024 10:09:38 +0800
Subject: [PATCH 3/9] =?UTF-8?q?refine:=20=E5=85=BC=E5=AE=B9=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E6=8E=A5=E5=8F=A3=E6=98=AFurl=E5=92=8Cobj?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/about/components/upload.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/about/components/upload.vue b/src/pages/about/components/upload.vue
index fc76e04..e2de4be 100644
--- a/src/pages/about/components/upload.vue
+++ b/src/pages/about/components/upload.vue
@@ -15,7 +15,7 @@
       <view class="m-2">上传后返回的接口数据：</view>
       <view class="m-2">{{ JSON.stringify(data) }}</view>
       <view class="h-80 w-full">
-        <image v-if="data" :src="data.url" mode="scaleToFill" />
+        <image v-if="data" :src="data.url || data" mode="scaleToFill" />
       </view>
     </template>
   </view>

From ef83c31b8bcc44cbb400606470ffb7144e544fb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8F=B2=E9=B8=BD?= <1020103647@qq.com>
Date: Wed, 15 May 2024 10:12:40 +0800
Subject: [PATCH 4/9] =?UTF-8?q?refine:=20upload=20=E8=BF=98=E6=98=AF?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E4=B8=80=E4=B8=AAurl=E5=90=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/useUpload.ts                | 7 ++-----
 src/pages/about/components/upload.vue | 6 +++---
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/hooks/useUpload.ts b/src/hooks/useUpload.ts
index 469aef0..4870a9c 100644
--- a/src/hooks/useUpload.ts
+++ b/src/hooks/useUpload.ts
@@ -6,7 +6,7 @@ const VITE_UPLOAD_BASEURL = import.meta.env.VITE_UPLOAD_BASEURL
  * @param formData 额外传递给后台的数据，如{name: '菲鸽'}。
  * @returns 返回一个对象{loading, error, data, run}，包含请求的加载状态、错误信息、响应数据和手动触发请求的函数。
  */
-export default function useUpload<T>(formData: Record<string, any> = {}) {
+export default function useUpload<T = string>(formData: Record<string, any> = {}) {
   const loading = ref(false)
   const error = ref(false)
   const data = ref<T>()
@@ -18,7 +18,6 @@ export default function useUpload<T>(formData: Record<string, any> = {}) {
       count: 1,
       mediaType: ['image'],
       success: (res) => {
-        console.log(res)
         loading.value = true
         const tempFilePath = res.tempFiles[0].tempFilePath
         uploadFile<T>({ tempFilePath, formData, data, error, loading })
@@ -33,7 +32,6 @@ export default function useUpload<T>(formData: Record<string, any> = {}) {
     uni.chooseImage({
       count: 1,
       success: (res) => {
-        console.log(res)
         loading.value = true
         const tempFilePath = res.tempFilePaths[0]
         uploadFile<T>({ tempFilePath, formData, data, error, loading })
@@ -56,8 +54,7 @@ function uploadFile<T>({ tempFilePath, formData, data, error, loading }) {
     name: 'file',
     formData,
     success: (uploadFileRes) => {
-      console.log(uploadFileRes, typeof uploadFileRes.data)
-      data.value = JSON.parse(uploadFileRes.data) as T
+      data.value = uploadFileRes.data as T
     },
     fail: (err) => {
       console.log('uni.uploadFile err->', err)
diff --git a/src/pages/about/components/upload.vue b/src/pages/about/components/upload.vue
index e2de4be..07f81f5 100644
--- a/src/pages/about/components/upload.vue
+++ b/src/pages/about/components/upload.vue
@@ -13,16 +13,16 @@
     <view v-if="loading" class="text-blue h-10">上传...</view>
     <template v-else>
       <view class="m-2">上传后返回的接口数据：</view>
-      <view class="m-2">{{ JSON.stringify(data) }}</view>
+      <view class="m-2">{{ data }}</view>
       <view class="h-80 w-full">
-        <image v-if="data" :src="data.url || data" mode="scaleToFill" />
+        <image v-if="data" :src="data || data" mode="scaleToFill" />
       </view>
     </template>
   </view>
 </template>
 
 <script lang="ts" setup>
-const { loading, data, run } = useUpload<any>({ user: '菲鸽' })
+const { loading, data, run } = useUpload({ user: '菲鸽' })
 </script>
 
 <style lang="scss" scoped>

From 599e1283adc541914162021498aac3a108df1c6c Mon Sep 17 00:00:00 2001
From: zy499 <hqh499@gmail.com>
Date: Thu, 16 May 2024 14:18:19 +0800
Subject: [PATCH 5/9] =?UTF-8?q?fix:=20=E5=85=BC=E5=AE=B9macbook=20m?=
 =?UTF-8?q?=E8=8A=AF=E7=89=87=20HBX=E6=89=93=E5=8C=85APP?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package.json b/package.json
index 6fd0e34..14aa923 100644
--- a/package.json
+++ b/package.json
@@ -109,7 +109,10 @@
     "@dcloudio/uni-cli-shared": "3.0.0-4010420240430001",
     "@dcloudio/uni-stacktracey": "3.0.0-4010420240430001",
     "@dcloudio/vite-plugin-uni": "3.0.0-4010420240430001",
+    "@esbuild/darwin-arm64": "0.20.2",
+    "@esbuild/darwin-x64": "0.20.2",
     "@iconify-json/carbon": "^1.1.27",
+    "@rollup/rollup-darwin-x64": "^4.17.2",
     "@types/node": "^20.11.5",
     "@types/wechat-miniprogram": "^3.4.7",
     "@typescript-eslint/eslint-plugin": "^6.15.0",

From 4789b5ba41624519ec1ecb3a2237b9b22d690a97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8F=B2=E9=B8=BD?= <1020103647@qq.com>
Date: Sat, 18 May 2024 16:28:52 +0800
Subject: [PATCH 6/9] build(app): ignoreVersion

---
 manifest.config.ts | 3 +++
 src/manifest.json  | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/manifest.config.ts b/manifest.config.ts
index 6f8667a..90becaf 100644
--- a/manifest.config.ts
+++ b/manifest.config.ts
@@ -32,6 +32,9 @@ export default defineManifestConfig({
     usingComponents: true,
     nvueStyleCompiler: 'uni-app',
     compilerVersion: 3,
+    compatible: {
+      ignoreVersion: true,
+    },
     splashscreen: {
       alwaysShowBeforeRender: true,
       waiting: true,
diff --git a/src/manifest.json b/src/manifest.json
index bbd76ff..2956014 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -48,6 +48,9 @@
         "android": {},
         "ios": {}
       }
+    },
+    "compatible": {
+      "ignoreVersion": true
     }
   },
   "quickapp": {},

From b83541d4834e65f35f2eae8552b7d5b91fd209e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8F=B2=E9=B8=BD?= <1020103647@qq.com>
Date: Sat, 18 May 2024 17:24:21 +0800
Subject: [PATCH 7/9] =?UTF-8?q?feat:=20add=20VITE=5FAPP=5FPROXY=20?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6H5=E4=BB=A3=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 env/.env                    |  2 ++
 src/env.d.ts                |  2 ++
 src/interceptors/request.ts | 11 +++++++++++
 src/types/global.d.ts       |  2 ++
 vite.config.ts              | 25 +++++++++++++++++--------
 5 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/env/.env b/env/.env
index 8f89c8f..93a53d6 100644
--- a/env/.env
+++ b/env/.env
@@ -3,6 +3,8 @@ VITE_APP_PORT = 9000
 
 # h5部署网站的base，配置到 manifest.config.ts 里的 h5.router.base
 VITE_APP_PUBLIC_BASE=/
+# h5是否需要配置代理
+VITE_APP_PROXY=true
 
 VITE_UNI_APPID = 'H57F2ACE4'
 VITE_WX_APPID = 'wxa2abb91f64032a2b'
diff --git a/src/env.d.ts b/src/env.d.ts
index f19eda8..e98d4e6 100644
--- a/src/env.d.ts
+++ b/src/env.d.ts
@@ -15,6 +15,8 @@ interface ImportMetaEnv {
   readonly VITE_SERVER_PORT: string
   /** 后台接口地址 */
   readonly VITE_SERVER_BASEURL: string
+  /** H5是否需要代理 */
+  readonly VITE_APP_PROXY: boolean
   /** 上传图片地址 */
   readonly VITE_UPLOAD_BASEURL: string
   /** 是否清除console */
diff --git a/src/interceptors/request.ts b/src/interceptors/request.ts
index 5ae62f3..499285e 100644
--- a/src/interceptors/request.ts
+++ b/src/interceptors/request.ts
@@ -27,7 +27,18 @@ const httpInterceptor = {
     }
     // 非 http 开头需拼接地址
     if (!options.url.startsWith('http')) {
+      // #ifdef H5
+      console.log(__VITE_APP_PROXY__)
+      if (JSON.parse(__VITE_APP_PROXY__)) {
+        // 啥都不需要做
+      } else {
+        options.url = baseUrl + options.url
+      }
+      // #endif
+      // 非H5正常拼接
+      // #ifndef H5
       options.url = baseUrl + options.url
+      // #endif
       // TIPS: 如果需要对接多个后端服务，也可以在这里处理，拼接成所需要的地址
     }
     // 1. 请求超时
diff --git a/src/types/global.d.ts b/src/types/global.d.ts
index 2e67ed8..c243ef0 100644
--- a/src/types/global.d.ts
+++ b/src/types/global.d.ts
@@ -12,3 +12,5 @@ declare const __UNI_PLATFORM__:
   | 'quickapp-webview'
   | 'quickapp-webview-huawei'
   | 'quickapp-webview-union'
+
+declare const __VITE_APP_PROXY__: 'true' | 'false'
diff --git a/vite.config.ts b/vite.config.ts
index 24acf1c..f2feb8b 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -35,7 +35,13 @@ export default ({ command, mode }) => {
   console.log('UNI_PLATFORM -> ', UNI_PLATFORM) // 得到 mp-weixin, h5, app 等
 
   const env = loadEnv(mode, path.resolve(process.cwd(), 'env'))
-  const { VITE_APP_PORT, VITE_SERVER_BASEURL, VITE_DELETE_CONSOLE, VITE_SHOW_SOURCEMAP } = env
+  const {
+    VITE_APP_PORT,
+    VITE_SERVER_BASEURL,
+    VITE_DELETE_CONSOLE,
+    VITE_SHOW_SOURCEMAP,
+    VITE_APP_PROXY,
+  } = env
   console.log('环境变量 env -> ', env)
 
   return defineConfig({
@@ -87,6 +93,7 @@ export default ({ command, mode }) => {
     ],
     define: {
       __UNI_PLATFORM__: JSON.stringify(UNI_PLATFORM),
+      __VITE_APP_PROXY__: JSON.stringify(VITE_APP_PROXY),
     },
     css: {
       postcss: {
@@ -110,13 +117,15 @@ export default ({ command, mode }) => {
       hmr: true,
       port: Number.parseInt(VITE_APP_PORT, 10),
       // 仅 H5 端生效，其他端不生效（其他端走build，不走devServer)
-      // proxy: {
-      //   '/api': {
-      //     target: VITE_SERVER_BASEURL,
-      //     changeOrigin: true,
-      //     rewrite: (path) => path.replace(/^\/api/, ''),
-      //   },
-      // },
+      proxy: JSON.parse(VITE_APP_PROXY)
+        ? {
+            '/api': {
+              target: VITE_SERVER_BASEURL,
+              changeOrigin: true,
+              rewrite: (path) => path.replace(/^\/api/, ''),
+            },
+          }
+        : undefined,
     },
     build: {
       // 方便非h5端调试

From 8bd9bddd83a0f581529cf078f7abf207d918b37f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8F=B2=E9=B8=BD?= <1020103647@qq.com>
Date: Sat, 18 May 2024 17:36:34 +0800
Subject: [PATCH 8/9] =?UTF-8?q?feat:=20=E9=85=8D=E7=BD=AEVITE=5FAPP=5FPROX?=
 =?UTF-8?q?Y=5FPREFIX=20=E5=89=8D=E7=BC=80=E6=98=AF=E4=B8=AA=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 env/.env       | 2 +-
 src/env.d.ts   | 4 +++-
 vite.config.ts | 5 +++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/env/.env b/env/.env
index 93a53d6..2661363 100644
--- a/env/.env
+++ b/env/.env
@@ -5,12 +5,12 @@ VITE_APP_PORT = 9000
 VITE_APP_PUBLIC_BASE=/
 # h5是否需要配置代理
 VITE_APP_PROXY=true
+VITE_APP_PROXY_PREFIX = '/api'
 
 VITE_UNI_APPID = 'H57F2ACE4'
 VITE_WX_APPID = 'wxa2abb91f64032a2b'
 
 # 非h5端只能使用完整的baseurl，否则无法请求，本地proxy只支持h5端
-# VITE_SERVER_BASEURL = '/api'
 VITE_SERVER_BASEURL = 'https://ukw0y1.laf.run'
 
 VITE_UPLOAD_BASEURL = 'https://ukw0y1.laf.run/upload'
diff --git a/src/env.d.ts b/src/env.d.ts
index e98d4e6..daea211 100644
--- a/src/env.d.ts
+++ b/src/env.d.ts
@@ -16,7 +16,9 @@ interface ImportMetaEnv {
   /** 后台接口地址 */
   readonly VITE_SERVER_BASEURL: string
   /** H5是否需要代理 */
-  readonly VITE_APP_PROXY: boolean
+  readonly VITE_APP_PROXY: 'true' | 'false'
+  /** H5是否需要代理，需要的话有个前缀 */
+  readonly VITE_APP_PROXY_PREFIX: string // 一般是/api
   /** 上传图片地址 */
   readonly VITE_UPLOAD_BASEURL: string
   /** 是否清除console */
diff --git a/vite.config.ts b/vite.config.ts
index f2feb8b..265f752 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -41,6 +41,7 @@ export default ({ command, mode }) => {
     VITE_DELETE_CONSOLE,
     VITE_SHOW_SOURCEMAP,
     VITE_APP_PROXY,
+    VITE_APP_PROXY_PREFIX,
   } = env
   console.log('环境变量 env -> ', env)
 
@@ -119,10 +120,10 @@ export default ({ command, mode }) => {
       // 仅 H5 端生效，其他端不生效（其他端走build，不走devServer)
       proxy: JSON.parse(VITE_APP_PROXY)
         ? {
-            '/api': {
+            [VITE_APP_PROXY_PREFIX]: {
               target: VITE_SERVER_BASEURL,
               changeOrigin: true,
-              rewrite: (path) => path.replace(/^\/api/, ''),
+              rewrite: (path) => path.replace(new RegExp(`^${VITE_APP_PROXY_PREFIX}`), ''),
             },
           }
         : undefined,

From dd261f2364f87111ab7b7c061d14eb2ce988c8d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8F=B2=E9=B8=BD?= <1020103647@qq.com>
Date: Sat, 18 May 2024 17:40:08 +0800
Subject: [PATCH 9/9] =?UTF-8?q?refine:=20=E4=BC=98=E5=8C=96=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E9=A1=B9=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 env/.env | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/env/.env b/env/.env
index 2661363..d068df7 100644
--- a/env/.env
+++ b/env/.env
@@ -1,16 +1,15 @@
 VITE_APP_TITLE = 'unibest'
 VITE_APP_PORT = 9000
 
-# h5部署网站的base，配置到 manifest.config.ts 里的 h5.router.base
-VITE_APP_PUBLIC_BASE=/
-# h5是否需要配置代理
-VITE_APP_PROXY=true
-VITE_APP_PROXY_PREFIX = '/api'
-
 VITE_UNI_APPID = 'H57F2ACE4'
 VITE_WX_APPID = 'wxa2abb91f64032a2b'
 
-# 非h5端只能使用完整的baseurl，否则无法请求，本地proxy只支持h5端
-VITE_SERVER_BASEURL = 'https://ukw0y1.laf.run'
+# h5部署网站的base，配置到 manifest.config.ts 里的 h5.router.base
+VITE_APP_PUBLIC_BASE=/
 
+VITE_SERVER_BASEURL = 'https://ukw0y1.laf.run'
 VITE_UPLOAD_BASEURL = 'https://ukw0y1.laf.run/upload'
+
+# h5是否需要配置代理
+VITE_APP_PROXY=true
+VITE_APP_PROXY_PREFIX = '/api'