Auto merge base into tabbar

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,