Auto merge base into tabbar

src/hooks/useUpload.ts

@@ -103,10 +103,10 @@ export default function useUpload<T extends TfileType>(options: TOptions<T> = {}
       tempFilePath: tempFilePath,
       formData,
       onSuccess: (res) => {
-        data.value = res
-        // https://oss.laf.run/ukw0y1-unibest/unibest.f5308ecd-06c3-463b-b3e0-5df08154c7f3.svg
+        const { data: _data } = JSON.parse(res)
+        data.value = _data
         // console.log('上传成功', res)
-        success?.(res)
+        success?.(_data)
       },
       onError: (err) => {
         error.value = err

src/pages/about/components/upload.vue

@@ -15,7 +15,7 @@
       <view class="m-2">上传后返回的接口数据：</view>
       <view class="m-2">{{ data }}</view>
       <view class="h-80 w-full">
-        <image v-if="data" :src="data || data" mode="scaleToFill" />
+        <image v-if="data" :src="data.url" mode="scaleToFill" />
       </view>
     </template>
   </view>

src/pages/mine/index.vue

@@ -111,9 +111,9 @@ const { run } = useUpload<IUploadSuccessInfo>(
   import.meta.env.VITE_UPLOAD_BASEURL,
   {},
   {
-    onSuccess: (res: string) => {
-      console.log('头像上传成功', res)
-      useUserStore().setUserAvatar(res)
+    onSuccess: (res) => {
+      console.log('h5头像上传成功', res)
+      useUserStore().setUserAvatar(res.url)
     },
   },
 )
@@ -143,8 +143,8 @@ const onChooseAvatar = (e: any) => {
     {},
     {
       onSuccess: (res) => {
-        console.log('头像上传成功', res)
-        useUserStore().setUserAvatar(res)
+        console.log('wx头像上传成功', res)
+        useUserStore().setUserAvatar(res.url)
       },
     },
     avatarUrl,

src/utils/uploadFile.ts

@@ -61,7 +61,7 @@ export interface UploadOptions {
   /** 上传进度回调函数 */
   onProgress?: (progress: number) => void
   /** 上传成功回调函数 */
-  onSuccess?: (res: string) => void
+  onSuccess?: (res: Record<string, any>) => void
   /** 上传失败回调函数 */
   onError?: (err: Error | UniApp.GeneralCallbackResult) => void
   /** 上传完成回调函数（无论成功失败） */
@@ -248,7 +248,7 @@ interface UploadFileOptions<T> {
   /** 上传进度回调 */
   onProgress?: (progress: number) => void
   /** 上传成功回调 */
-  onSuccess?: (res: string) => void
+  onSuccess?: (res: Record<string, any>) => void
   /** 上传失败回调 */
   onError?: (err: Error | UniApp.GeneralCallbackResult) => void
   /** 上传完成回调 */
@@ -291,10 +291,10 @@ function uploadFile<T>({
         console.log('上传文件成功:', uploadFileRes)
         try {
           // 解析响应数据
-          const result = uploadFileRes.data
+          const { data: _data } = JSON.parse(uploadFileRes.data)
           // 上传成功
-          data.value = result as T
-          onSuccess?.(result)
+          data.value = _data as T
+          onSuccess?.(_data)
         } catch (err) {
           // 响应解析错误
           console.error('解析上传响应失败:', err)