Auto merge base into i18n
This commit is contained in:
commit
8f156b23d9
@ -103,10 +103,10 @@ export default function useUpload<T extends TfileType>(options: TOptions<T> = {}
|
|||||||
tempFilePath: tempFilePath,
|
tempFilePath: tempFilePath,
|
||||||
formData,
|
formData,
|
||||||
onSuccess: (res) => {
|
onSuccess: (res) => {
|
||||||
data.value = res
|
const { data: _data } = JSON.parse(res)
|
||||||
// https://oss.laf.run/ukw0y1-unibest/unibest.f5308ecd-06c3-463b-b3e0-5df08154c7f3.svg
|
data.value = _data
|
||||||
// console.log('上传成功', res)
|
// console.log('上传成功', res)
|
||||||
success?.(res)
|
success?.(_data)
|
||||||
},
|
},
|
||||||
onError: (err) => {
|
onError: (err) => {
|
||||||
error.value = err
|
error.value = err
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
<view class="m-2">上传后返回的接口数据:</view>
|
<view class="m-2">上传后返回的接口数据:</view>
|
||||||
<view class="m-2">{{ data }}</view>
|
<view class="m-2">{{ data }}</view>
|
||||||
<view class="h-80 w-full">
|
<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>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
</view>
|
</view>
|
||||||
|
@ -110,9 +110,9 @@ const { run } = useUpload<IUploadSuccessInfo>(
|
|||||||
import.meta.env.VITE_UPLOAD_BASEURL,
|
import.meta.env.VITE_UPLOAD_BASEURL,
|
||||||
{},
|
{},
|
||||||
{
|
{
|
||||||
onSuccess: (res: string) => {
|
onSuccess: (res) => {
|
||||||
console.log('头像上传成功', res)
|
console.log('h5头像上传成功', res)
|
||||||
useUserStore().setUserAvatar(res)
|
useUserStore().setUserAvatar(res.url)
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
@ -142,8 +142,8 @@ const onChooseAvatar = (e: any) => {
|
|||||||
{},
|
{},
|
||||||
{
|
{
|
||||||
onSuccess: (res) => {
|
onSuccess: (res) => {
|
||||||
console.log('头像上传成功', res)
|
console.log('wx头像上传成功', res)
|
||||||
useUserStore().setUserAvatar(res)
|
useUserStore().setUserAvatar(res.url)
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
avatarUrl,
|
avatarUrl,
|
||||||
|
@ -61,7 +61,7 @@ export interface UploadOptions {
|
|||||||
/** 上传进度回调函数 */
|
/** 上传进度回调函数 */
|
||||||
onProgress?: (progress: number) => void
|
onProgress?: (progress: number) => void
|
||||||
/** 上传成功回调函数 */
|
/** 上传成功回调函数 */
|
||||||
onSuccess?: (res: string) => void
|
onSuccess?: (res: Record<string, any>) => void
|
||||||
/** 上传失败回调函数 */
|
/** 上传失败回调函数 */
|
||||||
onError?: (err: Error | UniApp.GeneralCallbackResult) => void
|
onError?: (err: Error | UniApp.GeneralCallbackResult) => void
|
||||||
/** 上传完成回调函数(无论成功失败) */
|
/** 上传完成回调函数(无论成功失败) */
|
||||||
@ -248,7 +248,7 @@ interface UploadFileOptions<T> {
|
|||||||
/** 上传进度回调 */
|
/** 上传进度回调 */
|
||||||
onProgress?: (progress: number) => void
|
onProgress?: (progress: number) => void
|
||||||
/** 上传成功回调 */
|
/** 上传成功回调 */
|
||||||
onSuccess?: (res: string) => void
|
onSuccess?: (res: Record<string, any>) => void
|
||||||
/** 上传失败回调 */
|
/** 上传失败回调 */
|
||||||
onError?: (err: Error | UniApp.GeneralCallbackResult) => void
|
onError?: (err: Error | UniApp.GeneralCallbackResult) => void
|
||||||
/** 上传完成回调 */
|
/** 上传完成回调 */
|
||||||
@ -291,10 +291,10 @@ function uploadFile<T>({
|
|||||||
console.log('上传文件成功:', uploadFileRes)
|
console.log('上传文件成功:', uploadFileRes)
|
||||||
try {
|
try {
|
||||||
// 解析响应数据
|
// 解析响应数据
|
||||||
const result = uploadFileRes.data
|
const { data: _data } = JSON.parse(uploadFileRes.data)
|
||||||
// 上传成功
|
// 上传成功
|
||||||
data.value = result as T
|
data.value = _data as T
|
||||||
onSuccess?.(result)
|
onSuccess?.(_data)
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
// 响应解析错误
|
// 响应解析错误
|
||||||
console.error('解析上传响应失败:', err)
|
console.error('解析上传响应失败:', err)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user