diff --git a/src/assets/icons/close_nocolor.svg b/src/assets/icons/close_nocolor.svg new file mode 100644 index 0000000..b31f6f4 --- /dev/null +++ b/src/assets/icons/close_nocolor.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/assets/icons/profile_white.svg b/src/assets/icons/profile_white.svg new file mode 100644 index 0000000..7103aca --- /dev/null +++ b/src/assets/icons/profile_white.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/images/checked.png b/src/assets/images/checked.png new file mode 100644 index 0000000..a0054b0 Binary files /dev/null and b/src/assets/images/checked.png differ diff --git a/src/views/Workshop/product.vue b/src/views/Workshop/product.vue index b45e502..f139201 100644 --- a/src/views/Workshop/product.vue +++ b/src/views/Workshop/product.vue @@ -6,6 +6,8 @@ import { useRouter, useRoute } from 'vue-router' import GenerateLoading from '@/views/asistant/components/GenerateLoading.vue' import { useGenerateStore } from '@/stores' import { generateTryOnEffect, setTryOnEffectFavorite, cancelTryOnEffectFavorite, addTryOnEffectComment } from '@/api/workshop' +import { FlowType } from '@/types/enum' + const router = useRouter() //const props = defineProps({ //}) @@ -33,7 +35,11 @@ const feedbackForm = ref({ const onContinue = ()=>{ const query = router.currentRoute.value.query - router.push({ path: 'uploadFace', query: {...query} }) + if(query?.flowType == FlowType.MAIN){ + router.push({ path: 'uploadFace', query: {...query} }) + }else{ + router.push({ path: 'creation', query: {...query} }) + } } const changeModel = ()=>{ diff --git a/src/views/Workshop/profile.vue b/src/views/Workshop/profile.vue index 11302da..e3dc126 100644 --- a/src/views/Workshop/profile.vue +++ b/src/views/Workshop/profile.vue @@ -1,261 +1,392 @@ - - - - Profile - - - - - Your Name - - - - - - {{ form.name.msg }} - - - Your Email - - - - - - {{ form.email.msg }} - - - Password - - - - - - - - {{ form.password.msg }} - + + {{ form.password.msg }} + - - Confirm - Powered by AiDLab for Lane Crawford - - - Switch Customer - Edit Profile - Log out - - - - + + Confirm + Powered by AiDLab for Lane Crawford + + + Switch Customer + Edit Profile + Log out + + + + + + + Saved Customer ID + + + + + + {{ item.nickname }} + {{ item.id }} + + + + + + + + + + Confirm + diff --git a/src/views/Workshop/selectStyle.vue b/src/views/Workshop/selectStyle.vue index a461feb..37d2dd8 100644 --- a/src/views/Workshop/selectStyle.vue +++ b/src/views/Workshop/selectStyle.vue @@ -7,6 +7,8 @@ import { useRouter } from 'vue-router' import { useGenerateStore, useUserInfoStore } from '@/stores' import { showToast } from 'vant'; import { generateRequestOutfit, getRequestOutfit } from '@/api/workshop' +import { FlowType } from '@/types/enum' + const router = useRouter() //const props = defineProps({ @@ -45,7 +47,11 @@ const toProduct = ()=>{ generateStore.setIsGenerate(true) } const query = router.currentRoute.value.query - router.push({ path: 'product', query: {...query} }) + if(query?.flowType == FlowType.MAIN){ + router.push({ path: 'product', query: {...query} }) + }else{ + router.push({ path: 'creation', query: {...query} }) + } } const requestOutfit = ({num,index})=>{ diff --git a/src/views/login/customer.vue b/src/views/login/customer.vue index 413615e..ada4ffd 100644 --- a/src/views/login/customer.vue +++ b/src/views/login/customer.vue @@ -1,17 +1,17 @@ - + Who is Your Customer? - + Create @@ -23,18 +23,27 @@ - Customer ID + {{ formTitle }} Redefine the styling experience with AI. Use Styling Angel to speed up your fashion journey. - + + + VIP ID + + Nickname Confirm - Show All + + Show All + Powered by AiDLab for Lane Crawford + +
{{ form.name.msg }}
{{ form.email.msg }}
{{ form.password.msg }}
Powered by AiDLab for Lane Crawford
Redefine the styling experience with AI.
Use Styling Angel to speed up your fashion journey.