From d0fed8fbba8d9f4ad27af64032d3be5952adb41e Mon Sep 17 00:00:00 2001 From: bob <312777916@qq.com> Date: Thu, 27 Feb 2025 16:57:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A4=E6=96=AD=E4=B8=AA=E4=BA=BA=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=98=AF=E5=90=A6=E4=BF=AE=E6=94=B9=E5=86=8D=E4=BF=9D?= =?UTF-8?q?=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/js/utils/common.js | 9 +++++++++ src/views/setting/sub/SettingPersonal.vue | 19 +++++++++++++++---- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/src/js/utils/common.js b/src/js/utils/common.js index d14c5eb..4177f01 100644 --- a/src/js/utils/common.js +++ b/src/js/utils/common.js @@ -153,6 +153,15 @@ export const showTimeFormat = (datatime) => { return `${year}-${month}-${day} ${hours}:${minutes}` } +export const showTimeFormatDay = (datatime) => { + const currentDate = new Date(datatime) + const year = currentDate.getFullYear() + const month = (currentDate.getMonth() + 1).toString().padStart(2, '0') + const day = currentDate.getDate().toString().padStart(2, '0') + + return `${year}-${month}-${day}` +} + export const combineId = (fromId, toId) => { if (fromId < toId) { return fromId + '@' + toId diff --git a/src/views/setting/sub/SettingPersonal.vue b/src/views/setting/sub/SettingPersonal.vue index c8258a1..6bb697d 100644 --- a/src/views/setting/sub/SettingPersonal.vue +++ b/src/views/setting/sub/SettingPersonal.vue @@ -4,8 +4,8 @@ import { userStore } from '@/stores' import router from '@/router' import { userModifySelfService } from '@/api/user' import defaultImg from '@/assets/image/select_avatar.jpg' -import { cloneDeep, isEqual } from 'lodash' -import { maskPhoneNum, showTimeFormat } from '@/js/utils/common' +import { cloneDeep } from 'lodash' +import { maskPhoneNum, showTimeFormatDay } from '@/js/utils/common' import EditAvatar from '@/components/common/EditAvatar.vue' import { ElMessage } from 'element-plus' @@ -18,7 +18,7 @@ const isShowEditAvatar = ref(false) onMounted(async () => { userData.updateUser().then(() => { formModel.value = cloneDeep(userData.user) - formModel.value.birthday = showTimeFormat(userData.user.birthday) + formModel.value.birthday = showTimeFormatDay(userData.user.birthday) }) }) @@ -28,7 +28,7 @@ const onNewAvatar = ({ avatar, avatarThumb }) => { } const onSave = () => { - if (isEqual(formModel.value, userData.user)) { + if (!isSomeChanged()) { ElMessage.warning('您还没有修改任何信息哦!') return } @@ -44,6 +44,17 @@ const onSave = () => { }) } +const isSomeChanged = () => { + return !( + formModel.value.nickName === userData.user.nickName && + formModel.value.gender === userData.user.gender && + formModel.value.birthday === showTimeFormatDay(userData.user.birthday) && + formModel.value.signature === userData.user.signature && + formModel.value.avatar === userData.user.avatar && + formModel.value.avatarThumb === userData.user.avatarThumb + ) +} + const displayPhone = computed(() => { if (formModel.value.phoneNum) { return maskPhoneNum(formModel.value.phoneNum)