diff --git a/src/App.vue b/src/App.vue
index 6f89a265..03fc49b7 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,631 +1,635 @@
 <script>
-import { onLaunch, onShow, onError } from '@dcloudio/uni-app';
-import { ShoproInit } from './sheep';
-import RecentApi from './sheep/api/member/recent';
+  import { onLaunch, onShow, onError } from '@dcloudio/uni-app';
+  import { ShoproInit } from './sheep';
+  import RecentApi from './sheep/api/member/recent';
 
-// 与聊天相关的导入
-import http from './common/request';
-import * as msgType from './common/messageType';
-import * as enums from './common/enums';
-import * as wsApi from './common/wssocket';
-import CHAT_ENV from '@/chat-env.js';
+  // 与聊天相关的导入
+  import http from './common/request';
+  import * as msgType from './common/messageType';
+  import * as enums from './common/enums';
+  import * as wsApi from './common/wssocket';
+  import CHAT_ENV from '@/chat-env.js';
 
-export default {
-  /** ↓↓↓ 以下为app启动聊天相关模块初始化，WebSocket链接，加载聊天消息，加载离线消息，加载群组消息，初始化聊天相关的全局状态仓库 */
-  data() {
-    return {
-      isExit: false, // 是否已退出
-      audioTip: null,
-      reconnecting: false, // 正在重连标志
-      privateMessagesBuffer: [],
-      groupMessagesBuffer: [],
-    };
-  },
-  methods: {
-    init() {
-      this.reconnecting = false;
-      this.isExit = false;
-      // 加载数据
-      this.loadStore()
-        .then(() => {
-          // 初始化websocket
-          this.initWebSocket();
-        })
-        .catch((e) => {
-          console.log(e);
-          this.exit();
-        });
+  export default {
+    /** ↓↓↓ 以下为app启动聊天相关模块初始化，WebSocket链接，加载聊天消息，加载离线消息，加载群组消息，初始化聊天相关的全局状态仓库 */
+    data() {
+      return {
+        isExit: false, // 是否已退出
+        audioTip: null,
+        reconnecting: false, // 正在重连标志
+        privateMessagesBuffer: [],
+        groupMessagesBuffer: [],
+      };
     },
-    initWebSocket() {
-      let loginInfo = uni.getStorageSync('loginInfo');
-      wsApi.connect(CHAT_ENV.WS_URL, loginInfo.accessToken);
-      wsApi.onConnect(() => {
-        if (this.reconnecting) {
-          // 重连成功
-          this.onReconnectWs();
-        } else {
-          // 加载离线消息
-          this.pullOfflineMessage();
-          this.configStore.setAppInit(true);
+    methods: {
+      init() {
+        this.reconnecting = false;
+        this.isExit = false;
+        // 加载数据
+        this.loadStore()
+          .then(() => {
+            // 初始化websocket
+            this.initWebSocket();
+          })
+          .catch((e) => {
+            console.log(e);
+            this.exit();
+          });
+      },
+      initWebSocket() {
+        let loginInfo = uni.getStorageSync('loginInfo');
+        wsApi.connect(CHAT_ENV.WS_URL, loginInfo.accessToken);
+        wsApi.onConnect(() => {
+          if (this.reconnecting) {
+            // 重连成功
+            this.onReconnectWs();
+          } else {
+            // 加载离线消息
+            this.pullOfflineMessage();
+            this.configStore.setAppInit(true);
+          }
+        });
+        wsApi.onMessage((cmd, msgInfo) => {
+          if (cmd == 2) {
+            // 异地登录，强制下线
+            uni.showModal({
+              content: '您已在其他地方登录，将被强制下线',
+              showCancel: false,
+            });
+            this.exit();
+          } else if (cmd == 3) {
+            if (!this.configStore.appInit || this.chatStore.loading) {
+              // 如果正在拉取离线消息，先存入缓存区，等待消息拉取完成再处理，防止消息乱序
+              this.privateMessagesBuffer.push(msgInfo);
+            } else {
+              // 插入私聊消息
+              this.handlePrivateMessage(msgInfo);
+            }
+          } else if (cmd == 4) {
+            if (!this.configStore.appInit || this.chatStore.loading) {
+              // 如果正在拉取离线消息，先存入缓存区，等待消息拉取完成再处理，防止消息乱序
+              this.privateMessagesBuffer.push(msgInfo);
+            } else {
+              // 插入群聊消息
+              this.handleGroupMessage(msgInfo);
+            }
+          } else if (cmd == 5) {
+            // 系统消息
+            this.handleSystemMessage(msgInfo);
+          }
+        });
+        wsApi.onClose((res) => {
+          console.log('ws断开', res);
+          // 重新连接
+          if (!this.reconnecting) {
+            this.reconnectWs();
+            this.configStore.setAppInit(false);
+          }
+        });
+      },
+      loadStore() {
+        return this.userStore.loadUser().then(() => {
+          const promises = [];
+          promises.push(this.friendStore.loadFriend());
+          promises.push(this.groupStore.loadGroup());
+          promises.push(this.chatStore.loadChat());
+          promises.push(this.configStore.loadConfig());
+          return Promise.all(promises);
+        });
+      },
+      unloadStore() {
+        this.friendStore.clear();
+        this.groupStore.clear();
+        this.chatStore.clear();
+        this.configStore.clear();
+        this.userStore.clear();
+      },
+      pullOfflineMessage() {
+        this.chatStore.setLoading(true);
+        const promises = [];
+        promises.push(this.pullPrivateOfflineMessage(this.chatStore.privateMsgMaxId));
+        promises.push(this.pullGroupOfflineMessage(this.chatStore.groupMsgMaxId));
+        Promise.all(promises)
+          .then((messages) => {
+            // 处理离线消息
+            messages[0].forEach((m) => this.handlePrivateMessage(m));
+            messages[1].forEach((m) => this.handleGroupMessage(m));
+            // 处理缓冲区收到的实时消息
+            this.privateMessagesBuffer.forEach((m) => this.handlePrivateMessage(m));
+            this.groupMessagesBuffer.forEach((m) => this.handleGroupMessage(m));
+            // 清空缓冲区
+            this.privateMessagesBuffer = [];
+            this.groupMessagesBuffer = [];
+            // 关闭加载离线标记
+            this.chatStore.setLoading(false);
+            // 刷新会话
+            this.chatStore.refreshChats();
+          })
+          .catch((e) => {
+            console.log(e);
+            uni.showToast({
+              title: '拉取离线消息失败',
+              icon: 'none',
+            });
+            this.exit();
+          });
+      },
+      pullPrivateOfflineMessage(minId) {
+        return this.$http({
+          url: '/message/private/loadOfflineMessage?minId=' + minId,
+          method: 'GET',
+          timeout: 60000,
+        });
+      },
+      pullGroupOfflineMessage(minId) {
+        return this.$http({
+          url: '/message/group/loadOfflineMessage?minId=' + minId,
+          method: 'GET',
+          timeout: 60000,
+        });
+      },
+      handlePrivateMessage(msg) {
+        // 标记这条消息是不是自己发的
+        msg.selfSend = msg.sendId == this.userStore.userInfo.id;
+        // 好友id
+        let friendId = msg.selfSend ? msg.recvId : msg.sendId;
+        // 会话信息
+        let chatInfo = {
+          type: 'PRIVATE',
+          targetId: friendId,
+        };
+        // 消息已读处理，清空已读数量
+        if (msg.type == enums.MESSAGE_TYPE.READED) {
+          this.chatStore.resetUnreadCount(chatInfo);
+          return;
         }
-      });
-      wsApi.onMessage((cmd, msgInfo) => {
-        if (cmd == 2) {
-          // 异地登录，强制下线
+        // 消息回执处理,改消息状态为已读
+        if (msg.type == enums.MESSAGE_TYPE.RECEIPT) {
+          this.chatStore.readedMessage({
+            friendId: msg.sendId,
+          });
+          return;
+        }
+        // 消息撤回
+        if (msg.type == enums.MESSAGE_TYPE.RECALL) {
+          this.chatStore.recallMessage(msg, chatInfo);
+          return;
+        }
+        // 新增好友
+        if (msg.type == enums.MESSAGE_TYPE.FRIEND_NEW) {
+          this.friendStore.addFriend(JSON.parse(msg.content));
+          return;
+        }
+        // 删除好友
+        if (msg.type == enums.MESSAGE_TYPE.FRIEND_DEL) {
+          this.friendStore.removeFriend(friendId);
+          return;
+        }
+        // 对好友设置免打扰
+        if (msg.type == enums.MESSAGE_TYPE.FRIEND_DND) {
+          this.friendStore.setDnd(friendId, JSON.parse(msg.content));
+          this.chatStore.setDnd(chatInfo, JSON.parse(msg.content));
+          return;
+        }
+        // 消息插入
+        let friend = this.loadFriendInfo(friendId);
+        this.insertPrivateMessage(friend, msg);
+      },
+      insertPrivateMessage(friend, msg) {
+        // 单人视频信令
+        if (msgType.isRtcPrivate(msg.type)) {
+          // #ifdef MP-WEIXIN
+          return; // 小程序不支持音视频
+          // #endif
+
+          // 被呼叫，弹出视频页面
+          let delayTime = 100;
+          if (
+            msg.type == enums.MESSAGE_TYPE.RTC_CALL_VOICE ||
+            msg.type == enums.MESSAGE_TYPE.RTC_CALL_VIDEO
+          ) {
+            let mode = msg.type == enums.MESSAGE_TYPE.RTC_CALL_VIDEO ? 'video' : 'voice';
+            let pages = getCurrentPages();
+            let curPage = pages[pages.length - 1].route;
+            if (curPage != 'pages/chat/chat-private-video') {
+              const friendInfo = encodeURIComponent(JSON.stringify(friend));
+              uni.navigateTo({
+                url: `/pages/chat/chat-private-video?mode=${mode}&friend=${friendInfo}&isHost=false`,
+              });
+              delayTime = 500;
+            }
+          }
+          setTimeout(() => {
+            uni.$emit('WS_RTC_PRIVATE', msg);
+          }, delayTime);
+          return;
+        }
+        // 插入消息
+        if (msgType.isNormal(msg.type) || msgType.isTip(msg.type) || msgType.isAction(msg.type)) {
+          let chatInfo = {
+            type: 'PRIVATE',
+            targetId: friend.id,
+            showName: friend.nickName,
+            headImage: friend.headImage,
+            isDnd: friend.isDnd,
+          };
+          // 打开会话
+          this.chatStore.openChat(chatInfo);
+          // 插入消息
+          this.chatStore.insertMessage(msg, chatInfo);
+          // 播放提示音
+          if (
+            !friend.isDnd &&
+            !this.chatStore.loading &&
+            !msg.selfSend &&
+            msgType.isNormal(msg.type) &&
+            msg.status != enums.MESSAGE_STATUS.READED
+          ) {
+            this.playAudioTip();
+          }
+        }
+      },
+      handleGroupMessage(msg) {
+        // 标记这条消息是不是自己发的
+        msg.selfSend = msg.sendId == this.userStore.userInfo.id;
+        let chatInfo = {
+          type: 'GROUP',
+          targetId: msg.groupId,
+        };
+        // 消息已读处理
+        if (msg.type == enums.MESSAGE_TYPE.READED) {
+          // 我已读对方的消息，清空已读数量
+          this.chatStore.resetUnreadCount(chatInfo);
+          return;
+        }
+        // 消息回执处理
+        if (msg.type == enums.MESSAGE_TYPE.RECEIPT) {
+          // 更新消息已读人数
+          let msgInfo = {
+            id: msg.id,
+            groupId: msg.groupId,
+            readedCount: msg.readedCount,
+            receiptOk: msg.receiptOk,
+          };
+          this.chatStore.updateMessage(msgInfo, chatInfo);
+          return;
+        }
+        // 消息撤回
+        if (msg.type == enums.MESSAGE_TYPE.RECALL) {
+          this.chatStore.recallMessage(msg, chatInfo);
+          return;
+        }
+        // 新增群
+        if (msg.type == enums.MESSAGE_TYPE.GROUP_NEW) {
+          this.groupStore.addGroup(JSON.parse(msg.content));
+          return;
+        }
+        // 删除群
+        if (msg.type == enums.MESSAGE_TYPE.GROUP_DEL) {
+          this.groupStore.removeGroup(msg.groupId);
+          return;
+        }
+        // 对群设置免打扰
+        if (msg.type == enums.MESSAGE_TYPE.GROUP_DND) {
+          this.groupStore.setDnd(msg.groupId, JSON.parse(msg.content));
+          this.chatStore.setDnd(chatInfo, JSON.parse(msg.content));
+          return;
+        }
+        // 插入消息
+        let group = this.loadGroupInfo(msg.groupId);
+        this.insertGroupMessage(group, msg);
+      },
+      handleSystemMessage(msg) {
+        if (msg.type == enums.MESSAGE_TYPE.USER_BANNED) {
+          // 用户被封禁
+          wsApi.close(3099);
           uni.showModal({
-            content: '您已在其他地方登录，将被强制下线',
+            content: '您的账号已被管理员封禁，原因:' + msg.content,
             showCancel: false,
           });
           this.exit();
-        } else if (cmd == 3) {
-          if (!this.configStore.appInit || this.chatStore.loading) {
-            // 如果正在拉取离线消息，先存入缓存区，等待消息拉取完成再处理，防止消息乱序
-            this.privateMessagesBuffer.push(msgInfo);
-          } else {
-            // 插入私聊消息
-            this.handlePrivateMessage(msgInfo);
-          }
-        } else if (cmd == 4) {
-          if (!this.configStore.appInit || this.chatStore.loading) {
-            // 如果正在拉取离线消息，先存入缓存区，等待消息拉取完成再处理，防止消息乱序
-            this.privateMessagesBuffer.push(msgInfo);
-          } else {
-            // 插入群聊消息
-            this.handleGroupMessage(msgInfo);
-          }
-        } else if (cmd == 5) {
-          // 系统消息
-          this.handleSystemMessage(msgInfo);
         }
-      });
-      wsApi.onClose((res) => {
-        console.log('ws断开', res);
-        // 重新连接
-        if (!this.reconnecting) {
-          this.reconnectWs();
-          this.configStore.setAppInit(false);
+      },
+      insertGroupMessage(group, msg) {
+        // 群视频信令
+        if (msgType.isRtcGroup(msg.type)) {
+          // #ifdef MP-WEIXIN
+          return; // 小程序不支持音视频
+          // #endif
+
+          // 被呼叫，弹出视频页面
+          let delayTime = 100;
+          if (msg.type == enums.MESSAGE_TYPE.RTC_GROUP_SETUP) {
+            let pages = getCurrentPages();
+            let curPage = pages[pages.length - 1].route;
+            if (curPage != 'pages/chat/chat-group-video') {
+              const userInfos = encodeURIComponent(msg.content);
+              const inviterId = msg.sendId;
+              const groupId = msg.groupId;
+              uni.navigateTo({
+                url: `/pages/chat/chat-group-video?groupId=${groupId}&isHost=false
+    									&inviterId=${inviterId}&userInfos=${userInfos}`,
+              });
+              delayTime = 500;
+            }
+          }
+          // 消息转发到chat-group-video页面进行处理
+          setTimeout(() => {
+            uni.$emit('WS_RTC_GROUP', msg);
+          }, delayTime);
+          return;
         }
-      });
-    },
-    loadStore() {
-      return this.userStore.loadUser().then(() => {
+        // 插入消息
+        if (msgType.isNormal(msg.type) || msgType.isTip(msg.type) || msgType.isAction(msg.type)) {
+          let chatInfo = {
+            type: 'GROUP',
+            targetId: group.id,
+            showName: group.showGroupName,
+            headImage: group.headImageThumb,
+            isDnd: group.isDnd,
+          };
+          // 打开会话
+          this.chatStore.openChat(chatInfo);
+          // 插入消息
+          this.chatStore.insertMessage(msg, chatInfo);
+          // 播放提示音
+          if (
+            !group.isDnd &&
+            !this.chatStore.loading &&
+            !msg.selfSend &&
+            msgType.isNormal(msg.type) &&
+            msg.status != enums.MESSAGE_STATUS.READED
+          ) {
+            this.playAudioTip();
+          }
+        }
+      },
+      loadFriendInfo(id, callback) {
+        let friend = this.friendStore.findFriend(id);
+        if (!friend) {
+          console.log('未知用户:', id);
+          friend = {
+            id: id,
+            showNickName: '未知用户',
+            headImage: '',
+          };
+        }
+        return friend;
+      },
+      loadGroupInfo(id) {
+        let group = this.groupStore.findGroup(id);
+        if (!group) {
+          group = {
+            id: id,
+            showGroupName: '未知群聊',
+            headImageThumb: '',
+          };
+        }
+        return group;
+      },
+      exit() {
+        console.log('exit');
+        this.isExit = true;
+        wsApi.close(3099);
+        uni.removeStorageSync('loginInfo');
+        uni.reLaunch({
+          url: '/pages/login/login',
+        });
+        this.unloadStore();
+      },
+      playAudioTip() {
+        // 音频播放无法成功
+        // this.audioTip = uni.createInnerAudioContext();
+        // this.audioTip.src =  "/static/audio/tip.wav";
+        // this.audioTip.play();
+      },
+      // 刷新token
+      refreshToken(loginInfo) {
+        return new Promise((resolve, reject) => {
+          if (!loginInfo || !loginInfo.refreshToken) {
+            reject();
+            return;
+          }
+          http({
+            url: '/refreshToken',
+            method: 'PUT',
+            header: {
+              refreshToken: loginInfo.refreshToken,
+            },
+          })
+            .then((newLoginInfo) => {
+              uni.setStorageSync('loginInfo', newLoginInfo);
+              resolve();
+            })
+            .catch((e) => {
+              reject(e);
+            });
+        });
+      },
+      reconnectWs() {
+        // 已退出则不再重连
+        if (this.isExit) {
+          return;
+        }
+        // 记录标志
+        this.reconnecting = true;
+        // 重新加载一次个人信息，目的是为了保证网络已经正常且token有效
+        this.userStore
+          .loadUser()
+          .then((userInfo) => {
+            uni.showToast({
+              title: '连接已断开，尝试重新连接...',
+              icon: 'none',
+            });
+            // 重新连接
+            let loginInfo = uni.getStorageSync('loginInfo');
+            wsApi.reconnect(CHAT_ENV.WS_URL, loginInfo.accessToken);
+          })
+          .catch(() => {
+            // 5s后重试
+            setTimeout(() => {
+              this.reconnectWs();
+            }, 5000);
+          });
+      },
+      onReconnectWs() {
+        this.reconnecting = false;
+        // 重新加载好友和群聊
         const promises = [];
         promises.push(this.friendStore.loadFriend());
         promises.push(this.groupStore.loadGroup());
-        promises.push(this.chatStore.loadChat());
-        promises.push(this.configStore.loadConfig());
-        return Promise.all(promises);
-      });
-    },
-    unloadStore() {
-      this.friendStore.clear();
-      this.groupStore.clear();
-      this.chatStore.clear();
-      this.configStore.clear();
-      this.userStore.clear();
-    },
-    pullOfflineMessage() {
-      this.chatStore.setLoading(true);
-      const promises = [];
-      promises.push(this.pullPrivateOfflineMessage(this.chatStore.privateMsgMaxId));
-      promises.push(this.pullGroupOfflineMessage(this.chatStore.groupMsgMaxId));
-      Promise.all(promises)
-        .then((messages) => {
-          // 处理离线消息
-          messages[0].forEach((m) => this.handlePrivateMessage(m));
-          messages[1].forEach((m) => this.handleGroupMessage(m));
-          // 处理缓冲区收到的实时消息
-          this.privateMessagesBuffer.forEach((m) => this.handlePrivateMessage(m));
-          this.groupMessagesBuffer.forEach((m) => this.handleGroupMessage(m));
-          // 清空缓冲区
-          this.privateMessagesBuffer = [];
-          this.groupMessagesBuffer = [];
-          // 关闭加载离线标记
-          this.chatStore.setLoading(false);
-          // 刷新会话
-          this.chatStore.refreshChats();
-        })
-        .catch((e) => {
-          console.log(e);
-          uni.showToast({
-            title: '拉取离线消息失败',
-            icon: 'none',
-          });
-          this.exit();
-        });
-    },
-    pullPrivateOfflineMessage(minId) {
-      return this.$http({
-        url: '/message/private/loadOfflineMessage?minId=' + minId,
-        method: 'GET',
-        timeout: 60000,
-      });
-    },
-    pullGroupOfflineMessage(minId) {
-      return this.$http({
-        url: '/message/group/loadOfflineMessage?minId=' + minId,
-        method: 'GET',
-        timeout: 60000,
-      });
-    },
-    handlePrivateMessage(msg) {
-      // 标记这条消息是不是自己发的
-      msg.selfSend = msg.sendId == this.userStore.userInfo.id;
-      // 好友id
-      let friendId = msg.selfSend ? msg.recvId : msg.sendId;
-      // 会话信息
-      let chatInfo = {
-        type: 'PRIVATE',
-        targetId: friendId,
-      };
-      // 消息已读处理，清空已读数量
-      if (msg.type == enums.MESSAGE_TYPE.READED) {
-        this.chatStore.resetUnreadCount(chatInfo);
-        return;
-      }
-      // 消息回执处理,改消息状态为已读
-      if (msg.type == enums.MESSAGE_TYPE.RECEIPT) {
-        this.chatStore.readedMessage({
-          friendId: msg.sendId,
-        });
-        return;
-      }
-      // 消息撤回
-      if (msg.type == enums.MESSAGE_TYPE.RECALL) {
-        this.chatStore.recallMessage(msg, chatInfo);
-        return;
-      }
-      // 新增好友
-      if (msg.type == enums.MESSAGE_TYPE.FRIEND_NEW) {
-        this.friendStore.addFriend(JSON.parse(msg.content));
-        return;
-      }
-      // 删除好友
-      if (msg.type == enums.MESSAGE_TYPE.FRIEND_DEL) {
-        this.friendStore.removeFriend(friendId);
-        return;
-      }
-      // 对好友设置免打扰
-      if (msg.type == enums.MESSAGE_TYPE.FRIEND_DND) {
-        this.friendStore.setDnd(friendId, JSON.parse(msg.content));
-        this.chatStore.setDnd(chatInfo, JSON.parse(msg.content));
-        return;
-      }
-      // 消息插入
-      let friend = this.loadFriendInfo(friendId);
-      this.insertPrivateMessage(friend, msg);
-    },
-    insertPrivateMessage(friend, msg) {
-      // 单人视频信令
-      if (msgType.isRtcPrivate(msg.type)) {
-        // #ifdef MP-WEIXIN
-        return; // 小程序不支持音视频
-        // #endif
-
-        // 被呼叫，弹出视频页面
-        let delayTime = 100;
-        if (
-          msg.type == enums.MESSAGE_TYPE.RTC_CALL_VOICE ||
-          msg.type == enums.MESSAGE_TYPE.RTC_CALL_VIDEO
-        ) {
-          let mode = msg.type == enums.MESSAGE_TYPE.RTC_CALL_VIDEO ? 'video' : 'voice';
-          let pages = getCurrentPages();
-          let curPage = pages[pages.length - 1].route;
-          if (curPage != 'pages/chat/chat-private-video') {
-            const friendInfo = encodeURIComponent(JSON.stringify(friend));
-            uni.navigateTo({
-              url: `/pages/chat/chat-private-video?mode=${mode}&friend=${friendInfo}&isHost=false`,
-            });
-            delayTime = 500;
-          }
-        }
-        setTimeout(() => {
-          uni.$emit('WS_RTC_PRIVATE', msg);
-        }, delayTime);
-        return;
-      }
-      // 插入消息
-      if (msgType.isNormal(msg.type) || msgType.isTip(msg.type) || msgType.isAction(msg.type)) {
-        let chatInfo = {
-          type: 'PRIVATE',
-          targetId: friend.id,
-          showName: friend.nickName,
-          headImage: friend.headImage,
-          isDnd: friend.isDnd,
-        };
-        // 打开会话
-        this.chatStore.openChat(chatInfo);
-        // 插入消息
-        this.chatStore.insertMessage(msg, chatInfo);
-        // 播放提示音
-        if (
-          !friend.isDnd &&
-          !this.chatStore.loading &&
-          !msg.selfSend &&
-          msgType.isNormal(msg.type) &&
-          msg.status != enums.MESSAGE_STATUS.READED
-        ) {
-          this.playAudioTip();
-        }
-      }
-    },
-    handleGroupMessage(msg) {
-      // 标记这条消息是不是自己发的
-      msg.selfSend = msg.sendId == this.userStore.userInfo.id;
-      let chatInfo = {
-        type: 'GROUP',
-        targetId: msg.groupId,
-      };
-      // 消息已读处理
-      if (msg.type == enums.MESSAGE_TYPE.READED) {
-        // 我已读对方的消息，清空已读数量
-        this.chatStore.resetUnreadCount(chatInfo);
-        return;
-      }
-      // 消息回执处理
-      if (msg.type == enums.MESSAGE_TYPE.RECEIPT) {
-        // 更新消息已读人数
-        let msgInfo = {
-          id: msg.id,
-          groupId: msg.groupId,
-          readedCount: msg.readedCount,
-          receiptOk: msg.receiptOk,
-        };
-        this.chatStore.updateMessage(msgInfo, chatInfo);
-        return;
-      }
-      // 消息撤回
-      if (msg.type == enums.MESSAGE_TYPE.RECALL) {
-        this.chatStore.recallMessage(msg, chatInfo);
-        return;
-      }
-      // 新增群
-      if (msg.type == enums.MESSAGE_TYPE.GROUP_NEW) {
-        this.groupStore.addGroup(JSON.parse(msg.content));
-        return;
-      }
-      // 删除群
-      if (msg.type == enums.MESSAGE_TYPE.GROUP_DEL) {
-        this.groupStore.removeGroup(msg.groupId);
-        return;
-      }
-      // 对群设置免打扰
-      if (msg.type == enums.MESSAGE_TYPE.GROUP_DND) {
-        this.groupStore.setDnd(msg.groupId, JSON.parse(msg.content));
-        this.chatStore.setDnd(chatInfo, JSON.parse(msg.content));
-        return;
-      }
-      // 插入消息
-      let group = this.loadGroupInfo(msg.groupId);
-      this.insertGroupMessage(group, msg);
-    },
-    handleSystemMessage(msg) {
-      if (msg.type == enums.MESSAGE_TYPE.USER_BANNED) {
-        // 用户被封禁
-        wsApi.close(3099);
-        uni.showModal({
-          content: '您的账号已被管理员封禁，原因:' + msg.content,
-          showCancel: false,
-        });
-        this.exit();
-      }
-    },
-    insertGroupMessage(group, msg) {
-      // 群视频信令
-      if (msgType.isRtcGroup(msg.type)) {
-        // #ifdef MP-WEIXIN
-        return; // 小程序不支持音视频
-        // #endif
-
-        // 被呼叫，弹出视频页面
-        let delayTime = 100;
-        if (msg.type == enums.MESSAGE_TYPE.RTC_GROUP_SETUP) {
-          let pages = getCurrentPages();
-          let curPage = pages[pages.length - 1].route;
-          if (curPage != 'pages/chat/chat-group-video') {
-            const userInfos = encodeURIComponent(msg.content);
-            const inviterId = msg.sendId;
-            const groupId = msg.groupId;
-            uni.navigateTo({
-              url: `/pages/chat/chat-group-video?groupId=${groupId}&isHost=false
-    									&inviterId=${inviterId}&userInfos=${userInfos}`,
-            });
-            delayTime = 500;
-          }
-        }
-        // 消息转发到chat-group-video页面进行处理
-        setTimeout(() => {
-          uni.$emit('WS_RTC_GROUP', msg);
-        }, delayTime);
-        return;
-      }
-      // 插入消息
-      if (msgType.isNormal(msg.type) || msgType.isTip(msg.type) || msgType.isAction(msg.type)) {
-        let chatInfo = {
-          type: 'GROUP',
-          targetId: group.id,
-          showName: group.showGroupName,
-          headImage: group.headImageThumb,
-          isDnd: group.isDnd,
-        };
-        // 打开会话
-        this.chatStore.openChat(chatInfo);
-        // 插入消息
-        this.chatStore.insertMessage(msg, chatInfo);
-        // 播放提示音
-        if (
-          !group.isDnd &&
-          !this.chatStore.loading &&
-          !msg.selfSend &&
-          msgType.isNormal(msg.type) &&
-          msg.status != enums.MESSAGE_STATUS.READED
-        ) {
-          this.playAudioTip();
-        }
-      }
-    },
-    loadFriendInfo(id, callback) {
-      let friend = this.friendStore.findFriend(id);
-      if (!friend) {
-        console.log('未知用户:', id);
-        friend = {
-          id: id,
-          showNickName: '未知用户',
-          headImage: '',
-        };
-      }
-      return friend;
-    },
-    loadGroupInfo(id) {
-      let group = this.groupStore.findGroup(id);
-      if (!group) {
-        group = {
-          id: id,
-          showGroupName: '未知群聊',
-          headImageThumb: '',
-        };
-      }
-      return group;
-    },
-    exit() {
-      console.log('exit');
-      this.isExit = true;
-      wsApi.close(3099);
-      uni.removeStorageSync('loginInfo');
-      uni.reLaunch({
-        url: '/pages/login/login',
-      });
-      this.unloadStore();
-    },
-    playAudioTip() {
-      // 音频播放无法成功
-      // this.audioTip = uni.createInnerAudioContext();
-      // this.audioTip.src =  "/static/audio/tip.wav";
-      // this.audioTip.play();
-    },
-    // 刷新token
-    refreshToken(loginInfo) {
-      return new Promise((resolve, reject) => {
-        if (!loginInfo || !loginInfo.refreshToken) {
-          reject();
-          return;
-        }
-        http({
-          url: '/refreshToken',
-          method: 'PUT',
-          header: {
-            refreshToken: loginInfo.refreshToken,
-          },
-        })
-          .then((newLoginInfo) => {
-            uni.setStorageSync('loginInfo', newLoginInfo);
-            resolve();
+        Promise.all(promises)
+          .then(() => {
+            // uni.showToast({
+            //   title: '已重新连接',
+            //   icon: 'none',
+            // });
+            // 加载离线消息
+            this.pullPrivateOfflineMessage(this.chatStore.privateMsgMaxId);
+            this.pullGroupOfflineMessage(this.chatStore.groupMsgMaxId);
+            this.configStore.setAppInit(true);
           })
           .catch((e) => {
-            reject(e);
+            console.log(e);
+            this.exit();
           });
-      });
+      },
+      closeSplashscreen(delay) {
+        // #ifdef APP-PLUS
+        // 关闭开机动画
+        setTimeout(() => {
+          plus.navigator.closeSplashscreen();
+        }, delay);
+        // #endif
+      },
     },
-    reconnectWs() {
-      // 已退出则不再重连
-      if (this.isExit) {
-        return;
-      }
-      // 记录标志
-      this.reconnecting = true;
-      // 重新加载一次个人信息，目的是为了保证网络已经正常且token有效
-      this.userStore
-        .loadUser()
-        .then((userInfo) => {
-          uni.showToast({
-            title: '连接已断开，尝试重新连接...',
-            icon: 'none',
-          });
-          // 重新连接
-          let loginInfo = uni.getStorageSync('loginInfo');
-          wsApi.reconnect(CHAT_ENV.WS_URL, loginInfo.accessToken);
+    /** ↑↑↑ 以上为app启动聊天相关模块初始化，WebSocket链接，加载聊天消息，加载离线消息，加载群组消息，初始化聊天相关的全局状态仓库 */
+
+    onLaunch() {
+      // 隐藏原生导航栏 使用自定义底部导航
+      // uni.hideTabBar({
+      //   fail: () => {},
+      // });
+      // 加载Shopro底层依赖
+      ShoproInit();
+      // app启动时更新用户位置
+      uni.getLocation({
+        geocode: true,
+        success: (res) => {
+          const params = {
+            lat: String(res.latitude),
+            lon: String(res.longitude),
+            province: res.address?.province ?? '',
+            city: res.address?.city ?? '',
+            district: res.address?.district ?? '',
+            address: res.address?.street ?? '',
+          };
+          RecentApi.updateUserLocation(params);
+        },
+        fail: (err) => {
+          uni.showToast({ title: '位置信息获取失败，请打开系统定位', icon: 'none' });
+        },
+      });
+
+      this.$mountStore();
+      this.closeSplashscreen(1000); // 延迟1s，避免用户看到页面跳转
+      // 登录状态校验
+      let loginInfo = uni.getStorageSync('loginInfo');
+      this.refreshToken(loginInfo)
+        .then(() => {
+          // 聊天初始化
+          this.init();
+          this.closeSplashscreen(0);
         })
         .catch(() => {
-          // 5s后重试
-          setTimeout(() => {
-            this.reconnectWs();
-          }, 5000);
+          // 跳转到登录页
+          uni.redirectTo({ url: '/pages/login/login' });
         });
     },
-    onReconnectWs() {
-      this.reconnecting = false;
-      // 重新加载好友和群聊
-      const promises = [];
-      promises.push(this.friendStore.loadFriend());
-      promises.push(this.groupStore.loadGroup());
-      Promise.all(promises)
-        .then(() => {
-          uni.showToast({
-            title: '已重新连接',
-            icon: 'none',
-          });
-          // 加载离线消息
-          this.pullPrivateOfflineMessage(this.chatStore.privateMsgMaxId);
-          this.pullGroupOfflineMessage(this.chatStore.groupMsgMaxId);
-          this.configStore.setAppInit(true);
-        })
-        .catch((e) => {
-          console.log(e);
-          this.exit();
-        });
-    },
-    closeSplashscreen(delay) {
+    onShow() {
       // #ifdef APP-PLUS
-      // 关闭开机动画
-      setTimeout(() => {
-        plus.navigator.closeSplashscreen();
-      }, delay);
+      // 获取urlSchemes参数
+      const args = plus.runtime.arguments;
+      if (args) {
+      }
+
+      // 获取剪贴板
+      uni.getClipboardData({
+        success: (res) => {},
+      });
       // #endif
     },
-  },
-  /** ↑↑↑ 以上为app启动聊天相关模块初始化，WebSocket链接，加载聊天消息，加载离线消息，加载群组消息，初始化聊天相关的全局状态仓库 */
-
-  onLaunch() {
-    // 隐藏原生导航栏 使用自定义底部导航
-    // uni.hideTabBar({
-    //   fail: () => {},
-    // });
-    // 加载Shopro底层依赖
-    ShoproInit();
-    // app启动时更新用户位置
-    uni.getLocation({
-      geocode: true,
-      success: (res) => {
-        const params = {
-          lat: String(res.latitude),
-          lon: String(res.longitude),
-          province: res.address?.province ?? '',
-          city: res.address?.city ?? '',
-          district: res.address?.district ?? '',
-          address: res.address?.street ?? '',
-        };
-        RecentApi.updateUserLocation(params);
-      },
-      fail: (err) => {
-        uni.showToast({ title: '位置信息获取失败，请打开系统定位', icon: 'none' });
-      },
-    });
-
-    this.$mountStore();
-    this.closeSplashscreen(1000); // 延迟1s，避免用户看到页面跳转
-    // 登录状态校验
-    let loginInfo = uni.getStorageSync('loginInfo');
-    this.refreshToken(loginInfo)
-      .then(() => {
-        // 聊天初始化
-        this.init();
-        this.closeSplashscreen(0);
-      })
-      .catch(() => {
-        // 跳转到登录页
-        uni.redirectTo({ url: '/pages/login/login' });
-      });
-  },
-  onShow() {
-    // #ifdef APP-PLUS
-    // 获取urlSchemes参数
-    const args = plus.runtime.arguments;
-    if (args) {
-    }
-
-    // 获取剪贴板
-    uni.getClipboardData({
-      success: (res) => { },
-    });
-    // #endif
-  },
-};
+  };
 </script>
 
 <style lang="scss">
-/* @import '@/sheep/scss/index.scss'; */
+  /* @import '@/sheep/scss/index.scss'; */
 
-:root,
-page {
-  font-family: Noto Sans SC, Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB,
-    Microsoft YaHei, SimSun, sans-serif, Inter, system-ui, Avenir, Helvetica, Arial, sans-serif;
-  line-height: 1.5;
-  font-weight: 400;
+  :root,
+  page {
+    font-family: Noto Sans SC, Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB,
+      Microsoft YaHei, SimSun, sans-serif, Inter, system-ui, Avenir, Helvetica, Arial, sans-serif;
+    line-height: 1.5;
+    font-weight: 400;
 
-  font-synthesis: none;
-  text-rendering: optimizeLegibility;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
+    font-synthesis: none;
+    text-rendering: optimizeLegibility;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
 
-  user-select: none;
-  background-color: #222222;
-  color: #ffffff;
-  font-size: 14px;
-  height: 100%;
-  --wot-color-theme: #d29e52;
-  --wot-backtop-bg: #d29e52;
-  --wot-dark-background: #222;
-  --wot-dark-background2: #222;
-  --wot-dark-color: #d29e52;
-  --wot-picker-toolbar-title-color: #fff;
-  // background-image: url(./static/page-bg.png);
-  // background-repeat: no-repeat;
-  // background-size: 100% 100%;
-}
+    user-select: none;
+    background-color: #222222;
+    color: #ffffff;
+    font-size: 14px;
+    height: 100%;
+    --wot-color-theme: #d29e52;
+    --wot-backtop-bg: #d29e52;
+    --wot-dark-background: #222;
+    --wot-dark-background2: #222;
+    --wot-dark-color: #d29e52;
+    --wot-picker-toolbar-title-color: #fff;
+    // background-image: url(./static/page-bg.png);
+    // background-repeat: no-repeat;
+    // background-size: 100% 100%;
+  }
 
-@import '@/im.scss';
-@import url('./static/icon/iconfont.css');
-@import url('./static/icon/self/iconfont.css');
+  @import '@/im.scss';
+  @import url('./static/icon/iconfont.css');
+  @import url('./static/icon/self/iconfont.css');
 
-// #ifdef H5
-uni-page-head {
-  display: none; // h5浏览器本身就有标题
-}
-
-// #endif
-.tab-page {
-  position: relative;
-  display: flex;
-  flex-direction: column;
   // #ifdef H5
-  height: calc(100vh - 50px - $im-nav-bar-height); // h5平台100vh是包含了底部高度，需要减去
-  top: $im-nav-bar-height;
-  // #endif
-
-  // #ifdef APP-PLUS
-  height: calc(100vh - var(--status-bar-height) - $im-nav-bar-height ); // app平台还要减去顶部手机状态栏高度
-  top: calc($im-nav-bar-height + var(--status-bar-height));
-  // #endif
-
-  // #ifdef MP-WEIXIN
-  height: calc(100vh - $im-nav-bar-height);
-  top: $im-nav-bar-height;
+  uni-page-head {
+    display: none; // h5浏览器本身就有标题
+  }
 
   // #endif
-  color: $im-text-color;
-  background: $im-bg-linear;
-  font-size: $im-font-size;
-}
+  .tab-page {
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    // #ifdef H5
+    height: calc(100vh - 50px - $im-nav-bar-height); // h5平台100vh是包含了底部高度，需要减去
+    top: $im-nav-bar-height;
+    // #endif
 
-.page {
-  position: relative;
-  // #ifdef H5
-  height: calc(100vh - $im-nav-bar-height); // h5平台100vh是包含了底部高度，需要减去
-  top: $im-nav-bar-height;
-  // #endif
+    // #ifdef APP-PLUS
+    height: calc(
+      100vh - var(--status-bar-height) - $im-nav-bar-height
+    ); // app平台还要减去顶部手机状态栏高度
+    top: calc($im-nav-bar-height + var(--status-bar-height));
+    // #endif
 
-  // #ifdef APP-PLUS
-  height: calc(100vh - var(--status-bar-height) - $im-nav-bar-height ); // app平台还要减去顶部手机状态栏高度
-  top: calc($im-nav-bar-height + var(--status-bar-height));
-  // #endif
+    // #ifdef MP-WEIXIN
+    height: calc(100vh - $im-nav-bar-height);
+    top: $im-nav-bar-height;
 
-  // #ifdef MP-WEIXIN
-  height: calc(100vh - $im-nav-bar-height);
-  top: $im-nav-bar-height;
-  // #endif
+    // #endif
+    color: $im-text-color;
+    background: $im-bg-linear;
+    font-size: $im-font-size;
+  }
 
-  color: $im-text-color;
-  background: $im-bg-linear;
-  font-size: $im-font-size;
-}
+  .page {
+    position: relative;
+    // #ifdef H5
+    height: calc(100vh - $im-nav-bar-height); // h5平台100vh是包含了底部高度，需要减去
+    top: $im-nav-bar-height;
+    // #endif
+
+    // #ifdef APP-PLUS
+    height: calc(
+      100vh - var(--status-bar-height) - $im-nav-bar-height
+    ); // app平台还要减去顶部手机状态栏高度
+    top: calc($im-nav-bar-height + var(--status-bar-height));
+    // #endif
+
+    // #ifdef MP-WEIXIN
+    height: calc(100vh - $im-nav-bar-height);
+    top: $im-nav-bar-height;
+    // #endif
+
+    color: $im-text-color;
+    background: $im-bg-linear;
+    font-size: $im-font-size;
+  }
 </style>
diff --git a/src/pages/profile/components/capsule-cell.vue b/src/pages/profile/components/capsule-cell.vue
new file mode 100644
index 00000000..da75635b
--- /dev/null
+++ b/src/pages/profile/components/capsule-cell.vue
@@ -0,0 +1,16 @@
+<template>
+  <view
+    class="h-100rpx mx-8 my-4 rounded-50rpx bg-color-light px-40rpx text-32rpx text-color-theme flex items-center"
+  >
+    <view v-if="title" class="text-center truncate">{{ title }}</view>
+    <view class="mx-4 h-1/2 w-3rpx bg-#949494"></view>
+    <view v-if="value">{{ value }}</view>
+  </view>
+</template>
+
+<script setup lang="ts">
+  defineProps<{
+    title: '';
+    value: '';
+  }>();
+</script>
diff --git a/src/pages/profile/face-verify.vue b/src/pages/profile/face-verify.vue
index 06fd8086..1bf23df0 100644
--- a/src/pages/profile/face-verify.vue
+++ b/src/pages/profile/face-verify.vue
@@ -1,7 +1,9 @@
 <template>
   <wd-config-provider theme="dark">
     <wd-navbar
-      :title="userInfoStore.sex == 2 ? '魅力女生认证' : '精英男士认证'"
+      :title="
+        userInfoStore.sex == 2 ? '魅力女生认证' : userInfoStore.sex == 1 ? '精英男士认证' : ''
+      "
       safeAreaInsetTop
       :bordered="false"
     >
@@ -12,14 +14,13 @@
       </template>
     </wd-navbar>
 
-    <!-- v-if="userInfoStore.sex == 2" -->
-    <view v-if="false" class="py-6 h-[calc(100vh - 44rpx - 200rpx)]">
+    <view v-if="userInfoStore.sex == 2" class="py-6 h-[calc(100vh - 44rpx - 200rpx)]">
       <wd-steps :active="stepActive" align-center>
         <wd-step v-for="index in 4" :key="index" />
       </wd-steps>
       <view class="h-30rpx"></view>
 
-      <view v-show="stepActive === 0">
+      <view v-if="stepActive === 0">
         <view class="text-xl my-2 mx-8 c-#FCFBFE">完善详细资料（必填）</view>
         <view class="text-sm my-2 mx-8 c-#949494">认真填写，展现你的魅力~</view>
         <view class="h-60rpx"></view>
@@ -31,13 +32,7 @@
           align-right
           :default-value="180"
         >
-          <input
-            class="h-100rpx mx-8 my-4 rounded-50rpx bg-color-light px-40rpx text-32rpx text-color-theme"
-            :value="userinfo.height ? userinfo.height + 'cm' : ''"
-            type="text"
-            placeholder="请选择身高"
-            placeholder-style="color: rgba(255, 255, 255, 0.6)"
-          />
+          <capsule-cell title="身高" :value="userinfo.height ? userinfo.height + 'cm' : ''" />
         </wd-picker>
         <wd-picker
           v-model="userinfo.weight"
@@ -47,13 +42,7 @@
           align-right
           :default-value="60"
         >
-          <input
-            class="h-100rpx mx-8 my-4 rounded-50rpx bg-color-light px-40rpx text-32rpx text-color-theme"
-            :value="userinfo.weight ? userinfo.weight + 'kg' : ''"
-            type="text"
-            placeholder="请选择体重"
-            placeholder-style="color: rgba(255, 255, 255, 0.6)"
-          />
+          <capsule-cell title="体重" :value="userinfo.weight ? userinfo.weight + 'kg' : ''" />
         </wd-picker>
         <wd-picker
           v-model="userinfo.occ"
@@ -62,16 +51,10 @@
           title="从事职业"
           align-right
         >
-          <input
-            class="h-100rpx mx-8 my-4 rounded-50rpx bg-color-light px-40rpx text-32rpx text-color-theme"
-            :value="userinfo.occ"
-            type="text"
-            placeholder="请选择职业"
-            placeholder-style="color: rgba(255, 255, 255, 0.6)"
-          />
+          <capsule-cell title="职业" :value="userinfo.occ" />
         </wd-picker>
         <textarea
-          class="h-200rpx mx-8 my-4 rounded-10rpx bg-color-light p-10rpx text-28rpx text-color-theme"
+          class="h-280rpx mx-8 my-4 rounded-10rpx bg-color-light p-10rpx text-32rpx text-color-theme"
           v-model="userinfo.description"
           :maxlength="100"
           placeholder="个人简介（100字以内）"
@@ -79,7 +62,7 @@
         />
       </view>
 
-      <view v-show="stepActive === 1">
+      <view v-if="stepActive === 1">
         <view class="text-xl my-2 mx-8 c-#FCFBFE">请上传3-5张最美的照片</view>
         <view class="text-sm my-2 mx-8 c-#949494">请上传本人真实照片，更容易受到男士青睐</view>
         <view class="h-60rpx"></view>
@@ -97,7 +80,7 @@
         </view>
       </view>
 
-      <view v-show="stepActive === 2">
+      <view v-if="stepActive === 2">
         <view class="text-xl my-2 mx-8 c-#FCFBFE">添加联系方式</view>
         <view class="text-sm my-2 mx-8 c-#949494">
           我们会保护你的隐私，联系方式只展示给审核人员和付费后的VIP男生
@@ -117,7 +100,11 @@
             fileMediatype="image"
             limit="1"
             mode="grid"
-            :imageStyles="{ width: '268rpx', height: '268rpx' }"
+            :imageStyles="{
+              width: '268rpx',
+              height: '268rpx',
+              border: { width: '6rpx', color: '#D29E52', radius: '50rpx' },
+            }"
           />
         </view>
         <view class="text-sm mx-8 text-color-theme">
@@ -126,20 +113,28 @@
         <view class="text-sm mx-8 text-color-theme">匹配不通过将不会认证通过哦~</view>
       </view>
 
-      <view v-show="stepActive === 3">
+      <view v-if="stepActive === 3">
         <view class="text-xl my-2 mx-8 c-#FCFBFE">基本资料</view>
         <view class="text-sm my-2 mx-8 c-#949494">上传清晰的五官头像，让更多用户发现你~</view>
         <view class="h-60rpx"></view>
-        <view class="mx-8 flex justify-between items-center">
+        <view class="mx-8 flex items-center">
           <s-uploader
             class="flex-1"
             v-model:url="girlAuthPic"
             fileMediatype="image"
             limit="1"
             mode="grid"
-            :imageStyles="{ width: '268rpx', height: '268rpx' }"
+            :imageStyles="{
+              width: '268rpx',
+              height: '268rpx',
+              border: { width: '6rpx', color: '#D29E52', radius: '50rpx' },
+            }"
           />
-          <view class="flex-1 text-sm mx-8 text-color-theme">确保本人头像，才能通过审核</view>
+          <view class="flex-1 flex-col-center">
+            <image class="w-160rpx h-180rpx" src="@/static/face-auth-prompt.png" mode="aspectFit" />
+            <view class="text-xs text-color-theme">确保本人头像</view>
+            <view class="text-xs text-color-theme">才能通过审核哦</view>
+          </view>
         </view>
         <wd-datetime-picker
           v-model="userinfo.birthday"
@@ -151,13 +146,7 @@
           :min-date="new Date(1980, 1, 1).getTime()"
           :max-date="Date.now()"
         >
-          <input
-            class="h-100rpx mx-8 my-4 rounded-50rpx bg-color-light px-40rpx text-32rpx text-color-theme"
-            :value="formatDate(userinfo.birthday, 'YYYY-MM-DD')"
-            type="text"
-            placeholder="请选择生日"
-            placeholder-style="color: rgba(255, 255, 255, 0.6)"
-          />
+          <capsule-cell title="生日" :value="formatDate(userinfo.birthday, 'YYYY-MM-DD')" />
         </wd-datetime-picker>
         <input
           class="h-100rpx mx-8 my-4 rounded-50rpx bg-color-light px-40rpx text-32rpx text-color-theme"
@@ -167,26 +156,28 @@
           placeholder-style="color: rgba(255, 255, 255, 0.6)"
           maxlength="10"
         />
-        <input
-          class="h-100rpx mx-8 my-4 rounded-50rpx bg-color-light px-40rpx text-32rpx text-color-theme"
-          value="位置权限       未允许"
-          type="text"
-          placeholder="位置权限"
-          placeholder-style="color: rgba(255, 255, 255, 0.6)"
-          disabled
-        />
+        <capsule-cell title="位置权限" :value="'未允许'" />
+      </view>
+
+      <view class="flex-row-center mt-6 gap-8">
+        <view
+          v-if="stepActive > 0"
+          class="size-100rpx rounded-full bg-color-light text-center line-height-100rpx active:bg-color"
+          @click="stepActive--"
+        >
+          <uni-icons type="arrow-left" color="#D29E52" size="36" />
+        </view>
+        <view
+          v-if="stepActive < 3"
+          class="size-100rpx rounded-full bg-color-light text-center line-height-100rpx active:bg-color"
+          @click="stepActive++"
+        >
+          <uni-icons type="arrow-right" color="#D29E52" size="36" />
+        </view>
       </view>
 
       <view
-        v-if="stepActive < 3"
-        class="size-100rpx rounded-full mx-auto bg-color-light mt-6 text-center line-height-100rpx active:bg-color"
-        @click="stepActive++"
-      >
-        <uni-icons type="arrow-right" color="#D29E52" size="36" />
-      </view>
-
-      <view
-        v-else
+        v-if="stepActive === 3"
         class="mx-auto mt-6 w-200rpx rounded-full p-3 text-center bg-color-theme-dark active:bg-color-theme"
         @click="girlFaceVerify"
       >
@@ -194,8 +185,7 @@
       </view>
     </view>
 
-    <!-- v-if="userInfoStore.sex == 1" -->
-    <view class="py-6 h-[calc(100vh - 44rpx - 200rpx)]">
+    <view v-if="userInfoStore.sex == 1" class="py-6 h-[calc(100vh - 44rpx - 200rpx)]">
       <view class="text-xl my-2 mx-8 c-#FCFBFE">基本资料</view>
       <view class="text-sm my-2 mx-8 c-#949494">上传本人头像，女生更放心与你见面~</view>
       <view class="h-60rpx"></view>
@@ -237,6 +227,7 @@
   import { baseUrl, apiPath, tenantId } from '@/sheep/config';
   import { getAccessToken } from '@/sheep/request';
   import { formatDate } from '@/sheep/helper/utils';
+  import CapsuleCell from './components/capsule-cell.vue';
 
   const userInfoStore = computed(() => sheep.$store('user').userInfo);
 
@@ -274,33 +265,25 @@
     // #endif
 
     // #ifdef APP-PLUS
+    if (!girlAuthPic.value) return uni.showToast({ title: '请先上传人脸照片', icon: 'error' });
+
     const aliyunVerify = uni.requireNativePlugin('AP-FaceDetectModule');
     const metaInfo = JSON.stringify(aliyunVerify.getMetaInfo());
-    let p = uni.getSystemInfoSync().platform;
-    if (p === 'ios') {
-    }
 
-    console.log('参数：', {
+    // 创建人脸认证
+    const { code, data } = await RecentApi.createGirlFaceVerify({
+      memberHeight: userinfo.height,
+      memberWeight: userinfo.weight,
+      memberWechatNumber: wxInfo.wechatNum,
+      memberOcc: userinfo.occ,
+      memberDesc: userinfo.description,
       authPic: girlAuthPic.value,
       metaInfoJson: metaInfo,
     });
-
-    // const { code, data } = await RecentApi.createGirlFaceVerify({
-    //   authPic: girlAuthPic.value,
-    //   metaInfoJson: metaInfo,
-    // });
-    // console.log('创建人脸认证response：', data);
-
-    // aliyunVerify.verify(
-    //   {
-    //     certifyId: '<替换生成的certifyId>',
-    //     extParams: { '<扩展参数key>': '<扩展参数value>' },
-    //   },
-    //   function (response: any) {
-    //     console.log(response);
-    // uni.navigateBack();
-    //   },
-    // );
+    console.log('创建人脸认证接口responseData：', code, data);
+    if (code !== 0)
+      return uni.showToast({ title: '请上传包含人脸的头像', icon: 'none', duration: 6000 });
+    verify(data.bizId);
     // #endif
   };
 
@@ -316,38 +299,49 @@
     const aliyunVerify = uni.requireNativePlugin('AP-FaceDetectModule');
     const metaInfo = JSON.stringify(aliyunVerify.getMetaInfo());
 
-    console.log('参数：', {
+    // 查询用户人脸认证
+    // const { code, data } = await RecentApi.getFaceVerify();
+    // if (code !== 0) return uni.showToast({ title: '查询用户人脸认证失败', icon: 'error' });
+
+    // console.log('查询用户人脸认证', code, data);
+
+    // switch (data.authStatus) {
+    //   case '1':
+    //     // 待认证
+    //     break;
+    //   case '2':
+    //     return uni.showToast({ title: '你的人脸审核中', icon: 'error' });
+    //   case '3':
+    //     // 审核通过
+    //     break;
+    //   case '4':
+    //     // 审核失败
+    //     break;
+    // }
+
+    // 创建人脸认证
+    const { code, data } = await RecentApi.createBoyFaceVerify({
       authPic: boyAuthPic.value,
       metaInfoJson: metaInfo,
     });
-
-    // 查询用户人脸认证
-    const { code, data } = await RecentApi.getFaceVerify();
-    if (code === 0) {
-      const { bizId: certifyId } = data;
-      verify(certifyId);
-    } else {
-      // 创建人脸认证
-      const {
-        code,
-        data: { bizId },
-      } = await RecentApi.createBoyFaceVerify({
-        authPic: boyAuthPic.value,
-        metaInfoJson: metaInfo,
-      });
-      if (code === 0) {
-        console.log('创建人脸认证接口response：', data);
-        verify(bizId);
-      }
-    }
+    console.log('创建人脸认证接口responseData：', code, data);
+    if (code !== 0)
+      return uni.showToast({ title: '请上传包含人脸的头像', icon: 'none', duration: 6000 });
+    verify(data.bizId, data.id);
     // #endif
   };
 
-  const verify = (certifyId: string) => {
+  /**
+   *
+   * @param certifyId 阿里人脸认证id
+   * @param authId 发起认证的id
+   */
+  const verify = (certifyId: string, authId: string) => {
     if (!certifyId) return uni.showToast({ title: 'certifyId不存在', icon: 'none' });
     const p = uni.getSystemInfoSync().platform;
     if (p === 'ios') {
     }
+    console.log('certifyId', certifyId);
 
     const aliyunVerify = uni.requireNativePlugin('AP-FaceDetectModule');
     aliyunVerify.verify(
@@ -356,7 +350,7 @@
         useMsgBox: true,
         extParams: null,
       },
-      function (response: any) {
+      async function (response: any) {
         console.log('认证结果', response);
 
         switch (response.code) {
@@ -371,7 +365,8 @@
             uni.showToast({ title: '您已认证成功', icon: 'none' });
             break;
           case 1001:
-            uni.showToast({ title: '系统错误', icon: 'none' });
+            await RecentApi.cancelFaceVerify({ authId });
+            // uni.showToast({ title: '系统错误', icon: 'none' });
             break;
           case 1003:
             uni.showToast({ title: '验证中断', icon: 'none' });
diff --git a/src/sheep/api/member/recent.ts b/src/sheep/api/member/recent.ts
index 1facd7e5..f1751b9a 100644
--- a/src/sheep/api/member/recent.ts
+++ b/src/sheep/api/member/recent.ts
@@ -362,18 +362,41 @@ const RecentApi = {
       },
     });
   },
-  // 查询用户人脸认证
-  getFaceVerify: (params: any) => {
+  // 创建女性人脸认证
+  createGirlFaceVerify: (data: any) => {
     return request({
-      url: '/member/com-auth/get',
-      method: 'GET',
-      params,
+      url: '/member/com-auth/create-woman-auth',
+      method: 'POST',
+      data,
       custom: {
         showLoading: true,
         loadingMsg: '加载中',
       },
     });
   },
+  // 查询用户人脸认证
+  getFaceVerify: () => {
+    return request({
+      url: '/member/com-auth/get',
+      method: 'GET',
+      custom: {
+        showLoading: true,
+        loadingMsg: '加载中',
+      },
+    });
+  },
+  // 取消用户人脸认证
+  cancelFaceVerify: (params: { authId: string | number }) => {
+    return request({
+      url: '/member/com-auth/cancel',
+      method: 'GET',
+      params,
+      custom: {
+        showLoading: true,
+        loadingMsg: '正在取消',
+      },
+    });
+  },
 };
 
 export default RecentApi;
diff --git a/test.keystore b/test.keystore
deleted file mode 100644
index 23d7a211..00000000
Binary files a/test.keystore and /dev/null differ