From 6561e9034bff5045f342d8dea7950bed7c18c202 Mon Sep 17 00:00:00 2001
From: H1d3rOne <H1d3rOne@users.noreply.github.com>
Date: Tue, 10 Mar 2026 01:37:24 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=8C=E5=96=84=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E6=8E=88=E6=9D=83=E7=99=BB=E5=BD=95=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增半屏授权登录窗口，从底部滑出
- 支持微信头像和昵称选择
- 新用户注册默认3个金币
- 新增注销账号功能，从数据库删除用户
- 删除旧的授权登录页面
- 退出登录和注销后跳转首页
- 优化登录交互体验
---
 .../java/xuan/controller/UserController.java  |  21 +
 .../java/xuan/service/UserInfoService.java    |  15 +-
 xuan-deduct-uniapp/src/App.vue                | 158 ++---
 .../src/components/auth-modal/auth-modal.vue  | 563 +++++++++++++-----
 xuan-deduct-uniapp/src/manifest.json          |   3 +-
 xuan-deduct-uniapp/src/pages.json             |   8 -
 xuan-deduct-uniapp/src/pages/auth/auth.vue    | 283 ---------
 xuan-deduct-uniapp/src/pages/index/index.vue  |  49 +-
 xuan-deduct-uniapp/src/pages/mine/account.vue |  47 +-
 xuan-deduct-uniapp/src/pages/mine/mine.vue    |   2 +-
 xuan-deduct-uniapp/src/utils/api.js           |   7 +
 11 files changed, 593 insertions(+), 563 deletions(-)
 delete mode 100644 xuan-deduct-uniapp/src/pages/auth/auth.vue

diff --git a/src/main/java/xuan/controller/UserController.java b/src/main/java/xuan/controller/UserController.java
index 31f1155..851b8dc 100644
--- a/src/main/java/xuan/controller/UserController.java
+++ b/src/main/java/xuan/controller/UserController.java
@@ -245,4 +245,25 @@ public class UserController {
         }
         return result;
     }
+    
+    @PostMapping("/deleteAccount")
+    public Map<String, Object> deleteAccount(@RequestBody Map<String, Object> params) {
+        Map<String, Object> result = new HashMap<>();
+        try {
+            String userId = params.get("userId").toString();
+            
+            boolean deleted = userInfoService.deleteAccount(userId);
+            if (deleted) {
+                result.put("success", true);
+                result.put("message", "账号已注销");
+            } else {
+                result.put("success", false);
+                result.put("error", "用户不存在");
+            }
+        } catch (Exception e) {
+            result.put("success", false);
+            result.put("error", e.getMessage());
+        }
+        return result;
+    }
 }
diff --git a/src/main/java/xuan/service/UserInfoService.java b/src/main/java/xuan/service/UserInfoService.java
index f667861..71038e2 100644
--- a/src/main/java/xuan/service/UserInfoService.java
+++ b/src/main/java/xuan/service/UserInfoService.java
@@ -16,7 +16,9 @@ public class UserInfoService {
     public UserInfo loginOrRegister(String openId, String nickname, String avatarUrl) {
         UserInfo user = userInfoRepository.findByOpenId(openId);
         if (user != null) {
-            return user;
+            user.setNickname(nickname);
+            user.setAvatarUrl(avatarUrl);
+            return userInfoRepository.save(user);
         }
         
         user = new UserInfo();
@@ -26,7 +28,7 @@ public class UserInfoService {
         user.setUsername(generateUsername());
         user.setUserId(generateUserId());
         user.setVipLevel(0);
-        user.setCoins(10);
+        user.setCoins(3);
         user.setStreakDays(0);
         
         return userInfoRepository.save(user);
@@ -108,6 +110,15 @@ public class UserInfoService {
         return null;
     }
     
+    public boolean deleteAccount(String userId) {
+        UserInfo user = userInfoRepository.findByUserId(userId);
+        if (user != null) {
+            userInfoRepository.delete(user);
+            return true;
+        }
+        return false;
+    }
+    
     private String generateUsername() {
         String prefix = "玄机用户";
         String suffix = generateRandomString(6);
diff --git a/xuan-deduct-uniapp/src/App.vue b/xuan-deduct-uniapp/src/App.vue
index aff7a6a..e758b8b 100644
--- a/xuan-deduct-uniapp/src/App.vue
+++ b/xuan-deduct-uniapp/src/App.vue
@@ -1,21 +1,11 @@
 <script>
-import AuthModal from '@/components/auth-modal/auth-modal.vue'
 import authCheck from '@/utils/authCheck.js'
 
 export default {
-  components: {
-    AuthModal
-  },
-  data() {
-    return {
-      showAuthModal: false,
-      isCheckingClick: false
-    }
-  },
   onLaunch: function() {
     console.log('App Launch')
-    this.checkUserAuth()
     this.setupGlobalListeners()
+    this.setupRouteInterceptor()
   },
   onShow: function() {
     console.log('App Show')
@@ -25,90 +15,77 @@ export default {
     this.removeGlobalListeners()
   },
   methods: {
+    setupRouteInterceptor() {
+      const self = this
+      
+      uni.addInterceptor('switchTab', {
+        invoke(e) {
+          console.log('拦截switchTab:', e.url)
+          
+          if (authCheck.isLoggedIn()) {
+            return true
+          }
+          
+          self.showLoginPrompt()
+          return false
+        }
+      })
+      
+      uni.addInterceptor('navigateTo', {
+        invoke(e) {
+          console.log('拦截navigateTo:', e.url)
+          
+          if (authCheck.isLoggedIn()) {
+            return true
+          }
+          
+          self.showLoginPrompt()
+          return false
+        }
+      })
+      
+      uni.addInterceptor('redirectTo', {
+        invoke(e) {
+          console.log('拦截redirectTo:', e.url)
+          
+          if (authCheck.isLoggedIn()) {
+            return true
+          }
+          
+          self.showLoginPrompt()
+          return false
+        }
+      })
+    },
+    
+    showLoginPrompt() {
+      uni.showModal({
+        title: '未登录',
+        content: '请先登录后再使用',
+        confirmText: '去登录',
+        cancelText: '取消',
+        success: (res) => {
+          if (res.confirm) {
+            console.log('用户点击去登录，发送showAuthModal事件')
+            uni.$emit('showAuthModal')
+          }
+        }
+      })
+    },
+    
     setupGlobalListeners() {
       uni.$on('showAuthModal', () => {
-        console.log('收到showAuthModal事件，显示授权窗口')
-        this.showAuthModal = true
+        console.log('App收到showAuthModal事件')
       })
       
       uni.$on('hideAuthModal', () => {
-        console.log('收到hideAuthModal事件，隐藏授权窗口')
-        this.showAuthModal = false
+        console.log('App收到hideAuthModal事件')
       })
     },
     
     removeGlobalListeners() {
       uni.$off('showAuthModal')
       uni.$off('hideAuthModal')
-    },
-    
-    handleGlobalClick(e) {
-      if (this.showAuthModal) return
-      if (this.isCheckingClick) return
-      
-      if (!authCheck.isLoggedIn()) {
-        this.isCheckingClick = true
-        
-        uni.showModal({
-          title: '未登录',
-          content: '请先登录后再使用',
-          confirmText: '去登录',
-          cancelText: '取消',
-          success: (res) => {
-            this.isCheckingClick = false
-            if (res.confirm) {
-              this.showAuthModal = true
-            }
-          },
-          fail: () => {
-            this.isCheckingClick = false
-          }
-        })
-      }
-    },
-    
-    checkUserAuth() {
-      const userInfo = uni.getStorageSync('userInfo')
-      const hasShownAuth = uni.getStorageSync('hasShownAuth')
-      
-      console.log('检查用户授权状态:', {
-        hasUserInfo: !!userInfo,
-        hasShownAuth: hasShownAuth
-      })
-      
-      if (!userInfo && !hasShownAuth) {
-        console.log('首次使用，显示授权模态窗口')
-        uni.setStorageSync('hasShownAuth', true)
-        setTimeout(() => {
-          this.showAuthModal = true
-        }, 500)
-      } else if (userInfo) {
-        console.log('用户已登录')
-      } else {
-        console.log('用户跳过了授权')
-      }
-    },
-    
-    onAuthSuccess(userInfo) {
-      console.log('授权成功:', userInfo)
-      this.showAuthModal = false
-      uni.showToast({
-        title: '登录成功',
-        icon: 'success'
-      })
-    },
-    
-    onAuthCancel() {
-      console.log('用户取消授权')
-      this.showAuthModal = false
-    },
-    
-    onAuthError(error) {
-      console.error('授权失败:', error)
-      uni.showToast({
-        title: '授权失败，请重试',
-        icon: 'none'
-      })
     }
   },
   globalData: {
@@ -124,19 +101,6 @@ export default {
 }
 </script>
 
-<template>
-  <view @click="handleGlobalClick">
-    <router-view />
-    <auth-modal 
-      :visible="showAuthModal" 
-      @success="onAuthSuccess"
-      @cancel="onAuthCancel"
-      @error="onAuthError"
-      @update:visible="showAuthModal = $event"
-    />
-  </view>
-</template>
-
 <style>
 page {
   background-color: #f5f5f5;
diff --git a/xuan-deduct-uniapp/src/components/auth-modal/auth-modal.vue b/xuan-deduct-uniapp/src/components/auth-modal/auth-modal.vue
index 567b60d..2094df5 100644
--- a/xuan-deduct-uniapp/src/components/auth-modal/auth-modal.vue
+++ b/xuan-deduct-uniapp/src/components/auth-modal/auth-modal.vue
@@ -1,29 +1,96 @@
 <template>
-  <view class="auth-modal-overlay" v-if="visible" @click="handleOverlayClick">
-    <view class="auth-modal" :class="{ 'auth-modal-show': showAnimation }" @click.stop>
-      <view class="modal-header">
-        <view class="modal-icon">
-          <text class="icon-text">🔐</text>
+  <view class="auth-container" v-show="visible">
+    <view 
+      class="auth-overlay" 
+      :class="{ 'overlay-show': showAnimation }"
+      @click="handleOverlayClick"
+    ></view>
+    
+    <view 
+      class="auth-panel" 
+      :class="{ 'panel-show': showAnimation }"
+      @click.stop
+    >
+      <view class="panel-handle"></view>
+      
+      <view class="panel-header">
+        <view class="header-icon">
+          <image v-if="avatarUrl" :src="avatarUrl" class="header-avatar" mode="aspectFill"></image>
+          <text v-else class="icon-emoji">🔐</text>
         </view>
-        <text class="modal-title">微信授权登录</text>
-        <text class="modal-subtitle">获取微信头像和昵称</text>
+        <text class="header-title">微信授权登录</text>
+        <text class="header-subtitle">{{ getStatusText() }}</text>
       </view>
       
-      <view class="modal-content">
-        <button class="wechat-auth-btn" open-type="chooseAvatar" @chooseavatar="onChooseAvatar" @error="onChooseAvatarError">
-          <view class="btn-icon">
-            <text class="wechat-icon-text">👤</text>
+      <view class="panel-body">
+        <!-- 未选择头像时：显示授权按钮 -->
+        <view v-if="!avatarUrl" class="step-content">
+          <view class="auth-tips">
+            <view class="tip-item">
+              <text class="tip-icon">1</text>
+              <text class="tip-text">选择您的微信头像</text>
+            </view>
+            <view class="tip-item">
+              <text class="tip-icon">2</text>
+              <text class="tip-text">选择您的微信昵称</text>
+            </view>
           </view>
-          <text class="btn-text">微信授权登录</text>
-        </button>
+          
+          <button class="auth-btn wechat-btn" open-type="chooseAvatar" @chooseavatar="onChooseAvatar">
+            <text class="btn-icon">👤</text>
+            <text class="btn-text">选择微信头像</text>
+          </button>
+          
+          <button class="auth-btn cancel-btn" @click="handleCancel">
+            <text class="cancel-text">取消登录</text>
+          </button>
+        </view>
         
-        <button class="cancel-btn" @click="handleCancel">
-          <text class="cancel-btn-text">取消登录</text>
-        </button>
+        <!-- 已选择头像：显示用户信息卡片 -->
+        <view v-else class="step-content">
+          <view class="user-info-card" :class="{ 'card-complete': nickname }">
+            <view class="avatar-wrapper">
+              <image :src="avatarUrl" class="user-avatar" mode="aspectFill"></image>
+              <view class="avatar-badge">✓</view>
+            </view>
+            <view class="user-info" @click="handleUserInfoClick">
+              <view class="nickname-row">
+                <input 
+                  class="nickname-input" 
+                  type="nickname" 
+                  placeholder="输入昵称或选择微信昵称"
+                  :focus="nicknameFocus"
+                  v-show="!nickname"
+                  @input="onNicknameInput"
+                  @blur="onNicknameBlur"
+                />
+                <text class="nickname-text" v-show="nickname">{{ nickname }}</text>
+              </view>
+              <text class="user-tip" v-if="!nickname">点击输入框输入或选择昵称</text>
+              <text class="user-tip complete" v-else>点击下方按钮确认登录</text>
+            </view>
+            <view class="action-indicator">
+              <text v-if="!nickname" class="add-icon">+</text>
+              <text v-else class="confirm-icon">✓</text>
+            </view>
+          </view>
+          
+          <button 
+            class="auth-btn confirm-btn" 
+            @click="handleConfirmLogin"
+            :disabled="!nickname || loading"
+          >
+            <text class="btn-text">{{ loading ? '登录中...' : '确认登录' }}</text>
+          </button>
+          
+          <button class="auth-btn back-btn" @click="resetSelection">
+            <text class="back-text">重新选择</text>
+          </button>
+        </view>
       </view>
       
-      <view class="modal-footer">
-        <text class="footer-text">授权后即可使用完整功能</text>
+      <view class="panel-footer">
+        <text class="footer-text">登录即表示同意《用户协议》和《隐私政策》</text>
       </view>
     </view>
   </view>
@@ -45,12 +112,16 @@ export default {
       showAnimation: false,
       avatarUrl: '',
       nickname: '',
+      nicknameFocus: false,
       loading: false
     }
   },
   watch: {
     visible(val) {
+      console.log('AuthModal visible changed:', val)
       if (val) {
+        this.avatarUrl = ''
+        this.nickname = ''
         setTimeout(() => {
           this.showAnimation = true
         }, 50)
@@ -60,8 +131,32 @@ export default {
     }
   },
   methods: {
+    getStatusText() {
+      if (!this.avatarUrl) {
+        return '请选择您的微信头像开始授权'
+      }
+      if (!this.nickname) {
+        return '请选择您的微信昵称完成授权'
+      }
+      return '点击用户信息或确认按钮完成登录'
+    },
+    
     handleOverlayClick() {
-      this.handleCancel()
+      if (!this.loading) {
+        this.handleCancel()
+      }
+    },
+    
+    resetSelection() {
+      this.avatarUrl = ''
+      this.nickname = ''
+    },
+    
+    handleUserInfoClick() {
+      console.log('handleUserInfoClick', this.nickname)
+      if (!this.nickname) {
+        this.nicknameFocus = true
+      }
     },
     
     onChooseAvatar(e) {
@@ -69,53 +164,33 @@ export default {
       const { avatarUrl } = e.detail
       if (avatarUrl) {
         this.avatarUrl = avatarUrl
-        this.showNicknameInput()
       }
     },
     
-    onChooseAvatarError(e) {
-      console.log('选择头像错误:', e)
-      const { errMsg } = e.detail
-      if (errMsg && errMsg.includes('cancel')) {
-        console.log('用户取消了选择头像')
-      } else {
-        uni.showToast({
-          title: '选择头像失败，请重试',
-          icon: 'none'
-        })
+    onNicknameInput(e) {
+      console.log('输入昵称:', e.detail.value)
+      const value = e.detail.value
+      if (value) {
+        this.nickname = value
+        this.nicknameFocus = false
+        setTimeout(() => {
+          uni.hideKeyboard()
+        }, 100)
       }
     },
     
-    showNicknameInput() {
-      uni.showModal({
-        title: '设置昵称',
-        editable: true,
-        placeholderText: '请输入昵称',
-        success: (res) => {
-          if (res.confirm && res.content) {
-            this.nickname = res.content
-            this.doAuth()
-          } else if (res.confirm) {
-            uni.showToast({
-              title: '请输入昵称',
-              icon: 'none'
-            })
-            setTimeout(() => {
-              this.showNicknameInput()
-            }, 1500)
-          }
-        }
-      })
+    onNicknameBlur() {
+      this.nicknameFocus = false
     },
     
-    async doAuth() {
+    async handleConfirmLogin() {
+      if (this.loading) return
       if (!this.avatarUrl) {
         uni.showToast({ title: '请选择头像', icon: 'none' })
         return
       }
-      
       if (!this.nickname) {
-        uni.showToast({ title: '请输入昵称', icon: 'none' })
+        uni.showToast({ title: '请选择昵称', icon: 'none' })
         return
       }
       
@@ -146,14 +221,14 @@ export default {
           
           uni.setStorageSync('userId', res.data.userId)
           uni.setStorageSync('userInfo', JSON.stringify(res.data))
-          uni.setStorageSync('userCoins', res.data.coins || 10)
+          uni.setStorageSync('userCoins', res.data.coins || 3)
           uni.setStorageSync('vipLevel', res.data.vipLevel || 0)
-          uni.setStorageSync('username', res.data.username || res.data.nickname)
-          uni.setStorageSync('userAvatar', res.data.avatarUrl)
+          uni.setStorageSync('username', res.data.nickname || this.nickname)
+          uni.setStorageSync('userAvatar', res.data.avatarUrl || this.avatarUrl)
           uni.setStorageSync('isLoggedIn', true)
           
           uni.showToast({ 
-            title: '授权成功', 
+            title: '登录成功', 
             icon: 'success',
             duration: 2000
           })
@@ -177,165 +252,345 @@ export default {
     },
     
     handleCancel() {
-      uni.showModal({
-        title: '提示',
-        content: '取消登录将无法使用完整功能，确定要取消吗？',
-        confirmText: '确定取消',
-        cancelText: '继续登录',
-        success: (res) => {
-          if (res.confirm) {
-            this.$emit('cancel')
-            this.$emit('update:visible', false)
-          }
-        }
-      })
+      this.showAnimation = false
+      setTimeout(() => {
+        this.$emit('cancel')
+        this.$emit('update:visible', false)
+      }, 400)
     }
   }
 }
 </script>
 
-<style>
-.auth-modal-overlay {
+<style scoped>
+.auth-container {
   position: fixed;
   top: 0;
   left: 0;
-  right: 0;
-  bottom: 0;
-  background: rgba(0, 0, 0, 0.5);
-  z-index: 9999;
-  display: flex;
-  align-items: flex-end;
-  justify-content: center;
-  animation: fadeIn 0.3s ease;
-}
-
-@keyframes fadeIn {
-  from {
-    opacity: 0;
-  }
-  to {
-    opacity: 1;
-  }
-}
-
-.auth-modal {
   width: 100%;
-  height: 70vh;
+  height: 100%;
+  z-index: 9999;
+}
+
+.auth-overlay {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0);
+  transition: background 0.4s ease;
+}
+
+.auth-overlay.overlay-show {
+  background: rgba(0, 0, 0, 0.5);
+}
+
+.auth-panel {
+  position: absolute;
+  left: 0;
+  bottom: 0;
+  width: 100%;
+  height: 50vh;
   background: #ffffff;
-  border-radius: 32rpx 32rpx 0 0;
-  overflow: hidden;
-  box-shadow: 0 -10rpx 40rpx rgba(0, 0, 0, 0.2);
+  border-radius: 40rpx 40rpx 0 0;
+  box-shadow: 0 -8rpx 40rpx rgba(0, 0, 0, 0.15);
   transform: translateY(100%);
-  transition: transform 0.4s cubic-bezier(0.34, 1.56, 0.64, 1);
+  transition: transform 0.4s cubic-bezier(0.25, 0.46, 0.45, 0.94);
   display: flex;
   flex-direction: column;
+  overflow: hidden;
 }
 
-.auth-modal-show {
+.auth-panel.panel-show {
   transform: translateY(0);
 }
 
-.modal-header {
-  background: linear-gradient(135deg, #10B981 0%, #059669 100%);
-  padding: 80rpx 32rpx 60rpx;
+.panel-handle {
+  width: 80rpx;
+  height: 8rpx;
+  background: #E5E7EB;
+  border-radius: 4rpx;
+  margin: 24rpx auto 0;
+  flex-shrink: 0;
+}
+
+.panel-header {
+  padding: 20rpx 40rpx 30rpx;
   text-align: center;
   flex-shrink: 0;
 }
 
-.modal-icon {
-  width: 96rpx;
-  height: 96rpx;
-  background: rgba(255, 255, 255, 0.2);
-  border-radius: 24rpx;
+.header-icon {
+  width: 100rpx;
+  height: 100rpx;
+  background: linear-gradient(135deg, #10B981 0%, #059669 100%);
+  border-radius: 50%;
   display: flex;
   align-items: center;
   justify-content: center;
-  margin: 0 auto 24rpx;
+  margin: 0 auto 20rpx;
+  box-shadow: 0 8rpx 24rpx rgba(16, 185, 129, 0.3);
+  overflow: hidden;
 }
 
-.icon-text {
+.header-avatar {
+  width: 100rpx;
+  height: 100rpx;
+  border-radius: 50%;
+}
+
+.icon-emoji {
   font-size: 48rpx;
 }
 
-.modal-title {
-  font-size: 40rpx;
+.header-title {
+  font-size: 34rpx;
   font-weight: 700;
-  color: #ffffff;
+  color: #1F2937;
   display: block;
-  margin-bottom: 12rpx;
+  margin-bottom: 8rpx;
 }
 
-.modal-subtitle {
-  font-size: 24rpx;
-  color: rgba(255, 255, 255, 0.8);
+.header-subtitle {
+  font-size: 26rpx;
+  color: #6B7280;
 }
 
-.modal-content {
-  padding: 60rpx 32rpx;
+.panel-body {
+  flex: 1;
+  padding: 0 40rpx;
+  display: flex;
+  flex-direction: column;
+}
+
+.step-content {
   flex: 1;
   display: flex;
   flex-direction: column;
-  justify-content: center;
 }
 
-.wechat-auth-btn {
+.auth-tips {
+  margin-bottom: 30rpx;
+}
+
+.tip-item {
+  display: flex;
+  align-items: center;
+  margin-bottom: 16rpx;
+}
+
+.tip-icon {
+  width: 40rpx;
+  height: 40rpx;
   background: linear-gradient(135deg, #07C160 0%, #06AD56 100%);
-  border-radius: 24rpx;
-  padding: 32rpx;
+  color: #ffffff;
+  border-radius: 50%;
   display: flex;
   align-items: center;
   justify-content: center;
-  margin-bottom: 24rpx;
-  box-shadow: 0 12rpx 32rpx rgba(7, 193, 96, 0.3);
-  border: none;
-  width: 100%;
+  font-size: 24rpx;
+  font-weight: bold;
+  margin-right: 16rpx;
 }
 
-.wechat-auth-btn::after {
+.tip-text {
+  font-size: 28rpx;
+  color: #4B5563;
+}
+
+.user-info-card {
+  display: flex;
+  align-items: center;
+  padding: 24rpx;
+  background: #F9FAFB;
+  border-radius: 20rpx;
+  margin-bottom: 30rpx;
+  border: 2rpx solid #E5E7EB;
+  transition: all 0.3s ease;
+}
+
+.user-info-card:active {
+  background: #F3F4F6;
+}
+
+.user-info-card.card-complete {
+  border-color: #10B981;
+  background: #ECFDF5;
+}
+
+.avatar-wrapper {
+  position: relative;
+  flex-shrink: 0;
+}
+
+.user-avatar {
+  width: 100rpx;
+  height: 100rpx;
+  border-radius: 50%;
+}
+
+.avatar-badge {
+  position: absolute;
+  bottom: 0;
+  right: 0;
+  width: 32rpx;
+  height: 32rpx;
+  background: #10B981;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: #ffffff;
+  font-size: 18rpx;
+  font-weight: bold;
+  border: 4rpx solid #ffffff;
+}
+
+.user-info {
+  flex: 1;
+  margin-left: 20rpx;
+}
+
+.nickname-row {
+  display: flex;
+  align-items: center;
+}
+
+.nickname-input {
+  flex: 1;
+  height: 56rpx;
+  font-size: 28rpx;
+  color: #1F2937;
+  background: transparent;
+  padding: 0;
+}
+
+.nickname-text {
+  font-size: 32rpx;
+  font-weight: 600;
+  color: #1F2937;
+}
+
+.user-tip {
+  font-size: 22rpx;
+  color: #9CA3AF;
+  margin-top: 8rpx;
+}
+
+.user-tip.complete {
+  color: #10B981;
+  font-weight: 500;
+}
+
+.action-indicator {
+  width: 48rpx;
+  height: 48rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-shrink: 0;
+}
+
+.add-icon {
+  font-size: 36rpx;
+  color: #9CA3AF;
+  font-weight: 300;
+}
+
+.confirm-icon {
+  font-size: 36rpx;
+  color: #10B981;
+  font-weight: bold;
+}
+
+.auth-btn {
+  width: 100%;
+  height: 88rpx;
+  border-radius: 44rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 30rpx;
+  font-weight: 600;
   border: none;
+  padding: 0;
+  margin: 0;
+  line-height: normal;
+}
+
+.auth-btn::after {
+  border: none;
+}
+
+.wechat-btn {
+  background: linear-gradient(135deg, #07C160 0%, #06AD56 100%);
+  color: #ffffff;
+  box-shadow: 0 8rpx 24rpx rgba(7, 193, 96, 0.3);
+  margin-bottom: 20rpx;
+}
+
+.wechat-btn:active {
+  opacity: 0.9;
+}
+
+.confirm-btn {
+  background: linear-gradient(135deg, #07C160 0%, #06AD56 100%);
+  color: #ffffff;
+  box-shadow: 0 8rpx 24rpx rgba(7, 193, 96, 0.3);
+  margin-bottom: 16rpx;
+}
+
+.confirm-btn:active {
+  opacity: 0.9;
+}
+
+.confirm-btn[disabled] {
+  opacity: 0.5;
 }
 
 .btn-icon {
-  width: 48rpx;
-  height: 48rpx;
-  margin-right: 16rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-.wechat-icon-text {
-  font-size: 36rpx;
+  font-size: 32rpx;
+  margin-right: 10rpx;
 }
 
 .btn-text {
-  font-size: 32rpx;
-  color: #ffffff;
+  font-size: 30rpx;
   font-weight: 600;
 }
 
 .cancel-btn {
-  background: transparent;
-  border-radius: 24rpx;
-  padding: 32rpx;
-  text-align: center;
-  border: 2rpx solid #D1D5DB;
-  width: 100%;
-}
-
-.cancel-btn::after {
-  border: none;
-}
-
-.cancel-btn-text {
-  font-size: 32rpx;
+  background: #F3F4F6;
   color: #6B7280;
-  font-weight: 600;
 }
 
-.modal-footer {
-  padding: 24rpx 32rpx 32rpx;
+.cancel-btn:active {
+  background: #E5E7EB;
+}
+
+.cancel-text {
+  font-size: 28rpx;
+  font-weight: 500;
+}
+
+.back-btn {
+  background: #F3F4F6;
+  color: #6B7280;
+}
+
+.back-btn:active {
+  background: #E5E7EB;
+}
+
+.back-text {
+  font-size: 28rpx;
+  font-weight: 500;
+}
+
+.panel-footer {
+  padding: 20rpx 40rpx;
   text-align: center;
+  flex-shrink: 0;
   background: #F9FAFB;
 }
 
diff --git a/xuan-deduct-uniapp/src/manifest.json b/xuan-deduct-uniapp/src/manifest.json
index 6666151..a1e9f5c 100644
--- a/xuan-deduct-uniapp/src/manifest.json
+++ b/xuan-deduct-uniapp/src/manifest.json
@@ -20,8 +20,7 @@
     "requiredPrivateInfos": [],
     "optimization": {
       "subPackages": true
-    },
-    "runmode": "librun"
+    }
   },
   "h5": {
     "title": "排盘工具",
diff --git a/xuan-deduct-uniapp/src/pages.json b/xuan-deduct-uniapp/src/pages.json
index 4e49eab..f5e2a8a 100644
--- a/xuan-deduct-uniapp/src/pages.json
+++ b/xuan-deduct-uniapp/src/pages.json
@@ -1,13 +1,5 @@
 {
   "pages": [
-    {
-      "path": "pages/auth/auth",
-      "style": {
-        "navigationBarTitleText": "授权登录",
-        "navigationBarBackgroundColor": "#10B981",
-        "navigationBarTextStyle": "white"
-      }
-    },
     {
       "path": "pages/index/index",
       "style": {
diff --git a/xuan-deduct-uniapp/src/pages/auth/auth.vue b/xuan-deduct-uniapp/src/pages/auth/auth.vue
deleted file mode 100644
index bbbd02a..0000000
--- a/xuan-deduct-uniapp/src/pages/auth/auth.vue
+++ /dev/null
@@ -1,283 +0,0 @@
-<template>
-  <view class="container">
-    <view class="header-card">
-      <view class="header-icon">
-        <text class="icon-text">🔐</text>
-      </view>
-      <text class="header-title">授权登录</text>
-      <text class="header-subtitle">获取微信头像和昵称</text>
-    </view>
-    
-    <view class="auth-card">
-      <button class="auth-btn" open-type="chooseAvatar" @chooseavatar="onChooseAvatar">
-        <text class="auth-btn-text">微信授权登录</text>
-      </button>
-      
-      <button class="cancel-btn" @click="cancelAuth">
-        <text class="cancel-btn-text">取消登录</text>
-      </button>
-    </view>
-    
-    <view class="tips-card">
-      <text class="tips-title">💡 授权说明</text>
-      <text class="tips-content">• 点击"微信授权登录"按钮
-• 选择微信头像或从相册选择
-• 输入或获取微信昵称
-• 完成授权即可使用完整功能</text>
-    </view>
-  </view>
-</template>
-
-<script>
-import api from '@/utils/api.js'
-
-export default {
-  data() {
-    return {
-      avatarUrl: '',
-      nickname: '',
-      loading: false
-    }
-  },
-  methods: {
-    onChooseAvatar(e) {
-      console.log('选择头像:', e)
-      const { avatarUrl } = e.detail
-      if (avatarUrl) {
-        this.avatarUrl = avatarUrl
-        this.showNicknameInput()
-      }
-    },
-    
-    showNicknameInput() {
-      uni.showModal({
-        title: '设置昵称',
-        editable: true,
-        placeholderText: '请输入昵称',
-        success: (res) => {
-          if (res.confirm && res.content) {
-            this.nickname = res.content
-            this.doAuth()
-          } else if (res.confirm) {
-            uni.showToast({
-              title: '请输入昵称',
-              icon: 'none'
-            })
-            setTimeout(() => {
-              this.showNicknameInput()
-            }, 1500)
-          }
-        }
-      })
-    },
-    
-    async doAuth() {
-      if (!this.avatarUrl) {
-        uni.showToast({ title: '请选择头像', icon: 'none' })
-        return
-      }
-      
-      if (!this.nickname) {
-        uni.showToast({ title: '请输入昵称', icon: 'none' })
-        return
-      }
-      
-      this.loading = true
-      
-      try {
-        const loginRes = await new Promise((resolve, reject) => {
-          uni.login({
-            success: resolve,
-            fail: reject
-          })
-        })
-        
-        if (!loginRes.code) {
-          throw new Error('获取授权失败')
-        }
-        
-        console.log('获取code成功:', loginRes.code)
-        
-        const res = await api.userApi.loginOrRegister({
-          code: loginRes.code,
-          nickname: this.nickname,
-          avatarUrl: this.avatarUrl
-        })
-        
-        if (res.success) {
-          console.log('登录成功:', res.data)
-          
-          uni.setStorageSync('userId', res.data.userId)
-          uni.setStorageSync('userInfo', JSON.stringify(res.data))
-          uni.setStorageSync('userCoins', res.data.coins || 10)
-          uni.setStorageSync('vipLevel', res.data.vipLevel || 0)
-          uni.setStorageSync('username', res.data.username || res.data.nickname)
-          uni.setStorageSync('userAvatar', res.data.avatarUrl)
-          
-          uni.showToast({ 
-            title: '授权成功', 
-            icon: 'success',
-            duration: 2000
-          })
-          
-          setTimeout(() => {
-            uni.switchTab({ url: '/pages/index/index' })
-          }, 2000)
-        } else {
-          throw new Error(res.error || '登录失败')
-        }
-      } catch (err) {
-        console.error('登录失败:', err)
-        uni.showToast({ 
-          title: err.message || '授权失败，请重试', 
-          icon: 'none',
-          duration: 3000
-        })
-      } finally {
-        this.loading = false
-      }
-    },
-    
-    cancelAuth() {
-      uni.showModal({
-        title: '提示',
-        content: '取消登录将无法使用完整功能，确定要取消吗？',
-        confirmText: '确定取消',
-        cancelText: '继续登录',
-        success: (res) => {
-          if (res.confirm) {
-            uni.switchTab({ url: '/pages/index/index' })
-          }
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style>
-page {
-  background: linear-gradient(180deg, #ECFDF5 0%, #D1FAE5 50%, #A7F3D0 100%);
-  min-height: 100vh;
-}
-
-.container {
-  min-height: 100vh;
-  padding: 32rpx;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-}
-
-.header-card {
-  background: linear-gradient(135deg, #10B981 0%, #059669 100%);
-  border-radius: 32rpx;
-  padding: 48rpx 32rpx;
-  text-align: center;
-  margin-bottom: 32rpx;
-  box-shadow: 0 16rpx 48rpx rgba(16, 185, 129, 0.25);
-  width: 100%;
-}
-
-.header-icon {
-  width: 96rpx;
-  height: 96rpx;
-  background: rgba(255, 255, 255, 0.2);
-  border-radius: 24rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin: 0 auto 24rpx;
-}
-
-.icon-text {
-  font-size: 48rpx;
-}
-
-.header-title {
-  font-size: 44rpx;
-  font-weight: 700;
-  color: #ffffff;
-  display: block;
-  margin-bottom: 12rpx;
-}
-
-.header-subtitle {
-  font-size: 26rpx;
-  color: rgba(255, 255, 255, 0.8);
-}
-
-.auth-card {
-  background: rgba(255, 255, 255, 0.95);
-  border-radius: 24rpx;
-  padding: 32rpx;
-  margin-bottom: 24rpx;
-  box-shadow: 0 8rpx 32rpx rgba(16, 185, 129, 0.1);
-  border: 2rpx solid rgba(16, 185, 129, 0.1);
-  width: 100%;
-}
-
-.auth-btn {
-  background: linear-gradient(135deg, #10B981 0%, #059669 100%);
-  border-radius: 24rpx;
-  padding: 32rpx;
-  text-align: center;
-  margin-bottom: 24rpx;
-  box-shadow: 0 12rpx 32rpx rgba(16, 185, 129, 0.3);
-  border: none;
-  width: 100%;
-}
-
-.auth-btn::after {
-  border: none;
-}
-
-.auth-btn-text {
-  font-size: 32rpx;
-  color: #ffffff;
-  font-weight: 600;
-}
-
-.cancel-btn {
-  background: transparent;
-  border-radius: 24rpx;
-  padding: 32rpx;
-  text-align: center;
-  border: 2rpx solid #D1D5DB;
-  width: 100%;
-}
-
-.cancel-btn::after {
-  border: none;
-}
-
-.cancel-btn-text {
-  font-size: 32rpx;
-  color: #6B7280;
-  font-weight: 600;
-}
-
-.tips-card {
-  background: rgba(255, 255, 255, 0.95);
-  border-radius: 24rpx;
-  padding: 32rpx;
-  margin-bottom: 32rpx;
-  box-shadow: 0 8rpx 32rpx rgba(16, 185, 129, 0.1);
-  border: 2rpx solid rgba(16, 185, 129, 0.1);
-  width: 100%;
-}
-
-.tips-title {
-  font-size: 28rpx;
-  font-weight: 600;
-  color: #065F46;
-  display: block;
-  margin-bottom: 16rpx;
-}
-
-.tips-content {
-  font-size: 24rpx;
-  color: #374151;
-  line-height: 1.8;
-}
-</style>
diff --git a/xuan-deduct-uniapp/src/pages/index/index.vue b/xuan-deduct-uniapp/src/pages/index/index.vue
index ce86211..9d73a86 100644
--- a/xuan-deduct-uniapp/src/pages/index/index.vue
+++ b/xuan-deduct-uniapp/src/pages/index/index.vue
@@ -155,21 +155,66 @@
     </view>
     
     <custom-tabbar :current="0"></custom-tabbar>
+    
+    <auth-modal 
+      :visible="showAuthModal" 
+      @success="onAuthSuccess"
+      @cancel="onAuthCancel"
+    />
   </view>
 </template>
 
 <script>
 import CustomTabbar from '@/components/custom-tabbar/custom-tabbar.vue'
+import AuthModal from '@/components/auth-modal/auth-modal.vue'
 import authCheck from '@/utils/authCheck.js'
 
 export default {
   components: {
-    CustomTabbar
+    CustomTabbar,
+    AuthModal
   },
   data() {
-    return {}
+    return {
+      showAuthModal: false
+    }
+  },
+  onShow() {
+    this.setupListeners()
+  },
+  onHide() {
+    this.removeListeners()
   },
   methods: {
+    setupListeners() {
+      uni.$on('showAuthModal', () => {
+        console.log('首页收到showAuthModal事件')
+        this.showAuthModal = true
+      })
+      uni.$on('hideAuthModal', () => {
+        this.showAuthModal = false
+      })
+    },
+    
+    removeListeners() {
+      uni.$off('showAuthModal')
+      uni.$off('hideAuthModal')
+    },
+    
+    onAuthSuccess(userInfo) {
+      console.log('授权成功:', userInfo)
+      this.showAuthModal = false
+      uni.showToast({
+        title: '登录成功',
+        icon: 'success'
+      })
+    },
+    
+    onAuthCancel() {
+      console.log('用户取消授权')
+      this.showAuthModal = false
+    },
+    
     goToBazi() {
       if (!authCheck.requireLogin()) return
       uni.navigateTo({ url: '/pages/bazi/bazi' })
diff --git a/xuan-deduct-uniapp/src/pages/mine/account.vue b/xuan-deduct-uniapp/src/pages/mine/account.vue
index 44e5c51..0c1f09a 100644
--- a/xuan-deduct-uniapp/src/pages/mine/account.vue
+++ b/xuan-deduct-uniapp/src/pages/mine/account.vue
@@ -3,7 +3,7 @@
     <view class="user-info-card">
       <image class="avatar-img" :src="userInfo.avatarUrl || defaultAvatar" mode="aspectFit" />
       <view class="user-detail">
-        <text class="username">{{ userInfo.username || userInfo.nickname || '玄机用户' }}</text>
+        <text class="username">{{ userInfo.nickname || userInfo.username || '玄机用户' }}</text>
         <text class="user-id">ID: {{ userInfo.userId || '100001' }}</text>
       </view>
     </view>
@@ -127,14 +127,14 @@ export default {
         content: '确定要退出登录吗？',
         success: (res) => {
           if (res.confirm) {
-            uni.removeStorageSync('userInfo')
-            uni.removeStorageSync('userId')
+            uni.clearStorageSync()
+            uni.setStorageSync('isLoggedIn', false)
             uni.showToast({
               title: '已退出登录',
               icon: 'success'
             })
             setTimeout(() => {
-              uni.reLaunch({ url: '/pages/auth/auth' })
+              uni.reLaunch({ url: '/pages/index/index' })
             }, 1500)
           }
         }
@@ -143,20 +143,39 @@ export default {
     deleteAccount() {
       uni.showModal({
         title: '注销账号',
-        content: '注销后数据将无法恢复，确定要注销吗？',
+        content: '注销后所有数据将被删除且无法恢复，确定要注销吗？',
         confirmText: '确认注销',
         confirmColor: '#EF4444',
         success: async (res) => {
           if (res.confirm) {
-            uni.removeStorageSync('userInfo')
-            uni.removeStorageSync('userId')
-            uni.showToast({
-              title: '账号已注销',
-              icon: 'success'
-            })
-            setTimeout(() => {
-              uni.reLaunch({ url: '/pages/auth/auth' })
-            }, 1500)
+            try {
+              uni.showLoading({ title: '注销中...' })
+              const result = await api.userApi.deleteAccount(this.userInfo.userId)
+              uni.hideLoading()
+              
+              if (result.success) {
+                uni.clearStorageSync()
+                uni.showToast({
+                  title: '账号已注销',
+                  icon: 'success'
+                })
+                setTimeout(() => {
+                  uni.reLaunch({ url: '/pages/index/index' })
+                }, 1500)
+              } else {
+                uni.showToast({
+                  title: result.error || '注销失败',
+                  icon: 'none'
+                })
+              }
+            } catch (e) {
+              uni.hideLoading()
+              console.error('注销账号失败:', e)
+              uni.showToast({
+                title: '注销失败：' + (e.message || '未知错误'),
+                icon: 'none'
+              })
+            }
           }
         }
       })
diff --git a/xuan-deduct-uniapp/src/pages/mine/mine.vue b/xuan-deduct-uniapp/src/pages/mine/mine.vue
index ad4bd36..22e3313 100644
--- a/xuan-deduct-uniapp/src/pages/mine/mine.vue
+++ b/xuan-deduct-uniapp/src/pages/mine/mine.vue
@@ -123,7 +123,7 @@ export default {
             const userData = res.data
             this.coins = userData.coins || 0
             this.vipLevel = userData.vipLevel || 0
-            this.username = userData.username || userData.nickname || '玄机用户'
+            this.username = userData.nickname || userData.username || '玄机用户'
             this.avatar = userData.avatarUrl || ''
             
             uni.setStorageSync('userCoins', this.coins)
diff --git a/xuan-deduct-uniapp/src/utils/api.js b/xuan-deduct-uniapp/src/utils/api.js
index 4cb6527..3d8296b 100644
--- a/xuan-deduct-uniapp/src/utils/api.js
+++ b/xuan-deduct-uniapp/src/utils/api.js
@@ -387,6 +387,13 @@ const userApi = {
       method: 'POST',
       data: { userId: userId, avatarUrl: avatarUrl }
     })
+  },
+  deleteAccount: (userId) => {
+    return request({
+      url: '/user/deleteAccount',
+      method: 'POST',
+      data: { userId: userId }
+    })
   }
 }