diff --git a/src/components/Login/Loginabout.vue b/src/components/Login/Loginabout.vue index fa9fbd8..bb182a5 100644 --- a/src/components/Login/Loginabout.vue +++ b/src/components/Login/Loginabout.vue @@ -8,276 +8,280 @@ import { useUserStore } from '~/stores/user' const emit = defineEmits(['close', 'ok']) const userStore = useUserStore() const { userInfo } = storeToRefs(userStore) +const { name, signature } = userInfo.value -const userInfoTemp = ref(userInfo.value) const dialogVisible = defineModel(false) onMounted(() => { - // console.log('🍪-----userInfoTemp.value-----', userInfoTemp.value) + formData.value.name = name + formData.value.signature = signature }) const formData = ref({}) // 获取用户信息 async function getMyInfoFunc() { - const params = {} - const { code, msg, result } = ({} = await getMyInfo()) - if (code === 200) { - userStore.setUserInfo(result) - } - else { - } + const params = {} + const { code, msg, result } = ({} = await getMyInfo()) + if (code === 200) { + userStore.setUserInfo(result) + } + else { + } } async function onConfirm(data: any) { - console.log('🐳-----data-----', data) + console.log('🐳-----data-----', data) - const { fileMd5 } = data + const { fileMd5 } = data - await updateUserInfoFunc(fileMd5) - getMyInfoFunc() + await updateUserInfoFunc(fileMd5) + getMyInfoFunc() } -// 修改信息 -// async function updateUserInfoFunc() { -// const params = compareObjects(userInfo.value, userInfoTemp.value) -// const [err, suData] = await to(updateUserInfo(params)) -// const { code, msg, result } = suData || {} -// if (code === 200) { -// toast.success('修改成功') -// } -// else { -// toast.error('修改失败') -// } -// dialogVisible.value = false -// } - // 上传头像 const editTarget = ref(null) const clipperRef = ref(null) const clipperData = { - type: 'browserLogo', // 该参数可根据实际要求修改类型 - allowTypeList: ['png', 'jpg', 'jpeg', 'peeee'], // 允许上传的图片格式 - previewWidth: 100, // 预览宽度 + type: 'browserLogo', // 该参数可根据实际要求修改类型 + allowTypeList: ['png', 'jpg', 'jpeg', 'peeee'], // 允许上传的图片格式 + previewWidth: 100, // 预览宽度 } // 回显 const userheadUpload = computed(() => { - const { avatarInfo, avatar } = userInfo.value as any - return isObject(avatarInfo) ? avatarInfo?.url : avatar + const { avatarInfo, avatar } = userInfo.value as any + return isObject(avatarInfo) ? avatarInfo?.url : avatar }) function headUpload() { - editTarget.value = 'avatarFileMd5' - if (clipperRef.value) { - clipperRef.value.uploadFile() - } + editTarget.value = 'avatarFileMd5' + if (clipperRef.value) { + clipperRef.value.uploadFile() + } } // 更新用户信息 const updateLoading = ref(false) async function updateUserInfoFunc(fileMd5: string) { - if (updateLoading.value) - return - updateLoading.value = true - const params = { - // backgroundInfoFileMd5: fileMd5, - // avatarFileMd5: - // name: "suan", - // avatar, - // // github: null, - // // wakatime: null, - // // wechat: null, - // // gitee: null, - // // qq: "3128006406@qq.com", - } - // if(editTarget.value === 'background'){ - // params['backgroundInfoFileMd5'] = fileMd5 - // } - // if(editTarget.value === 'avatar'){ - // params['avatarFileMd5'] = fileMd5 - // } - params[editTarget.value] = fileMd5 - console.log('🐳-----params---77--', params) - // return - const { code, msg, result } = ({} = await updateUserInfo(params).catch( - (err) => { - updateLoading.value = false - ElMessage.error('更新用户信息失败') - }, - )) - if (code === 200) { - ElMessage.success('更新用户信息成功') - } - else { - ElMessage.error('更新用户信息失败') - } - updateLoading.value = false + if (updateLoading.value) +return + updateLoading.value = true + const params = { + // backgroundInfoFileMd5: fileMd5, + // avatarFileMd5: + // name: "suan", + // avatar, + // // github: null, + // // wakatime: null, + // // wechat: null, + // // gitee: null, + // // qq: "3128006406@qq.com", + } + // if(editTarget.value === 'background'){ + // params['backgroundInfoFileMd5'] = fileMd5 + // } + // if(editTarget.value === 'avatar'){ + // params['avatarFileMd5'] = fileMd5 + // } + params[editTarget.value] = fileMd5 + console.log('🐳-----params---77--', params) + // return + const { code, msg, result } = ({} = await updateUserInfo(params).catch( + (err) => { + updateLoading.value = false + ElMessage.error('更新用户信息失败') + }, + )) + if (code === 200) { + ElMessage.success('更新用户信息成功') + } + else { + ElMessage.error('更新用户信息失败') + } + updateLoading.value = false } function handleCancel() { - console.log('💗handleCancel---------->') - emit('close') + console.log('💗handleCancel---------->') + emit('close') } async function handleOk() { - const params = removeEmptyValues(formData.value) - console.log('🎁-----formData.value-----', formData.value) - const [err, data] = await requestTo(updateUserInfo(params)) - if (!err) { - console.log('🎉-----data-----', data) - userStore.setUserInfo(data) - // handleCancel() - // emit('close') - emit('close') - } + const params = removeEmptyValues(formData.value) + console.log('🎁-----formData.value-----', formData.value) + const [err, data] = await requestTo(updateUserInfo(params)) + if (!err) { + console.log('🎉-----data-----', data) + userStore.setUserInfo(data) + // handleCancel() + // emit('close') + emit('close') + } } diff --git a/src/pages/mine/indexs.vue b/src/pages/mine/indexs.vue index 32a4c9f..5b2e2bd 100644 --- a/src/pages/mine/indexs.vue +++ b/src/pages/mine/indexs.vue @@ -177,7 +177,7 @@ ref="clipperRef" :type="clipperData.type" :allow-type-list="clipperData.allowTyp