chamomind/jws-frontend
chamomind/jws-frontend
6
0
Fork 0
Code Issues Projects Releases Packages 1 Wiki Activity Actions

fix: merge

Browse source
This commit is contained in:
puriphatt 2024-09-11 16:51:27 +07:00
parent 62fc7055dd
commit cd2c941466
1 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/stores/user/index.ts
View file

@ -275,10 +275,6 @@ const useUserStore = defineStore('api-user', () => {
transactionId?: string; transactionId?: string;
}, },
) { ) {
<<<<<<< HEAD
const { profileImage, zipCode, ...payload } = data;
const res = await api.post<User & { profileImageUploadUrl: string }>(
=======
const res = await api.get(`/user/${id}/profile-image`, { const res = await api.get(`/user/${id}/profile-image`, {
headers: { headers: {
'X-Session-Id': flow?.sessionId, 'X-Session-Id': flow?.sessionId,
@ -338,7 +334,7 @@ const useUserStore = defineStore('api-user', () => {
}, },
) { ) {
const { zipCode, ...payload } = data; const { zipCode, ...payload } = data;
const res = await api.post<User & { profileImageUploadUrl: string }>( const res = await api.post<User>(
'/user', '/user',
{ {
...payload, ...payload,