diff --git a/src/components/common/EditInformation.vue b/src/components/common/EditInformation.vue index bd061bd..336f224 100644 --- a/src/components/common/EditInformation.vue +++ b/src/components/common/EditInformation.vue @@ -10,7 +10,7 @@ @@ -196,17 +196,33 @@ const validateName = () => { }) } } -const handleCancel = () => { - router.back() -} -const handlePwChange = () => { +const checkChange = () => { if ( selectedFile.value || info.value.name != name.value || info.value.notificationSettingInfo.kakaoWork != kakaoWorkCheck.value || info.value.notificationSettingInfo.email != emailCheck.value ) { + return true + } else { + return false + } +} + +const modalTarget = ref('') +const handleCancel = () => { + if (checkChange()) { + modalTarget.value = 'cancel' + warningModalToggle() + } else { + router.back() + } +} + +const handlePwChange = () => { + if (checkChange()) { + modalTarget.value = 'pw' warningModalToggle() } else { changePw() diff --git a/src/components/common/ModalView.vue b/src/components/common/ModalView.vue index b69a85c..5c47159 100644 --- a/src/components/common/ModalView.vue +++ b/src/components/common/ModalView.vue @@ -72,7 +72,7 @@ type="button" class="button-large-red" @click="confirmModal"> - {{ type === 'inputType' ? '반려' : type === 'terminate' ? '종료' : '삭제' }} + {{ type === 'inputType' ? '반려' : type === 'terminate' ? '종료' : '확인' }} diff --git a/src/components/lists/ListCardTab.vue b/src/components/lists/ListCardTab.vue index 47b2536..5432cba 100644 --- a/src/components/lists/ListCardTab.vue +++ b/src/components/lists/ListCardTab.vue @@ -3,11 +3,10 @@ class="flex gap-2 items-center" :style="{ width: width ? `${width}px` : '' }" :class="width ? 'shrink-0' : 'grow'"> -
- -
+ @@ -23,9 +22,8 @@ - - diff --git a/src/components/member-management/MemberManagementListCard.vue b/src/components/member-management/MemberManagementListCard.vue index 29490e8..54e2bb2 100644 --- a/src/components/member-management/MemberManagementListCard.vue +++ b/src/components/member-management/MemberManagementListCard.vue @@ -21,7 +21,7 @@ @click="toggleModal('delete')"> 삭제 -
+
diff --git a/src/components/request-history/RequestHistoryListCard.vue b/src/components/request-history/RequestHistoryListCard.vue index c6e1e44..8681c6a 100644 --- a/src/components/request-history/RequestHistoryListCard.vue +++ b/src/components/request-history/RequestHistoryListCard.vue @@ -46,8 +46,8 @@ const myRequestTabList: ListCardProps[] = [ { content: info.mainCategoryName, width: 80 }, { content: info.categoryName, width: 80 }, { content: info.title }, - { content: info.requesterName, width: 120, profileImg: info.requesterImg }, - { content: info.processorName, width: 120, profileImg: info.processorImg }, + { content: info.requesterName, width: 120, profileImg: info.requesterUrl || '' }, + { content: info.processorName, width: 120, profileImg: info.processorUrl || '' }, { content: info.taskStatus, width: 80, isStatus: true }, { content: info.finishedAt ? formatDate(info.finishedAt) : '', width: 80 } ] diff --git a/src/components/request-task/RequestTaskDropdown.vue b/src/components/request-task/RequestTaskDropdown.vue index e72dcf5..43d114b 100644 --- a/src/components/request-task/RequestTaskDropdown.vue +++ b/src/components/request-task/RequestTaskDropdown.vue @@ -10,7 +10,7 @@ class="relative flex">

{{ modelValue || placeholderText }} diff --git a/src/components/request-task/RequestTaskFileInputAfter.vue b/src/components/request-task/RequestTaskFileInputAfter.vue index 8a55590..3fc29bb 100644 --- a/src/components/request-task/RequestTaskFileInputAfter.vue +++ b/src/components/request-task/RequestTaskFileInputAfter.vue @@ -32,7 +32,7 @@