diff --git a/src/main.ts b/src/main.ts
index 5cb1eb5..ed7eb62 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -11,6 +11,11 @@ app.use(pinia)
 app.use(router)
 
 const authStore = useAuthStore()
-authStore.initialize().then(() => {
+
+if (window.location.pathname === '/auth/confirm') {
   app.mount('#app')
-})
+} else {
+  authStore.initialize().then(() => {
+    app.mount('#app')
+  })
+}
diff --git a/src/router/index.ts b/src/router/index.ts
index 1d5247d..68b33bf 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -19,6 +19,11 @@ const router = createRouter({
       name: 'register',
       component: () => import('@/views/auth/RegisterView.vue'),
     },
+    {
+      path: '/auth/confirm',
+      name: 'auth-confirm',
+      component: () => import('@/views/auth/AuthConfirmView.vue'),
+    },
     {
       path: '/upload',
       name: 'upload',
diff --git a/src/stores/auth.ts b/src/stores/auth.ts
index 94074b2..186a1ee 100644
--- a/src/stores/auth.ts
+++ b/src/stores/auth.ts
@@ -19,12 +19,24 @@ export const useAuthStore = defineStore('auth', () => {
       .select('*')
       .eq('id', user.value.id)
       .single()
-    profile.value = data
+    if (data) {
+      profile.value = data as Profile
+    }
   }
 
   async function login(email: string, password: string) {
-    const { error } = await supabase.auth.signInWithPassword({ email, password })
-    if (error) throw error
+    const { data, error } = await supabase.auth.signInWithPassword({ email, password })
+    if (error) {
+      if (error.message.includes('Invalid login credentials')) {
+        throw new Error('邮箱或密码错误')
+      }
+      if (error.message.includes('Email not confirmed')) {
+        throw new Error('邮箱未确认，请先查收确认邮件')
+      }
+      throw error
+    }
+    user.value = data.user
+    await fetchProfile()
   }
 
   async function register(email: string, password: string, username: string) {
@@ -33,9 +45,18 @@ export const useAuthStore = defineStore('auth', () => {
       password,
       options: {
         data: { username },
+        emailRedirectTo: `${window.location.origin}/auth/confirm`,
       },
     })
-    if (error) throw error
+    if (error) {
+      if (error.message.includes('already registered')) {
+        throw new Error('该邮箱已被注册')
+      }
+      if (error.message.includes('Password')) {
+        throw new Error('密码强度不足，请使用至少6位密码')
+      }
+      throw error
+    }
   }
 
   async function logout() {
diff --git a/src/views/auth/AuthConfirmView.vue b/src/views/auth/AuthConfirmView.vue
new file mode 100644
index 0000000..13eef39
--- /dev/null
+++ b/src/views/auth/AuthConfirmView.vue
@@ -0,0 +1,106 @@
+<script setup lang="ts">
+import { ref, onMounted, onUnmounted } from 'vue'
+import { useRouter } from 'vue-router'
+import { createClient } from '@supabase/supabase-js'
+
+const router = useRouter()
+
+const state = ref<'loading' | 'success' | 'failed'>('loading')
+const countdown = ref(5)
+let countdownTimer: ReturnType<typeof setInterval> | null = null
+
+function startCountdown() {
+  countdownTimer = setInterval(() => {
+    countdown.value--
+    if (countdown.value <= 0) {
+      if (countdownTimer) clearInterval(countdownTimer)
+      router.push('/login')
+    }
+  }, 1000)
+}
+
+onMounted(async () => {
+  try {
+    const hash = window.location.hash.slice(1)
+    const params = new URLSearchParams(hash)
+    const accessToken = params.get('access_token')
+    const refreshToken = params.get('refresh_token')
+    const type = params.get('type')
+    const error = params.get('error')
+
+    if (error) {
+      state.value = 'failed'
+      return
+    }
+
+    if (type === 'signup' && accessToken && refreshToken) {
+      const confirmClient = createClient(
+        import.meta.env.VITE_SUPABASE_URL,
+        import.meta.env.VITE_SUPABASE_PUBLISHABLE_KEY,
+      )
+
+      const { error: setSessionError } = await confirmClient.auth.setSession({
+        access_token: accessToken,
+        refresh_token: refreshToken,
+      })
+
+      if (setSessionError) {
+        state.value = 'failed'
+        return
+      }
+
+      await confirmClient.auth.signOut()
+
+      window.history.replaceState(null, '', window.location.pathname)
+      state.value = 'success'
+      startCountdown()
+      return
+    }
+
+    state.value = 'failed'
+  } catch {
+    state.value = 'failed'
+  }
+})
+
+onUnmounted(() => {
+  if (countdownTimer) clearInterval(countdownTimer)
+})
+</script>
+
+<template>
+  <div class="flex items-center justify-center min-h-[calc(100vh-4rem)] px-4">
+    <div class="w-full max-w-sm text-center">
+      <template v-if="state === 'success'">
+        <span class="text-5xl block mb-4">✅</span>
+        <h1 class="text-2xl font-bold text-gray-900 mb-2">邮箱认证成功</h1>
+        <p class="text-gray-500 mb-2">你的邮箱已确认，现在可以登录了！</p>
+        <p class="text-sm text-gray-400 mb-6">{{ countdown }} 秒后自动跳转登录页面...</p>
+        <RouterLink
+          to="/login"
+          class="inline-flex items-center px-6 py-2.5 bg-sky-500 text-white font-medium rounded-lg hover:bg-sky-600 transition-colors"
+        >
+          立即登录
+        </RouterLink>
+      </template>
+
+      <template v-else-if="state === 'failed'">
+        <span class="text-5xl block mb-4">❌</span>
+        <h1 class="text-2xl font-bold text-gray-900 mb-2">认证失败</h1>
+        <p class="text-gray-500 mb-6">邮箱确认链接无效或已过期，请重新注册。</p>
+        <RouterLink
+          to="/register"
+          class="inline-flex items-center px-6 py-2.5 bg-sky-500 text-white font-medium rounded-lg hover:bg-sky-600 transition-colors"
+        >
+          重新注册
+        </RouterLink>
+      </template>
+
+      <template v-else>
+        <span class="text-5xl block mb-4 animate-pulse">⏳</span>
+        <h1 class="text-2xl font-bold text-gray-900 mb-2">正在验证...</h1>
+        <p class="text-gray-500">请稍候</p>
+      </template>
+    </div>
+  </div>
+</template>
diff --git a/src/views/auth/LoginView.vue b/src/views/auth/LoginView.vue
index f09632a..2b30125 100644
--- a/src/views/auth/LoginView.vue
+++ b/src/views/auth/LoginView.vue
@@ -20,7 +20,7 @@ async function handleLogin() {
     const redirect = (route.query.redirect as string) || '/'
     router.push(redirect)
   } catch (e: unknown) {
-    error.value = e instanceof Error ? e.message : '登录失败'
+    error.value = e instanceof Error ? e.message : '登录失败，请稍后重试'
   } finally {
     loading.value = false
   }
@@ -30,7 +30,11 @@ async function handleLogin() {
 <template>
   <div class="flex items-center justify-center min-h-[calc(100vh-4rem)] px-4">
     <div class="w-full max-w-sm">
-      <h1 class="text-2xl font-bold text-gray-900 text-center mb-8">登录 OpenCloud</h1>
+      <div class="text-center mb-8">
+        <span class="text-5xl block mb-4">☁️</span>
+        <h1 class="text-2xl font-bold text-gray-900">登录 OpenCloud</h1>
+        <p class="text-sm text-gray-500 mt-1">记录你眼中的每一朵云</p>
+      </div>
 
       <form @submit.prevent="handleLogin" class="space-y-4">
         <div>
@@ -39,8 +43,9 @@ async function handleLogin() {
             v-model="email"
             type="email"
             required
+            autocomplete="email"
             placeholder="your@email.com"
-            class="w-full px-3 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-sky-500 focus:border-transparent"
+            class="w-full px-3 py-2.5 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-sky-500 focus:border-transparent transition-colors"
           />
         </div>
 
@@ -50,17 +55,20 @@ async function handleLogin() {
             v-model="password"
             type="password"
             required
-            placeholder="至少8位"
-            class="w-full px-3 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-sky-500 focus:border-transparent"
+            autocomplete="current-password"
+            placeholder="输入密码"
+            class="w-full px-3 py-2.5 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-sky-500 focus:border-transparent transition-colors"
           />
         </div>
 
-        <p v-if="error" class="text-sm text-red-600">{{ error }}</p>
+        <div v-if="error" class="p-3 bg-red-50 border border-red-200 rounded-lg">
+          <p class="text-sm text-red-600">{{ error }}</p>
+        </div>
 
         <button
           type="submit"
           :disabled="loading"
-          class="w-full py-2.5 bg-sky-500 text-white font-medium rounded-lg hover:bg-sky-600 disabled:opacity-50 transition-colors"
+          class="w-full py-2.5 bg-sky-500 text-white font-medium rounded-lg hover:bg-sky-600 focus:outline-none focus:ring-2 focus:ring-sky-500 focus:ring-offset-2 disabled:opacity-50 transition-colors"
         >
           {{ loading ? '登录中...' : '登录' }}
         </button>
diff --git a/src/views/auth/RegisterView.vue b/src/views/auth/RegisterView.vue
index 4e8a8e3..5454047 100644
--- a/src/views/auth/RegisterView.vue
+++ b/src/views/auth/RegisterView.vue
@@ -1,10 +1,8 @@
 <script setup lang="ts">
 import { ref } from 'vue'
-import { useRouter } from 'vue-router'
 import { useAuthStore } from '@/stores/auth'
 
 const authStore = useAuthStore()
-const router = useRouter()
 
 const email = ref('')
 const password = ref('')
@@ -12,10 +10,19 @@ const confirmPassword = ref('')
 const username = ref('')
 const error = ref('')
 const loading = ref(false)
+const emailSent = ref(false)
 
 async function handleRegister() {
   error.value = ''
 
+  if (!username.value.trim()) {
+    error.value = '请输入用户名'
+    return
+  }
+  if (username.value.length > 20) {
+    error.value = '用户名不能超过20个字符'
+    return
+  }
   if (password.value.length < 8) {
     error.value = '密码至少8位'
     return
@@ -27,10 +34,10 @@ async function handleRegister() {
 
   loading.value = true
   try {
-    await authStore.register(email.value, password.value, username.value)
-    router.push('/')
+    await authStore.register(email.value, password.value, username.value.trim())
+    emailSent.value = true
   } catch (e: unknown) {
-    error.value = e instanceof Error ? e.message : '注册失败'
+    error.value = e instanceof Error ? e.message : '注册失败，请稍后重试'
   } finally {
     loading.value = false
   }
@@ -40,68 +47,96 @@ async function handleRegister() {
 <template>
   <div class="flex items-center justify-center min-h-[calc(100vh-4rem)] px-4">
     <div class="w-full max-w-sm">
-      <h1 class="text-2xl font-bold text-gray-900 text-center mb-8">注册 OpenCloud</h1>
-
-      <form @submit.prevent="handleRegister" class="space-y-4">
-        <div>
-          <label class="block text-sm font-medium text-gray-700 mb-1">用户名</label>
-          <input
-            v-model="username"
-            type="text"
-            required
-            placeholder="你的昵称"
-            class="w-full px-3 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-sky-500 focus:border-transparent"
-          />
-        </div>
-
-        <div>
-          <label class="block text-sm font-medium text-gray-700 mb-1">邮箱</label>
-          <input
-            v-model="email"
-            type="email"
-            required
-            placeholder="your@email.com"
-            class="w-full px-3 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-sky-500 focus:border-transparent"
-          />
-        </div>
-
-        <div>
-          <label class="block text-sm font-medium text-gray-700 mb-1">密码</label>
-          <input
-            v-model="password"
-            type="password"
-            required
-            placeholder="至少8位"
-            class="w-full px-3 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-sky-500 focus:border-transparent"
-          />
-        </div>
-
-        <div>
-          <label class="block text-sm font-medium text-gray-700 mb-1">确认密码</label>
-          <input
-            v-model="confirmPassword"
-            type="password"
-            required
-            placeholder="再次输入密码"
-            class="w-full px-3 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-sky-500 focus:border-transparent"
-          />
-        </div>
-
-        <p v-if="error" class="text-sm text-red-600">{{ error }}</p>
-
-        <button
-          type="submit"
-          :disabled="loading"
-          class="w-full py-2.5 bg-sky-500 text-white font-medium rounded-lg hover:bg-sky-600 disabled:opacity-50 transition-colors"
+      <div v-if="emailSent" class="text-center">
+        <span class="text-5xl block mb-4">📧</span>
+        <h1 class="text-2xl font-bold text-gray-900 mb-2">确认你的邮箱</h1>
+        <p class="text-gray-500 mb-6">
+          我们已向 <strong class="text-gray-700">{{ email }}</strong> 发送了确认邮件，请查收并点击确认链接完成注册。
+        </p>
+        <p class="text-sm text-gray-400 mb-6">没有收到？请检查垃圾邮件文件夹</p>
+        <RouterLink
+          to="/login"
+          class="inline-flex items-center px-6 py-2.5 bg-sky-500 text-white font-medium rounded-lg hover:bg-sky-600 transition-colors"
         >
-          {{ loading ? '注册中...' : '注册' }}
-        </button>
-      </form>
+          去登录
+        </RouterLink>
+      </div>
 
-      <p class="mt-6 text-center text-sm text-gray-500">
-        已有账号？
-        <RouterLink to="/login" class="text-sky-600 hover:text-sky-700 font-medium">去登录</RouterLink>
-      </p>
+      <template v-else>
+        <div class="text-center mb-8">
+          <span class="text-5xl block mb-4">☁️</span>
+          <h1 class="text-2xl font-bold text-gray-900">注册 OpenCloud</h1>
+          <p class="text-sm text-gray-500 mt-1">加入天空探索者社区</p>
+        </div>
+
+        <form @submit.prevent="handleRegister" class="space-y-4">
+          <div>
+            <label class="block text-sm font-medium text-gray-700 mb-1">用户名</label>
+            <input
+              v-model="username"
+              type="text"
+              required
+              autocomplete="username"
+              placeholder="你的昵称"
+              maxlength="20"
+              class="w-full px-3 py-2.5 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-sky-500 focus:border-transparent transition-colors"
+            />
+          </div>
+
+          <div>
+            <label class="block text-sm font-medium text-gray-700 mb-1">邮箱</label>
+            <input
+              v-model="email"
+              type="email"
+              required
+              autocomplete="email"
+              placeholder="your@email.com"
+              class="w-full px-3 py-2.5 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-sky-500 focus:border-transparent transition-colors"
+            />
+          </div>
+
+          <div>
+            <label class="block text-sm font-medium text-gray-700 mb-1">密码</label>
+            <input
+              v-model="password"
+              type="password"
+              required
+              autocomplete="new-password"
+              placeholder="至少8位"
+              class="w-full px-3 py-2.5 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-sky-500 focus:border-transparent transition-colors"
+            />
+          </div>
+
+          <div>
+            <label class="block text-sm font-medium text-gray-700 mb-1">确认密码</label>
+            <input
+              v-model="confirmPassword"
+              type="password"
+              required
+              autocomplete="new-password"
+              placeholder="再次输入密码"
+              class="w-full px-3 py-2.5 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-sky-500 focus:border-transparent transition-colors"
+            />
+          </div>
+
+          <div v-if="error" class="p-3 bg-red-50 border border-red-200 rounded-lg">
+            <p class="text-sm text-red-600">{{ error }}</p>
+          </div>
+
+          <button
+            type="submit"
+            :disabled="loading"
+            class="w-full py-2.5 bg-sky-500 text-white font-medium rounded-lg hover:bg-sky-600 focus:outline-none focus:ring-2 focus:ring-sky-500 focus:ring-offset-2 disabled:opacity-50 transition-colors"
+          >
+            {{ loading ? '注册中...' : '注册' }}
+          </button>
+        </form>
+
+        <p class="mt-6 text-center text-sm text-gray-500">
+          已有账号？
+          <RouterLink to="/login" class="text-sky-600 hover:text-sky-700 font-medium">去登录</RouterLink>
+        </p>
+      </template>
     </div>
   </div>
 </template>