Merge remote-tracking branch 'origin/main' into board-view-profile

This commit is contained in:
kimdaae328 2025-01-24 12:27:39 +09:00
commit 7b138452c2
3 changed files with 27 additions and 34 deletions

View File

@ -114,7 +114,6 @@ const emitAddressData = () => {
postcode: postcode.value,
address: address.value,
detailAddress: detailAddress.value,
fullAddress: `${address.value} ${detailAddress.value}`.trim()
};
emits('update:data', fullAddress);
};

View File

View File

@ -124,12 +124,12 @@
<ArrInput
title="주소"
name="arr"
name="address"
:isEssential="true"
:is-alert="arrAlert"
:is-alert="addressAlert"
@update:data="handleAddressUpdate"
@update:alert="arrAlert = $event"
:value="arr"
@update:alert="addressAlert = $event"
:value="address"
/>
<UserFormInput
@ -177,7 +177,8 @@
const pwhintRes = ref('');
const name = ref('');
const birth = ref('');
const arr = ref(''); //
const address = ref('');
const detailAddress = ref('');
const postcode = ref(''); //
const phone = ref('');
const colorList = ref([]);
@ -194,7 +195,7 @@
const pwhintResAlert = ref(false);
const nameAlert = ref(false);
const birthAlert = ref(false);
const arrAlert = ref(false);
const addressAlert = ref(false);
const phoneAlert = ref(false);
const toastStore = useToastStore();
@ -252,27 +253,20 @@
};
const Colors = async () => {
try {
const response = await $api.get('/user/color');
colorList.value = response.data.data.map(item => ({
label: item.CMNCODNAM,
value: item.CMNCODVAL
}));
} catch (error) {
console.error('Error colors:', error);
}
const response = await $api.get('/user/color');
colorList.value = response.data.data.map(item => ({
label: item.CMNCODNAM,
value: item.CMNCODVAL
}));
};
const Mbtis = async () => {
try {
const response = await $api.get('/user/mbti');
mbtiList.value = response.data.data.map(item => ({
label: item.CMNCODNAM,
value: item.CMNCODVAL
}));
} catch (error) {
console.error('Error MBTIs:', error);
}
const response = await $api.get('/user/mbti');
mbtiList.value = response.data.data.map(item => ({
label: item.CMNCODNAM,
value: item.CMNCODVAL
}));
};
onMounted(() => {
@ -282,7 +276,8 @@
//
const handleAddressUpdate = (addressData) => {
arr.value = addressData.fullAddress; //
address.value = addressData.address;
detailAddress.value = addressData.detailAddress;
postcode.value = addressData.postcode; //
};
@ -306,7 +301,7 @@
pwhintResAlert.value = pwhintRes.value.trim() === '';
nameAlert.value = name.value.trim() === '';
birthAlert.value = birth.value.trim() === '';
arrAlert.value = arr.value.trim() === '';
addressAlert.value = address.value.trim() === '';
phoneAlert.value = phone.value.trim() === '';
//
@ -319,7 +314,7 @@
}
if (profilAlert.value || idAlert.value || idErrorAlert.value || passwordAlert.value || passwordcheckAlert.value ||
passwordcheckErrorAlert.value || pwhintResAlert.value || nameAlert.value || birthAlert.value || arrAlert.value || phoneAlert.value) {
passwordcheckErrorAlert.value || pwhintResAlert.value || nameAlert.value || birthAlert.value || addressAlert.value || phoneAlert.value) {
return;
}
@ -329,15 +324,14 @@
formData.append('memberPwh', pwhintList[pwhint.value]);
formData.append('memberPwr', pwhintRes.value);
formData.append('memberNam', name.value);
formData.append('memberArr', arr.value); //
formData.append('memberZip', postcode.value); //
formData.append('memberArr', address.value);
formData.append('memberDtl', detailAddress.value);
formData.append('memberZip', postcode.value);
formData.append('memberBth', birth.value);
formData.append('memberTel', phone.value);
formData.append('memberCol', color.value);
formData.append('memberMbt', mbti.value);
if (profile.value) {
formData.append('profile', profile.value);
}
formData.append('memberPrf', profile.value);
const response = await $api.post('/user/join', formData, { isFormData : true });