From ca30dc0941bb83eff47b3252160e891f0181faa4 Mon Sep 17 00:00:00 2001 From: zhangyahui Date: Thu, 30 Oct 2025 13:54:11 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E9=87=8D=E5=8F=91=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E7=A0=81&=E5=9B=BE=E7=89=87=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/login/LoginPage.vue | 8 ++++---- src/views/login/ResetPage.vue | 7 +++++-- src/views/login/components/Mail.vue | 2 +- src/views/login/components/Verify.vue | 3 ++- src/views/stylist/index.vue | 11 +++++++---- 5 files changed, 19 insertions(+), 12 deletions(-) diff --git a/src/views/login/LoginPage.vue b/src/views/login/LoginPage.vue index f622d1d..6bc5a9d 100644 --- a/src/views/login/LoginPage.vue +++ b/src/views/login/LoginPage.vue @@ -79,19 +79,19 @@ const validatePassword = (password: string) => { const validateForm = () => { // 验证邮箱 if (!formData.email) { - showToast('请输入邮箱地址') + showToast('place input your email') return false } else if (!validateEmail(formData.email)) { - showToast('请输入有效的邮箱地址') + showToast('please input valid email') return false } // 验证密码 if (!formData.password) { - showToast('请输入密码') + showToast('please input password') return false } else if (!validatePassword(formData.password)) { - showToast('密码至少需要6位字符') + showToast('please input correct password') return false } diff --git a/src/views/login/ResetPage.vue b/src/views/login/ResetPage.vue index 8c418d1..7873102 100644 --- a/src/views/login/ResetPage.vue +++ b/src/views/login/ResetPage.vue @@ -22,6 +22,7 @@ v-else-if="step === 'verify'" :ct="emailCode" @nextStep="handleCheckVerifyCode" + @resend="handleSendVerifyCode" /> @@ -75,8 +76,10 @@ const handleStep = (type: 'mail' | 'verify' | 'password') => { } const handleSendVerifyCode = (data: any) => { - fromData.value.email = data.email - precheckEmail({ email: data.email }).then(() => { + if (data?.email) { + fromData.value.email = data?.email + } + precheckEmail({ email: fromData.value.email }).then(() => { showToast('the verification code has been sent to your email') handleStep('verify') }) diff --git a/src/views/login/components/Mail.vue b/src/views/login/components/Mail.vue index 2eaf594..ffd3716 100644 --- a/src/views/login/components/Mail.vue +++ b/src/views/login/components/Mail.vue @@ -2,7 +2,7 @@
Your Email
- +
Next
diff --git a/src/views/login/components/Verify.vue b/src/views/login/components/Verify.vue index a92a24e..8305b0f 100644 --- a/src/views/login/components/Verify.vue +++ b/src/views/login/components/Verify.vue @@ -48,7 +48,7 @@ const props = defineProps({ const agreePolicy = ref(false) // Emits -const emit = defineEmits(['nextStep']) +const emit = defineEmits(['nextStep','resend']) // Reactive data const loading = ref(false) @@ -83,6 +83,7 @@ const handleResend = () => { if (countdown.value > 0) return countdown.value = 60 handleSendVerifyCode() + emit('resend') } const handleConfirmCaptcha = () => { diff --git a/src/views/stylist/index.vue b/src/views/stylist/index.vue index 7801227..63e9c0c 100644 --- a/src/views/stylist/index.vue +++ b/src/views/stylist/index.vue @@ -54,6 +54,9 @@ import { ref, watch } from 'vue' import { useRouter } from 'vue-router' import Video from './components/Video.vue' import { useUserInfoStore } from '@/stores' +import male from '@/assets/images/male.png' +import female from '@/assets/images/female.png' + const router = useRouter() const userInfoStore = useUserInfoStore() @@ -64,28 +67,28 @@ const stylists = ref([ value: 'mini', name: 'Vera Lo', description: 'Contemporary, Classic, Simple Silhouettes, Statement Pieces', - image: '/src/assets/images/female.png' + image: female }, { id: 2, value: 'crystal', name: 'Sarah Chen', description: 'Modern, Edgy, Bold Colors, Street Style', - image: '/src/assets/images/male.png' + image: male }, { id: 3, value: 'mini', name: 'Emma Wilson', description: 'Elegant, Feminine, Vintage Inspired, Soft Tones', - image: '/src/assets/images/female.png' + image: female }, { id: 4, value: 'crystal', name: 'Alex Johnson', description: 'Minimalist, Professional, Neutral Palette, Clean Lines', - image: '/src/assets/images/male.png' + image: male } ]) const currentChoosed = ref(1) From 495f31a84074cdb47cb45d03f485fc515df81258 Mon Sep 17 00:00:00 2001 From: zhangyahui Date: Thu, 30 Oct 2025 14:22:24 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E9=A1=B5=E9=9D=A2=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E7=BC=BA=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/asistant/index.vue | 4 +++- src/views/login/ResetPage.vue | 2 +- src/views/login/components/Password.vue | 6 ++++++ src/views/stylist/dressfor.vue | 6 +++++- src/views/stylist/index.vue | 1 + 5 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/views/asistant/index.vue b/src/views/asistant/index.vue index 305b622..d7c9e1d 100644 --- a/src/views/asistant/index.vue +++ b/src/views/asistant/index.vue @@ -31,12 +31,13 @@ import InputArea from './components/InputArea.vue' import GenerateLoading from './components/GenerateLoading.vue' import { ref, onMounted, onUnmounted } from 'vue' import { useRouter } from 'vue-router' -import { useUserInfoStore } from '@/stores' +import { useUserInfoStore,useGenerateStore } from '@/stores' import { streamChatAddress } from '@/api/workshop' import { generateUUID } from '@/utils/tools' import { showToast } from 'vant' const router = useRouter() +const generateStore = useGenerateStore() const userInfoStore = useUserInfoStore() defineOptions({ @@ -214,6 +215,7 @@ const handleContinue = () => { // router.push('/workshop/selectStyle') // 模拟接口之后再跳转 isLoading.value = true + generateStore.clearProductData() setTimeout(() => { router.push('/workshop/selectStyle') isLoading.value = false diff --git a/src/views/login/ResetPage.vue b/src/views/login/ResetPage.vue index 7873102..ce8e35e 100644 --- a/src/views/login/ResetPage.vue +++ b/src/views/login/ResetPage.vue @@ -45,7 +45,7 @@ import { showToast } from 'vant' import { precheckEmail, resetPassword } from '@/api/login' const router = useRouter() -const step = ref<'mail' | 'verify' | 'password'>('mail') +const step = ref<'mail' | 'verify' | 'password'>('password') const emailCode = ref(['', '', '', '', '']) const fromData = ref({ diff --git a/src/views/login/components/Password.vue b/src/views/login/components/Password.vue index 1e86439..551eadf 100644 --- a/src/views/login/components/Password.vue +++ b/src/views/login/components/Password.vue @@ -50,6 +50,12 @@ const handleNext = () => { padding: 0 2.2rem 0 5.5rem; border: 2px solid #fff; border-radius: 7.1rem; + overflow: hidden; + box-sizing: border-box; + } + :deep(.van-icon) { + flex-shrink: 0; + font-size: 3.5rem; } .input-field { background: transparent; diff --git a/src/views/stylist/dressfor.vue b/src/views/stylist/dressfor.vue index 71e1edf..4d7da92 100644 --- a/src/views/stylist/dressfor.vue +++ b/src/views/stylist/dressfor.vue @@ -2,7 +2,7 @@
- +
What are you dressing for?
@@ -14,6 +14,10 @@ import { useRouter } from 'vue-router' const router = useRouter() +const handleBack = () => { + router.go(-1) +} + const handleStart = () => { console.log('click start') router.push('/asistant') diff --git a/src/views/stylist/index.vue b/src/views/stylist/index.vue index 63e9c0c..3612569 100644 --- a/src/views/stylist/index.vue +++ b/src/views/stylist/index.vue @@ -38,6 +38,7 @@ class="video-dialog" :show-confirm-button="false" :show-cancel-button="false" + close-on-click-overlay v-model:show="showVideo" title="" > From af02d59f1bbd76b147bc9d1f1e4109a219f61b8a Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Thu, 30 Oct 2025 14:29:13 +0800 Subject: [PATCH 3/4] =?UTF-8?q?selectStyle=E9=A1=B5=E9=9D=A2=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E4=BF=A1=E6=81=AF=E9=A2=9C=E8=89=B2=E5=86=B2=E7=AA=81?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Workshop/selectStyle.vue | 4 ++-- vite.config.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/Workshop/selectStyle.vue b/src/views/Workshop/selectStyle.vue index 4b783cb..e89b0f3 100644 --- a/src/views/Workshop/selectStyle.vue +++ b/src/views/Workshop/selectStyle.vue @@ -1,5 +1,5 @@