Merge remote-tracking branch 'origin/main' into board-view-profile
This commit is contained in:
commit
7b138452c2
@ -114,7 +114,6 @@ const emitAddressData = () => {
|
|||||||
postcode: postcode.value,
|
postcode: postcode.value,
|
||||||
address: address.value,
|
address: address.value,
|
||||||
detailAddress: detailAddress.value,
|
detailAddress: detailAddress.value,
|
||||||
fullAddress: `${address.value} ${detailAddress.value}`.trim()
|
|
||||||
};
|
};
|
||||||
emits('update:data', fullAddress);
|
emits('update:data', fullAddress);
|
||||||
};
|
};
|
||||||
|
|||||||
0
src/components/user/FindPassword.vue
Normal file
0
src/components/user/FindPassword.vue
Normal file
@ -124,12 +124,12 @@
|
|||||||
|
|
||||||
<ArrInput
|
<ArrInput
|
||||||
title="주소"
|
title="주소"
|
||||||
name="arr"
|
name="address"
|
||||||
:isEssential="true"
|
:isEssential="true"
|
||||||
:is-alert="arrAlert"
|
:is-alert="addressAlert"
|
||||||
@update:data="handleAddressUpdate"
|
@update:data="handleAddressUpdate"
|
||||||
@update:alert="arrAlert = $event"
|
@update:alert="addressAlert = $event"
|
||||||
:value="arr"
|
:value="address"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<UserFormInput
|
<UserFormInput
|
||||||
@ -177,7 +177,8 @@
|
|||||||
const pwhintRes = ref('');
|
const pwhintRes = ref('');
|
||||||
const name = ref('');
|
const name = ref('');
|
||||||
const birth = ref('');
|
const birth = ref('');
|
||||||
const arr = ref(''); // 전체 주소
|
const address = ref('');
|
||||||
|
const detailAddress = ref('');
|
||||||
const postcode = ref(''); // 우편번호
|
const postcode = ref(''); // 우편번호
|
||||||
const phone = ref('');
|
const phone = ref('');
|
||||||
const colorList = ref([]);
|
const colorList = ref([]);
|
||||||
@ -194,7 +195,7 @@
|
|||||||
const pwhintResAlert = ref(false);
|
const pwhintResAlert = ref(false);
|
||||||
const nameAlert = ref(false);
|
const nameAlert = ref(false);
|
||||||
const birthAlert = ref(false);
|
const birthAlert = ref(false);
|
||||||
const arrAlert = ref(false);
|
const addressAlert = ref(false);
|
||||||
const phoneAlert = ref(false);
|
const phoneAlert = ref(false);
|
||||||
|
|
||||||
const toastStore = useToastStore();
|
const toastStore = useToastStore();
|
||||||
@ -252,27 +253,20 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
const Colors = async () => {
|
const Colors = async () => {
|
||||||
try {
|
const response = await $api.get('/user/color');
|
||||||
const response = await $api.get('/user/color');
|
colorList.value = response.data.data.map(item => ({
|
||||||
colorList.value = response.data.data.map(item => ({
|
label: item.CMNCODNAM,
|
||||||
label: item.CMNCODNAM,
|
value: item.CMNCODVAL
|
||||||
value: item.CMNCODVAL
|
}));
|
||||||
}));
|
|
||||||
} catch (error) {
|
|
||||||
console.error('Error colors:', error);
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const Mbtis = async () => {
|
const Mbtis = async () => {
|
||||||
try {
|
const response = await $api.get('/user/mbti');
|
||||||
const response = await $api.get('/user/mbti');
|
mbtiList.value = response.data.data.map(item => ({
|
||||||
mbtiList.value = response.data.data.map(item => ({
|
label: item.CMNCODNAM,
|
||||||
label: item.CMNCODNAM,
|
value: item.CMNCODVAL
|
||||||
value: item.CMNCODVAL
|
}));
|
||||||
}));
|
|
||||||
} catch (error) {
|
|
||||||
console.error('Error MBTIs:', error);
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
@ -282,7 +276,8 @@
|
|||||||
|
|
||||||
// 주소 업데이트 핸들러
|
// 주소 업데이트 핸들러
|
||||||
const handleAddressUpdate = (addressData) => {
|
const handleAddressUpdate = (addressData) => {
|
||||||
arr.value = addressData.fullAddress; // 전체 주소
|
address.value = addressData.address;
|
||||||
|
detailAddress.value = addressData.detailAddress;
|
||||||
postcode.value = addressData.postcode; // 우편번호
|
postcode.value = addressData.postcode; // 우편번호
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -306,7 +301,7 @@
|
|||||||
pwhintResAlert.value = pwhintRes.value.trim() === '';
|
pwhintResAlert.value = pwhintRes.value.trim() === '';
|
||||||
nameAlert.value = name.value.trim() === '';
|
nameAlert.value = name.value.trim() === '';
|
||||||
birthAlert.value = birth.value.trim() === '';
|
birthAlert.value = birth.value.trim() === '';
|
||||||
arrAlert.value = arr.value.trim() === '';
|
addressAlert.value = address.value.trim() === '';
|
||||||
phoneAlert.value = phone.value.trim() === '';
|
phoneAlert.value = phone.value.trim() === '';
|
||||||
|
|
||||||
// 프로필 이미지 체크
|
// 프로필 이미지 체크
|
||||||
@ -319,7 +314,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (profilAlert.value || idAlert.value || idErrorAlert.value || passwordAlert.value || passwordcheckAlert.value ||
|
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;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -329,15 +324,14 @@
|
|||||||
formData.append('memberPwh', pwhintList[pwhint.value]);
|
formData.append('memberPwh', pwhintList[pwhint.value]);
|
||||||
formData.append('memberPwr', pwhintRes.value);
|
formData.append('memberPwr', pwhintRes.value);
|
||||||
formData.append('memberNam', name.value);
|
formData.append('memberNam', name.value);
|
||||||
formData.append('memberArr', arr.value); // 전체 주소
|
formData.append('memberArr', address.value);
|
||||||
formData.append('memberZip', postcode.value); // 우편번호
|
formData.append('memberDtl', detailAddress.value);
|
||||||
|
formData.append('memberZip', postcode.value);
|
||||||
|
formData.append('memberBth', birth.value);
|
||||||
formData.append('memberTel', phone.value);
|
formData.append('memberTel', phone.value);
|
||||||
formData.append('memberCol', color.value);
|
formData.append('memberCol', color.value);
|
||||||
formData.append('memberMbt', mbti.value);
|
formData.append('memberMbt', mbti.value);
|
||||||
|
formData.append('memberPrf', profile.value);
|
||||||
if (profile.value) {
|
|
||||||
formData.append('profile', profile.value);
|
|
||||||
}
|
|
||||||
|
|
||||||
const response = await $api.post('/user/join', formData, { isFormData : true });
|
const response = await $api.post('/user/join', formData, { isFormData : true });
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user