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] =?UTF-8?q?refine:=20upload=20=E8=BF=98=E6=98=AF=E8=BF=94?=
 =?UTF-8?q?=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>