From 181ffdae66717ad61000e6ef6e02c446479b17cf Mon Sep 17 00:00:00 2001
From: 18631081161 <2088094923@qq.com>
Date: Mon, 5 Jan 2026 20:57:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9UI.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/components/ImageUpload/index.vue    |    9 +-
 miniapp/components/Empty/index.vue            |    4 +-
 miniapp/components/UserCard/index.vue         |   32 +-
 miniapp/pages.json                            |   12 +-
 miniapp/pages/chat/index.vue                  | 1152 ++++++++----
 miniapp/pages/index/index.vue                 |  225 ++-
 miniapp/pages/interact/favoritedMe.vue        |    4 +-
 miniapp/pages/interact/myFavorite.vue         |    4 +-
 miniapp/pages/interact/myUnlocked.vue         |    4 +-
 miniapp/pages/interact/myViewed.vue           |    4 +-
 miniapp/pages/interact/unlockedMe.vue         |    4 +-
 miniapp/pages/interact/viewedMe.vue           |    4 +-
 miniapp/pages/profile/detail.vue              |  135 +-
 miniapp/pages/realname/index.vue              |  516 ++++--
 miniapp/pages/search/index.vue                | 1538 ++++++++++-------
 miniapp/pages/search/result.vue               |  369 ++++
 miniapp/static/ic_check_s.png                 |  Bin 749 -> 731 bytes
 miniapp/static/ic_empty.png                   |  Bin 0 -> 19716 bytes
 miniapp/utils/cityData.js                     |  147 ++
 miniapp/utils/image.js                        |    4 +-
 .../Controllers/AdminUploadController.cs      |   14 +-
 .../Controllers/UserController.cs             |   16 +-
 .../Properties/launchSettings.json            |   24 +
 .../DTOs/Responses/ProfileResponses.cs        |   45 +
 .../Interfaces/IInteractService.cs            |    7 +
 .../Services/AdminUserService.cs              |    2 +-
 .../Services/InteractService.cs               |   18 +
 .../Services/ProfileService.cs                |    2 +
 28 files changed, 2931 insertions(+), 1364 deletions(-)
 create mode 100644 miniapp/pages/search/result.vue
 create mode 100644 miniapp/static/ic_empty.png
 create mode 100644 miniapp/utils/cityData.js
 create mode 100644 server/src/XiangYi.AppApi/Properties/launchSettings.json

diff --git a/admin/src/components/ImageUpload/index.vue b/admin/src/components/ImageUpload/index.vue
index 5a333b1..7c08334 100644
--- a/admin/src/components/ImageUpload/index.vue
+++ b/admin/src/components/ImageUpload/index.vue
@@ -60,9 +60,8 @@ import { ElMessage } from 'element-plus'
 import type { UploadFile, UploadFiles, UploadRawFile, UploadUserFile } from 'element-plus'
 import { getToken } from '@/utils/auth'
 
-// 获取后端基础地址（去掉 /api 后缀）
-const API_BASE = import.meta.env.VITE_API_BASE_URL || ''
-const SERVER_BASE = API_BASE.replace(/\/api$/, '')
+// 获取静态资源服务器地址（AppApi，用于图片等静态资源）
+const STATIC_BASE = import.meta.env.VITE_STATIC_BASE_URL || 'http://localhost:5001'
 
 // 处理图片URL，将相对路径转换为完整URL
 function getFullImageUrl(url: string): string {
@@ -71,8 +70,8 @@ function getFullImageUrl(url: string): string {
   if (url.startsWith('http://') || url.startsWith('https://')) {
     return url
   }
-  // 相对路径，拼接服务器地址
-  return `${SERVER_BASE}${url.startsWith('/') ? '' : '/'}${url}`
+  // 相对路径，拼接静态资源服务器地址
+  return `${STATIC_BASE}${url.startsWith('/') ? '' : '/'}${url}`
 }
 
 interface Props {
diff --git a/miniapp/components/Empty/index.vue b/miniapp/components/Empty/index.vue
index bcfd7ca..644654f 100644
--- a/miniapp/components/Empty/index.vue
+++ b/miniapp/components/Empty/index.vue
@@ -49,8 +49,8 @@ export default {
   emits: ['click'],
   data() {
     return {
-      defaultImage: '/static/empty.png',
-      hasDefaultImage: false // 默认不使用图片，使用emoji
+      defaultImage: '/static/ic_empty.png',
+      hasDefaultImage: true // 使用空占位图
     }
   },
   methods: {
diff --git a/miniapp/components/UserCard/index.vue b/miniapp/components/UserCard/index.vue
index f3ce59f..d8c401f 100644
--- a/miniapp/components/UserCard/index.vue
+++ b/miniapp/components/UserCard/index.vue
@@ -236,7 +236,7 @@ export default {
 
 <style lang="scss" scoped>
 .user-card {
-  background-color: #fff;
+  background: linear-gradient(to bottom, #FFEBEA 0%, #FFFFFF 100%);
   border-radius: 24rpx;
   overflow: hidden;
   box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.06);
@@ -412,11 +412,37 @@ export default {
   .btn-detail {
     background: #fff;
     color: #333;
-    border: 2rpx solid #ddd;
+    border: 2rpx solid #FFCBCB;
+    position: relative;
+    overflow: hidden;
+    
+    &::before {
+      content: '';
+      position: absolute;
+      top: -2rpx;
+      left: -2rpx;
+      right: -2rpx;
+      bottom: -2rpx;
+      background: linear-gradient(to right, #FFCBCB, #FF7B7B);
+      z-index: -1;
+      border-radius: 40rpx;
+    }
+    
+    &::after {
+      content: '';
+      position: absolute;
+      top: 0;
+      left: 0;
+      right: 0;
+      bottom: 0;
+      background: #fff;
+      z-index: -1;
+      border-radius: 38rpx;
+    }
   }
   
   .btn-contact {
-    background: linear-gradient(135deg, #ff8a8a 0%, #ff6b6b 100%);
+    background: linear-gradient(to right, #FFBDC2, #FF8A93);
     color: #fff;
   }
 }
diff --git a/miniapp/pages.json b/miniapp/pages.json
index c337084..1d0ee0d 100644
--- a/miniapp/pages.json
+++ b/miniapp/pages.json
@@ -5,7 +5,7 @@
       "style": {
         "navigationStyle": "custom",
         "navigationBarTitleText": "相宜相亲",
-        "enablePullDownRefresh": true
+        "enablePullDownRefresh": false
       }
     },
     {
@@ -53,15 +53,24 @@
     {
       "path": "pages/chat/index",
       "style": {
+        "navigationStyle": "custom",
         "navigationBarTitleText": "聊天"
       }
     },
     {
       "path": "pages/search/index",
       "style": {
+        "navigationStyle": "custom",
         "navigationBarTitleText": "搜索"
       }
     },
+    {
+      "path": "pages/search/result",
+      "style": {
+        "navigationStyle": "custom",
+        "navigationBarTitleText": "搜索结果"
+      }
+    },
     {
       "path": "pages/member/index",
       "style": {
@@ -71,6 +80,7 @@
     {
       "path": "pages/realname/index",
       "style": {
+        "navigationStyle": "custom",
         "navigationBarTitleText": "实名认证"
       }
     },
diff --git a/miniapp/pages/chat/index.vue b/miniapp/pages/chat/index.vue
index fecf221..262792e 100644
--- a/miniapp/pages/chat/index.vue
+++ b/miniapp/pages/chat/index.vue
@@ -3,125 +3,227 @@
     <!-- 加载状态 -->
     <Loading type="page" :loading="loading" />
     
-    <!-- 聊天头部 -->
-    <view class="chat-header">
-      <view class="header-left" @click="handleBack">
-        <text class="back-icon">←</text>
-      </view>
-      <view class="header-center">
-        <text class="target-name">{{ targetNickname }}</text>
-      </view>
-      <view class="header-right">
-        <text class="more-icon" @click="handleMore">⋮</text>
+    <!-- 自定义导航栏 -->
+    <view class="custom-navbar" :style="{ paddingTop: statusBarHeight + 'px' }">
+      <view class="navbar-content">
+        <view class="navbar-back" @click="handleBack">
+          <text class="back-icon">‹</text>
+        </view>
+        <text class="navbar-title">详情资料</text>
+        <view class="navbar-actions">
+          <text class="action-icon" @click="handleMore">···</text>
+          <text class="action-icon" @click="handleViewProfile">⊙</text>
+        </view>
       </view>
     </view>
     
-    <!-- 消息列表 -->
+    <!-- 内容区域 -->
     <scroll-view 
-      class="message-list"
+      class="content-scroll"
       scroll-y
       :scroll-into-view="scrollToId"
+      :style="{ paddingTop: (statusBarHeight + 44) + 'px' }"
       @scrolltoupper="loadMoreMessages"
     >
+      <!-- 用户信息卡片 -->
+      <view class="user-info-card" @click="handleViewProfile">
+        <view class="user-avatar">
+          <image :src="targetAvatar || '/static/default-avatar.png'" mode="aspectFill" />
+        </view>
+        <view class="user-details">
+          <view class="user-name-row">
+            <text class="nickname">{{ targetNickname }}</text>
+            <text class="relationship" v-if="targetRelationship">({{ targetRelationship }})</text>
+            <view class="user-tags">
+              <text v-if="targetIsMember" class="tag tag-vip">VIP会员</text>
+              <text v-if="targetIsRealName" class="tag tag-realname">已实名</text>
+            </view>
+          </view>
+          <text class="xiangqin-no">相亲ID: {{ targetXiangQinNo }}</text>
+        </view>
+      </view>
+      
+      <!-- 基本资料区域 -->
+      <view class="basic-info-section" v-if="targetUserDetail">
+        <view class="gender-year">
+          <text :class="{ male: targetUserDetail.childGender === 1 }">
+            {{ targetUserDetail.childGender === 1 ? '男' : '女' }} · {{ targetUserDetail.birthYear }}年
+          </text>
+        </view>
+        <view class="info-grid">
+          <view class="info-item">
+            <text class="label">年龄</text>
+            <text class="value">{{ targetUserDetail.age }}岁</text>
+          </view>
+          <view class="info-item">
+            <text class="label">身高</text>
+            <text class="value">{{ targetUserDetail.height }}cm</text>
+          </view>
+          <view class="info-item">
+            <text class="label">学历</text>
+            <text class="value">{{ getEducationText(targetUserDetail.education) }}</text>
+          </view>
+          <view class="info-item">
+            <text class="label">体重</text>
+            <text class="value">{{ targetUserDetail.weight ? targetUserDetail.weight + 'kg' : '未填写' }}</text>
+          </view>
+          <view class="info-item">
+            <text class="label">收入</text>
+            <text class="value">{{ getIncomeText(targetUserDetail.monthlyIncome) }}</text>
+          </view>
+          <view class="info-item">
+            <text class="label">职业</text>
+            <text class="value">{{ targetUserDetail.occupation || '未填写' }}</text>
+          </view>
+          <view class="info-item">
+            <text class="label">现居</text>
+            <text class="value">{{ targetUserDetail.workCity || '未填写' }}</text>
+          </view>
+          <view class="info-item">
+            <text class="label">家乡</text>
+            <text class="value">{{ targetUserDetail.homeCity || '未填写' }}</text>
+          </view>
+        </view>
+      </view>
+      
+      <!-- 聊天安全提示 -->
+      <view class="safety-tip">
+        <text>聊天安全提示：请友好和谐交流，请友好和谐交流，</text>
+        <text>请友好和谐交流，请友好和谐交流哦。</text>
+      </view>
+      
       <!-- 加载更多提示 -->
       <view v-if="hasMore" class="load-more">
         <text>上拉加载更多</text>
       </view>
       
-      <!-- 消息项 -->
-      <view 
-        v-for="(message, index) in messages" 
-        :key="message.id"
-        :id="'msg-' + message.id"
-        class="message-item"
-        :class="{ 'mine': message.isMine }"
-      >
-        <!-- 时间分隔 -->
-        <view v-if="shouldShowTime(message, index)" class="time-divider">
-          <text>{{ formatMessageTime(message.createTime) }}</text>
-        </view>
-        
-        <!-- 消息内容 -->
-        <view class="message-content">
-          <!-- 对方头像 -->
-          <image 
-            v-if="!message.isMine" 
-            class="avatar" 
-            :src="targetAvatar || '/static/default-avatar.png'" 
-            mode="aspectFill"
-          />
-          
-          <!-- 消息气泡 -->
-          <view class="bubble-wrapper">
-            <!-- 文本消息 -->
-            <view 
-              v-if="message.messageType === MessageType.TEXT" 
-              class="bubble text-bubble"
-            >
-              <text>{{ message.content }}</text>
-            </view>
-            
-            <!-- 图片消息 -->
-            <view 
-              v-else-if="message.messageType === MessageType.IMAGE" 
-              class="bubble image-bubble"
-            >
-              <image 
-                :src="message.content" 
-                mode="widthFix"
-                @click="previewImage(message.content)"
-              />
-            </view>
-            
-            <!-- 交换微信请求 -->
-            <view 
-              v-else-if="message.messageType === MessageType.EXCHANGE_WECHAT" 
-              class="bubble exchange-bubble"
-            >
-              <view class="exchange-content">
-                <text class="exchange-title">{{ getExchangeTitle(message) }}</text>
-                <view v-if="showExchangeActions(message)" class="exchange-actions">
-                  <button class="action-btn reject" @click="handleRespondExchange(message.id, false)">拒绝</button>
-                  <button class="action-btn accept" @click="handleRespondExchange(message.id, true)">接受</button>
-                </view>
-                <view v-else class="exchange-result" :class="getExchangeStatusClass(message)">
-                  <text>{{ getExchangeStatusText(message) }}</text>
-                  <text v-if="message.exchangedContent" class="exchanged-info">微信号: {{ message.exchangedContent }}</text>
-                </view>
-              </view>
-            </view>
-            
-            <!-- 交换照片请求 -->
-            <view 
-              v-else-if="message.messageType === MessageType.EXCHANGE_PHOTO" 
-              class="bubble exchange-bubble"
-            >
-              <view class="exchange-content">
-                <text class="exchange-title">{{ getExchangePhotoTitle(message) }}</text>
-                <view v-if="showExchangeActions(message)" class="exchange-actions">
-                  <button class="action-btn reject" @click="handleRespondExchange(message.id, false)">拒绝</button>
-                  <button class="action-btn accept" @click="handleRespondExchange(message.id, true)">接受</button>
-                </view>
-                <view v-else class="exchange-result" :class="getExchangeStatusClass(message)">
-                  <text>{{ getExchangeStatusText(message) }}</text>
-                </view>
-              </view>
-            </view>
-            
-            <!-- 消息状态 -->
-            <view v-if="message.isMine" class="message-status">
-              <text v-if="message.status === MessageStatus.SENDING" class="status sending">发送中</text>
-              <text v-else-if="message.status === MessageStatus.FAILED" class="status failed">发送失败</text>
-            </view>
+      <!-- 消息列表 -->
+      <view class="message-list">
+        <view 
+          v-for="(message, index) in messages" 
+          :key="message.id"
+          :id="'msg-' + message.id"
+          class="message-item"
+          :class="{ 'mine': message.isMine }"
+        >
+          <!-- 时间分隔 -->
+          <view v-if="shouldShowTime(message, index)" class="time-divider">
+            <text>{{ formatMessageTime(message.createTime) }}</text>
           </view>
           
-          <!-- 自己头像 -->
-          <image 
-            v-if="message.isMine" 
-            class="avatar" 
-            :src="myAvatar || '/static/default-avatar.png'" 
-            mode="aspectFill"
-          />
+          <!-- 消息内容 -->
+          <view class="message-content">
+            <!-- 对方头像 -->
+            <image 
+              v-if="!message.isMine" 
+              class="avatar" 
+              :src="targetAvatar || '/static/default-avatar.png'" 
+              mode="aspectFill"
+              @click="handleViewProfile"
+            />
+            
+            <!-- 消息气泡 -->
+            <view class="bubble-wrapper">
+              <!-- 文本消息 -->
+              <view 
+                v-if="message.messageType === MessageType.TEXT" 
+                class="bubble text-bubble"
+              >
+                <text>{{ message.content }}</text>
+              </view>
+              
+              <!-- 图片消息 -->
+              <view 
+                v-else-if="message.messageType === MessageType.IMAGE" 
+                class="bubble image-bubble"
+              >
+                <image 
+                  :src="message.content" 
+                  mode="widthFix"
+                  @click="previewImage(message.content)"
+                />
+              </view>
+              
+              <!-- 交换微信请求卡片 -->
+              <view 
+                v-else-if="message.messageType === MessageType.EXCHANGE_WECHAT" 
+                class="exchange-card"
+              >
+                <view class="exchange-card-header">
+                  <text>{{ getExchangeTitle(message) }}</text>
+                </view>
+                <!-- 待处理状态 - 显示操作按钮 -->
+                <view v-if="showExchangeActions(message)" class="exchange-card-actions">
+                  <button class="action-btn reject-btn" @click="handleRespondExchange(message.id, false)">拒绝</button>
+                  <button class="action-btn accept-btn" @click="handleRespondExchange(message.id, true)">同意</button>
+                </view>
+                <!-- 已接受 - 显示微信号 -->
+                <view v-else-if="message.status === ExchangeStatus.ACCEPTED" class="exchange-card-result accepted">
+                  <text class="result-label">{{ targetNickname }}（{{ targetRelationship || '本人' }}）的微信号</text>
+                  <text class="wechat-no">{{ message.exchangedContent || 'abcv123123' }}</text>
+                  <button class="copy-btn" @click="handleCopyWeChat(message.exchangedContent)">点击复制微信号</button>
+                </view>
+                <!-- 已拒绝 -->
+                <view v-else-if="message.status === ExchangeStatus.REJECTED" class="exchange-card-result rejected">
+                  <text>{{ message.isMine ? targetNickname : '您' }}拒绝了交换微信号</text>
+                </view>
+                <!-- 等待中 -->
+                <view v-else class="exchange-card-result pending">
+                  <text>等待对方回应...</text>
+                </view>
+              </view>
+              
+              <!-- 交换照片请求卡片 -->
+              <view 
+                v-else-if="message.messageType === MessageType.EXCHANGE_PHOTO" 
+                class="exchange-card"
+              >
+                <view class="exchange-card-header">
+                  <text>{{ getExchangePhotoTitle(message) }}</text>
+                </view>
+                <!-- 待处理状态 - 显示操作按钮 -->
+                <view v-if="showExchangeActions(message)" class="exchange-card-actions">
+                  <button class="action-btn reject-btn" @click="handleRespondExchange(message.id, false)">拒绝</button>
+                  <button class="action-btn accept-btn" @click="handleRespondExchange(message.id, true)">同意</button>
+                </view>
+                <!-- 已接受 - 显示照片 -->
+                <view v-else-if="message.status === ExchangeStatus.ACCEPTED" class="exchange-card-result accepted">
+                  <text class="result-label">{{ targetNickname }}（{{ targetRelationship || '本人' }}）的照片共{{ message.photoCount || 5 }}张</text>
+                  <view class="photo-preview" v-if="message.photos && message.photos.length > 0">
+                    <image 
+                      v-for="(photo, idx) in message.photos.slice(0, 3)" 
+                      :key="idx" 
+                      :src="photo" 
+                      mode="aspectFill"
+                      @click="previewPhotos(message.photos, idx)"
+                    />
+                  </view>
+                </view>
+                <!-- 已拒绝 -->
+                <view v-else-if="message.status === ExchangeStatus.REJECTED" class="exchange-card-result rejected">
+                  <text>{{ message.isMine ? targetNickname : '您' }}拒绝了交换孩子照片</text>
+                </view>
+                <!-- 等待中 -->
+                <view v-else class="exchange-card-result pending">
+                  <text>等待对方回应...</text>
+                </view>
+              </view>
+              
+              <!-- 消息状态 -->
+              <view v-if="message.isMine && message.messageType === MessageType.TEXT" class="message-status">
+                <text v-if="message.status === MessageStatus.SENDING" class="status sending">发送中</text>
+                <text v-else-if="message.status === MessageStatus.FAILED" class="status failed">发送失败</text>
+              </view>
+            </view>
+            
+            <!-- 自己头像 -->
+            <image 
+              v-if="message.isMine" 
+              class="avatar" 
+              :src="myAvatar || '/static/default-avatar.png'" 
+              mode="aspectFill"
+            />
+          </view>
         </view>
       </view>
       
@@ -129,40 +231,34 @@
       <view class="bottom-placeholder" id="bottom-anchor"></view>
     </scroll-view>
     
-    <!-- 输入区域 -->
-    <view class="input-area">
-      <view class="input-actions">
-        <view class="action-btn-icon" @click="showExchangeMenu = !showExchangeMenu">
-          <text>+</text>
-        </view>
+    <!-- 底部操作栏 -->
+    <view class="bottom-action-bar">
+      <!-- 三个操作按钮 - 键盘弹起时隐藏 -->
+      <view class="action-buttons" v-show="!isInputFocused">
+        <button class="action-btn" @click="handleExchangeWeChat">交换微信</button>
+        <button class="action-btn" @click="handleCall">拨打电话</button>
+        <button class="action-btn" @click="handleExchangePhoto">交换照片</button>
       </view>
-      <view class="input-wrapper">
-        <input 
-          v-model="inputText"
-          class="message-input"
-          type="text"
-          placeholder="输入消息..."
-          :adjust-position="true"
-          @confirm="handleSendMessage"
-        />
-      </view>
-      <view class="send-btn" :class="{ active: inputText.trim() }" @click="handleSendMessage">
-        <text>发送</text>
-      </view>
-    </view>
-    
-    <!-- 交换功能菜单 -->
-    <view v-if="showExchangeMenu" class="exchange-menu">
-      <view class="menu-mask" @click="showExchangeMenu = false"></view>
-      <view class="menu-content">
-        <view class="menu-item" @click="handleExchangeWeChat">
-          <text class="menu-icon">💬</text>
-          <text class="menu-text">交换微信</text>
-        </view>
-        <view class="menu-item" @click="handleExchangePhoto">
-          <text class="menu-icon">📷</text>
-          <text class="menu-text">交换照片</text>
+      
+      <!-- 输入区域 -->
+      <view class="input-area">
+        <view class="input-wrapper">
+          <input 
+            v-model="inputText"
+            class="message-input"
+            type="text"
+            placeholder="请输入..."
+            placeholder-style="color: #999;"
+            :adjust-position="true"
+            confirm-type="send"
+            @focus="handleInputFocus"
+            @blur="handleInputBlur"
+            @confirm="handleSendMessage"
+          />
         </view>
+        <button class="send-btn" :class="{ active: inputText.trim() }" @click="handleSendMessage">
+          发送
+        </button>
       </view>
     </view>
   </view>
@@ -174,6 +270,7 @@ import { ref, computed, onMounted, onUnmounted, nextTick } from 'vue'
 import { useUserStore } from '@/store/user.js'
 import { useChatStore, MessageType, MessageStatus } from '@/store/chat.js'
 import { getMessages, sendMessage, exchangeWeChat, exchangePhoto, respondExchange } from '@/api/chat.js'
+import { getUserDetail } from '@/api/user.js'
 import Loading from '@/components/Loading/index.vue'
 import { formatTimestamp } from '@/utils/format.js'
 
@@ -187,11 +284,19 @@ const ExchangeStatus = {
   REJECTED: 2
 }
 
+// 状态栏高度
+const statusBarHeight = ref(20)
+
 // 页面参数
 const targetUserId = ref(0)
 const sessionId = ref(0)
 const targetNickname = ref('')
 const targetAvatar = ref('')
+const targetRelationship = ref('')
+const targetIsMember = ref(false)
+const targetIsRealName = ref(false)
+const targetXiangQinNo = ref('')
+const targetUserDetail = ref(null)
 
 // 状态
 const loading = ref(true)
@@ -200,12 +305,75 @@ const inputText = ref('')
 const scrollToId = ref('')
 const hasMore = ref(true)
 const pageIndex = ref(1)
-const showExchangeMenu = ref(false)
+const isInputFocused = ref(false)
 
 // 用户信息
 const myAvatar = computed(() => userStore.avatar)
 const myUserId = computed(() => userStore.userId)
 
+// 选项映射
+const educationMap = {
+  1: '高中',
+  2: '中专',
+  3: '大专',
+  4: '本科',
+  5: '研究生',
+  6: '博士及以上'
+}
+
+const incomeMap = {
+  1: '5千以下',
+  2: '5千-8千/月',
+  3: '8千-1万/月',
+  4: '1万-2万/月',
+  5: '2万以上'
+}
+
+const relationshipMap = {
+  1: '父亲',
+  2: '母亲',
+  3: '本人'
+}
+
+// 获取学历文本
+const getEducationText = (value) => {
+  return educationMap[value] || '未填写'
+}
+
+// 获取收入文本
+const getIncomeText = (value) => {
+  return incomeMap[value] || '未填写'
+}
+
+// 获取系统信息
+const getSystemInfo = () => {
+  uni.getSystemInfo({
+    success: (res) => {
+      statusBarHeight.value = res.statusBarHeight || 20
+    }
+  })
+}
+
+// 加载目标用户详情
+const loadTargetUserDetail = async () => {
+  if (!targetUserId.value) return
+  
+  try {
+    const res = await getUserDetail(targetUserId.value)
+    if (res && res.code === 0 && res.data) {
+      targetUserDetail.value = res.data
+      targetNickname.value = res.data.nickname || targetNickname.value
+      targetAvatar.value = res.data.avatar || targetAvatar.value
+      targetIsMember.value = res.data.isMember || false
+      targetIsRealName.value = res.data.isRealName || false
+      targetXiangQinNo.value = res.data.xiangQinNo || ''
+      targetRelationship.value = relationshipMap[res.data.relationship] || ''
+    }
+  } catch (error) {
+    console.error('加载用户详情失败:', error)
+  }
+}
+
 // 加载消息列表 (Requirements 7.1)
 const loadMessages = async (isLoadMore = false) => {
   if (!isLoadMore) {
@@ -293,8 +461,6 @@ const handleSendMessage = async () => {
 
 // 交换微信 (Requirements 7.3)
 const handleExchangeWeChat = async () => {
-  showExchangeMenu.value = false
-  
   try {
     const res = await exchangeWeChat(sessionId.value, targetUserId.value)
     if (res && res.success) {
@@ -321,8 +487,6 @@ const handleExchangeWeChat = async () => {
 }
 
 const handleExchangePhoto = async () => {
-  showExchangeMenu.value = false
-  
   try {
     const res = await exchangePhoto(sessionId.value, targetUserId.value)
     if (res && res.success) {
@@ -397,6 +561,50 @@ const getExchangeStatusText = (message) => {
   return ''
 }
 
+// 复制微信号
+const handleCopyWeChat = (wechatNo) => {
+  if (!wechatNo) {
+    uni.showToast({ title: '微信号为空', icon: 'none' })
+    return
+  }
+  uni.setClipboardData({
+    data: wechatNo,
+    success: () => {
+      uni.showToast({ title: '已复制微信号', icon: 'success' })
+    }
+  })
+}
+
+// 预览多张照片
+const previewPhotos = (photos, index) => {
+  uni.previewImage({
+    urls: photos,
+    current: index
+  })
+}
+
+// 拨打电话
+const handleCall = () => {
+  uni.showToast({ title: '请通过微信联系对方', icon: 'none' })
+}
+
+// 查看用户资料
+const handleViewProfile = () => {
+  uni.navigateTo({ url: `/pages/profile/detail?userId=${targetUserId.value}` })
+}
+
+// 输入框焦点处理
+const handleInputFocus = () => {
+  isInputFocused.value = true
+}
+
+const handleInputBlur = () => {
+  // 延迟隐藏，避免点击发送按钮时按钮消失
+  setTimeout(() => {
+    isInputFocused.value = false
+  }, 100)
+}
+
 const shouldShowTime = (message, index) => {
   if (index === 0) return true
   
@@ -440,6 +648,8 @@ const handleMore = () => {
 }
 
 onMounted(() => {
+  getSystemInfo()
+  
   const pages = getCurrentPages()
   const currentPage = pages[pages.length - 1]
   const options = currentPage?.options || {}
@@ -457,6 +667,9 @@ onMounted(() => {
     targetAvatar.value = decodeURIComponent(options.avatar)
   }
   
+  // 加载目标用户详情
+  loadTargetUserDetail()
+  
   if (sessionId.value) {
     chatStore.setCurrentSession(sessionId.value)
     loadMessages()
@@ -483,79 +696,221 @@ onUnmounted(() => {
   display: flex;
   flex-direction: column;
   height: 100vh;
-  background-color: #f5f5f5;
+  background-color: #f5f6fa;
 }
 
-.chat-header {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding: 20rpx 30rpx;
-  background-color: #fff;
-  border-bottom: 1rpx solid #eee;
-  
-  .header-left, .header-right {
-    width: 80rpx;
+// 自定义导航栏
+.custom-navbar {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  z-index: 100;
+  background: linear-gradient(135deg, #ffb5b5 0%, #ff9a9a 100%);
+
+  .navbar-content {
+    height: 44px;
     display: flex;
     align-items: center;
-  }
-  
-  .header-left {
-    justify-content: flex-start;
-  }
-  
-  .header-right {
-    justify-content: flex-end;
-  }
-  
-  .back-icon {
-    font-size: 40rpx;
-    color: #333;
-  }
-  
-  .more-icon {
-    font-size: 40rpx;
-    color: #333;
-  }
-  
-  .header-center {
-    flex: 1;
-    text-align: center;
-    
-    .target-name {
-      font-size: 32rpx;
+    justify-content: space-between;
+    padding: 0 24rpx;
+
+    .navbar-back {
+      width: 80rpx;
+      height: 80rpx;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+
+      .back-icon {
+        font-size: 64rpx;
+        color: #fff;
+        font-weight: 400;
+      }
+    }
+
+    .navbar-title {
+      font-size: 34rpx;
       font-weight: 600;
-      color: #333;
+      color: #fff;
+    }
+
+    .navbar-actions {
+      display: flex;
+      align-items: center;
+      gap: 24rpx;
+
+      .action-icon {
+        font-size: 40rpx;
+        color: #fff;
+      }
     }
   }
 }
 
-.message-list {
+// 内容滚动区域
+.content-scroll {
   flex: 1;
-  padding: 20rpx;
-  
-  .load-more {
-    text-align: center;
-    padding: 20rpx;
-    
-    text {
+  padding-bottom: 280rpx;
+}
+
+// 用户信息卡片
+.user-info-card {
+  display: flex;
+  align-items: center;
+  padding: 24rpx 32rpx;
+  background: #fff;
+  margin: 24rpx;
+  border-radius: 24rpx;
+
+  .user-avatar {
+    width: 100rpx;
+    height: 100rpx;
+    border-radius: 50%;
+    overflow: hidden;
+    flex-shrink: 0;
+
+    image {
+      width: 100%;
+      height: 100%;
+    }
+  }
+
+  .user-details {
+    margin-left: 24rpx;
+    flex: 1;
+
+    .user-name-row {
+      display: flex;
+      align-items: center;
+      flex-wrap: wrap;
+      gap: 8rpx;
+      margin-bottom: 8rpx;
+
+      .nickname {
+        font-size: 32rpx;
+        font-weight: 600;
+        color: #333;
+      }
+
+      .relationship {
+        font-size: 28rpx;
+        color: #666;
+      }
+
+      .user-tags {
+        display: flex;
+        gap: 8rpx;
+
+        .tag {
+          font-size: 20rpx;
+          padding: 4rpx 12rpx;
+          border-radius: 16rpx;
+
+          &.tag-vip {
+            background: linear-gradient(135deg, #fff3e0 0%, #ffe0b2 100%);
+            color: #ff9800;
+          }
+
+          &.tag-realname {
+            background: #e8f5e9;
+            color: #4caf50;
+          }
+        }
+      }
+    }
+
+    .xiangqin-no {
       font-size: 24rpx;
       color: #999;
     }
   }
-  
-  .bottom-placeholder {
-    height: 20rpx;
+}
+
+// 基本资料区域
+.basic-info-section {
+  background: #fff;
+  margin: 0 24rpx 24rpx;
+  border-radius: 24rpx;
+  padding: 28rpx;
+
+  .gender-year {
+    margin-bottom: 24rpx;
+
+    text {
+      font-size: 40rpx;
+      font-weight: 600;
+      color: #ff6b6b;
+
+      &.male {
+        color: #4a90d9;
+      }
+    }
   }
+
+  .info-grid {
+    display: flex;
+    flex-wrap: wrap;
+
+    .info-item {
+      width: 50%;
+      display: flex;
+      align-items: center;
+      margin-bottom: 16rpx;
+
+      .label {
+        font-size: 26rpx;
+        color: #999;
+        width: 70rpx;
+        flex-shrink: 0;
+      }
+
+      .value {
+        font-size: 26rpx;
+        color: #333;
+        margin-left: 12rpx;
+      }
+    }
+  }
+}
+
+// 聊天安全提示
+.safety-tip {
+  text-align: center;
+  padding: 20rpx 32rpx;
+  margin-bottom: 20rpx;
+
+  text {
+    display: block;
+    font-size: 22rpx;
+    color: #999;
+    line-height: 1.6;
+  }
+}
+
+// 加载更多
+.load-more {
+  text-align: center;
+  padding: 20rpx;
+
+  text {
+    font-size: 24rpx;
+    color: #999;
+  }
+}
+
+// 消息列表
+.message-list {
+  padding: 0 24rpx;
 }
 
 .message-item {
   margin-bottom: 30rpx;
-  
+
   .time-divider {
     text-align: center;
     margin-bottom: 20rpx;
-    
+
     text {
       font-size: 24rpx;
       color: #999;
@@ -564,259 +919,292 @@ onUnmounted(() => {
       border-radius: 20rpx;
     }
   }
-  
+
   .message-content {
     display: flex;
     align-items: flex-start;
   }
-  
+
   .avatar {
     width: 80rpx;
     height: 80rpx;
     border-radius: 50%;
     flex-shrink: 0;
   }
-  
+
   .bubble-wrapper {
-    max-width: 60%;
+    max-width: 70%;
     margin: 0 16rpx;
   }
-  
+
   .bubble {
     padding: 20rpx 24rpx;
     border-radius: 16rpx;
     word-break: break-all;
-    
+
     &.text-bubble {
       background-color: #fff;
-      
+
       text {
         font-size: 28rpx;
         color: #333;
         line-height: 1.5;
       }
     }
-    
+
     &.image-bubble {
       padding: 8rpx;
       background-color: #fff;
-      
+
       image {
         max-width: 300rpx;
         border-radius: 8rpx;
       }
     }
-    
-    &.exchange-bubble {
-      background-color: #fff;
-      
-      .exchange-content {
-        .exchange-title {
-          display: block;
-          font-size: 26rpx;
+  }
+
+  // 自己发送的消息 - 整体靠右，头像在最右边
+  &.mine {
+    .message-content {
+      justify-content: flex-end;
+    }
+
+    .bubble-wrapper {
+      display: flex;
+      flex-direction: column;
+      align-items: flex-end;
+    }
+
+    .bubble {
+      &.text-bubble {
+        background: linear-gradient(135deg, #a8e6cf 0%, #88d8b0 100%);
+
+        text {
+          color: #333;
+        }
+      }
+    }
+
+    .message-status {
+      text-align: right;
+    }
+  }
+
+  // 交换卡片样式
+  .exchange-card {
+    background: #fff;
+    border-radius: 16rpx;
+    overflow: hidden;
+    min-width: 400rpx;
+
+    .exchange-card-header {
+      padding: 24rpx;
+      background: #f8f8f8;
+      border-bottom: 1rpx solid #f0f0f0;
+
+      text {
+        font-size: 26rpx;
+        color: #666;
+      }
+    }
+
+    .exchange-card-actions {
+      display: flex;
+      padding: 24rpx;
+      gap: 24rpx;
+
+      .action-btn {
+        flex: 1;
+        height: 72rpx;
+        line-height: 72rpx;
+        font-size: 28rpx;
+        border-radius: 36rpx;
+        border: none;
+
+        &::after {
+          border: none;
+        }
+
+        &.reject-btn {
+          background: #f5f5f5;
           color: #666;
-          margin-bottom: 16rpx;
         }
-        
-        .exchange-actions {
-          display: flex;
-          gap: 16rpx;
-          
-          .action-btn {
-            flex: 1;
-            height: 60rpx;
-            line-height: 60rpx;
-            font-size: 24rpx;
-            border-radius: 30rpx;
-            border: none;
-            
-            &::after {
-              border: none;
-            }
-            
-            &.reject {
-              background-color: #f5f5f5;
-              color: #666;
-            }
-            
-            &.accept {
-              background: linear-gradient(135deg, #ff6b6b 0%, #ff5252 100%);
-              color: #fff;
-            }
-          }
+
+        &.accept-btn {
+          background: linear-gradient(135deg, #ff9a9a 0%, #ff6b6b 100%);
+          color: #fff;
         }
-        
-        .exchange-result {
-          text-align: center;
-          
-          text {
-            display: block;
-            font-size: 24rpx;
-          }
-          
-          &.accepted text {
-            color: #4cd964;
-          }
-          
-          &.rejected text {
-            color: #999;
-          }
-          
-          &.pending text {
-            color: #ff9500;
-          }
-          
-          .exchanged-info {
-            margin-top: 12rpx;
-            font-size: 26rpx;
-            color: #333;
-            font-weight: 500;
-          }
+      }
+    }
+
+    .exchange-card-result {
+      padding: 24rpx;
+
+      .result-label {
+        display: block;
+        font-size: 26rpx;
+        color: #666;
+        margin-bottom: 16rpx;
+      }
+
+      .wechat-no {
+        display: block;
+        font-size: 32rpx;
+        font-weight: 600;
+        color: #333;
+        margin-bottom: 20rpx;
+      }
+
+      .copy-btn {
+        width: 100%;
+        height: 72rpx;
+        line-height: 72rpx;
+        background: linear-gradient(135deg, #4cd964 0%, #34c759 100%);
+        color: #fff;
+        font-size: 28rpx;
+        border-radius: 36rpx;
+        border: none;
+
+        &::after {
+          border: none;
+        }
+      }
+
+      .photo-preview {
+        display: flex;
+        gap: 12rpx;
+        margin-top: 16rpx;
+
+        image {
+          width: 120rpx;
+          height: 120rpx;
+          border-radius: 8rpx;
+        }
+      }
+
+      &.rejected {
+        text {
+          color: #999;
+          font-size: 26rpx;
+        }
+      }
+
+      &.pending {
+        text {
+          color: #ff9500;
+          font-size: 26rpx;
         }
       }
     }
   }
-  
+
   .message-status {
     margin-top: 8rpx;
-    
+
     .status {
       font-size: 22rpx;
-      
+
       &.sending {
         color: #999;
       }
-      
+
       &.failed {
         color: #ff5252;
       }
     }
   }
-  
-  &.mine {
-    .message-content {
-      flex-direction: row-reverse;
-    }
-    
-    .bubble {
-      &.text-bubble {
-        background: linear-gradient(135deg, #ff6b6b 0%, #ff5252 100%);
-        
-        text {
-          color: #fff;
-        }
-      }
-    }
-    
-    .message-status {
-      text-align: right;
-    }
-  }
 }
 
-.input-area {
-  display: flex;
-  align-items: center;
-  padding: 16rpx 20rpx;
-  background-color: #fff;
-  border-top: 1rpx solid #eee;
-  
-  .input-actions {
-    .action-btn-icon {
-      width: 64rpx;
-      height: 64rpx;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      background-color: #f5f5f5;
-      border-radius: 50%;
-      
-      text {
-        font-size: 40rpx;
-        color: #666;
+.bottom-placeholder {
+  height: 40rpx;
+}
+
+// 底部操作栏
+.bottom-action-bar {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  background: #f5f6fa;
+  padding-bottom: env(safe-area-inset-bottom);
+
+  .action-buttons {
+    display: flex;
+    justify-content: space-between;
+    padding: 20rpx 24rpx;
+    gap: 20rpx;
+
+    .action-btn {
+      flex: 1;
+      height: 80rpx;
+      line-height: 80rpx;
+      background: #fff;
+      border-radius: 40rpx;
+      font-size: 28rpx;
+      color: #333;
+      text-align: center;
+      border: none;
+      box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+
+      &::after {
+        border: none;
+      }
+
+      &:active {
+        background: #f5f5f5;
       }
     }
   }
-  
-  .input-wrapper {
-    flex: 1;
-    margin: 0 16rpx;
-    
-    .message-input {
-      width: 100%;
-      height: 72rpx;
+
+  .input-area {
+    display: flex;
+    align-items: center;
+    padding: 16rpx 24rpx;
+    gap: 16rpx;
+    background: #fff;
+
+    .input-wrapper {
+      flex: 1;
+      min-width: 0;
+      background: #f5f5f5;
+      border-radius: 36rpx;
+      overflow: hidden;
+      box-sizing: border-box;
       padding: 0 24rpx;
-      background-color: #f5f5f5;
+
+      .message-input {
+        width: 100%;
+        height: 72rpx;
+        padding: 0;
+        margin: 0;
+        font-size: 28rpx;
+        text-align: left;
+        box-sizing: border-box;
+        background: transparent;
+        border: none;
+        outline: none;
+      }
+    }
+
+    .send-btn {
+      padding: 0 32rpx;
+      height: 72rpx;
+      line-height: 72rpx;
+      background: linear-gradient(135deg, #ff9a9a 0%, #ff6b6b 100%);
       border-radius: 36rpx;
       font-size: 28rpx;
-    }
-  }
-  
-  .send-btn {
-    padding: 16rpx 32rpx;
-    background-color: #ddd;
-    border-radius: 32rpx;
-    
-    text {
-      font-size: 28rpx;
-      color: #999;
-    }
-    
-    &.active {
-      background: linear-gradient(135deg, #ff6b6b 0%, #ff5252 100%);
-      
-      text {
+      color: #fff;
+      border: none;
+
+      &::after {
+        border: none;
+      }
+
+      &.active {
+        background: linear-gradient(135deg, #ff9a9a 0%, #ff6b6b 100%);
         color: #fff;
       }
     }
   }
 }
-
-.exchange-menu {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  z-index: 100;
-  
-  .menu-mask {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background-color: rgba(0, 0, 0, 0.3);
-  }
-  
-  .menu-content {
-    position: absolute;
-    bottom: 140rpx;
-    left: 20rpx;
-    background-color: #fff;
-    border-radius: 16rpx;
-    padding: 16rpx;
-    box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.1);
-    
-    .menu-item {
-      display: flex;
-      align-items: center;
-      padding: 20rpx 30rpx;
-      
-      &:active {
-        background-color: #f5f5f5;
-      }
-      
-      .menu-icon {
-        font-size: 40rpx;
-        margin-right: 16rpx;
-      }
-      
-      .menu-text {
-        font-size: 28rpx;
-        color: #333;
-      }
-    }
-  }
-}
 </style>
diff --git a/miniapp/pages/index/index.vue b/miniapp/pages/index/index.vue
index 2739181..751a596 100644
--- a/miniapp/pages/index/index.vue
+++ b/miniapp/pages/index/index.vue
@@ -14,28 +14,36 @@
 
 		<!-- 固定头部区域 -->
 		<view class="fixed-header">
-			<!-- Banner 轮播图区域 -->
+			<!-- Banner区域（导航栏和搜索框浮在Banner上） -->
 			<view class="banner-section">
-				<!-- 悬浮标题和搜索框 -->
-				<view class="banner-overlay">
-					<view class="header-title">相宜相亲</view>
-					<view class="search-bar" @click="handleSearchClick">
-						<text class="search-icon">🔍</text>
-						<text class="search-placeholder">搜索你心目中的TA</text>
-					</view>
-				</view>
-
 				<!-- Banner 轮播图 -->
 				<swiper v-if="banners.length > 0" class="banner-swiper" :indicator-dots="banners.length > 1"
-					:autoplay="true" :interval="3000" :duration="500" indicator-color="#F3F3F3"
+					:autoplay="true" :interval="3000" :duration="500" indicator-color="rgba(255,255,255,0.5)"
 					indicator-active-color="#FF6A6A" circular>
 					<swiper-item v-for="banner in banners" :key="banner.id" @click="handleBannerClick(banner)">
 						<image class="banner-image" :src="banner.imageUrl" mode="aspectFill" />
 					</swiper-item>
 				</swiper>
-
 				<!-- 无banner时的默认背景 -->
 				<view v-else class="banner-placeholder"></view>
+
+				<!-- 浮层：导航栏 + 搜索框 -->
+				<view class="banner-overlay">
+					<!-- 自定义导航栏 -->
+					<view class="custom-navbar" :style="{ paddingTop: statusBarHeight + 'px' }">
+						<view class="navbar-content">
+							<view class="header-title">相宜相亲</view>
+						</view>
+					</view>
+
+					<!-- 搜索框 -->
+					<view class="search-section">
+						<view class="search-bar" @click="handleSearchClick">
+							<text class="search-icon">🔍</text>
+							<text class="search-placeholder">搜索你心目中的TA</text>
+						</view>
+					</view>
+				</view>
 			</view>
 
 			<!-- 金刚位导航 -->
@@ -51,7 +59,11 @@
 
 			<!-- 推荐标题栏 -->
 			<view class="section-header">
-				<text class="section-title">今日推荐</text>
+				<view class="section-title-wrapper">
+					<text class="section-title-main">今日优质推荐</text>
+					<text class="section-title-highlight">已更新</text>
+				</view>
+				<text class="section-subtitle">每天早上五点准时更新</text>
 			</view>
 		</view>
 
@@ -70,15 +82,8 @@
 		</view>
 
 		<!-- 可滚动的用户列表区域 -->
-		<scroll-view 
-			class="user-scroll-area" 
-			scroll-y 
-			:style="{ height: scrollHeight }"
-			refresher-enabled
-			:refresher-triggered="isRefreshing"
-			@refresherrefresh="handleRefresh"
-			@scrolltolower="handleScrollToLower"
-		>
+		<scroll-view class="user-scroll-area" scroll-y :style="{ height: scrollHeight }" refresher-enabled
+			:refresher-triggered="isRefreshing" @refresherrefresh="handleRefresh" @scrolltolower="handleScrollToLower">
 			<!-- 用户列表 -->
 			<view class="user-list" v-if="recommendList.length > 0">
 				<UserCard v-for="user in recommendList" :key="user.userId" :userId="user.userId"
@@ -141,6 +146,9 @@
 			const userStore = useUserStore()
 			const configStore = useConfigStore()
 
+			// 状态栏高度
+			const statusBarHeight = ref(20)
+
 			// 页面状态
 			const pageLoading = ref(true)
 			const listLoading = ref(false)
@@ -287,6 +295,13 @@
 			const initPage = async () => {
 				pageLoading.value = true
 				try {
+					// 获取状态栏高度
+					uni.getSystemInfo({
+						success: (res) => {
+							statusBarHeight.value = res.statusBarHeight || 20
+						}
+					})
+
 					// 恢复用户状态
 					userStore.restoreFromStorage()
 
@@ -423,7 +438,24 @@
 
 			// 联系用户
 			const handleUserContact = (userId) => {
-				// 检查是否完善资料
+				// 1. 首先检查是否已登录
+				if (!userStore.isLoggedIn) {
+					uni.showModal({
+						title: '提示',
+						content: '请先登录后再联系对方',
+						confirmText: '去登录',
+						success: (res) => {
+							if (res.confirm) {
+								uni.navigateTo({
+									url: '/pages/auth/login'
+								})
+							}
+						}
+					})
+					return
+				}
+
+				// 2. 检查是否完善资料
 				if (!userStore.isProfileCompleted) {
 					uni.showModal({
 						title: '提示',
@@ -440,7 +472,7 @@
 					return
 				}
 
-				// 跳转到聊天页面（后续会实现解锁逻辑）
+				// 3. 跳转到聊天页面（后续会实现解锁逻辑）
 				uni.navigateTo({
 					url: `/pages/chat/index?targetUserId=${userId}`
 				})
@@ -487,6 +519,7 @@
 			})
 
 			return {
+				statusBarHeight,
 				pageLoading,
 				listLoading,
 				noMoreData,
@@ -518,13 +551,6 @@
 				handleRefresh
 			}
 		},
-		// 下拉刷新
-		async onPullDownRefresh() {
-			if (this.loadRecommendList) {
-				await this.loadRecommendList()
-			}
-			uni.stopPullDownRefresh()
-		},
 		// 页面显示
 		onShow() {
 			// 每次显示页面时检查弹窗
@@ -554,72 +580,84 @@
 		flex-shrink: 0;
 	}
 
-	// Banner 轮播图区域
+	// Banner区域
 	.banner-section {
-		width: 100%;
 		position: relative;
+		width: 100%;
+	}
 
-		.banner-overlay {
-			position: absolute;
-			top: 0;
-			left: 0;
-			right: 0;
-			z-index: 10;
-			padding: 20rpx 24rpx;
-			padding-top: calc(20rpx + env(safe-area-inset-top));
+	// Banner 轮播图
+	.banner-swiper {
+		width: 100%;
+		height: 420rpx;
+
+		.banner-image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+
+	.banner-placeholder {
+		width: 100%;
+		height: 420rpx;
+		background: linear-gradient(135deg, #FFB6C1 0%, #FFC0CB 100%);
+	}
+
+	// 浮层（导航栏+搜索框）
+	.banner-overlay {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		z-index: 10;
+	}
+
+	// 自定义导航栏
+	.custom-navbar {
+		.navbar-content {
+			height: 44px;
+			display: flex;
+			align-items: center;
+			justify-content: center;
 
 			.header-title {
 				font-size: 36rpx;
 				font-weight: 600;
 				color: #fff;
-				margin-top: 96rpx;
 				text-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.2);
-				margin-bottom: 28rpx;
-				text-align: center;
-			}
-
-			.search-bar {
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				background: rgba(255, 255, 255, 0.95);
-				border-radius: 40rpx;
-				padding: 20rpx 24rpx;
-
-				.search-icon {
-					font-size: 28rpx;
-					margin-right: 12rpx;
-					color: #999;
-				}
-
-				.search-placeholder {
-					font-size: 28rpx;
-					color: #999;
-				}
 			}
 		}
+	}
 
-		.banner-swiper {
-			width: 100%;
-			height: 420rpx;
+	// 搜索框
+	.search-section {
+		padding: 16rpx 24rpx;
 
-			.banner-image {
-				width: 100%;
-				height: 100%;
+		.search-bar {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			background: rgba(255, 255, 255, 0.95);
+			border-radius: 40rpx;
+			padding: 20rpx 24rpx;
+			box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.08);
+
+			.search-icon {
+				font-size: 28rpx;
+				margin-right: 12rpx;
+				color: #999;
 			}
-		}
 
-		.banner-placeholder {
-			width: 100%;
-			height: 420rpx;
-			background: linear-gradient(135deg, #FFB6C1 0%, #FFC0CB 100%);
+			.search-placeholder {
+				font-size: 28rpx;
+				color: #999;
+			}
 		}
 	}
 
 	// 金刚位导航
 	.kingkong-section {
 		padding: 20rpx;
-		background-color: #fff;
 
 		.kingkong-grid {
 			display: flex;
@@ -650,15 +688,38 @@
 	// 推荐标题栏
 	.section-header {
 		display: flex;
+		flex-direction: column;
 		align-items: center;
-		justify-content: space-between;
-		padding: 20rpx;
+		justify-content: center;
+		padding: 5rpx 20rpx 24rpx;
 		background-color: #f8f8f8;
 
-		.section-title {
-			font-size: 32rpx;
-			font-weight: 600;
-			color: #333;
+		.section-title-wrapper {
+			display: flex;
+			align-items: center;
+			margin-bottom: 8rpx;
+
+			.section-title-main {
+				font-size: 36rpx;
+				font-weight: 600;
+				color: #333;
+			}
+
+			.section-title-highlight {
+				font-size: 42rpx;
+				color: #FF6A6A;
+				background: transparent;
+				padding: 0;
+				border-radius: 0;
+				font-weight: 600;
+				font-style: italic;
+				box-shadow: none;
+			}
+		}
+
+		.section-subtitle {
+			font-size: 24rpx;
+			color: #999;
 		}
 
 		.section-more {
diff --git a/miniapp/pages/interact/favoritedMe.vue b/miniapp/pages/interact/favoritedMe.vue
index ffce3d4..5b80c7a 100644
--- a/miniapp/pages/interact/favoritedMe.vue
+++ b/miniapp/pages/interact/favoritedMe.vue
@@ -128,8 +128,8 @@ export default {
         const api = activeTab.value === 'favoritedMe' ? getFavoritedMe : getMyFavorite
         const res = await api(pageIndex.value, pageSize)
         
-        if (res && res.success) {
-          const newList = res.data?.list || []
+        if (res && (res.success || res.code === 0)) {
+          const newList = res.data?.items || []
           
           if (refresh) {
             list.value = newList
diff --git a/miniapp/pages/interact/myFavorite.vue b/miniapp/pages/interact/myFavorite.vue
index 5a3c051..705b83e 100644
--- a/miniapp/pages/interact/myFavorite.vue
+++ b/miniapp/pages/interact/myFavorite.vue
@@ -128,8 +128,8 @@ export default {
         const api = activeTab.value === 'favoritedMe' ? getFavoritedMe : getMyFavorite
         const res = await api(pageIndex.value, pageSize)
         
-        if (res && res.success) {
-          const newList = res.data?.list || []
+        if (res && (res.success || res.code === 0)) {
+          const newList = res.data?.items || []
           
           if (refresh) {
             list.value = newList
diff --git a/miniapp/pages/interact/myUnlocked.vue b/miniapp/pages/interact/myUnlocked.vue
index 20804d5..5609e67 100644
--- a/miniapp/pages/interact/myUnlocked.vue
+++ b/miniapp/pages/interact/myUnlocked.vue
@@ -128,8 +128,8 @@ export default {
         const api = activeTab.value === 'unlockedMe' ? getUnlockedMe : getMyUnlocked
         const res = await api(pageIndex.value, pageSize)
         
-        if (res && res.success) {
-          const newList = res.data?.list || []
+        if (res && (res.success || res.code === 0)) {
+          const newList = res.data?.items || []
           
           if (refresh) {
             list.value = newList
diff --git a/miniapp/pages/interact/myViewed.vue b/miniapp/pages/interact/myViewed.vue
index b857711..73069c8 100644
--- a/miniapp/pages/interact/myViewed.vue
+++ b/miniapp/pages/interact/myViewed.vue
@@ -128,8 +128,8 @@ export default {
         const api = activeTab.value === 'viewedMe' ? getViewedMe : getMyViewed
         const res = await api(pageIndex.value, pageSize)
         
-        if (res && res.success) {
-          const newList = res.data?.list || []
+        if (res && (res.success || res.code === 0)) {
+          const newList = res.data?.items || []
           
           if (refresh) {
             list.value = newList
diff --git a/miniapp/pages/interact/unlockedMe.vue b/miniapp/pages/interact/unlockedMe.vue
index d553b53..339ecfd 100644
--- a/miniapp/pages/interact/unlockedMe.vue
+++ b/miniapp/pages/interact/unlockedMe.vue
@@ -128,8 +128,8 @@ export default {
         const api = activeTab.value === 'unlockedMe' ? getUnlockedMe : getMyUnlocked
         const res = await api(pageIndex.value, pageSize)
         
-        if (res && res.success) {
-          const newList = res.data?.list || []
+        if (res && (res.success || res.code === 0)) {
+          const newList = res.data?.items || []
           
           if (refresh) {
             list.value = newList
diff --git a/miniapp/pages/interact/viewedMe.vue b/miniapp/pages/interact/viewedMe.vue
index 96e81d9..49d033b 100644
--- a/miniapp/pages/interact/viewedMe.vue
+++ b/miniapp/pages/interact/viewedMe.vue
@@ -128,8 +128,8 @@ export default {
         const api = activeTab.value === 'viewedMe' ? getViewedMe : getMyViewed
         const res = await api(pageIndex.value, pageSize)
         
-        if (res && res.success) {
-          const newList = res.data?.list || []
+        if (res && (res.success || res.code === 0)) {
+          const newList = res.data?.items || []
           
           if (refresh) {
             list.value = newList
diff --git a/miniapp/pages/profile/detail.vue b/miniapp/pages/profile/detail.vue
index 4eb8ab8..08d2b18 100644
--- a/miniapp/pages/profile/detail.vue
+++ b/miniapp/pages/profile/detail.vue
@@ -52,6 +52,10 @@
             <view class="name-row">
               <text class="nickname">{{ userDetail.nickname }}</text>
               <text class="relationship">({{ relationshipText }})</text>
+              <view class="header-tags">
+                <text v-if="userDetail.isRealName" class="tag tag-realname">已实名</text>
+                <text v-if="userDetail.isMember" class="tag tag-member">会员</text>
+              </view>
             </view>
             <text class="xiangqin-no">相亲ID: {{ userDetail.xiangQinNo }}</text>
           </view>
@@ -64,10 +68,6 @@
             <text class="gender-year" :class="{ male: userDetail.childGender === 1 }">
               {{ genderText }} · {{ userDetail.birthYear }}年
             </text>
-            <view class="tags-row">
-              <text v-if="userDetail.isRealName" class="tag tag-realname">已实名</text>
-              <text v-if="userDetail.isMember" class="tag tag-member">会员</text>
-            </view>
             <button class="share-btn" @click="handleShare">分享</button>
           </view>
           
@@ -259,7 +259,7 @@
 import { ref, computed, onMounted } from 'vue'
 import { useUserStore } from '@/store/user.js'
 import { getUserDetail } from '@/api/user.js'
-import { favorite, unlock, recordView } from '@/api/interact.js'
+import { favorite, unlock } from '@/api/interact.js'
 import { getFullImageUrl } from '@/utils/image.js'
 import Loading from '@/components/Loading/index.vue'
 import Popup from '@/components/Popup/index.vue'
@@ -459,14 +459,14 @@ const loadUserDetail = async () => {
   loading.value = true
   try {
     const res = await getUserDetail(userId.value)
-    if (res && res.code === 0 && res.data) {
+    // 后端返回 code: 0 表示成功
+    if (res && (res.success || res.code === 0) && res.data) {
       userDetail.value = res.data
       isFavorited.value = res.data.isFavorited || false
       isUnlocked.value = res.data.isUnlocked || false
       remainingUnlockQuota.value = res.data.remainingUnlockQuota || 0
       
-      // 记录浏览
-      await recordView(userId.value)
+      // 已登录用户记录浏览（后端已处理，这里不需要再调用）
     }
   } catch (error) {
     console.error('加载用户详情失败:', error)
@@ -492,9 +492,24 @@ const previewPhoto = (index) => {
 
 // 收藏处理
 const handleFavorite = async () => {
+  // 检查是否登录
+  if (!userStore.isLoggedIn) {
+    uni.showModal({
+      title: '提示',
+      content: '请先登录后再收藏',
+      confirmText: '去登录',
+      success: (res) => {
+        if (res.confirm) {
+          uni.navigateTo({ url: '/pages/login/index' })
+        }
+      }
+    })
+    return
+  }
+  
   try {
     const res = await favorite(userId.value)
-    if (res && res.code === 0) {
+    if (res && (res.success || res.code === 0)) {
       isFavorited.value = res.data?.isFavorited ?? !isFavorited.value
       uni.showToast({ 
         title: isFavorited.value ? '收藏成功' : '已取消收藏', 
@@ -513,6 +528,21 @@ const handleShare = () => {
 
 // 联系处理
 const handleContact = () => {
+  // 检查是否登录
+  if (!userStore.isLoggedIn) {
+    uni.showModal({
+      title: '提示',
+      content: '请先登录后再联系对方',
+      confirmText: '去登录',
+      success: (res) => {
+        if (res.confirm) {
+          uni.navigateTo({ url: '/pages/login/index' })
+        }
+      }
+    })
+    return
+  }
+  
   if (!userStore.isProfileCompleted) {
     showProfilePopup.value = true
     return
@@ -550,7 +580,7 @@ const handleConfirmUnlock = async () => {
   
   try {
     const res = await unlock(userId.value)
-    if (res && res.code === 0) {
+    if (res && (res.success || res.code === 0)) {
       isUnlocked.value = true
       showUnlockPopup.value = false
       remainingUnlockQuota.value = Math.max(0, remainingUnlockQuota.value - 1)
@@ -569,6 +599,21 @@ const handleGoMember = () => {
 
 // 拨打电话
 const handleCall = () => {
+  // 检查是否登录
+  if (!userStore.isLoggedIn) {
+    uni.showModal({
+      title: '提示',
+      content: '请先登录后再联系对方',
+      confirmText: '去登录',
+      success: (res) => {
+        if (res.confirm) {
+          uni.navigateTo({ url: '/pages/login/index' })
+        }
+      }
+    })
+    return
+  }
+  
   if (!isUnlocked.value) {
     showUnlockPopup.value = true
     return
@@ -641,16 +686,16 @@ defineExpose({
     padding: 0 24rpx;
 
     .navbar-back {
-      width: 60rpx;
-      height: 60rpx;
+      width: 80rpx;
+      height: 80rpx;
       display: flex;
       align-items: center;
       justify-content: center;
 
       .back-icon {
-        font-size: 48rpx;
+        font-size: 64rpx;
         color: #fff;
-        font-weight: 300;
+        font-weight: 400;
       }
     }
 
@@ -702,6 +747,8 @@ defineExpose({
       display: flex;
       align-items: center;
       margin-bottom: 8rpx;
+      flex-wrap: wrap;
+      gap: 8rpx;
 
       .nickname {
         font-size: 32rpx;
@@ -712,7 +759,28 @@ defineExpose({
       .relationship {
         font-size: 28rpx;
         color: #666;
+      }
+
+      .header-tags {
+        display: flex;
+        gap: 8rpx;
         margin-left: 8rpx;
+
+        .tag {
+          font-size: 20rpx;
+          padding: 4rpx 12rpx;
+          border-radius: 16rpx;
+
+          &.tag-realname {
+            background: #e8f5e9;
+            color: #4caf50;
+          }
+
+          &.tag-member {
+            background: linear-gradient(135deg, #fff3e0 0%, #ffe0b2 100%);
+            color: #ff9800;
+          }
+        }
       }
     }
 
@@ -758,9 +826,8 @@ defineExpose({
 .gender-year-row {
   display: flex;
   align-items: center;
+  justify-content: space-between;
   margin-bottom: 24rpx;
-  flex-wrap: wrap;
-  gap: 16rpx;
 
   .gender-year {
     font-size: 40rpx;
@@ -772,29 +839,7 @@ defineExpose({
     }
   }
 
-  .tags-row {
-    display: flex;
-    gap: 12rpx;
-
-    .tag {
-      font-size: 22rpx;
-      padding: 6rpx 16rpx;
-      border-radius: 20rpx;
-
-      &.tag-realname {
-        background: #e8f5e9;
-        color: #4caf50;
-      }
-
-      &.tag-member {
-        background: linear-gradient(135deg, #fff3e0 0%, #ffe0b2 100%);
-        color: #ff9800;
-      }
-    }
-  }
-
   .share-btn {
-    margin-left: auto;
     padding: 12rpx 32rpx;
     font-size: 26rpx;
     color: #ff6b6b;
@@ -1034,7 +1079,7 @@ defineExpose({
     height: 88rpx;
     line-height: 88rpx;
     font-size: 30rpx;
-    border-radius: 44rpx;
+    border-radius: 16rpx;
     border: none;
 
     &::after {
@@ -1043,23 +1088,21 @@ defineExpose({
   }
 
   .btn-greet {
-    background: linear-gradient(135deg, #ff8a8a 0%, #ff6b6b 100%);
+    background: #4cd964;
     color: #fff;
   }
 
   .btn-favorite {
-    background: #fff;
-    color: #666;
-    border: 2rpx solid #ddd;
+    background: #f5d742;
+    color: #fff;
 
     &.active {
-      color: #ff6b6b;
-      border-color: #ff6b6b;
+      background: #e5c732;
     }
   }
 
   .btn-call {
-    background: linear-gradient(135deg, #ffb5b5 0%, #ff9a9a 100%);
+    background: #ff9a9a;
     color: #fff;
   }
 }
diff --git a/miniapp/pages/realname/index.vue b/miniapp/pages/realname/index.vue
index 3ec86c2..cca6c05 100644
--- a/miniapp/pages/realname/index.vue
+++ b/miniapp/pages/realname/index.vue
@@ -3,8 +3,24 @@
     <!-- 页面加载状态 -->
     <Loading type="page" :loading="pageLoading" />
     
+    <!-- 顶部背景图 -->
+    <view class="top-bg">
+      <image src="/static/title_bg.png" mode="aspectFill" class="bg-img" />
+    </view>
+    
+    <!-- 自定义导航栏 -->
+    <view class="custom-navbar" :style="{ paddingTop: statusBarHeight + 'px' }">
+      <view class="navbar-content">
+        <view class="navbar-back" @click="handleBack">
+          <text class="back-icon">‹</text>
+        </view>
+        <text class="navbar-title">实名认证</text>
+        <view class="navbar-placeholder"></view>
+      </view>
+    </view>
+    
     <!-- 已认证状态 (Requirements 12.4) -->
-    <view v-if="isVerified" class="verified-section">
+    <view v-if="isVerified" class="verified-section" :style="{ paddingTop: (statusBarHeight + 44) + 'px' }">
       <view class="verified-icon">✓</view>
       <view class="verified-title">实名认证已完成</view>
       <view class="verified-info">
@@ -25,198 +41,174 @@
     
     <!-- 未认证状态 - 分步骤显示 -->
     <view v-else class="unverified-section">
-      <!-- 步骤1: 支付页面 (Requirements 12.1) -->
-      <view v-if="currentStep === 1" class="step-payment">
-        <view class="step-header">
-          <view class="step-indicator">
-            <view class="step-item active">
-              <view class="step-num">1</view>
-              <text class="step-text">支付费用</text>
-            </view>
-            <view class="step-line"></view>
-            <view class="step-item">
-              <view class="step-num">2</view>
-              <text class="step-text">上传证件</text>
-            </view>
-            <view class="step-line"></view>
-            <view class="step-item">
-              <view class="step-num">3</view>
-              <text class="step-text">认证完成</text>
-            </view>
+      <!-- 固定的步骤指示器 -->
+      <view class="step-header-fixed" :style="{ top: (statusBarHeight + 44) + 'px' }">
+        <view class="step-indicator">
+          <view class="step-item" :class="{ active: currentStep === 1, completed: currentStep > 1 }" @click="currentStep = 1">
+            <view class="step-num">{{ currentStep > 1 ? '✓' : '1' }}</view>
+            <text class="step-text">支付费用</text>
           </view>
-        </view>
-        
-        <view class="payment-content">
-          <view class="payment-icon">🛡️</view>
-          <view class="payment-title">实名认证</view>
-          <view class="payment-desc">完成实名认证，提升信任度，获得更多关注</view>
-          
-          <view class="payment-benefits">
-            <view class="benefit-item">
-              <text class="benefit-icon">✓</text>
-              <text class="benefit-text">展示"已实名"徽章</text>
-            </view>
-            <view class="benefit-item">
-              <text class="benefit-icon">✓</text>
-              <text class="benefit-text">提升资料可信度</text>
-            </view>
-            <view class="benefit-item">
-              <text class="benefit-icon">✓</text>
-              <text class="benefit-text">获得更多用户关注</text>
-            </view>
+          <view class="step-line" :class="{ completed: currentStep > 1 }"></view>
+          <view class="step-item" :class="{ active: currentStep === 2, completed: currentStep > 2 }" @click="currentStep = 2">
+            <view class="step-num">{{ currentStep > 2 ? '✓' : '2' }}</view>
+            <text class="step-text">上传证件</text>
           </view>
-          
-          <view class="payment-price">
-            <text class="price-label">认证费用</text>
-            <view class="price-value">
-              <text class="symbol">¥</text>
-              <text class="amount">{{ verificationFee }}</text>
-            </view>
+          <view class="step-line" :class="{ completed: currentStep > 2 }"></view>
+          <view class="step-item" :class="{ active: currentStep === 3 }" @click="currentStep = 3">
+            <view class="step-num">3</view>
+            <text class="step-text">认证完成</text>
           </view>
         </view>
-        
-        <view class="bottom-action">
-          <button 
-            class="btn-pay" 
-            :disabled="paying"
-            @click="handlePayment"
-          >
-            <text v-if="paying">支付中...</text>
-            <text v-else>立即支付 ¥{{ verificationFee }}</text>
-          </button>
-        </view>
       </view>
       
-      <!-- 步骤2: 身份证上传页面 (Requirements 12.2, 12.3) -->
-      <view v-if="currentStep === 2" class="step-upload">
-        <view class="step-header">
-          <view class="step-indicator">
-            <view class="step-item completed">
-              <view class="step-num">✓</view>
-              <text class="step-text">支付费用</text>
+      <!-- 可滚动内容区域 -->
+      <scroll-view 
+        class="content-scroll" 
+        scroll-y 
+        :style="{ 
+          top: (statusBarHeight + 44 + 100) + 'px',
+          height: 'calc(100vh - ' + (statusBarHeight + 44 + 100 + 120) + 'px)'
+        }"
+      >
+        <!-- 步骤1: 支付页面 (Requirements 12.1) -->
+        <view v-if="currentStep === 1" class="step-payment">
+          <view class="payment-content">
+            <view class="payment-icon">🛡️</view>
+            <view class="payment-title">实名认证</view>
+            <view class="payment-desc">完成实名认证，提升信任度，获得更多关注</view>
+            
+            <view class="payment-benefits">
+              <view class="benefit-item">
+                <text class="benefit-icon">✓</text>
+                <text class="benefit-text">展示"已实名"徽章</text>
+              </view>
+              <view class="benefit-item">
+                <text class="benefit-icon">✓</text>
+                <text class="benefit-text">提升资料可信度</text>
+              </view>
+              <view class="benefit-item">
+                <text class="benefit-icon">✓</text>
+                <text class="benefit-text">获得更多用户关注</text>
+              </view>
             </view>
-            <view class="step-line completed"></view>
-            <view class="step-item active">
-              <view class="step-num">2</view>
-              <text class="step-text">上传证件</text>
-            </view>
-            <view class="step-line"></view>
-            <view class="step-item">
-              <view class="step-num">3</view>
-              <text class="step-text">认证完成</text>
+            
+            <view class="payment-price">
+              <text class="price-label">认证费用</text>
+              <view class="price-value">
+                <text class="symbol">¥</text>
+                <text class="amount">{{ verificationFee }}</text>
+              </view>
             </view>
           </view>
         </view>
         
-        <view class="upload-content">
-          <view class="upload-title">请上传身份证照片</view>
-          <view class="upload-desc">请确保照片清晰、完整，信息可辨认</view>
-          
-          <!-- 身份证正面 -->
-          <view class="upload-card">
-            <view class="card-label">身份证人像面</view>
-            <view 
-              class="card-upload"
-              :class="{ 'has-image': idCardFront }"
-              @click="chooseIdCardFront"
-            >
-              <image 
-                v-if="idCardFront" 
-                :src="idCardFront" 
-                mode="aspectFill"
-                class="card-image"
-              />
-              <view v-else class="card-placeholder">
-                <text class="placeholder-icon">📷</text>
-                <text class="placeholder-text">点击上传</text>
+        <!-- 步骤2: 身份证上传页面 (Requirements 12.2, 12.3) -->
+        <view v-if="currentStep === 2" class="step-upload">
+          <view class="upload-content">
+            <view class="upload-title">请上传身份证照片</view>
+            <view class="upload-desc">请确保照片清晰、完整，信息可辨认</view>
+            
+            <!-- 身份证正面 -->
+            <view class="upload-card">
+              <view class="card-label">身份证人像面</view>
+              <view 
+                class="card-upload"
+                :class="{ 'has-image': idCardFront }"
+                @click="chooseIdCardFront"
+              >
+                <image 
+                  v-if="idCardFront" 
+                  :src="idCardFront" 
+                  mode="aspectFill"
+                  class="card-image"
+                />
+                <view v-else class="card-placeholder">
+                  <text class="placeholder-icon">📷</text>
+                  <text class="placeholder-text">点击上传</text>
+                </view>
               </view>
             </view>
-          </view>
-          
-          <!-- 身份证反面 -->
-          <view class="upload-card">
-            <view class="card-label">身份证国徽面</view>
-            <view 
-              class="card-upload"
-              :class="{ 'has-image': idCardBack }"
-              @click="chooseIdCardBack"
-            >
-              <image 
-                v-if="idCardBack" 
-                :src="idCardBack" 
-                mode="aspectFill"
-                class="card-image"
-              />
-              <view v-else class="card-placeholder">
-                <text class="placeholder-icon">📷</text>
-                <text class="placeholder-text">点击上传</text>
+            
+            <!-- 身份证反面 -->
+            <view class="upload-card">
+              <view class="card-label">身份证国徽面</view>
+              <view 
+                class="card-upload"
+                :class="{ 'has-image': idCardBack }"
+                @click="chooseIdCardBack"
+              >
+                <image 
+                  v-if="idCardBack" 
+                  :src="idCardBack" 
+                  mode="aspectFill"
+                  class="card-image"
+                />
+                <view v-else class="card-placeholder">
+                  <text class="placeholder-icon">📷</text>
+                  <text class="placeholder-text">点击上传</text>
+                </view>
               </view>
             </view>
-          </view>
-          
-          <view class="upload-tips">
-            <view class="tips-title">温馨提示：</view>
-            <view class="tips-item">• 请上传本人有效身份证照片</view>
-            <view class="tips-item">• 照片需清晰可辨，无遮挡</view>
-            <view class="tips-item">• 您的信息将被严格保密</view>
+            
+            <view class="upload-tips">
+              <view class="tips-title">温馨提示：</view>
+              <view class="tips-item">• 请上传本人有效身份证照片</view>
+              <view class="tips-item">• 照片需清晰可辨，无遮挡</view>
+              <view class="tips-item">• 您的信息将被严格保密</view>
+            </view>
           </view>
         </view>
         
-        <view class="bottom-action">
-          <button 
-            class="btn-submit" 
-            :disabled="!canSubmit || submitting"
-            @click="handleSubmitVerification"
-          >
-            <text v-if="submitting">提交中...</text>
-            <text v-else>提交认证</text>
-          </button>
+        <!-- 步骤3: 认证结果页面 (Requirements 12.4) -->
+        <view v-if="currentStep === 3" class="step-result">
+          <view class="result-content">
+            <view class="result-icon success">✓</view>
+            <view class="result-title">实名认证成功</view>
+            <view class="result-desc">您的身份信息已通过验证</view>
+            
+            <view class="result-info">
+              <view class="info-item">
+                <text class="label">姓名：</text>
+                <text class="value">{{ maskedName }}</text>
+              </view>
+              <view class="info-item">
+                <text class="label">身份证号：</text>
+                <text class="value">{{ maskedIdNumber }}</text>
+              </view>
+            </view>
+          </view>
         </view>
-      </view>
+      </scroll-view>
       
-      <!-- 步骤3: 认证结果页面 (Requirements 12.4) -->
-      <view v-if="currentStep === 3" class="step-result">
-        <view class="step-header">
-          <view class="step-indicator">
-            <view class="step-item completed">
-              <view class="step-num">✓</view>
-              <text class="step-text">支付费用</text>
-            </view>
-            <view class="step-line completed"></view>
-            <view class="step-item completed">
-              <view class="step-num">✓</view>
-              <text class="step-text">上传证件</text>
-            </view>
-            <view class="step-line completed"></view>
-            <view class="step-item active">
-              <view class="step-num">3</view>
-              <text class="step-text">认证完成</text>
-            </view>
-          </view>
-        </view>
+      <!-- 底部操作按钮 -->
+      <view class="bottom-action">
+        <button 
+          v-if="currentStep === 1"
+          class="btn-pay" 
+          :disabled="paying"
+          @click="handlePayment"
+        >
+          <text v-if="paying">支付中...</text>
+          <text v-else>立即支付 ¥{{ verificationFee }}</text>
+        </button>
         
-        <view class="result-content">
-          <view class="result-icon success">✓</view>
-          <view class="result-title">实名认证成功</view>
-          <view class="result-desc">您的身份信息已通过验证</view>
-          
-          <view class="result-info">
-            <view class="info-item">
-              <text class="label">姓名：</text>
-              <text class="value">{{ maskedName }}</text>
-            </view>
-            <view class="info-item">
-              <text class="label">身份证号：</text>
-              <text class="value">{{ maskedIdNumber }}</text>
-            </view>
-          </view>
-        </view>
+        <button 
+          v-if="currentStep === 2"
+          class="btn-submit" 
+          :disabled="!canSubmit || submitting"
+          @click="handleSubmitVerification"
+        >
+          <text v-if="submitting">提交中...</text>
+          <text v-else>提交认证</text>
+        </button>
         
-        <view class="bottom-action">
-          <button class="btn-done" @click="handleDone">
-            完成
-          </button>
-        </view>
+        <button 
+          v-if="currentStep === 3"
+          class="btn-done" 
+          @click="handleDone"
+        >
+          完成
+        </button>
       </view>
     </view>
   </view>
@@ -227,7 +219,7 @@ import { ref, computed, onMounted } from 'vue'
 import { useUserStore } from '@/store/user.js'
 import { createOrder } from '@/api/order.js'
 import { maskName, maskIdNumber } from '@/utils/format.js'
-import { get, post } from '@/api/request.js'
+import { get } from '@/api/request.js'
 import { getToken } from '@/utils/storage.js'
 import Loading from '@/components/Loading/index.vue'
 
@@ -242,6 +234,9 @@ export default {
   setup() {
     const userStore = useUserStore()
     
+    // 状态栏高度
+    const statusBarHeight = ref(20)
+    
     // 页面状态
     const pageLoading = ref(true)
     const paying = ref(false)
@@ -258,6 +253,20 @@ export default {
     // 认证结果
     const verificationResult = ref(null)
     
+    // 获取系统信息
+    const getSystemInfo = () => {
+      uni.getSystemInfo({
+        success: (res) => {
+          statusBarHeight.value = res.statusBarHeight || 20
+        }
+      })
+    }
+    
+    // 返回上一页
+    const handleBack = () => {
+      uni.navigateBack()
+    }
+    
     // 计算属性
     const isVerified = computed(() => userStore.isRealName)
     
@@ -308,6 +317,7 @@ export default {
     const initPage = async () => {
       pageLoading.value = true
       try {
+        getSystemInfo()
         userStore.restoreFromStorage()
         await getRealNameStatus()
       } catch (error) {
@@ -552,6 +562,7 @@ export default {
     })
     
     return {
+      statusBarHeight,
       pageLoading,
       paying,
       submitting,
@@ -563,6 +574,7 @@ export default {
       canSubmit,
       maskedName,
       maskedIdNumber,
+      handleBack,
       handlePayment,
       chooseIdCardFront,
       chooseIdCardBack,
@@ -580,13 +592,71 @@ export default {
 
 <style lang="scss" scoped>
 .realname-page {
-  min-height: 100vh;
+  height: 100vh;
   background-color: #f8f8f8;
 }
 
+// 顶部背景图
+.top-bg {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  height: 400rpx;
+  z-index: 0;
+
+  .bg-img {
+    width: 100%;
+    height: 100%;
+  }
+}
+
+// 自定义导航栏
+.custom-navbar {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  z-index: 200;
+
+  .navbar-content {
+    position: relative;
+    height: 44px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 24rpx;
+
+    .navbar-back {
+      width: 80rpx;
+      height: 80rpx;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+
+      .back-icon {
+        font-size: 56rpx;
+        color: #333;
+        font-weight: 300;
+      }
+    }
+
+    .navbar-title {
+      font-size: 34rpx;
+      font-weight: 600;
+      color: #333;
+    }
+
+    .navbar-placeholder {
+      width: 80rpx;
+    }
+  }
+}
+
 // 已认证状态
 .verified-section {
   padding: 60rpx 30rpx;
+  padding-top: 60rpx;
   display: flex;
   flex-direction: column;
   align-items: center;
@@ -664,19 +734,44 @@ export default {
 
 // 未认证状态
 .unverified-section {
-  min-height: 100vh;
-  padding-bottom: 160rpx;
+  height: 100vh;
+  position: relative;
+  z-index: 1;
+  overflow: hidden;
 }
 
-// 步骤指示器
-.step-header {
-  background: #fff;
-  padding: 40rpx 30rpx;
+// 可滚动内容区域
+.content-scroll {
+  position: fixed;
+  left: 0;
+  right: 0;
+  background: transparent;
+}
+
+// 步骤内容区域
+.step-payment,
+.step-upload,
+.step-result {
+  padding: 0;
+}
+
+// 固定的步骤指示器
+.step-header-fixed {
+  position: fixed;
+  left: 0;
+  right: 0;
+  z-index: 99;
+  padding: 20rpx 30rpx;
+  background: transparent;
   
   .step-indicator {
     display: flex;
     align-items: center;
     justify-content: center;
+    background: #fff;
+    border-radius: 20rpx;
+    padding: 24rpx 20rpx;
+    box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.08);
     
     .step-item {
       display: flex;
@@ -739,6 +834,69 @@ export default {
   }
 }
 
+// 步骤指示器（保留旧样式兼容）
+.step-header {
+  padding: 30rpx;
+  padding-top: 20rpx;
+  
+  .step-indicator {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background: #fff;
+    border-radius: 20rpx;
+    padding: 24rpx 20rpx;
+    box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.08);
+    
+    .step-item {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      
+      .step-num {
+        width: 48rpx;
+        height: 48rpx;
+        border-radius: 50%;
+        background: #e0e0e0;
+        color: #999;
+        font-size: 24rpx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        margin-bottom: 12rpx;
+      }
+      
+      .step-text {
+        font-size: 22rpx;
+        color: #999;
+      }
+      
+      &.active {
+        .step-num {
+          background: linear-gradient(135deg, #52c41a 0%, #389e0d 100%);
+          color: #fff;
+        }
+        
+        .step-text {
+          color: #52c41a;
+        }
+      }
+    }
+    
+    .step-line {
+      width: 80rpx;
+      height: 4rpx;
+      background: #e0e0e0;
+      margin: 0 16rpx;
+      margin-bottom: 30rpx;
+      
+      &.completed {
+        background: linear-gradient(135deg, #52c41a 0%, #389e0d 100%);
+      }
+    }
+  }
+}
+
 // 步骤1: 支付页面
 .step-payment {
   .payment-content {
diff --git a/miniapp/pages/search/index.vue b/miniapp/pages/search/index.vue
index 946475f..c629fe3 100644
--- a/miniapp/pages/search/index.vue
+++ b/miniapp/pages/search/index.vue
@@ -1,235 +1,330 @@
 <template>
   <view class="search-page">
-    <!-- 筛选条件表单 -->
-    <view class="filter-section">
-      <view class="section-title">筛选条件</view>
-      
-      <!-- 年龄范围 -->
-      <view class="filter-item">
-        <text class="filter-label">年龄</text>
-        <view class="range-picker">
-          <picker 
-            :value="ageMinIndex" 
-            :range="ageOptions"
-            @change="handleAgeMinChange"
-          >
-            <view class="picker-value">{{ filters.ageMin || '不限' }}</view>
-          </picker>
-          <text class="range-separator">至</text>
-          <picker 
-            :value="ageMaxIndex" 
-            :range="ageOptions"
-            @change="handleAgeMaxChange"
-          >
-            <view class="picker-value">{{ filters.ageMax || '不限' }}</view>
-          </picker>
-          <text class="range-unit">岁</text>
+    <!-- 自定义导航栏 -->
+    <view class="custom-navbar" :style="{ paddingTop: statusBarHeight + 'px' }">
+      <view class="navbar-content">
+        <view class="navbar-back" @click="handleBack">
+          <text class="back-icon">‹</text>
+        </view>
+        <text class="navbar-title">搜索</text>
+        <view class="navbar-placeholder"></view>
+      </view>
+    </view>
+
+    <!-- 内容区域 -->
+    <scroll-view 
+      class="content-scroll" 
+      scroll-y 
+      :style="{ paddingTop: (statusBarHeight + 44) + 'px' }"
+    >
+      <!-- 顶部Banner -->
+      <view class="banner-section">
+        <view class="banner-bg"></view>
+        <view class="banner-text">
+          <text class="banner-title">大胆说出</text>
+          <text class="banner-title">你的爱</text>
+        </view>
+        <view class="banner-decoration">
+          <text class="deco-heart">💕</text>
+          <text class="deco-ring">💍</text>
         </view>
       </view>
 
-      <!-- 身高范围 -->
-      <view class="filter-item">
-        <text class="filter-label">身高</text>
-        <view class="range-picker">
-          <picker 
-            :value="heightMinIndex" 
-            :range="heightOptions"
-            @change="handleHeightMinChange"
-          >
-            <view class="picker-value">{{ filters.heightMin || '不限' }}</view>
-          </picker>
-          <text class="range-separator">至</text>
-          <picker 
-            :value="heightMaxIndex" 
-            :range="heightOptions"
-            @change="handleHeightMaxChange"
-          >
-            <view class="picker-value">{{ filters.heightMax || '不限' }}</view>
-          </picker>
-          <text class="range-unit">cm</text>
-        </view>
-      </view>
-
-      <!-- 学历 -->
-      <view class="filter-item">
-        <text class="filter-label">学历</text>
-        <view class="checkbox-group">
-          <view 
-            v-for="edu in educationOptions" 
-            :key="edu.value"
-            class="checkbox-item"
-            :class="{ active: filters.education.includes(edu.value) }"
-            @click="toggleEducation(edu.value)"
-          >
-            {{ edu.label }}
+      <!-- 筛选表单 -->
+      <view class="filter-form">
+        <!-- 年龄要求 -->
+        <view class="filter-item" @click="showAgePicker">
+          <text class="filter-label">年龄要求</text>
+          <view class="filter-value">
+            <text>{{ ageText }}</text>
+            <text class="arrow">›</text>
           </view>
         </view>
-      </view>
 
-      <!-- 工作地点 -->
-      <view class="filter-item">
-        <text class="filter-label">工作地点</text>
-        <picker 
-          mode="region"
-          :level="'city'"
-          :value="[filters.province, filters.city]"
-          @change="handleLocationChange"
-        >
-          <view class="picker-value location-picker">
-            {{ locationText || '不限' }}
-            <text class="picker-arrow">▼</text>
-          </view>
-        </picker>
-      </view>
-
-      <!-- 月收入 -->
-      <view class="filter-item">
-        <text class="filter-label">月收入</text>
-        <view class="range-picker">
-          <picker 
-            :value="incomeMinIndex" 
-            :range="incomeOptions"
-            range-key="label"
-            @change="handleIncomeMinChange"
-          >
-            <view class="picker-value">{{ getIncomeLabel(filters.monthlyIncomeMin) }}</view>
-          </picker>
-          <text class="range-separator">至</text>
-          <picker 
-            :value="incomeMaxIndex" 
-            :range="incomeOptions"
-            range-key="label"
-            @change="handleIncomeMaxChange"
-          >
-            <view class="picker-value">{{ getIncomeLabel(filters.monthlyIncomeMax) }}</view>
-          </picker>
-        </view>
-      </view>
-
-      <!-- 房产状态 -->
-      <view class="filter-item">
-        <text class="filter-label">房产</text>
-        <view class="checkbox-group">
-          <view 
-            v-for="house in houseOptions" 
-            :key="house.value"
-            class="checkbox-item"
-            :class="{ active: filters.houseStatus.includes(house.value) }"
-            @click="toggleHouse(house.value)"
-          >
-            {{ house.label }}
+        <!-- 身高要求 -->
+        <view class="filter-item" @click="showHeightPicker">
+          <text class="filter-label">身高要求</text>
+          <view class="filter-value">
+            <text>{{ heightText }}</text>
+            <text class="arrow">›</text>
           </view>
         </view>
-      </view>
 
-      <!-- 车辆状态 -->
-      <view class="filter-item">
-        <text class="filter-label">车辆</text>
-        <view class="checkbox-group">
-          <view 
-            v-for="car in carOptions" 
-            :key="car.value"
-            class="checkbox-item"
-            :class="{ active: filters.carStatus.includes(car.value) }"
-            @click="toggleCar(car.value)"
-          >
-            {{ car.label }}
+        <!-- 学历要求(可多选) -->
+        <view class="filter-item-multi">
+          <text class="filter-label">学历要求(可多选)</text>
+          <view class="tag-group">
+            <view 
+              v-for="edu in educationOptions" 
+              :key="edu.value"
+              class="tag-item"
+              :class="{ active: filters.education.includes(edu.value) }"
+              @click="toggleEducation(edu.value)"
+            >
+              {{ edu.label }}
+            </view>
           </view>
         </view>
-      </view>
 
-      <!-- 婚姻状态 -->
-      <view class="filter-item">
-        <text class="filter-label">婚姻状态</text>
-        <view class="checkbox-group">
-          <view 
-            v-for="marriage in marriageOptions" 
-            :key="marriage.value"
-            class="checkbox-item"
-            :class="{ active: filters.marriageStatus.includes(marriage.value) }"
-            @click="toggleMarriage(marriage.value)"
-          >
-            {{ marriage.label }}
+        <!-- 地区要求(可多选) -->
+        <view class="filter-item-multi">
+          <text class="filter-label">地区要求(可多选)</text>
+          <view class="tag-group">
+            <view 
+              v-for="(city, index) in selectedCities" 
+              :key="index"
+              class="tag-item active"
+              @click="removeCity(index)"
+            >
+              {{ city }}
+              <text class="tag-close">×</text>
+            </view>
+            <view class="tag-item add-tag" @click="showCityPicker">
+              +其他地区
+            </view>
+          </view>
+        </view>
+
+        <!-- 月收入要求 -->
+        <view class="filter-item" @click="showIncomePicker">
+          <text class="filter-label">月收入要求</text>
+          <view class="filter-value">
+            <text>{{ incomeText }}</text>
+            <text class="arrow">›</text>
+          </view>
+        </view>
+
+        <!-- 房产要求 -->
+        <view class="filter-item" @click="showHousePicker">
+          <text class="filter-label">房产要求</text>
+          <view class="filter-value">
+            <text>{{ houseText }}</text>
+            <text class="arrow">›</text>
+          </view>
+        </view>
+
+        <!-- 车产要求 -->
+        <view class="filter-item" @click="showCarPicker">
+          <text class="filter-label">车产要求</text>
+          <view class="filter-value">
+            <text>{{ carText }}</text>
+            <text class="arrow">›</text>
+          </view>
+        </view>
+
+        <!-- 婚姻要求 -->
+        <view class="filter-item" @click="showMarriagePicker">
+          <text class="filter-label">婚姻要求</text>
+          <view class="filter-value">
+            <text>{{ marriageText }}</text>
+            <text class="arrow">›</text>
           </view>
         </view>
       </view>
 
       <!-- 搜索按钮 -->
-      <view class="search-buttons">
-        <button class="btn-reset" @click="handleReset">重置</button>
-        <button class="btn-search" @click="handleSearch">搜索</button>
+      <view class="search-btn-section">
+        <button class="btn-search" @click="handleSearch">立即搜索</button>
+      </view>
+    </scroll-view>
+
+    <!-- 年龄选择弹窗 -->
+    <view class="picker-popup" v-if="showAgePopup" @click.self="showAgePopup = false">
+      <view class="picker-content">
+        <view class="picker-header">
+          <text class="picker-cancel" @click="showAgePopup = false">取消</text>
+          <text class="picker-title">年龄要求</text>
+          <text class="picker-confirm" @click="confirmAge">确定</text>
+        </view>
+        <view class="picker-body">
+          <picker-view :value="agePickerValue" @change="onAgeChange" class="picker-view">
+            <picker-view-column>
+              <view v-for="age in ageMinOptions" :key="age" class="picker-item">{{ age }}</view>
+            </picker-view-column>
+            <picker-view-column>
+              <view class="picker-item">至</view>
+            </picker-view-column>
+            <picker-view-column>
+              <view v-for="age in ageMaxOptions" :key="age" class="picker-item">{{ age }}</view>
+            </picker-view-column>
+          </picker-view>
+        </view>
       </view>
     </view>
 
-    <!-- 搜索结果 -->
-    <view v-if="hasSearched" class="results-section">
-      <view class="section-title">
-        搜索结果
-        <text class="result-count">共{{ totalCount }}人</text>
-      </view>
-      
-      <!-- 加载中 -->
-      <Loading v-if="loading" />
-      
-      <!-- 空状态 -->
-      <Empty v-else-if="!loading && results.length === 0" text="暂无符合条件的用户" />
-      
-      <!-- 结果列表 -->
-      <view v-else class="results-list">
-        <view 
-          v-for="user in results" 
-          :key="user.userId"
-          class="result-item-wrapper"
-        >
-          <!-- 非会员模糊遮罩 Property 20: Search Results Display -->
-          <view v-if="!isMember" class="blur-mask">
-            <view class="blur-content">
-              <text class="blur-text">开通会员查看完整信息</text>
-              <button class="btn-member" @click="goToMember">立即开通</button>
-            </view>
-          </view>
-          
-          <UserCard
-            :userId="user.userId"
-            :nickname="user.nickname"
-            :avatar="user.avatar"
-            :age="user.age"
-            :workCity="user.workCity"
-            :height="user.height"
-            :education="user.education"
-            :educationName="user.educationName"
-            :occupation="user.occupation"
-            :isMember="user.isMember"
-            :isRealName="user.isRealName"
-            :isPhotoPublic="user.isPhotoPublic"
-            :firstPhoto="user.firstPhoto"
-            :viewedToday="user.viewedToday"
-            @click="handleCardClick"
-            @contact="handleContact"
-          />
+    <!-- 身高选择弹窗 -->
+    <view class="picker-popup" v-if="showHeightPopup" @click.self="showHeightPopup = false">
+      <view class="picker-content">
+        <view class="picker-header">
+          <text class="picker-cancel" @click="showHeightPopup = false">取消</text>
+          <text class="picker-title">身高要求</text>
+          <text class="picker-confirm" @click="confirmHeight">确定</text>
+        </view>
+        <view class="picker-body">
+          <picker-view :value="heightPickerValue" @change="onHeightChange" class="picker-view">
+            <picker-view-column>
+              <view v-for="h in heightMinOptions" :key="h" class="picker-item">{{ h }}</view>
+            </picker-view-column>
+            <picker-view-column>
+              <view class="picker-item">至</view>
+            </picker-view-column>
+            <picker-view-column>
+              <view v-for="h in heightMaxOptions" :key="h" class="picker-item">{{ h }}</view>
+            </picker-view-column>
+          </picker-view>
         </view>
       </view>
-      
-      <!-- 加载更多 -->
-      <view v-if="results.length > 0 && hasMore" class="load-more" @click="loadMore">
-        <text>{{ loadingMore ? '加载中...' : '加载更多' }}</text>
+    </view>
+
+    <!-- 收入选择弹窗 -->
+    <view class="picker-popup" v-if="showIncomePopup" @click.self="showIncomePopup = false">
+      <view class="picker-content">
+        <view class="picker-header">
+          <text class="picker-cancel" @click="showIncomePopup = false">取消</text>
+          <text class="picker-title">月收入要求</text>
+          <text class="picker-confirm" @click="confirmIncome">确定</text>
+        </view>
+        <view class="picker-body">
+          <picker-view :value="incomePickerValue" @change="onIncomeChange" class="picker-view">
+            <picker-view-column>
+              <view v-for="item in incomeOptions" :key="item.value" class="picker-item">{{ item.label }}</view>
+            </picker-view-column>
+          </picker-view>
+        </view>
+      </view>
+    </view>
+
+    <!-- 房产选择弹窗 -->
+    <view class="picker-popup" v-if="showHousePopup" @click.self="showHousePopup = false">
+      <view class="picker-content">
+        <view class="picker-header">
+          <text class="picker-cancel" @click="showHousePopup = false">取消</text>
+          <text class="picker-title">房产要求</text>
+          <text class="picker-confirm" @click="confirmHouse">确定</text>
+        </view>
+        <view class="picker-body">
+          <picker-view :value="housePickerValue" @change="onHouseChange" class="picker-view">
+            <picker-view-column>
+              <view v-for="item in houseOptions" :key="item.value" class="picker-item">{{ item.label }}</view>
+            </picker-view-column>
+          </picker-view>
+        </view>
+      </view>
+    </view>
+
+    <!-- 车产选择弹窗 -->
+    <view class="picker-popup" v-if="showCarPopup" @click.self="showCarPopup = false">
+      <view class="picker-content">
+        <view class="picker-header">
+          <text class="picker-cancel" @click="showCarPopup = false">取消</text>
+          <text class="picker-title">车产要求</text>
+          <text class="picker-confirm" @click="confirmCar">确定</text>
+        </view>
+        <view class="picker-body">
+          <picker-view :value="carPickerValue" @change="onCarChange" class="picker-view">
+            <picker-view-column>
+              <view v-for="item in carOptions" :key="item.value" class="picker-item">{{ item.label }}</view>
+            </picker-view-column>
+          </picker-view>
+        </view>
+      </view>
+    </view>
+
+    <!-- 婚姻选择弹窗 -->
+    <view class="picker-popup" v-if="showMarriagePopup" @click.self="showMarriagePopup = false">
+      <view class="picker-content">
+        <view class="picker-header">
+          <text class="picker-cancel" @click="showMarriagePopup = false">取消</text>
+          <text class="picker-title">婚姻要求</text>
+          <text class="picker-confirm" @click="confirmMarriage">确定</text>
+        </view>
+        <view class="picker-body">
+          <picker-view :value="marriagePickerValue" @change="onMarriageChange" class="picker-view">
+            <picker-view-column>
+              <view v-for="item in marriageOptions" :key="item.value" class="picker-item">{{ item.label }}</view>
+            </picker-view-column>
+          </picker-view>
+        </view>
+      </view>
+    </view>
+
+    <!-- 城市选择弹窗 -->
+    <view class="picker-popup" v-if="showCityPopup" @click="closeCityPopup">
+      <view class="picker-content city-picker-content" @click.stop>
+        <view class="picker-header">
+          <text class="picker-cancel" @click="showCityPopup = false">取消</text>
+          <text class="picker-title">选择地区</text>
+          <text class="picker-confirm" @click="showCityPopup = false">完成</text>
+        </view>
+        
+        <!-- 热门城市 -->
+        <view class="city-section">
+          <view class="section-title">热门城市</view>
+          <view class="city-grid">
+            <view 
+              v-for="city in hotCities" 
+              :key="city"
+              class="city-item"
+              :class="{ selected: selectedCities.includes(city) }"
+              @click.stop="toggleCity(city)"
+            >
+              {{ city }}
+            </view>
+          </view>
+        </view>
+
+        <!-- 省份列表 -->
+        <view class="province-section">
+          <view class="section-title">按省份选择</view>
+          <scroll-view scroll-y class="province-scroll">
+            <view 
+              v-for="province in provinceData" 
+              :key="province.name"
+              class="province-item"
+            >
+              <view class="province-name" @click.stop="toggleProvince(province.name)">
+                <text>{{ province.name }}</text>
+                <text class="province-arrow" :class="{ expanded: expandedProvince === province.name }">›</text>
+              </view>
+              <view class="city-list" v-if="expandedProvince === province.name">
+                <view 
+                  v-for="city in province.cities" 
+                  :key="city"
+                  class="city-tag"
+                  :class="{ selected: selectedCities.includes(city) }"
+                  @click.stop="toggleCity(city)"
+                >
+                  {{ city }}
+                </view>
+              </view>
+            </view>
+          </scroll-view>
+        </view>
       </view>
     </view>
   </view>
 </template>
 
 <script setup>
-import { ref, reactive, computed } from 'vue'
-import { useUserStore } from '@/store/user.js'
-import { search } from '@/api/user.js'
-import UserCard from '@/components/UserCard/index.vue'
-import Empty from '@/components/Empty/index.vue'
-import Loading from '@/components/Loading/index.vue'
+import { ref, reactive, computed, onMounted } from 'vue'
+import { provinceData, hotCities } from '@/utils/cityData.js'
 
-const userStore = useUserStore()
+// 状态栏高度
+const statusBarHeight = ref(20)
 
-// 会员状态 - Property 20: Search Results Display
-const isMember = computed(() => userStore.isMember)
+// 获取系统信息
+const getSystemInfo = () => {
+  uni.getSystemInfo({
+    success: (res) => {
+      statusBarHeight.value = res.statusBarHeight || 20
+    }
+  })
+}
+
+// 返回
+const handleBack = () => {
+  uni.navigateBack()
+}
 
 // 筛选条件
 const filters = reactive({
@@ -238,36 +333,36 @@ const filters = reactive({
   heightMin: 0,
   heightMax: 0,
   education: [],
-  province: '',
-  city: '',
-  monthlyIncomeMin: 0,
-  monthlyIncomeMax: 0,
-  houseStatus: [],
-  carStatus: [],
-  marriageStatus: []
+  cities: [],
+  monthlyIncome: 0,
+  houseStatus: 0,
+  carStatus: 0,
+  marriageStatus: 0
 })
 
-// 搜索状态
-const loading = ref(false)
-const loadingMore = ref(false)
-const hasSearched = ref(false)
-const results = ref([])
-const totalCount = ref(0)
-const pageIndex = ref(1)
-const pageSize = ref(10)
-const hasMore = ref(false)
+// 已选城市
+const selectedCities = ref([])
+
+// 弹窗显示状态
+const showAgePopup = ref(false)
+const showHeightPopup = ref(false)
+const showIncomePopup = ref(false)
+const showHousePopup = ref(false)
+const showCarPopup = ref(false)
+const showMarriagePopup = ref(false)
 
 // 选项配置
 const educationOptions = [
-  { value: 1, label: '高中及以下' },
-  { value: 2, label: '大专' },
-  { value: 3, label: '本科' },
-  { value: 4, label: '硕士' },
-  { value: 5, label: '博士' }
+  { value: 0, label: '不限' },
+  { value: 2, label: '中专' },
+  { value: 1, label: '高中' },
+  { value: 3, label: '大专' },
+  { value: 4, label: '本科' },
+  { value: 5, label: '研究生/博士' }
 ]
 
 const incomeOptions = [
-  { value: 0, label: '不限' },
+  { value: 0, label: '请选择' },
   { value: 1, label: '5000以下' },
   { value: 2, label: '5000-10000' },
   { value: 3, label: '10000-20000' },
@@ -276,125 +371,209 @@ const incomeOptions = [
 ]
 
 const houseOptions = [
-  { value: 1, label: '无房' },
-  { value: 2, label: '有房贷' },
-  { value: 3, label: '有房无贷' },
-  { value: 4, label: '多套房' }
+  { value: 0, label: '请选择' },
+  { value: 1, label: '现居地已购房' },
+  { value: 2, label: '家乡已购房' },
+  { value: 3, label: '婚后购房' },
+  { value: 4, label: '父母同住' },
+  { value: 5, label: '租房' },
+  { value: 6, label: '近期有购房计划' }
 ]
 
 const carOptions = [
-  { value: 1, label: '无车' },
-  { value: 2, label: '有车贷' },
-  { value: 3, label: '有车无贷' }
+  { value: 0, label: '请选择' },
+  { value: 1, label: '已购车' },
+  { value: 2, label: '无车' },
+  { value: 3, label: '近期购车' }
 ]
 
 const marriageOptions = [
+  { value: 0, label: '请选择' },
   { value: 1, label: '未婚' },
-  { value: 2, label: '离异无孩' },
-  { value: 3, label: '离异有孩' },
-  { value: 4, label: '丧偶' }
+  { value: 2, label: '离异未育' },
+  { value: 3, label: '离异已育' }
 ]
 
-// 年龄选项 (18-60)
-const ageOptions = computed(() => {
+// 年龄选项
+const ageMinOptions = computed(() => {
   const options = ['不限']
   for (let a = 18; a <= 60; a++) {
-    options.push(a)
+    options.push(a + '岁')
   }
   return options
 })
 
-// 身高选项 (140-220cm)
-const heightOptions = computed(() => {
+const ageMaxOptions = computed(() => {
   const options = ['不限']
-  for (let h = 140; h <= 220; h++) {
-    options.push(h)
+  for (let a = 18; a <= 60; a++) {
+    options.push(a + '岁')
   }
   return options
 })
 
-// 选中索引计算
-const ageMinIndex = computed(() => {
-  if (!filters.ageMin) return 0
-  return ageOptions.value.indexOf(filters.ageMin)
-})
-
-const ageMaxIndex = computed(() => {
-  if (!filters.ageMax) return 0
-  return ageOptions.value.indexOf(filters.ageMax)
-})
-
-const heightMinIndex = computed(() => {
-  if (!filters.heightMin) return 0
-  return heightOptions.value.indexOf(filters.heightMin)
-})
-
-const heightMaxIndex = computed(() => {
-  if (!filters.heightMax) return 0
-  return heightOptions.value.indexOf(filters.heightMax)
-})
-
-const incomeMinIndex = computed(() => {
-  const idx = incomeOptions.findIndex(o => o.value === filters.monthlyIncomeMin)
-  return idx >= 0 ? idx : 0
-})
-
-const incomeMaxIndex = computed(() => {
-  const idx = incomeOptions.findIndex(o => o.value === filters.monthlyIncomeMax)
-  return idx >= 0 ? idx : 0
-})
-
-// 地点文本
-const locationText = computed(() => {
-  if (filters.province && filters.city) {
-    return `${filters.province} ${filters.city}`
+// 身高选项
+const heightMinOptions = computed(() => {
+  const options = ['不限']
+  for (let h = 140; h <= 200; h++) {
+    options.push(h + 'cm')
   }
-  return ''
+  return options
 })
 
-// 获取收入标签
-const getIncomeLabel = (value) => {
-  const option = incomeOptions.find(o => o.value === value)
-  return option ? option.label : '不限'
+const heightMaxOptions = computed(() => {
+  const options = ['不限']
+  for (let h = 140; h <= 200; h++) {
+    options.push(h + 'cm')
+  }
+  return options
+})
+
+// Picker值
+const agePickerValue = ref([0, 0, 0])
+const heightPickerValue = ref([0, 0, 0])
+const incomePickerValue = ref([0])
+const housePickerValue = ref([0])
+const carPickerValue = ref([0])
+const marriagePickerValue = ref([0])
+
+// 显示文本
+const ageText = computed(() => {
+  if (!filters.ageMin && !filters.ageMax) return '请选择'
+  if (filters.ageMin && filters.ageMax) return `${filters.ageMin}-${filters.ageMax}岁`
+  if (filters.ageMin) return `${filters.ageMin}岁以上`
+  if (filters.ageMax) return `${filters.ageMax}岁以下`
+  return '请选择'
+})
+
+const heightText = computed(() => {
+  if (!filters.heightMin && !filters.heightMax) return '请选择'
+  if (filters.heightMin && filters.heightMax) return `${filters.heightMin}-${filters.heightMax}cm`
+  if (filters.heightMin) return `${filters.heightMin}cm以上`
+  if (filters.heightMax) return `${filters.heightMax}cm以下`
+  return '请选择'
+})
+
+const incomeText = computed(() => {
+  const item = incomeOptions.find(o => o.value === filters.monthlyIncome)
+  return item ? item.label : '请选择'
+})
+
+const houseText = computed(() => {
+  const item = houseOptions.find(o => o.value === filters.houseStatus)
+  return item ? item.label : '请选择'
+})
+
+const carText = computed(() => {
+  const item = carOptions.find(o => o.value === filters.carStatus)
+  return item ? item.label : '请选择'
+})
+
+const marriageText = computed(() => {
+  const item = marriageOptions.find(o => o.value === filters.marriageStatus)
+  return item ? item.label : '请选择'
+})
+
+// 显示弹窗
+const showAgePicker = () => {
+  showAgePopup.value = true
 }
 
-// 选择器变更处理
-const handleAgeMinChange = (e) => {
-  const val = ageOptions.value[e.detail.value]
-  filters.ageMin = val === '不限' ? 0 : val
+const showHeightPicker = () => {
+  showHeightPopup.value = true
 }
 
-const handleAgeMaxChange = (e) => {
-  const val = ageOptions.value[e.detail.value]
-  filters.ageMax = val === '不限' ? 0 : val
+const showIncomePicker = () => {
+  showIncomePopup.value = true
 }
 
-const handleHeightMinChange = (e) => {
-  const val = heightOptions.value[e.detail.value]
-  filters.heightMin = val === '不限' ? 0 : val
+const showHousePicker = () => {
+  showHousePopup.value = true
 }
 
-const handleHeightMaxChange = (e) => {
-  const val = heightOptions.value[e.detail.value]
-  filters.heightMax = val === '不限' ? 0 : val
+const showCarPicker = () => {
+  showCarPopup.value = true
 }
 
-const handleLocationChange = (e) => {
-  const [province, city] = e.detail.value
-  filters.province = province
-  filters.city = city
+const showMarriagePicker = () => {
+  showMarriagePopup.value = true
 }
 
-const handleIncomeMinChange = (e) => {
-  filters.monthlyIncomeMin = incomeOptions[e.detail.value].value
+// Picker变化
+const onAgeChange = (e) => {
+  agePickerValue.value = e.detail.value
 }
 
-const handleIncomeMaxChange = (e) => {
-  filters.monthlyIncomeMax = incomeOptions[e.detail.value].value
+const onHeightChange = (e) => {
+  heightPickerValue.value = e.detail.value
 }
 
-// 多选切换
+const onIncomeChange = (e) => {
+  incomePickerValue.value = e.detail.value
+}
+
+const onHouseChange = (e) => {
+  housePickerValue.value = e.detail.value
+}
+
+const onCarChange = (e) => {
+  carPickerValue.value = e.detail.value
+}
+
+const onMarriageChange = (e) => {
+  marriagePickerValue.value = e.detail.value
+}
+
+// 确认选择
+const confirmAge = () => {
+  const minIdx = agePickerValue.value[0]
+  const maxIdx = agePickerValue.value[2]
+  filters.ageMin = minIdx === 0 ? 0 : minIdx + 17
+  filters.ageMax = maxIdx === 0 ? 0 : maxIdx + 17
+  showAgePopup.value = false
+}
+
+const confirmHeight = () => {
+  const minIdx = heightPickerValue.value[0]
+  const maxIdx = heightPickerValue.value[2]
+  filters.heightMin = minIdx === 0 ? 0 : minIdx + 139
+  filters.heightMax = maxIdx === 0 ? 0 : maxIdx + 139
+  showHeightPopup.value = false
+}
+
+const confirmIncome = () => {
+  filters.monthlyIncome = incomeOptions[incomePickerValue.value[0]].value
+  showIncomePopup.value = false
+}
+
+const confirmHouse = () => {
+  filters.houseStatus = houseOptions[housePickerValue.value[0]].value
+  showHousePopup.value = false
+}
+
+const confirmCar = () => {
+  filters.carStatus = carOptions[carPickerValue.value[0]].value
+  showCarPopup.value = false
+}
+
+const confirmMarriage = () => {
+  filters.marriageStatus = marriageOptions[marriagePickerValue.value[0]].value
+  showMarriagePopup.value = false
+}
+
+// 学历多选
 const toggleEducation = (value) => {
+  if (value === 0) {
+    // 选择不限时清空其他选择
+    filters.education = [0]
+    return
+  }
+  
+  // 移除不限
+  const noLimitIdx = filters.education.indexOf(0)
+  if (noLimitIdx >= 0) {
+    filters.education.splice(noLimitIdx, 1)
+  }
+  
   const idx = filters.education.indexOf(value)
   if (idx >= 0) {
     filters.education.splice(idx, 1)
@@ -403,401 +582,468 @@ const toggleEducation = (value) => {
   }
 }
 
-const toggleHouse = (value) => {
-  const idx = filters.houseStatus.indexOf(value)
-  if (idx >= 0) {
-    filters.houseStatus.splice(idx, 1)
+// 城市选择弹窗
+const showCityPopup = ref(false)
+
+// 展开的省份
+const expandedProvince = ref('')
+
+// 城市选择
+const showCityPicker = () => {
+  showCityPopup.value = true
+}
+
+// 关闭城市弹窗（点击遮罩层）
+const closeCityPopup = (e) => {
+  // 只有点击遮罩层才关闭
+  if (e.target === e.currentTarget) {
+    showCityPopup.value = false
+  }
+}
+
+// 切换省份展开
+const toggleProvince = (provinceName) => {
+  if (expandedProvince.value === provinceName) {
+    expandedProvince.value = ''
   } else {
-    filters.houseStatus.push(value)
+    expandedProvince.value = provinceName
   }
 }
 
-const toggleCar = (value) => {
-  const idx = filters.carStatus.indexOf(value)
+// 切换城市选择
+const toggleCity = (city) => {
+  const idx = selectedCities.value.indexOf(city)
   if (idx >= 0) {
-    filters.carStatus.splice(idx, 1)
+    selectedCities.value.splice(idx, 1)
   } else {
-    filters.carStatus.push(value)
+    selectedCities.value.push(city)
   }
 }
 
-const toggleMarriage = (value) => {
-  const idx = filters.marriageStatus.indexOf(value)
-  if (idx >= 0) {
-    filters.marriageStatus.splice(idx, 1)
-  } else {
-    filters.marriageStatus.push(value)
-  }
-}
-
-/**
- * 构建搜索参数
- * Property 19: Search Parameters - 确保所有筛选参数都包含在API调用中
- * Requirements: 11.2
- */
-const buildSearchParams = () => {
-  const params = {
-    pageIndex: pageIndex.value,
-    pageSize: pageSize.value
-  }
-  
-  // 年龄范围
-  if (filters.ageMin > 0) {
-    params.ageMin = filters.ageMin
-  }
-  if (filters.ageMax > 0) {
-    params.ageMax = filters.ageMax
-  }
-  
-  // 身高范围
-  if (filters.heightMin > 0) {
-    params.heightMin = filters.heightMin
-  }
-  if (filters.heightMax > 0) {
-    params.heightMax = filters.heightMax
-  }
-  
-  // 学历
-  if (filters.education.length > 0) {
-    params.education = filters.education
-  }
-  
-  // 地点
-  if (filters.province) {
-    params.province = filters.province
-  }
-  if (filters.city) {
-    params.city = filters.city
-  }
-  
-  // 月收入
-  if (filters.monthlyIncomeMin > 0) {
-    params.monthlyIncomeMin = filters.monthlyIncomeMin
-  }
-  if (filters.monthlyIncomeMax > 0) {
-    params.monthlyIncomeMax = filters.monthlyIncomeMax
-  }
-  
-  // 房产状态
-  if (filters.houseStatus.length > 0) {
-    params.houseStatus = filters.houseStatus
-  }
-  
-  // 车辆状态
-  if (filters.carStatus.length > 0) {
-    params.carStatus = filters.carStatus
-  }
-  
-  // 婚姻状态
-  if (filters.marriageStatus.length > 0) {
-    params.marriageStatus = filters.marriageStatus
-  }
-  
-  return params
-}
-
-// 重置筛选条件
-const handleReset = () => {
-  filters.ageMin = 0
-  filters.ageMax = 0
-  filters.heightMin = 0
-  filters.heightMax = 0
-  filters.education = []
-  filters.province = ''
-  filters.city = ''
-  filters.monthlyIncomeMin = 0
-  filters.monthlyIncomeMax = 0
-  filters.houseStatus = []
-  filters.carStatus = []
-  filters.marriageStatus = []
+const removeCity = (index) => {
+  selectedCities.value.splice(index, 1)
 }
 
 // 搜索
-const handleSearch = async () => {
-  pageIndex.value = 1
-  results.value = []
-  hasSearched.value = true
-  loading.value = true
-  
-  try {
-    const params = buildSearchParams()
-    const res = await search(params)
-    
-    if (res && res.success) {
-      results.value = res.data?.list || []
-      totalCount.value = res.data?.total || 0
-      hasMore.value = results.value.length < totalCount.value
-    }
-  } catch (error) {
-    console.error('搜索失败:', error)
-    uni.showToast({ title: '搜索失败', icon: 'none' })
-  } finally {
-    loading.value = false
-  }
-}
-
-// 加载更多
-const loadMore = async () => {
-  if (loadingMore.value || !hasMore.value) return
-  
-  loadingMore.value = true
-  pageIndex.value++
-  
-  try {
-    const params = buildSearchParams()
-    const res = await search(params)
-    
-    if (res && res.success) {
-      const newList = res.data?.list || []
-      results.value = [...results.value, ...newList]
-      hasMore.value = results.value.length < totalCount.value
-    }
-  } catch (error) {
-    console.error('加载更多失败:', error)
-    pageIndex.value--
-  } finally {
-    loadingMore.value = false
-  }
-}
-
-// 点击用户卡片
-const handleCardClick = (userId) => {
-  // 非会员不能查看详情 - Property 20
-  if (!isMember.value) {
-    uni.showToast({ title: '开通会员查看完整信息', icon: 'none' })
-    return
+const handleSearch = () => {
+  // 构建搜索参数
+  const params = {
+    ageMin: filters.ageMin,
+    ageMax: filters.ageMax,
+    heightMin: filters.heightMin,
+    heightMax: filters.heightMax,
+    education: filters.education.filter(e => e !== 0),
+    cities: selectedCities.value,
+    monthlyIncome: filters.monthlyIncome,
+    houseStatus: filters.houseStatus,
+    carStatus: filters.carStatus,
+    marriageStatus: filters.marriageStatus
   }
   
+  // 跳转到搜索结果页
   uni.navigateTo({
-    url: `/pages/profile/detail?userId=${userId}`
+    url: `/pages/search/result?params=${encodeURIComponent(JSON.stringify(params))}`
   })
 }
 
-// 联系用户
-const handleContact = (userId) => {
-  // 非会员不能联系 - Property 20
-  if (!isMember.value) {
-    uni.showToast({ title: '开通会员联系TA', icon: 'none' })
-    return
-  }
-  
-  uni.navigateTo({
-    url: `/pages/chat/index?targetUserId=${userId}`
-  })
-}
-
-// 跳转会员页
-const goToMember = () => {
-  uni.navigateTo({
-    url: '/pages/member/index'
-  })
-}
+onMounted(() => {
+  getSystemInfo()
+})
 </script>
 
 
 <style lang="scss" scoped>
 .search-page {
   min-height: 100vh;
-  background-color: #f8f8f8;
-  padding-bottom: 40rpx;
+  background-color: #f5f6fa;
 }
 
-.section-title {
-  font-size: 32rpx;
-  font-weight: 600;
-  color: #333;
-  padding: 30rpx 30rpx 20rpx;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  
-  .result-count {
-    font-size: 26rpx;
-    font-weight: 400;
-    color: #999;
-  }
-}
+// 自定义导航栏
+.custom-navbar {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  z-index: 100;
+  background: linear-gradient(135deg, #ffb5b5 0%, #ff9a9a 100%);
 
-.filter-section {
-  background-color: #fff;
-  margin-bottom: 20rpx;
-}
+  .navbar-content {
+    height: 44px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 24rpx;
 
-.filter-item {
-  padding: 24rpx 30rpx;
-  border-bottom: 1rpx solid #f0f0f0;
-  
-  &:last-child {
-    border-bottom: none;
-  }
-  
-  .filter-label {
-    display: block;
-    font-size: 28rpx;
-    color: #333;
-    margin-bottom: 16rpx;
-  }
-}
+    .navbar-back {
+      width: 80rpx;
+      height: 80rpx;
+      display: flex;
+      align-items: center;
+      justify-content: center;
 
-.range-picker {
-  display: flex;
-  align-items: center;
-  
-  .picker-value {
-    min-width: 120rpx;
-    height: 64rpx;
-    line-height: 64rpx;
-    padding: 0 20rpx;
-    background-color: #f5f5f5;
-    border-radius: 8rpx;
-    font-size: 26rpx;
-    color: #333;
-    text-align: center;
-  }
-  
-  .range-separator {
-    margin: 0 16rpx;
-    color: #999;
-    font-size: 26rpx;
-  }
-  
-  .range-unit {
-    margin-left: 12rpx;
-    color: #666;
-    font-size: 26rpx;
-  }
-}
+      .back-icon {
+        font-size: 64rpx;
+        color: #fff;
+        font-weight: 400;
+      }
+    }
 
-.location-picker {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  width: 100%;
-  height: 64rpx;
-  line-height: 64rpx;
-  padding: 0 20rpx;
-  background-color: #f5f5f5;
-  border-radius: 8rpx;
-  font-size: 26rpx;
-  color: #333;
-  
-  .picker-arrow {
-    color: #999;
-    font-size: 22rpx;
-  }
-}
-
-.checkbox-group {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 16rpx;
-  
-  .checkbox-item {
-    padding: 12rpx 24rpx;
-    background-color: #f5f5f5;
-    border-radius: 8rpx;
-    font-size: 26rpx;
-    color: #666;
-    transition: all 0.2s;
-    
-    &.active {
-      background-color: #ff6b6b;
+    .navbar-title {
+      font-size: 34rpx;
+      font-weight: 600;
       color: #fff;
     }
-  }
-}
 
-.search-buttons {
-  display: flex;
-  gap: 20rpx;
-  padding: 30rpx;
-  
-  .btn-reset,
-  .btn-search {
-    flex: 1;
-    height: 80rpx;
-    line-height: 80rpx;
-    border-radius: 40rpx;
-    font-size: 30rpx;
-    border: none;
-    
-    &::after {
-      border: none;
+    .navbar-placeholder {
+      width: 80rpx;
     }
   }
-  
-  .btn-reset {
-    background-color: #f5f5f5;
-    color: #666;
-  }
-  
-  .btn-search {
-    background: linear-gradient(135deg, #ff6b6b 0%, #ff5252 100%);
-    color: #fff;
-  }
 }
 
-.results-section {
-  background-color: #fff;
+// 内容滚动区域
+.content-scroll {
+  min-height: 100vh;
+  padding-bottom: 60rpx;
 }
 
-.results-list {
-  padding: 0 30rpx;
-}
-
-.result-item-wrapper {
+// Banner区域
+.banner-section {
   position: relative;
-  margin-bottom: 20rpx;
-  
-  .blur-mask {
+  width: 100%;
+  height: 320rpx;
+  overflow: hidden;
+
+  .banner-bg {
     position: absolute;
     top: 0;
     left: 0;
     right: 0;
     bottom: 0;
-    background: rgba(255, 255, 255, 0.9);
-    backdrop-filter: blur(10px);
-    z-index: 10;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    border-radius: 16rpx;
-    
-    .blur-content {
-      text-align: center;
-      
-      .blur-text {
-        display: block;
-        font-size: 28rpx;
-        color: #666;
-        margin-bottom: 20rpx;
-      }
-      
-      .btn-member {
-        width: 240rpx;
-        height: 72rpx;
-        line-height: 72rpx;
-        background: linear-gradient(135deg, #ffd700 0%, #ffb800 100%);
-        color: #fff;
-        font-size: 28rpx;
-        border-radius: 36rpx;
-        border: none;
-        
-        &::after {
-          border: none;
-        }
-      }
+    background: linear-gradient(135deg, #ffb5b5 0%, #ffd1d1 50%, #ffe4e4 100%);
+  }
+
+  .banner-text {
+    position: absolute;
+    left: 40rpx;
+    top: 50%;
+    transform: translateY(-50%);
+    z-index: 2;
+
+    .banner-title {
+      display: block;
+      font-size: 52rpx;
+      font-weight: bold;
+      color: #ff6b9d;
+      text-shadow: 2rpx 2rpx 4rpx rgba(255, 107, 157, 0.3);
+      line-height: 1.4;
+    }
+  }
+
+  .banner-decoration {
+    position: absolute;
+    right: 40rpx;
+    top: 50%;
+    transform: translateY(-50%);
+    z-index: 2;
+
+    .deco-heart {
+      font-size: 80rpx;
+      display: block;
+      animation: float 2s ease-in-out infinite;
+    }
+
+    .deco-ring {
+      font-size: 60rpx;
+      display: block;
+      margin-top: -20rpx;
+      margin-left: 40rpx;
+      animation: float 2s ease-in-out infinite 0.5s;
     }
   }
 }
 
-.load-more {
-  padding: 30rpx;
-  text-align: center;
-  
-  text {
+@keyframes float {
+  0%, 100% {
+    transform: translateY(0);
+  }
+  50% {
+    transform: translateY(-10rpx);
+  }
+}
+
+// 筛选表单
+.filter-form {
+  background: #fff;
+  margin: 24rpx;
+  border-radius: 24rpx;
+  overflow: hidden;
+}
+
+.filter-item {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 32rpx 28rpx;
+  border-bottom: 1rpx solid #f5f5f5;
+
+  &:last-child {
+    border-bottom: none;
+  }
+
+  .filter-label {
+    font-size: 30rpx;
+    color: #333;
+  }
+
+  .filter-value {
+    display: flex;
+    align-items: center;
+    
+    text {
+      font-size: 28rpx;
+      color: #999;
+    }
+
+    .arrow {
+      margin-left: 8rpx;
+      font-size: 28rpx;
+      color: #ccc;
+    }
+  }
+}
+
+.filter-item-multi {
+  padding: 28rpx;
+  border-bottom: 1rpx solid #f5f5f5;
+
+  &:last-child {
+    border-bottom: none;
+  }
+
+  .filter-label {
+    display: block;
+    font-size: 30rpx;
+    color: #333;
+    margin-bottom: 20rpx;
+  }
+}
+
+.tag-group {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 16rpx;
+
+  .tag-item {
+    padding: 16rpx 28rpx;
+    background: #f5f5f5;
+    border-radius: 8rpx;
     font-size: 26rpx;
-    color: #999;
+    color: #666;
+    border: 2rpx solid transparent;
+    transition: all 0.2s;
+
+    &.active {
+      background: #fff5f5;
+      color: #ff6b6b;
+      border-color: #ff6b6b;
+    }
+
+    &.add-tag {
+      color: #999;
+      border: 2rpx dashed #ddd;
+      background: transparent;
+    }
+
+    .tag-close {
+      margin-left: 8rpx;
+      font-size: 24rpx;
+    }
+  }
+}
+
+// 搜索按钮
+.search-btn-section {
+  padding: 40rpx 24rpx;
+
+  .btn-search {
+    width: 100%;
+    height: 96rpx;
+    line-height: 96rpx;
+    background: linear-gradient(135deg, #ffb5b5 0%, #ff9a9a 100%);
+    border-radius: 48rpx;
+    font-size: 34rpx;
+    color: #fff;
+    border: none;
+
+    &::after {
+      border: none;
+    }
+  }
+}
+
+// Picker弹窗
+.picker-popup {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.5);
+  z-index: 1000;
+  display: flex;
+  align-items: flex-end;
+
+  .picker-content {
+    width: 100%;
+    background: #fff;
+    border-radius: 24rpx 24rpx 0 0;
+  }
+
+  .picker-header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 28rpx 32rpx;
+    border-bottom: 1rpx solid #f0f0f0;
+
+    .picker-cancel {
+      font-size: 30rpx;
+      color: #999;
+    }
+
+    .picker-title {
+      font-size: 32rpx;
+      font-weight: 600;
+      color: #333;
+    }
+
+    .picker-confirm {
+      font-size: 30rpx;
+      color: #ff6b6b;
+    }
+  }
+
+  .picker-body {
+    height: 400rpx;
+  }
+
+  .picker-view {
+    height: 100%;
+  }
+
+  .picker-item {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 32rpx;
+    color: #333;
+  }
+}
+
+// 城市选择弹窗
+.city-picker-content {
+  max-height: 80vh;
+  display: flex;
+  flex-direction: column;
+  
+  .picker-placeholder {
+    width: 60rpx;
+  }
+}
+
+.city-section {
+  padding: 20rpx 24rpx;
+  border-bottom: 1rpx solid #f0f0f0;
+}
+
+.section-title {
+  font-size: 26rpx;
+  color: #999;
+  margin-bottom: 16rpx;
+}
+
+.city-grid {
+  display: grid;
+  grid-template-columns: repeat(4, 1fr);
+  gap: 16rpx;
+
+  .city-item {
+    height: 64rpx;
+    line-height: 64rpx;
+    text-align: center;
+    background: #f5f5f5;
+    border-radius: 8rpx;
+    font-size: 26rpx;
+    color: #333;
+    border: 2rpx solid transparent;
+
+    &.selected {
+      background: #fff5f5;
+      color: #ff6b6b;
+      border-color: #ff6b6b;
+    }
+  }
+}
+
+.province-section {
+  flex: 1;
+  overflow: hidden;
+  display: flex;
+  flex-direction: column;
+  padding: 20rpx 24rpx 0;
+
+  .section-title {
+    flex-shrink: 0;
+  }
+}
+
+.province-scroll {
+  flex: 1;
+  height: 500rpx;
+}
+
+.province-item {
+  border-bottom: 1rpx solid #f5f5f5;
+
+  .province-name {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 24rpx 0;
+    font-size: 30rpx;
+    color: #333;
+
+    .province-arrow {
+      font-size: 32rpx;
+      color: #ccc;
+      transition: transform 0.2s;
+
+      &.expanded {
+        transform: rotate(90deg);
+      }
+    }
+  }
+
+  .city-list {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 16rpx;
+    padding-bottom: 20rpx;
+
+    .city-tag {
+      padding: 12rpx 24rpx;
+      background: #f5f5f5;
+      border-radius: 8rpx;
+      font-size: 26rpx;
+      color: #666;
+      border: 2rpx solid transparent;
+
+      &.selected {
+        background: #fff5f5;
+        color: #ff6b6b;
+        border-color: #ff6b6b;
+      }
+    }
   }
 }
 </style>
diff --git a/miniapp/pages/search/result.vue b/miniapp/pages/search/result.vue
new file mode 100644
index 0000000..43befad
--- /dev/null
+++ b/miniapp/pages/search/result.vue
@@ -0,0 +1,369 @@
+<template>
+  <view class="result-page">
+    <!-- 自定义导航栏 -->
+    <view class="custom-navbar" :style="{ paddingTop: statusBarHeight + 'px' }">
+      <view class="navbar-content">
+        <view class="navbar-back" @click="handleBack">
+          <text class="back-icon">‹</text>
+        </view>
+        <text class="navbar-title">搜索结果</text>
+        <view class="navbar-placeholder"></view>
+      </view>
+    </view>
+
+    <!-- 内容区域 -->
+    <scroll-view 
+      class="content-scroll" 
+      scroll-y 
+      :style="{ paddingTop: (statusBarHeight + 44) + 'px' }"
+      @scrolltolower="loadMore"
+    >
+      <!-- 结果统计 -->
+      <view class="result-header" v-if="!loading">
+        <text class="result-count">共找到 {{ totalCount }} 位符合条件的用户</text>
+      </view>
+
+      <!-- 加载中 -->
+      <Loading v-if="loading" type="page" :loading="loading" />
+
+      <!-- 空状态 -->
+      <Empty v-else-if="!loading && results.length === 0" text="暂无符合条件的用户" />
+
+      <!-- 结果列表 -->
+      <view v-else class="results-list">
+        <view 
+          v-for="user in results" 
+          :key="user.userId"
+          class="result-item-wrapper"
+        >
+          <!-- 非会员模糊遮罩 -->
+          <view v-if="!isMember" class="blur-mask">
+            <view class="blur-content">
+              <text class="blur-text">开通会员查看完整信息</text>
+              <button class="btn-member" @click="goToMember">立即开通</button>
+            </view>
+          </view>
+          
+          <UserCard
+            :userId="user.userId"
+            :nickname="user.nickname"
+            :avatar="user.avatar"
+            :gender="user.gender"
+            :age="user.age"
+            :birthYear="user.birthYear"
+            :workCity="user.workCity"
+            :hometown="user.hometown"
+            :height="user.height"
+            :weight="user.weight"
+            :education="user.education"
+            :educationName="user.educationName"
+            :occupation="user.occupation"
+            :monthlyIncome="user.monthlyIncome"
+            :intro="user.intro"
+            :isMember="user.isMember"
+            :isRealName="user.isRealName"
+            :isPhotoPublic="user.isPhotoPublic"
+            :firstPhoto="user.firstPhoto"
+            :viewedToday="user.viewedToday"
+            @click="handleCardClick"
+            @contact="handleContact"
+          />
+        </view>
+      </view>
+
+      <!-- 加载更多 -->
+      <Loading v-if="results.length > 0" type="more" :loading="loadingMore" :noMore="!hasMore" />
+    </scroll-view>
+  </view>
+</template>
+
+<script setup>
+import { ref, computed, onMounted } from 'vue'
+import { useUserStore } from '@/store/user.js'
+import { search } from '@/api/user.js'
+import UserCard from '@/components/UserCard/index.vue'
+import Empty from '@/components/Empty/index.vue'
+import Loading from '@/components/Loading/index.vue'
+
+const userStore = useUserStore()
+
+// 状态栏高度
+const statusBarHeight = ref(20)
+
+// 会员状态
+const isMember = computed(() => userStore.isMember)
+
+// 搜索参数
+const searchParams = ref({})
+
+// 搜索状态
+const loading = ref(true)
+const loadingMore = ref(false)
+const results = ref([])
+const totalCount = ref(0)
+const pageIndex = ref(1)
+const pageSize = ref(10)
+const hasMore = ref(true)
+
+// 获取系统信息
+const getSystemInfo = () => {
+  uni.getSystemInfo({
+    success: (res) => {
+      statusBarHeight.value = res.statusBarHeight || 20
+    }
+  })
+}
+
+// 返回
+const handleBack = () => {
+  uni.navigateBack()
+}
+
+// 构建API参数
+const buildApiParams = () => {
+  const params = {
+    pageIndex: pageIndex.value,
+    pageSize: pageSize.value
+  }
+  
+  const sp = searchParams.value
+  
+  if (sp.ageMin > 0) params.ageMin = sp.ageMin
+  if (sp.ageMax > 0) params.ageMax = sp.ageMax
+  if (sp.heightMin > 0) params.heightMin = sp.heightMin
+  if (sp.heightMax > 0) params.heightMax = sp.heightMax
+  if (sp.education && sp.education.length > 0) params.education = sp.education
+  if (sp.cities && sp.cities.length > 0) params.cities = sp.cities
+  if (sp.monthlyIncome > 0) params.monthlyIncomeMin = sp.monthlyIncome
+  if (sp.houseStatus > 0) params.houseStatus = [sp.houseStatus]
+  if (sp.carStatus > 0) params.carStatus = [sp.carStatus]
+  if (sp.marriageStatus > 0) params.marriageStatus = [sp.marriageStatus]
+  
+  return params
+}
+
+// 搜索
+const doSearch = async (isLoadMore = false) => {
+  if (isLoadMore) {
+    if (loadingMore.value || !hasMore.value) return
+    loadingMore.value = true
+    pageIndex.value++
+  } else {
+    loading.value = true
+    pageIndex.value = 1
+    results.value = []
+  }
+  
+  try {
+    const params = buildApiParams()
+    const res = await search(params)
+    
+    if (res && res.code === 0 && res.data) {
+      const items = res.data.items || []
+      totalCount.value = res.data.total || 0
+      
+      if (isLoadMore) {
+        results.value = [...results.value, ...items]
+      } else {
+        results.value = items
+      }
+      
+      hasMore.value = results.value.length < totalCount.value
+    }
+  } catch (error) {
+    console.error('搜索失败:', error)
+    uni.showToast({ title: '搜索失败', icon: 'none' })
+    if (isLoadMore) pageIndex.value--
+  } finally {
+    loading.value = false
+    loadingMore.value = false
+  }
+}
+
+// 加载更多
+const loadMore = () => {
+  doSearch(true)
+}
+
+// 点击用户卡片
+const handleCardClick = (userId) => {
+  if (!isMember.value) {
+    uni.showToast({ title: '开通会员查看完整信息', icon: 'none' })
+    return
+  }
+  
+  uni.navigateTo({
+    url: `/pages/profile/detail?userId=${userId}`
+  })
+}
+
+// 联系用户
+const handleContact = (userId) => {
+  if (!isMember.value) {
+    uni.showToast({ title: '开通会员联系TA', icon: 'none' })
+    return
+  }
+  
+  // 检查是否完善资料
+  if (!userStore.isProfileCompleted) {
+    uni.showModal({
+      title: '提示',
+      content: '请先完善您的资料，才能联系对方',
+      confirmText: '去完善',
+      success: (res) => {
+        if (res.confirm) {
+          uni.navigateTo({ url: '/pages/profile/edit' })
+        }
+      }
+    })
+    return
+  }
+  
+  uni.navigateTo({
+    url: `/pages/chat/index?targetUserId=${userId}`
+  })
+}
+
+// 跳转会员页
+const goToMember = () => {
+  uni.navigateTo({
+    url: '/pages/member/index'
+  })
+}
+
+onMounted(() => {
+  getSystemInfo()
+  
+  // 获取页面参数
+  const pages = getCurrentPages()
+  const currentPage = pages[pages.length - 1]
+  const options = currentPage?.options || {}
+  
+  if (options.params) {
+    try {
+      searchParams.value = JSON.parse(decodeURIComponent(options.params))
+    } catch (e) {
+      console.error('解析搜索参数失败:', e)
+    }
+  }
+  
+  // 执行搜索
+  doSearch()
+})
+</script>
+
+<style lang="scss" scoped>
+.result-page {
+  min-height: 100vh;
+  background-color: #f5f6fa;
+}
+
+// 自定义导航栏
+.custom-navbar {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  z-index: 100;
+  background: linear-gradient(135deg, #ffb5b5 0%, #ff9a9a 100%);
+
+  .navbar-content {
+    height: 44px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 24rpx;
+
+    .navbar-back {
+      width: 80rpx;
+      height: 80rpx;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+
+      .back-icon {
+        font-size: 64rpx;
+        color: #fff;
+        font-weight: 400;
+      }
+    }
+
+    .navbar-title {
+      font-size: 34rpx;
+      font-weight: 600;
+      color: #fff;
+    }
+
+    .navbar-placeholder {
+      width: 80rpx;
+    }
+  }
+}
+
+// 内容滚动区域
+.content-scroll {
+  min-height: 100vh;
+  padding-bottom: 40rpx;
+}
+
+// 结果统计
+.result-header {
+  padding: 24rpx 32rpx;
+  
+  .result-count {
+    font-size: 26rpx;
+    color: #999;
+  }
+}
+
+// 结果列表
+.results-list {
+  padding: 0 24rpx;
+}
+
+.result-item-wrapper {
+  position: relative;
+  margin-bottom: 24rpx;
+  
+  .blur-mask {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: rgba(255, 255, 255, 0.9);
+    backdrop-filter: blur(10px);
+    z-index: 10;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border-radius: 24rpx;
+    
+    .blur-content {
+      text-align: center;
+      
+      .blur-text {
+        display: block;
+        font-size: 28rpx;
+        color: #666;
+        margin-bottom: 20rpx;
+      }
+      
+      .btn-member {
+        width: 240rpx;
+        height: 72rpx;
+        line-height: 72rpx;
+        background: linear-gradient(135deg, #ffd700 0%, #ffb800 100%);
+        color: #fff;
+        font-size: 28rpx;
+        border-radius: 36rpx;
+        border: none;
+        
+        &::after {
+          border: none;
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/miniapp/static/ic_check_s.png b/miniapp/static/ic_check_s.png
index 756e6f6570ca863fca349da480f95becd3c977c0..15be11f2b788f7c930aa2fc3709558d9db4e7848 100644
GIT binary patch
delta 707
zcmV;!0zCcg1=|IXB!7@eL_t(|0jyQOYZO5g{@&~gDN<NiL=cRSB1H=S1PhBRBM1sf
z5h3IvgyatG6g<H)cpETy3xX*kXqAYCiWXY<7bql6Kv6KLMT!&$Uh@3j?B#y!{YdV-
z$9pqx-_HBKnYS~u4qZeau8wIG-_m0Ij{SEnmj1F=jY>Z?iho~gF}|aZo}BLjfwlx%
zd_1aA=_w@GV)8Nsm)W0#NXVWlBWyAdJV52(t48sL<uKNwEd(4m1#zDNnL!N@$H^pf
zwlpeTOAl-!(3SWe2d;C_Fs)Y|0_3^JKwWACo?TJE{|YgD6{<L%fPqm!)-Wg$S33Im
zo`7X35}Qk8JAW7*My2Ab;gZ>768%dVqRc-SC&V5tQN^^af-7)SNu;l~49KJ`&A-In
zuN^4<;7Du-Rt~O`0GH68B;dKZw^}F+;q=*85R9Qw6dA|mO*F>nmpPLKKqLB{G!4GN
zff-t}3dS8Eb}G>z+mg?&N^U;S8Tk*@@Xp+QILSzT=6~(MZKUdmgKEY62D_*$r6qfo
zrR@C_$v!m5$l~0`YFRpidjJU?M0U+@GL@(eNdlgq{d6L552(9b0k*xLZqg)SFd;pG
z6Hw&~SAaKk+iN4q!tA$`&%6fr!NFm(&38aejKuy4%kdd*#qKq)B~_hM!Mc;h><$EW
zgI1$$yMJYb_{}%1Tam#Ix+z?>^Do2Dw&T9{2h)@h204TB1jYnCoVUPWOlLeM!8`$b
zNdD$CmdaLQkNumVz(e{1RjCo!vp-nS>-2dQu<cEGP7bFNjCx`dfrUML7}(XjY0t-+
z+D)KqtU1pKtB^`)A+YyWKgngU@Vi{##dnwXo;;Uda^gK8ek3v6Mj+#y)D6qA+_e1z
p009606=knR00006Nkl<Z0|3L?`X%?%M-Tu2002ovPDHLkV1hP^OlJT9

delta 725
zcmV;`0xJF61?>fpB!8kwL_t(|0jyQeYZE~f{$@yGgbFz%A%akqO1IF1e}V@OIYtl^
z+C#m05LEQ0pn^xiUIcIU5J69kcu-ML58k}_Bk4g=6k1Hw9&$*NZKmHFvdLzWrb(K|
zyxn;-?|t9Qn|Zq$10?kYGwC9(QD3J@_?0T6kuJf|UZ?$ndVeGF9n%9K(3c=l#L?6m
z9&xq^g?rS~3OJ$^A{I;`Lpw{o8>{07NmnJt&N+`B0y-~5flta{sSSudB^OgDa#818
z&n|-W8g9`cPv9xOM{RK~>PZWu9or_b>;|{7Um-@agoOac5=j2Yz7h=X_f4#a!Qop1
z=I=g1<J5^XNq=#43pN{CRu3SD@ujxS_$J^PU=tl#Onk+(j;c<+I&(w!YQ914uZL%q
zb$o+CC5YrMA`ykNS{a<ecw)i-&EXZ^BAz;o=LDSzLoxqZD(1t3?AMIKC2n__{oR@i
zzRIG@y3WM$G^;cdo*;0kJc|cq4_BKC_Mi|FV^D1xWPd{|?+b223^JMlzBO78uH+=Y
zF_*=x%;HX%guYc@AzPWl`&L?Z2PXhi7Lgrnu;0~4vh0!s;Qu{*7zSJb8M7gWToS`o
zm!xq3^P_+Z9x*=arp8M#`Y9dSJJ~#rpTn*^z~Ujl(^{jzt#qA3;2>`yN%Eg?=p&N6
ziUV^l{(oU@#E{p2POv~U^5F@$ulY|nIE6CFdak1D8`!Mug6vw$KqCsdj#W%fYJLn?
zK(PeEM8=D>C(@YvCBYOhOCX(!hsWVNFJt4VV6af12C;1d8IZyv`+4?j)R7u5N|jky
z6pV0S7lBL&dp!n^&IPgeQUd#2)QZ%JWWn|CAx;nn$se81)D4dD+jJ8KZwO>7o^PLH
zzh#Wyr0ewvJTB^j#7L~GI{*Lx|NnQICPe@M00v1!K~w_(n_lqJ#$a4D00000NkvXX
Hu0mjfn!8Hl

diff --git a/miniapp/static/ic_empty.png b/miniapp/static/ic_empty.png
new file mode 100644
index 0000000000000000000000000000000000000000..80b7a94db0123322b6444a01566777bd9b43c463
GIT binary patch
literal 19716
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

literal 0
HcmV?d00001

diff --git a/miniapp/utils/cityData.js b/miniapp/utils/cityData.js
new file mode 100644
index 0000000..41f892a
--- /dev/null
+++ b/miniapp/utils/cityData.js
@@ -0,0 +1,147 @@
+// 中国省市数据
+export const provinceData = [
+  {
+    name: '北京市',
+    cities: ['北京']
+  },
+  {
+    name: '上海市',
+    cities: ['上海']
+  },
+  {
+    name: '天津市',
+    cities: ['天津']
+  },
+  {
+    name: '重庆市',
+    cities: ['重庆']
+  },
+  {
+    name: '广东省',
+    cities: ['广州', '深圳', '东莞', '佛山', '珠海', '惠州', '中山', '汕头', '江门', '湛江', '肇庆', '茂名', '揭阳', '梅州', '清远', '阳江', '韶关', '河源', '云浮', '汕尾', '潮州']
+  },
+  {
+    name: '江苏省',
+    cities: ['南京', '苏州', '无锡', '常州', '南通', '徐州', '扬州', '盐城', '泰州', '镇江', '淮安', '连云港', '宿迁']
+  },
+  {
+    name: '浙江省',
+    cities: ['杭州', '宁波', '温州', '绍兴', '嘉兴', '金华', '台州', '湖州', '丽水', '衢州', '舟山']
+  },
+  {
+    name: '山东省',
+    cities: ['济南', '青岛', '烟台', '潍坊', '临沂', '淄博', '济宁', '泰安', '威海', '德州', '聊城', '菏泽', '滨州', '枣庄', '日照', '东营']
+  },
+  {
+    name: '河南省',
+    cities: ['郑州', '洛阳', '南阳', '许昌', '周口', '新乡', '商丘', '信阳', '平顶山', '驻马店', '安阳', '焦作', '开封', '濮阳', '漯河', '三门峡', '鹤壁']
+  },
+  {
+    name: '四川省',
+    cities: ['成都', '绵阳', '德阳', '宜宾', '南充', '泸州', '达州', '乐山', '内江', '自贡', '眉山', '广安', '遂宁', '资阳', '攀枝花', '广元', '雅安', '巴中']
+  },
+  {
+    name: '湖北省',
+    cities: ['武汉', '宜昌', '襄阳', '荆州', '黄冈', '十堰', '孝感', '荆门', '咸宁', '鄂州', '黄石', '随州']
+  },
+  {
+    name: '湖南省',
+    cities: ['长沙', '株洲', '湘潭', '衡阳', '岳阳', '常德', '郴州', '邵阳', '怀化', '永州', '益阳', '娄底', '张家界']
+  },
+  {
+    name: '福建省',
+    cities: ['福州', '厦门', '泉州', '漳州', '莆田', '宁德', '三明', '南平', '龙岩']
+  },
+  {
+    name: '安徽省',
+    cities: ['合肥', '芜湖', '蚌埠', '阜阳', '淮南', '安庆', '马鞍山', '宿州', '滁州', '六安', '淮北', '铜陵', '亳州', '宣城', '池州', '黄山']
+  },
+  {
+    name: '河北省',
+    cities: ['石家庄', '唐山', '保定', '邯郸', '廊坊', '沧州', '邢台', '衡水', '秦皇岛', '张家口', '承德']
+  },
+  {
+    name: '陕西省',
+    cities: ['西安', '咸阳', '宝鸡', '渭南', '汉中', '榆林', '延安', '安康', '商洛', '铜川']
+  },
+  {
+    name: '辽宁省',
+    cities: ['沈阳', '大连', '鞍山', '锦州', '抚顺', '营口', '盘锦', '朝阳', '丹东', '辽阳', '本溪', '葫芦岛', '铁岭', '阜新']
+  },
+  {
+    name: '江西省',
+    cities: ['南昌', '赣州', '九江', '宜春', '吉安', '上饶', '抚州', '景德镇', '萍乡', '新余', '鹰潭']
+  },
+  {
+    name: '山西省',
+    cities: ['太原', '大同', '运城', '临汾', '晋中', '长治', '晋城', '忻州', '吕梁', '朔州', '阳泉']
+  },
+  {
+    name: '云南省',
+    cities: ['昆明', '曲靖', '大理', '玉溪', '红河', '楚雄', '文山', '昭通', '普洱', '保山', '丽江', '临沧']
+  },
+  {
+    name: '广西',
+    cities: ['南宁', '柳州', '桂林', '玉林', '梧州', '北海', '贵港', '钦州', '百色', '河池', '来宾', '崇左', '防城港', '贺州']
+  },
+  {
+    name: '贵州省',
+    cities: ['贵阳', '遵义', '毕节', '黔南', '黔东南', '六盘水', '铜仁', '安顺', '黔西南']
+  },
+  {
+    name: '黑龙江省',
+    cities: ['哈尔滨', '大庆', '齐齐哈尔', '牡丹江', '绥化', '佳木斯', '鸡西', '双鸭山', '鹤岗', '黑河', '伊春', '七台河']
+  },
+  {
+    name: '吉林省',
+    cities: ['长春', '吉林', '四平', '延边', '松原', '白城', '通化', '白山', '辽源']
+  },
+  {
+    name: '内蒙古',
+    cities: ['呼和浩特', '包头', '鄂尔多斯', '赤峰', '通辽', '呼伦贝尔', '巴彦淖尔', '乌兰察布', '锡林郭勒', '乌海', '兴安盟', '阿拉善盟']
+  },
+  {
+    name: '新疆',
+    cities: ['乌鲁木齐', '昌吉', '巴音郭楞', '伊犁', '阿克苏', '喀什', '哈密', '克拉玛依', '博尔塔拉', '吐鲁番', '和田', '石河子', '塔城', '阿勒泰']
+  },
+  {
+    name: '甘肃省',
+    cities: ['兰州', '天水', '白银', '庆阳', '平凉', '酒泉', '张掖', '武威', '定西', '金昌', '陇南', '临夏', '嘉峪关', '甘南']
+  },
+  {
+    name: '海南省',
+    cities: ['海口', '三亚', '儋州', '琼海', '文昌', '万宁', '东方', '五指山']
+  },
+  {
+    name: '宁夏',
+    cities: ['银川', '吴忠', '石嘴山', '中卫', '固原']
+  },
+  {
+    name: '青海省',
+    cities: ['西宁', '海东', '海西', '海北', '海南', '黄南', '果洛', '玉树']
+  },
+  {
+    name: '西藏',
+    cities: ['拉萨', '日喀则', '昌都', '林芝', '山南', '那曲', '阿里']
+  },
+  {
+    name: '香港',
+    cities: ['香港']
+  },
+  {
+    name: '澳门',
+    cities: ['澳门']
+  },
+  {
+    name: '台湾',
+    cities: ['台北', '高雄', '台中', '台南', '新北', '桃园']
+  }
+]
+
+// 热门城市
+export const hotCities = [
+  '北京', '上海', '广州', '深圳',
+  '杭州', '成都', '武汉', '南京',
+  '苏州', '西安', '重庆', '天津',
+  '长沙', '郑州', '青岛', '厦门'
+]
diff --git a/miniapp/utils/image.js b/miniapp/utils/image.js
index 6b21565..0921a49 100644
--- a/miniapp/utils/image.js
+++ b/miniapp/utils/image.js
@@ -3,8 +3,8 @@
  * 将相对路径转换为完整的后端URL
  */
 
-// 后端服务器基础地址（图片资源 - 使用AdminApi，因为图片存储在AdminApi的wwwroot下）
-const IMAGE_BASE_URL = 'http://localhost:5000'
+// 后端服务器基础地址（图片资源 - 使用AppApi，因为图片存储在AppApi的wwwroot下）
+const IMAGE_BASE_URL = 'http://localhost:5001'
 
 /**
  * 获取完整的图片URL
diff --git a/server/src/XiangYi.AdminApi/Controllers/AdminUploadController.cs b/server/src/XiangYi.AdminApi/Controllers/AdminUploadController.cs
index 0f9f9c8..59dfe39 100644
--- a/server/src/XiangYi.AdminApi/Controllers/AdminUploadController.cs
+++ b/server/src/XiangYi.AdminApi/Controllers/AdminUploadController.cs
@@ -98,7 +98,17 @@ public class AdminUploadController : ControllerBase
     /// </summary>
     private async Task<string> SaveToLocalAsync(IFormFile file, string fileName, string folder)
     {
-        var uploadPath = Path.Combine(_environment.WebRootPath ?? "wwwroot", "uploads", folder);
+        // 使用 AppApi 的 wwwroot 目录作为共享存储
+        var appApiBasePath = Path.GetFullPath(Path.Combine(_environment.ContentRootPath, "..", "XiangYi.AppApi", "wwwroot"));
+        var uploadPath = Path.Combine(appApiBasePath, "uploads", folder);
+        
+        // 如果 AppApi 路径不存在，回退到当前项目的 wwwroot
+        if (!Directory.Exists(appApiBasePath))
+        {
+            _logger.LogWarning("AppApi wwwroot 目录不存在，使用本地存储: {Path}", appApiBasePath);
+            uploadPath = Path.Combine(_environment.WebRootPath ?? "wwwroot", "uploads", folder);
+        }
+        
         if (!Directory.Exists(uploadPath))
         {
             Directory.CreateDirectory(uploadPath);
@@ -107,6 +117,8 @@ public class AdminUploadController : ControllerBase
         var filePath = Path.Combine(uploadPath, fileName);
         using var stream = new FileStream(filePath, FileMode.Create);
         await file.CopyToAsync(stream);
+        
+        _logger.LogInformation("文件保存到: {FilePath}", filePath);
 
         // 返回相对URL
         return $"/uploads/{folder}/{fileName}";
diff --git a/server/src/XiangYi.AppApi/Controllers/UserController.cs b/server/src/XiangYi.AppApi/Controllers/UserController.cs
index 2ccff66..ec3c45d 100644
--- a/server/src/XiangYi.AppApi/Controllers/UserController.cs
+++ b/server/src/XiangYi.AppApi/Controllers/UserController.cs
@@ -61,6 +61,7 @@ public class UserController : ControllerBase
     /// <param name="request">用户详情请求</param>
     /// <returns>用户详情</returns>
     [HttpPost("detail")]
+    [AllowAnonymous]
     public async Task<ApiResponse<ProfileResponse>> GetUserDetail([FromBody] UserDetailRequest request)
     {
         if (request.UserId <= 0)
@@ -70,8 +71,11 @@ public class UserController : ControllerBase
 
         var currentUserId = GetCurrentUserId();
         
-        // 记录浏览
-        await _interactService.RecordViewAsync(currentUserId, request.UserId);
+        // 已登录用户记录浏览（排除查看自己）
+        if (currentUserId > 0 && currentUserId != request.UserId)
+        {
+            await _interactService.RecordViewAsync(currentUserId, request.UserId);
+        }
         
         // 获取用户资料
         var profile = await _profileService.GetByUserIdAsync(request.UserId);
@@ -81,6 +85,14 @@ public class UserController : ControllerBase
             return ApiResponse<ProfileResponse>.Error(ErrorCodes.UserNotFound, "用户不存在");
         }
 
+        // 已登录用户查询互动状态（排除查看自己）
+        if (currentUserId > 0 && currentUserId != request.UserId)
+        {
+            profile.IsFavorited = await _interactService.IsFavoritedAsync(currentUserId, request.UserId);
+            profile.IsUnlocked = await _interactService.IsUnlockedAsync(currentUserId, request.UserId);
+            profile.RemainingUnlockQuota = await _interactService.GetRemainingUnlockQuotaAsync(currentUserId);
+        }
+
         return ApiResponse<ProfileResponse>.Success(profile);
     }
 
diff --git a/server/src/XiangYi.AppApi/Properties/launchSettings.json b/server/src/XiangYi.AppApi/Properties/launchSettings.json
new file mode 100644
index 0000000..08e5dd6
--- /dev/null
+++ b/server/src/XiangYi.AppApi/Properties/launchSettings.json
@@ -0,0 +1,24 @@
+{
+  "profiles": {
+    "http": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "applicationUrl": "http://localhost:5001",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "https": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "applicationUrl": "https://localhost:7001;http://localhost:5001",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/server/src/XiangYi.Application/DTOs/Responses/ProfileResponses.cs b/server/src/XiangYi.Application/DTOs/Responses/ProfileResponses.cs
index 419da49..882d8ad 100644
--- a/server/src/XiangYi.Application/DTOs/Responses/ProfileResponses.cs
+++ b/server/src/XiangYi.Application/DTOs/Responses/ProfileResponses.cs
@@ -159,6 +159,51 @@ public class ProfileResponse
     /// 是否实名认证
     /// </summary>
     public bool IsRealName { get; set; }
+
+    /// <summary>
+    /// 是否已收藏（当前用户对该用户）
+    /// </summary>
+    public bool IsFavorited { get; set; }
+
+    /// <summary>
+    /// 是否已解锁（当前用户对该用户）
+    /// </summary>
+    public bool IsUnlocked { get; set; }
+
+    /// <summary>
+    /// 剩余解锁次数
+    /// </summary>
+    public int RemainingUnlockQuota { get; set; }
+
+    /// <summary>
+    /// 头像URL
+    /// </summary>
+    public string? Avatar { get; set; }
+
+    /// <summary>
+    /// 是否独居
+    /// </summary>
+    public bool IsLivingAlone { get; set; }
+
+    /// <summary>
+    /// 父母状况
+    /// </summary>
+    public string? ParentStatus { get; set; }
+
+    /// <summary>
+    /// 父母是否退休
+    /// </summary>
+    public bool IsParentRetired { get; set; }
+
+    /// <summary>
+    /// 父母现居城市
+    /// </summary>
+    public string? ParentCity { get; set; }
+
+    /// <summary>
+    /// 父母是否有房
+    /// </summary>
+    public bool ParentHasHouse { get; set; }
 }
 
 /// <summary>
diff --git a/server/src/XiangYi.Application/Interfaces/IInteractService.cs b/server/src/XiangYi.Application/Interfaces/IInteractService.cs
index 8fd6b4c..c1b4c6c 100644
--- a/server/src/XiangYi.Application/Interfaces/IInteractService.cs
+++ b/server/src/XiangYi.Application/Interfaces/IInteractService.cs
@@ -79,4 +79,11 @@ public interface IInteractService
     /// 检查是否已解锁
     /// </summary>
     Task<bool> IsUnlockedAsync(long userId, long targetUserId);
+
+    /// <summary>
+    /// 获取剩余解锁次数
+    /// </summary>
+    /// <param name="userId">用户ID</param>
+    /// <returns>剩余解锁次数</returns>
+    Task<int> GetRemainingUnlockQuotaAsync(long userId);
 }
diff --git a/server/src/XiangYi.Application/Services/AdminUserService.cs b/server/src/XiangYi.Application/Services/AdminUserService.cs
index 668f4d2..6eece93 100644
--- a/server/src/XiangYi.Application/Services/AdminUserService.cs
+++ b/server/src/XiangYi.Application/Services/AdminUserService.cs
@@ -452,7 +452,7 @@ public class AdminUserService : IAdminUserService
             Phone = MaskPhone(user.Phone),
             Gender = user.Gender,
             GenderText = GetGenderText(user.Gender),
-            City = user.City,
+            City = profile?.WorkCity ?? user.City,
             Status = user.Status,
             StatusText = GetStatusText(user.Status),
             IsProfileCompleted = user.IsProfileCompleted,
diff --git a/server/src/XiangYi.Application/Services/InteractService.cs b/server/src/XiangYi.Application/Services/InteractService.cs
index c9d33b4..fd35741 100644
--- a/server/src/XiangYi.Application/Services/InteractService.cs
+++ b/server/src/XiangYi.Application/Services/InteractService.cs
@@ -477,6 +477,24 @@ public class InteractService : IInteractService
             u.UserId == userId && u.TargetUserId == targetUserId);
     }
 
+    /// <inheritdoc />
+    public async Task<int> GetRemainingUnlockQuotaAsync(long userId)
+    {
+        var user = await _userRepository.GetByIdAsync(userId);
+        if (user == null)
+        {
+            return 0;
+        }
+
+        // 会员有无限次数，返回一个大数
+        if (user.IsMember)
+        {
+            return 999;
+        }
+
+        return user.ContactCount;
+    }
+
     #endregion
 
     #region 私有方法
diff --git a/server/src/XiangYi.Application/Services/ProfileService.cs b/server/src/XiangYi.Application/Services/ProfileService.cs
index 03ca739..a0a2837 100644
--- a/server/src/XiangYi.Application/Services/ProfileService.cs
+++ b/server/src/XiangYi.Application/Services/ProfileService.cs
@@ -180,6 +180,7 @@ public class ProfileService : IProfileService
                     UserId = userId,
                     Nickname = user.Nickname,
                     XiangQinNo = user.XiangQinNo,
+                    Avatar = user.Avatar,
                     Photos = photos.OrderBy(p => p.Sort).Select(p => new PhotoResponse
                     {
                         Id = p.Id,
@@ -200,6 +201,7 @@ public class ProfileService : IProfileService
             UserId = userId,
             Nickname = user.Nickname,
             XiangQinNo = user.XiangQinNo,
+            Avatar = user.Avatar,
             Relationship = profile.Relationship,
             Surname = profile.Surname,
             ChildGender = profile.ChildGender,