From 15335e8921679179e2ca1b23e78bcaccde2c886d Mon Sep 17 00:00:00 2001
From: pengxiaolong <15716207+pengxiaolong711@user.noreply.gitee.com>
Date: Fri, 15 Aug 2025 13:05:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json                             |   6 +
 package.json                                  |   1 +
 src/api/account.js                            |  28 +
 src/components/Appaside.vue                   | 974 +++++++++++++++++-
 .../mineSubComponent/AnchorLibrary.vue        |  23 +-
 src/components/mineSubComponent/PKRecord.vue  |  42 +-
 src/components/mineSubComponent/PKmessage.vue | 247 ++++-
 .../mineSubComponent/PointsList.vue           |  53 +-
 src/main.js                                   |   9 +
 src/router/index.js                           |  36 +-
 src/utils/goeasy.js                           |  21 +
 src/utils/storage.js                          |   8 +-
 src/views/ActivateEmail.vue                   |  95 ++
 src/views/HomeView.vue                        |  36 +-
 src/views/emailRegistration.vue               |  45 +-
 src/views/hosts/Forum.vue                     |   2 +-
 src/views/hosts/pk.vue                        |   8 +
 17 files changed, 1501 insertions(+), 133 deletions(-)
 create mode 100644 src/utils/goeasy.js
 create mode 100644 src/views/ActivateEmail.vue

diff --git a/package-lock.json b/package-lock.json
index bfbb639..dbfe85c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,6 +13,7 @@
         "core-js": "^3.8.3",
         "echarts": "^5.6.0",
         "element-plus": "^2.10.4",
+        "goeasy": "^2.13.21",
         "pinia": "^3.0.3",
         "qwebchannel": "^6.2.0",
         "vue": "^3.2.13",
@@ -7376,6 +7377,11 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/goeasy": {
+      "version": "2.13.21",
+      "resolved": "https://registry.npmjs.org/goeasy/-/goeasy-2.13.21.tgz",
+      "integrity": "sha512-KxzYC9KRu02tt3Cv+9QHqP/yD6kl/kmI07UZw6BzRFjJUpNNuefZTD/bKC9a9nYbmLWYxYneoQqowHwl2GaEPw=="
+    },
     "node_modules/gopd": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
diff --git a/package.json b/package.json
index d23b504..58c1815 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,7 @@
     "core-js": "^3.8.3",
     "echarts": "^5.6.0",
     "element-plus": "^2.10.4",
+    "goeasy": "^2.13.21",
     "pinia": "^3.0.3",
     "qwebchannel": "^6.2.0",
     "vue": "^3.2.13",
diff --git a/src/api/account.js b/src/api/account.js
index aa83256..d8a8415 100644
--- a/src/api/account.js
+++ b/src/api/account.js
@@ -9,6 +9,18 @@ export function getVxQrcode() {
 export function getScanResult(data) {
     return getAxios({ url: 'user/check/' + data})
 }
+//获取用户信息
+export function getUserInfo(data) {
+    return postAxios({ url: 'user/getUserInfo',data})
+    }
+//修改用户信息
+export function editUserInfo(data) {
+    return postAxios({ url: 'user/updateUserInfo', data })
+}
+//检查用户名
+export function checkUsername(data) {
+    return postAxios({ url: 'user/checkUserName', data })
+}
 //注册
 export function register(data) {
     return postAxios({ url: 'user/registerWithMail', data })
@@ -90,3 +102,19 @@ export function topPkInfo(data) {
 export function cancelTopPkInfo(data) {
     return postAxios({ url: 'user/cancelPin', data })
 }
+//获取积分详情
+export function getIntegralDetail(data) {
+    return postAxios({ url: 'user/pointsDetail', data })
+}
+//获取PK记录
+export function getPkRecord(data) {
+    return postAxios({ url: 'user/handlePkInfo', data })
+}
+//签到
+export function signIn(data) {
+    return postAxios({ url: 'user/signIn', data })
+}
+//修改邮箱
+export function editEmail(data) {
+    return postAxios({ url: 'user/updateUserMail', data })
+}
diff --git a/src/components/Appaside.vue b/src/components/Appaside.vue
index fbaef8c..f5b1943 100644
--- a/src/components/Appaside.vue
+++ b/src/components/Appaside.vue
@@ -18,14 +18,14 @@
         
     </div>
     <div class="Avatar" >
-        <el-popover placement="right-end" :width="200" trigger="click">-
+        <el-popover placement="right-end" :width="250" trigger="click">
             <template #reference>
                 <img class="Avatar-img" :src="avatar" alt="logo"></img>
             </template>
             <div class="Avatar-content">
                 <!-- 点击头像弹出框内容 -->
                 <div class="Avatar-content-name">
-                    来自世界上最长名的国家的某个人
+                    {{ info.nickName }}
                 </div>
                 <div class="Avatar-content-btn" style="overflow:auto;">
                     <div class="Avatar-list" v-for="(item, index) in Avatarlist" :key="index" @click="popoverClick(item.id)">
@@ -41,10 +41,11 @@
      <!-- 添加或修改主播 -->
      <div class="demo-panel">
           <div class="add-anchor-library">
-            <div class="title">发布新PK</div>
-            <!-- <div class="title">
-                    修改PK信息
-                </div> -->
+            <div class="title">
+              <img class="titleimg" src="@/assets/embellish.png" alt="" />
+              <div>发布新PK</div>
+              <img class="titleimg" src="@/assets/embellish.png" alt="" />
+            </div>
             <div class="add-anchor-library-content">
               <div class="input-name">
                 <!-- 主播名称 -->
@@ -53,9 +54,12 @@
                   v-model="anchorName"
                   size="large"
                   placeholder="请输入主播名称"
+                  @blur="handleChange()"
                 />
                 <div class="myanchor">
-                  <div class="myanchor-btn">选择我的主播</div>
+                  <div class="myanchor-btn" @click="myAnchorDialogVisible = true">
+                    选择我的主播
+                  </div>
                 </div>
               </div>
               <div class="country">
@@ -84,44 +88,201 @@
               </div>
               <div class="timeselect">
                 <el-date-picker
-                  v-model="value1"
+                  v-model="timevalue"
                   type="datetime"
                   placeholder="选择PK时间"
                   size="large"
                   style="width: 100%; height: 100%"
+                  format="YYYY/MM/DD hh:mm"
+                  value-format="x"
                 />
               </div>
               <div class="Gold-sessions">
                 <div class="Goldcoinbox-right">
                   <div class="Goldcoinbox-text">金币数（单位为K）</div>
-                  <el-input-number
-                    v-model="maxnum"
-                    controls-position="right"
-                    @change="handleChange"
-                  />
+                  <el-input-number v-model="goldvalue" controls-position="right" />
                 </div>
                 <div class="Goldcoinbox-right">
                   <div class="Goldcoinbox-text">场次</div>
-                  <el-input-number
-                    v-model="maxnum"
-                    controls-position="right"
-                    @change="handleChange"
-                  />
+                  <el-input-number v-model="sessionnum" controls-position="right" />
                 </div>
               </div>
-              <div class="Confirm">确认</div>
-              <div class="Reset">重置</div>
+              <div class="remark">
+                <!-- 备注 -->
+                <textarea
+                  v-model="remark"
+                  class="textarea"
+                  style="width: 100%; height: 100%"
+                  maxlength="50"
+                  placeholder="请输入备注（选填）"
+                />
+              </div>
+              <div class="Confirm" @click="Confirm()">确认</div>
+              <div class="Reset" @click="Reset()">重置</div>
             </div>
           </div>
         </div>
   </el-drawer>
+   <!-- 选择我的主播弹窗 -->
+   <el-dialog v-model="myAnchorDialogVisible" center title="选择我的主播库主播" width="800" align-center>
+    <div class="myanchor-content">
+      <div class="myanchor-list">
+        <div
+          class="anchor-library-card"
+          v-for="(item, index) in anchorLibrary"
+          :key="index"
+          @click="selectStreamerLibrary(item)"
+        >
+          <div class="card-content" :style="{ backgroundImage: item == selectAnchor ? '' : '',background: item == selectAnchor ? '#FFFBFA' : '',border: item == selectAnchor ? '1px solid #F4D0C9' : ''}">
+            <div class="card-avatar">
+              <img
+                style="width: 100%; height: 100%; border-radius: 100px"
+                :src="item.headerIcon"
+                alt=""
+              />
+            </div>
+            <div class="personalInformation">
+              <div class="name">{{ item.anchorId }}</div>
+              <div class="GenderAndCountry">
+                <div
+                  class="Gender"
+                  :style="{
+                    background: item.gender == 1 ? '#59D8DB' : '#F3876F',
+                  }"
+                >
+                  {{ item.gender == 1 ? "男" : "女" }}
+                </div>
+                <div class="Country">{{ item.country }}</div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="myanchor-dialog-btn">
+        <div class="myAnchorDialogReset" @click="myAnchorDialogVisible = false">取消</div>
+        <div class="myAnchorDialogConfirm" @click="myAnchorDialogConfirm()">确认</div>
+      </div>
+    </div>
+  </el-dialog>
+  <el-dialog v-model="settingsVisible" center title="设置" width="800" align-center>
+    <div class="settings-content">
+        <!-- 头像设置 -->
+        <div class="avatar-setting">
+          <el-upload class="avatar-uploader"
+            action="http://192.168.1.174:8086/file/uploadHeadIcon"
+            :show-file-list="false"
+            :on-success="handleAvatarSuccess"
+            :before-upload="beforeAvatarUpload"
+            :headers="headers"
+          >
+          <img :src="avatar" class="avatar" />
+        </el-upload>
+        <div class="Hint">点击上方头像修改头像</div>
+        </div>
+        <!-- 昵称设置 -->
+        <div class="nickname-setting">
+          <input type="text" class="nickname-input" v-model="info.nickName" @blur="handleNickNameChange"/>
+          <div class="Hint">点击输入修改昵称</div>
+        </div>
+        <div class="email-setting" @click="ResendEmail" v-if="info.mailVerification == 1">
+          <div v-if="isResendEmail == 0">
+            向（{{info.email}}）重发邮箱验证
+          </div>
+          <div v-if="isResendEmail == 1">
+            {{timeLeft}}
+          </div>
+        </div>
+        <!-- 邮箱设置 -->
+          <div class="email-setting" @click="emailVisiblefu">修改邮箱（{{info.email}}）</div>
+          <!-- 密码设置 -->
+          <div class="password-setting"@click="passwordVisiblefn">修改密码</div>
+    </div>
+  </el-dialog>
+  <!-- 修改密码弹窗 -->
+  <el-dialog v-model="passwordVisible" center title="修改密码" width="600" align-center>
+    <div class="password-content">
+      <el-input
+        type="password"
+        v-model="password"
+        placeholder="请输入旧密码"
+        size="large"
+        class="password-input"
+        show-password
+      />
+      <el-input
+        type="password"
+        v-model="newPassword"
+        placeholder="请输入新密码"
+        size="large"
+        class="password-input"
+        show-password
+      />
+      <el-input
+        type="password"
+        v-model="confirmPassword"
+        placeholder="请确认新密码"
+        size="large"
+        class="password-input"
+        show-password
+      />
+      <div class="password-btn" @click="changePassword()">确定</div>
+    </div>
+  </el-dialog>
+  <!-- 修改邮箱弹窗 -->
+  <el-dialog v-model="emailVisible" center title="修改邮箱" width="600" align-center>
+    <div class="password-content">
+        <div class="email-content">
+          <div class="emailNumber">
+            {{ info.email }}
+          </div>
+            <div class="email-input">
+              <el-input type="text" size="large" class="input-item" v-model="Email" placeholder="请输入旧邮箱验证码" />
+              <div class="email-Verification-btn" @click="sendEmail()">
+
+               <div class="email-Verification-btn-text" v-if="isSendEmail == 0">
+                获取验证码
+               </div>
+
+               <div id="timer" class="email-Verification-btn-text" v-else-if="isSendEmail == 1">
+               <!-- 倒计时 -->
+               {{ timeLeft }}S
+               </div>
+
+               <div class="email-Verification-btn-text" v-else-if="isSendEmail == 2">
+                重新发送
+               </div>
+
+              </div>
+            </div>
+            <div class="newEmail">
+                  <el-input type="text" size="large" class="newEmail-item" v-model="newEmail" placeholder="请输入新邮箱" />
+              </div>
+            <div class="email-btn" @click="changeEmail()">
+             修改
+            </div>
+        </div>
+        <!--  -->
+
+    </div>
+  </el-dialog>
 </template>
 
 <script setup>
 import { useRouter } from 'vue-router';
-import { setStorage , getStorage } from '@/utils/storage.js';
+import { setStorage , getStorage , getPromiseStorage,clearStorage} from '@/utils/storage.js';
 import { UserStore } from '@/stores/notice'
-const router = useRouter();
+import { ElMessage } from "element-plus";
+import { ElLoading } from "element-plus";
+import {
+  getAnchorList,
+  releasePkInfo,
+  getAnchorAvatar,
+  signIn,
+  editUserInfo,
+  resendEmail,
+  editEmail,
+  getUserInfo
+} from "@/api/account";
 import {
   ref, // 响应式基础
   watch, // 侦听器
@@ -132,8 +293,7 @@ import {
   reactive 
 } from "vue";
 import { getCountryNamesArray } from "../utils/countryUtil";
-
-const info = ref(null); // 用户信息
+const info = ref({}); // 用户信息
 const avatar = ref(null); //头像
 const country = ref([]);
 country.value = getCountryNamesArray(); //国家条目
@@ -144,18 +304,27 @@ const genderOptions = [
 const gendervalue = ref(null); // 性别值
 const countryvalue = ref(null); //国家
 const anchorName = ref(null); // 主播名称
+const AnchorProfilePicture = ref(""); // 主播头像
+const timevalue = ref(null); // PK时间
+const goldvalue = ref(null); // 金币数
+const sessionnum = ref(null); // 场次
+const remark = ref(null); // 备注
 const Avatarlist = [
     {
-        name: '设置',
-        id: 1,
+      name:'签到',
+      id:1
     },
     {
-        name: '联系客服',
+        name: '设置',
         id: 2,
     },
     {
-        name: '退出登录',
+        name: '联系客服(点击复制邮箱)',
         id: 3,
+    },
+    {
+        name: '退出登录',
+        id: 4,
     }
 ]
 const NavigationModule = [
@@ -194,10 +363,299 @@ const NavigationModule = [
     }
 
 ]
-const drawer = ref(false)
-const activeId = ref(null);
+const drawer = ref(false)// 添加新PK弹窗
+const activeId = ref(null);//选中的导航id
+const router = useRouter();
+const myAnchorDialogVisible = ref(false); // 选择我的主播弹窗
+const selectAnchor = ref(null); // 选择的主播
+const anchorLibrary = ref([]); // 主播库
+const settingsVisible = ref(false); // 设置弹窗
+const passwordVisible = ref(false); // 修改密码弹窗
+const password = ref(''); // 旧密码
+const newPassword = ref(''); // 新密码
+const confirmPassword = ref(''); // 确认新密码
+const emailVisible = ref(false); // 修改邮箱弹窗
+const Email = ref(''); // 邮箱验证码
+const isSendEmail = ref(0); // 是否发送邮箱验证码
+const isResendEmail = ref(0); // 是否重发邮箱验证
+const timeLeft = ref(60); // 倒计时
+const newEmail = ref(''); // 新邮箱
+
+//重发邮箱验证
+function ResendEmail() {
+  if (isResendEmail.value == 1) {
+    return;
+  }
+  resendEmail({
+    mailAddress: info.value.email,
+    type: 2,
+  }).then(res => {
+    isResendEmail.value = 1;
+    setInterval(startCountdown, 1000);
+  });
+}
+
+//修改新邮箱
+function changeEmail() {
+  if (Email.value == null || Email.value == "") {
+    ElMessage.error("请输入邮箱验证码");
+    return;
+  }
+  if (newEmail.value == null || newEmail.value == "") {
+    ElMessage.error("请输入新邮箱");
+    return;
+  }
+    // 邮箱验证
+  const emailRegex = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;
+  if (!emailRegex.test(newEmail.value)) {
+    ElMessage.error("请输入有效的邮箱地址");
+    return;
+  }
+  editEmail({
+    mailAddress: newEmail.value,
+    code: Email.value,
+  }).then(res => {
+    ElMessage.success("修改成功,请至新邮箱中验证邮箱");
+    emailVisible.value = false;
+    UserInfo();
+  });
+}
+
+//获取验证码
+function sendEmail() {
+  if (isSendEmail.value == 1) {
+    return;
+  }
+  resendEmail({
+    mailAddress: info.value.email,
+    type: 4,
+  }).then(res => {
+    isSendEmail.value = 1;
+    setInterval(startCountdown, 1000);
+  });
+}
+
+function startCountdown() {
+    if(timeLeft.value > 0) {
+        timeLeft.value--;
+    } else {
+        isSendEmail.value = 2;
+        isResendEmail.value = 0;
+        timeLeft.value = 60;
+    }
+}
+//打开修改邮箱弹窗
+function emailVisiblefu() {
+  if (info.value.mailVerification == 1) {
+    ElMessage.error("您暂时无法修改邮箱，请先验证邮箱,如果已经验证请刷新页面");
+    return;
+  }
+  emailVisible.value = true;
+}
+// 打开修改密码弹窗
+function passwordVisiblefn() {
+  if (info.value.mailVerification == 1) {
+    ElMessage.error("您暂时无法修改密码，请先验证邮箱,如果已经验证请刷新页面");
+    return;
+  }
+  passwordVisible.value = true;
+}
+
+// 修改密码
+function changePassword() {
+  if (password.value == null || password.value == "") {
+    ElMessage.error("请输入旧密码");
+    return;
+  }
+  if (newPassword.value == null || newPassword.value == "") {
+    ElMessage.error("请输入新密码");
+    return;
+  }
+  const passwordRegex = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[a-zA-Z\d]{6,16}$/;
+  if (!passwordRegex.test(newPassword.value)) {
+    ElMessage.error("密码必须包含大小写字母和数字，长度6-16位");
+    return;
+  }
+  if (confirmPassword.value == null || confirmPassword.value == "") {
+    ElMessage.error("请确认新密码");
+    return;
+  }
+  if (newPassword.value !== confirmPassword.value) {
+    ElMessage.error("两次密码输入不一致");
+    return;
+  }
+  editUserInfo({
+    id: info.value.id,
+    newPassword:newPassword.value,
+    confirmPassword: confirmPassword.value,
+    oldPassword: password.value,
+  }).then(res => {
+    passwordVisible.value = false;
+    ElMessage.success("修改成功");
+  });
+}
+//修改昵称
+function handleNickNameChange() {
+  editUserInfo({
+    id: info.value.id,
+    nickName: info.value.nickName,
+  }).then(res => {
+    setStorage("user", res);
+    ElMessage.success("修改成功");
+    UserInfo();
+  });
+}
+// 上传头像
+const headers = {
+  token: getStorage("token")
+}
+const handleAvatarSuccess = (
+  response,
+  uploadFile
+) => {
+  avatar.value = URL.createObjectURL(uploadFile.raw)
+  console.log(info.value);
+  editUserInfo({
+    id: info.value.id,
+    headerIcon: response.data.filename,
+  }).then(res => {
+    setStorage("user", res);
+    ElMessage.success("修改成功");
+    UserInfo();
+  });
+}
+
+const beforeAvatarUpload = (rawFile) => {
+  if (rawFile.type !== 'image/jpeg' && rawFile.type !== 'image/png'){
+    ElMessage.error('请上传 jpg/png 格式的图片')
+    return false
+  } else if (rawFile.size / 1024 / 1024 > 2) {
+    ElMessage.error('图片大小不能超过2M')
+    return false
+  }
+  return true
+}
+
+
+
+//输入框失去焦点
+function handleChange() {
+  if (anchorName.value == null || anchorName.value == "") {
+    ElMessage.error("请输入主播名称");
+    return;
+  }
+  const loading = ElLoading.service({
+    lock: true,
+    text: "查询主播中....",
+    background: "rgba(0, 0, 0, 0.7)",
+  });
+  getAnchorAvatar({ name: anchorName.value })
+    .then((res) => {
+      loading.close();
+      AnchorProfilePicture.value = res;
+      ElMessage.success("查询成功");
+    })
+    .catch((err) => {
+      loading.close();
+    });
+}
+// 确认发布
+function Confirm() {
+  const currentTime = Date.now();
+  if (anchorName.value == null || anchorName.value == "") {
+    ElMessage.error("请输入主播名称");
+    return;
+  }
+  if (gendervalue.value == null || gendervalue.value == "") {
+    ElMessage.error("请选择性别");
+    return;
+  }
+  if (timevalue.value == null || timevalue.value == "") {
+    ElMessage.error("请选择PK时间");
+    return;
+  }
+  if (currentTime > timevalue.value) {
+    ElMessage.error("PK时间不能早于当前时间");
+    return;
+  }
+  if (countryvalue.value == null || countryvalue.value == "") {
+    ElMessage.error("请选择国家");
+    return;
+  }
+  if (goldvalue.value == null || goldvalue.value == "") {
+    ElMessage.error("请输入金币数");
+    return;
+  }
+  if (sessionnum.value == null || sessionnum.value == "") {
+    ElMessage.error("请输入场次");
+    return;
+  }
+  const loading = ElLoading.service({
+    lock: true,
+    text: "发布中....",
+    background: "rgba(0, 0, 0, 0.7)",
+  });
+  releasePkInfo({
+      anchorId: anchorName.value,
+      pkTime: timevalue.value / 1000,
+      sex: gendervalue.value,
+      country: countryvalue.value,
+      coin: goldvalue.value,
+      remark: remark.value,
+      status: 0,
+      senderId: info.value.id,
+      anchorIcon: AnchorProfilePicture.value,
+      pkNumber: sessionnum.value,
+    })
+      .then((res) => {
+        loading.close();
+        ElMessage.success("发布成功");
+        Reset();
+        drawer.value = false;
+      })
+      .catch((err) => {
+        loading.close();
+        console.log(err);
+      });
+  }
+
+  // 重置
+function Reset() {
+  anchorName.value = null;
+  gendervalue.value = null;
+  timevalue.value = null;
+  goldvalue.value = null;
+  sessionnum.value = null;
+  remark.value = null;
+  countryvalue.value = null;
+}
+
+// 选择我的主播弹窗确认
+function myAnchorDialogConfirm() {
+  AnchorProfilePicture.value = selectAnchor.value.headerIcon.split("/").pop();
+  anchorName.value = selectAnchor.value.anchorId;
+  gendervalue.value = selectAnchor.value.gender;
+  countryvalue.value = selectAnchor.value.country;
+  myAnchorDialogVisible.value = false;
+}
+// 选择主播库主播
+function selectStreamerLibrary(item) {
+  selectAnchor.value = item;
+}
+
+//获取主播库
+function getAnchorLibrary() {
+  getAnchorList(
+    {
+      id: info.value.id 
+    }
+  ).then(res => {
+    anchorLibrary.value = res;
+  });
+}
+
+//侧边导航
 function handleClick(path, id) {
-    
     if (id === 5) {
         drawer.value = true;
     }else{
@@ -206,10 +664,59 @@ function handleClick(path, id) {
         router.push(path);
     }
 }
-
+// 复制到剪切板
+function copyToClipboard(text) {
+  navigator.clipboard.writeText(text).then(() => {
+    ElMessage.success("邮箱地址已复制到剪切板");
+  }).catch(err => {
+    ElMessage.error("复制失败，请手动复制");
+    console.error('复制失败: ', err);
+  });
+}
+//头像弹出框
 function popoverClick(id) {
+  if (id === 1) {
+    // 签到
+    setsignIn() 
+  }else if (id === 2) {
+      // 设置
+      UserInfo();
+      settingsVisible.value = true;
+  }else if (id === 3) {
+    // 联系客服
+    copyToClipboard('PK@TikTok0.xyz')
+  }else if (id === 4) {
+    // 退出登录
+    clearStorage("user")
+    clearStorage("token")
+    router.push('/')
+  }
   
 }
+//签到
+function setsignIn() {
+  signIn({
+    userId: info.value.id,
+  }).then(res => {
+    ElMessage.success("签到成功");
+  });
+}
+
+//获取用户数据
+function UserInfo() {
+  getUserInfo({
+    id: info.value.id,
+  }).then(res => {
+    info.value = res;
+    setStorage("user", res);
+    if (info.value.status == 2) {
+        router.push('/ActivateEmail')
+      }
+      if (info.value.mailVerification == 1) {
+          ElMessage.error("邮箱未验证,请至设置验证邮箱，如果已经验证请刷新页面");
+      }
+  });
+}
 
 const refname = ref('');
 
@@ -217,9 +724,16 @@ watch(refname, async (newQuestion, oldQuestion) => {
   // 变化后执行
 });
 onMounted(() => {
-    activeId.value = getStorage('activeId') || 1;
-    info.value = getStorage('user')
-    avatar.value = info.value.headerIcon;
+    getPromiseStorage('activeId').then(res => {
+      activeId.value = res
+    });
+    getPromiseStorage('user').then(res => {
+      info.value = res;
+      console.log(res);
+      avatar.value = info.value.headerIcon;
+      getAnchorLibrary()
+      UserInfo();
+    });
 });
 onBeforeMount(()=>{
     // 组件挂载前执行
@@ -271,7 +785,7 @@ onUnmounted(() => {
 }
 .Avatar-content{
     width: 100%;
-    height: 200px;
+    height: 250px;
 }
 .Avatar-content-name{
     width: 100%;
@@ -363,14 +877,21 @@ onUnmounted(() => {
   flex-direction: column;
   align-items: center;
 }
+.titleimg {
+  width: 44px;
+  height: 30px;
+}
 .title {
-  width: 100%;
+  width: 80%;
   height: 70px;
   font-size: 24px;
   font-weight: bold;
   color: #333333;
   text-align: center;
   line-height: 70px;
+  display: flex;
+  align-items: center;
+  justify-content: space-evenly;
 }
 .add-anchor-library-content {
   width: 100%;
@@ -445,6 +966,31 @@ onUnmounted(() => {
   font-size: 12px;
   color: @Prompt-text-color;
 }
+.remark {
+  margin-top: 30px;
+  width: 90%;
+  height: 100px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  // margin-top: 10px;
+}
+.textarea {
+  width: 90%;
+  height: 90%;
+  max-height: 90%;
+  border: 1px solid #4fcacd;
+  border-radius: 10px;
+  outline: none;
+  overflow: hidden;
+  background-color: #ff000000;
+  font-size: 16px;
+  margin-left: 5px;
+  margin-right: 5px;
+  color: #000000;
+  letter-spacing: 1px;
+  resize: none;
+}
 .Confirm {
   width: 85%;
   height: 50px;
@@ -463,6 +1009,28 @@ onUnmounted(() => {
   transform: scale(1.1);
   opacity: 0.8;
 }
+.Confirm:active {
+  transition: all 0.1s ease;
+  transform: scale(0.95) !important;
+}
+.myAnchorDialogConfirm{
+   width: 400px;
+  height: 50px;
+  margin-top: 30px;
+  text-align: center;
+  line-height: 50px;
+  background: linear-gradient(0deg, #4FCACD, #5FDBDE);
+  color: #ffffff;
+  font-size: 20px;
+  transition: all 0.4s ease;
+  border-radius: 100px;
+
+}
+.myAnchorDialogConfirm:hover {
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.3);
+  transform: scale(1.1);
+  opacity: 0.8;
+}
 .Reset {
   width: 85%;
   height: 50px;
@@ -481,4 +1049,336 @@ onUnmounted(() => {
   transform: scale(1.1);
   opacity: 0.8;
 }
+.Reset:active {
+  transition: all 0.1s ease;
+  transform: scale(0.95) !important;
+}
+.myAnchorDialogReset{
+  width: 400px;
+  height: 50px;
+  margin-top: 30px;
+  text-align: center;
+  line-height: 50px;
+  background: linear-gradient(0deg, #E4FFFF, #ffffff);
+  color:#03ABA8;
+  font-size: 20px;
+  transition: all 0.4s ease;
+  border-radius: 100px;
+  border: 1px solid #4FCACD;
+}
+.myAnchorDialogReset:hover {
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.3);
+  transform: scale(1.1);
+  opacity: 0.8;
+}
+.myanchor-content {
+  width: 100%;
+  height: 600px;
+}
+.myanchor-list {
+  width: 100%;
+  height: 500px;
+  background-color: #e0f4f1;
+  border-radius: 16px;
+  border: 1px solid #4fcacd;
+  overflow: auto;
+}
+.myanchor-list::-webkit-scrollbar {
+  display: none;
+}
+.anchor-library-card {
+  width: 100%;
+  height: 150px;
+  margin-bottom: 15px;
+  margin-top: 15px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.card-content {
+  width: 90%;
+  height: 100%;
+  border-radius: 10px;
+  background-image: url(@/assets/PKbackground.png);
+  background-size: 100% 100%;
+  transition: all 0.4s ease;
+  display: flex;
+  align-items: center;
+}
+.card-content:hover {
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.3);
+  transform: scale(1.08);
+  opacity: 0.8;
+}
+.card-avatar {
+  width: 100px;
+  height: 100px;
+  border-radius: 50%;
+  background-color: #ffffff;
+  margin-left: 20px;
+}
+.personalInformation {
+  width: calc(100% - 340px);
+  height: 100px;
+  margin-left: 20px;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+}
+.name {
+  font-size: 20px;
+  font-weight: bold;
+  color: #333333;
+}
+.GenderAndCountry {
+  display: flex;
+  align-items: center;
+}
+.Gender {
+  font-size: 16px;
+  color: #ffffff;
+  border-radius: 50px;
+  padding: 5px 20px 5px 20px;
+  margin-right: 20px;
+  line-height: 100%;
+}
+.Country {
+  font-size: 16px;
+  color: #03aba8;
+  border-radius: 50px;
+  background-color: #e4f9f9;
+  padding: 2px 20px 2px 20px;
+}
+.myanchor-dialog-btn {
+  width: 100%;
+  height: 100px;
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+}
+.settings-content{
+  width: 100%;
+  height: 700px;
+  background-image: linear-gradient(180deg, #dbf0f1, #ffffff);
+  border-radius: 16px;
+  border: 1px solid #4fcacd;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  border-radius: 10px;
+  margin-top: 50px;
+}
+.avatar-setting{
+  width: 178px;
+}
+.Hint{
+  width: 100%;
+  text-align: center;
+  color: #999999;
+  font-size: 12px;
+}
+.nickname-setting{
+  width: 500px;
+  height: 50px;
+  margin-top: 30px;
+}
+.nickname-input{
+  width: 100%;
+  height: 100%;
+  border: none;
+  background: none;
+  border-bottom: 1px solid #4fcacd;
+  font-size: 16px;
+  text-align: center;
+}
+.nickname-input:focus{
+  outline: none;
+}
+.email-setting{
+  width: 500px;
+  height: 50px;
+  margin-top: 60px;
+  padding-left: 5px;
+  padding-right: 5px;
+  background: linear-gradient(0deg, #4FCACD, #5FDBDE);
+  border-radius: 50px;
+  text-align: center;
+  line-height: 50px;
+  color: #ffffff;
+  transition: all 0.4s ease;
+}
+.email-setting:hover{
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.3);
+  transform: scale(1.05);
+  opacity: 0.8;
+}
+.email-setting:active {
+  transition: all 0.1s ease;
+  transform: scale(0.95) !important;
+}
+.password-setting{
+  width: 500px;
+  height: 50px;
+  margin-top: 50px;
+  padding-left: 5px;
+  padding-right: 5px;
+  background: linear-gradient(0deg, #E4FFFF, #ffffff);
+  border-radius: 50px;
+  text-align: center;
+  line-height: 50px;
+  color: #03ABA8;
+  border: 1px solid #4FCACD;
+  transition: all 0.4s ease;
+}
+.password-setting:active {
+  transition: all 0.1s ease;
+  transform: scale(0.95) !important;
+}
+.password-setting:hover{
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.3);
+  transform: scale(1.05);
+  opacity: 0.8;
+}
+.password-content{
+  width: 100%;
+  height: 500px;
+  background-image: linear-gradient(180deg, #dbf0f1, #ffffff);
+  border-radius: 16px;
+  border: 1px solid #4fcacd;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+.password-input{
+  width: 500px;
+  height: 50px;
+  margin-top: 50px;
+}
+.password-btn{
+  width: 500px;
+  height: 50px;
+  margin-top: 50px;
+  padding-left: 5px;
+  padding-right: 5px;
+  background: linear-gradient(0deg, #E4FFFF, #ffffff);
+  border-radius: 50px;
+  text-align: center;
+  line-height: 50px;
+  color: #03ABA8;
+  border: 1px solid #4FCACD;
+  transition: all 0.4s ease;
+}
+.password-btn:active {
+  transition: all 0.1s ease;
+  transform: scale(0.95) !important;
+}
+.password-btn:hover{
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.3);
+  transform: scale(1.05);
+  opacity: 0.8;
+}
+.email-content{
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+}
+.emailNumber{
+  color: #03ABA8;
+  font-size: 24px;
+  font-weight: bold;
+  margin-top: 50px;
+}
+.email-input{
+  margin-top: 50px;
+  display: flex;
+  align-items: center;
+}
+.email-Verification-btn{
+  width: 100px;
+  height: 50px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border: #03ABA8 1px solid;
+  border-radius: 5px;
+  margin-left: 10px;
+  transition: all 0.4s ease;
+}
+.email-Verification-btn:hover{
+  background-color: #03ABA8;
+  color: #ffffff;
+  transform: scale(1.1);
+  opacity: 0.8;
+}
+.email-Verification-btn:active{
+  background-color: #03ABA8;
+  color: #ffffff;
+  transform: scale(0.90) !important;
+}
+.email-btn{
+  width: 500px;
+  height: 50px;
+  margin-top: 50px;
+  padding-left: 5px;
+  padding-right: 5px;
+  background: linear-gradient(0deg, #4FCACD, #5FDBDE);
+  border-radius: 50px;
+  text-align: center;
+  line-height: 50px;
+  color: #ffffff;
+  transition: all 0.4s ease;
+}
+.email-btn:active {
+  transition: all 0.1s ease;
+  transform: scale(0.95) !important;
+}
+.email-btn:hover{
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.3);
+  transform: scale(1.05);
+  opacity: 0.8;
+}
+.input-item {
+  border: none;
+  width: 300px;
+  height: 100%;
+  background-color: #ffffff00;
+  border-bottom: 1px solid #4fcacd;
+}
+.newEmail-item{
+  border: none;
+  width: 100%;
+  height: 100%;
+  background-color: #ffffff00;
+  border-bottom: 1px solid #4fcacd;
+}
+:deep(.el-input__wrapper) {
+  box-shadow: none !important;
+  background-color: transparent !important;
+}
+:deep(.el-input__wrapper.is-focus) {
+  box-shadow: none !important;
+}
+.email-Verification-btn-text{
+  font-size: 14px;
+  color: #999;
+}
+.newEmail{
+  margin-top: 50px;
+  width: 410px;
+}
 </style>
diff --git a/src/components/mineSubComponent/AnchorLibrary.vue b/src/components/mineSubComponent/AnchorLibrary.vue
index 4c358fa..b296714 100644
--- a/src/components/mineSubComponent/AnchorLibrary.vue
+++ b/src/components/mineSubComponent/AnchorLibrary.vue
@@ -102,7 +102,7 @@
     </el-splitter>
   </div>
   <!-- 确认删除弹窗 -->
-  <el-dialog
+  <el-dialog center
     class="center-dialog"
     v-model="centerDialogVisible"
     title="提示"
@@ -328,8 +328,7 @@ onUnmounted(() => {
 .card-content {
   width: 90%;
   height: 100%;
-  border-radius: 20px;
-  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.3);
+  border-radius: 10px;
   background-image: url(../../assets/PKbackground.png);
   background-size: 100% 100%;
   transition: all 0.4s ease;
@@ -337,7 +336,7 @@ onUnmounted(() => {
   align-items: center;
 }
 .card-content:hover {
-  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.8);
+  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.3);
   transform: scale(1.05);
   opacity: 0.8;
 }
@@ -397,11 +396,19 @@ onUnmounted(() => {
 .modify-icon:hover {
   transform: scale(1.2);
 }
+.modify-icon:active {
+  transition: all 0.1s ease;
+  transform: scale(0.95) !important;
+}
 .delete-icon {
   width: 30px;
   height: 30px;
   transition: all 0.4s ease;
 }
+.delete-icon:active {
+  transition: all 0.1s ease;
+  transform: scale(0.95) !important;
+}
 .delete-icon:hover {
   transform: scale(1.2);
 }
@@ -474,6 +481,10 @@ onUnmounted(() => {
   transform: scale(1.1);
   opacity: 0.8;
 }
+.Confirm:active {
+  transition: all 0.1s ease;
+  transform: scale(0.95) !important;
+}
 .Reset {
   width: 400px;
   height: 50px;
@@ -492,6 +503,10 @@ onUnmounted(() => {
   transform: scale(1.1);
   opacity: 0.8;
 }
+.Reset:active {
+  transition: all 0.1s ease;
+  transform: scale(0.95) !important;
+}
 .center-dialog {
   background-color: #03aba8;
 }
diff --git a/src/components/mineSubComponent/PKRecord.vue b/src/components/mineSubComponent/PKRecord.vue
index d8624f7..4813de5 100644
--- a/src/components/mineSubComponent/PKRecord.vue
+++ b/src/components/mineSubComponent/PKRecord.vue
@@ -125,6 +125,11 @@ import {
   onUpdated, // 组件更新后执行
   onUnmounted, // 组件销毁前执行
 } from "vue";
+import {getPkRecord} from "@/api/account";
+import { ElMessage } from "element-plus";
+import {getPromiseStorage } from "@/utils/storage.js";
+
+const user = ref(null); // 用户信息
 const refname = ref("");
 const segmentedvalue = ref(1);
 const options = [
@@ -141,9 +146,44 @@ const options = [
     SelectedIcon: require("@/assets/InvitationSelected.png"),
   },
 ];
-const list = ref([{}, {}, {}, {}, {}, {}, {}]);
+const list = ref([]);
+const page = ref(0);
+const IPKPostedData = ref([]);
+const  InvitationData = ref([]);
+
+//获取PK记录列表
+function PkRecord() {
+  getPkRecord({
+    type: segmentedvalue.value,
+    userId: user.value.id,
+    page: page.value,
+    size: 10,
+  }).then((res) => {
+    console.log(res);
+    if (segmentedvalue.value === 1) {
+      IPKPostedData.value.push(...res);
+      list.value = IPKPostedData.value;
+    }else{
+      InvitationData.value.push(...res);
+      list.value = InvitationData.value;
+    }
+  })
+}
+
+// 加载更多
 function load() {}
 
+// 组件挂载完成后执行
+onMounted(() => {
+  getPromiseStorage("user")
+    .then((res) => {
+      user.value = res;
+      PkRecord();
+    })
+    .catch((err) => {
+      console.log(err);
+    });
+});
 onUpdated(() => {
   // 组件更新后执行
 });
diff --git a/src/components/mineSubComponent/PKmessage.vue b/src/components/mineSubComponent/PKmessage.vue
index 98184fb..0d00484 100644
--- a/src/components/mineSubComponent/PKmessage.vue
+++ b/src/components/mineSubComponent/PKmessage.vue
@@ -108,7 +108,9 @@
                   @blur="handleChange()"
                 />
                 <div class="myanchor">
-                  <div class="myanchor-btn" @click="myAnchorDialogVisible = true">选择我的主播</div>
+                  <div class="myanchor-btn" @click="myAnchorDialogVisible = true">
+                    选择我的主播
+                  </div>
                 </div>
               </div>
               <div class="country">
@@ -176,7 +178,8 @@
     </el-splitter>
   </div>
   <!-- 确认删除弹窗 -->
-  <el-dialog
+  <el-dialog 
+  center
     class="center-dialog"
     v-model="centerDialogVisible"
     title="提示"
@@ -192,41 +195,82 @@
     </template>
   </el-dialog>
   <!-- 选择我的主播弹窗 -->
-  <el-dialog v-model="myAnchorDialogVisible" title="选择我的主播库主播" width="800">
+  <el-dialog align-center center v-model="myAnchorDialogVisible" title="选择我的主播库主播" width="800">
     <div class="myanchor-content">
       <div class="myanchor-list">
-        <div class="anchor-library-card" v-for="(item, index) in anchorLibrary" :key="index" @click="selectStreamerLibrary(item)" :style="{transform: item == selectAnchor? 'scale(1.05)':'scale(1)'}">
-              <div class="card-content">
-                <div class="card-avatar">
-                  <img
-                    style="width: 100%; height: 100%; border-radius: 100px"
-                    :src="item.headerIcon"
-                    alt=""
-                  />
-                </div>
-                <div class="personalInformation">
-                  <div class="name">{{ item.anchorId }}</div>
-                  <div class="GenderAndCountry">
-                    <div
-                      class="Gender"
-                      :style="{
-                        background: item.gender == 1 ? '#59D8DB' : '#F3876F',
-                      }"
-                    >
-                      {{ item.gender == 1 ? "男" : "女" }}
-                    </div>
-                    <div class="Country">{{ item.country }}</div>
-                  </div>
+        <div
+          class="anchor-library-card"
+          v-for="(item, index) in anchorLibrary"
+          :key="index"
+          @click="selectStreamerLibrary(item)"
+        >
+          <div class="card-content" :style="{ backgroundImage: item == selectAnchor ? '' : '',background: item == selectAnchor ? '#FFFBFA' : '',border: item == selectAnchor ? '1px solid #F4D0C9' : ''}">
+            <div class="card-avatar">
+              <img
+                style="width: 100%; height: 100%; border-radius: 100px"
+                :src="item.headerIcon"
+                alt=""
+              />
+            </div>
+            <div class="personalInformation">
+              <div class="name">{{ item.anchorId }}</div>
+              <div class="GenderAndCountry">
+                <div
+                  class="Gender"
+                  :style="{
+                    background: item.gender == 1 ? '#59D8DB' : '#F3876F',
+                  }"
+                >
+                  {{ item.gender == 1 ? "男" : "女" }}
                 </div>
+                <div class="Country">{{ item.country }}</div>
               </div>
             </div>
+          </div>
+        </div>
       </div>
       <div class="myanchor-dialog-btn">
         <div class="Reset" @click="myAnchorDialogVisible = false">取消</div>
-        <div class="Confirm" @click="handleSelect">确认</div>
+        <div class="Confirm" @click="myAnchorDialogConfirm()">确认</div>
       </div>
     </div>
   </el-dialog>
+  <!-- 置顶弹窗 -->
+  <el-dialog align-center center v-model="topPositionstate" title="置顶" width="800">
+    <div class="topPosition-content">
+      <div class="topPosition-content-title">
+        置顶后，该用户将在首页置顶，并在指定时长内享有置顶特权。置顶时长
+        不足1小时，系统将按1小时计算积分扣除。请选择置顶时长：
+      </div>
+      <div class="topPosition-input">
+        <el-select-v2
+          v-model="topPositionvalue"
+          :options="topPositionOptions"
+          placeholder="请选择置顶时长"
+          style="width: 100%"
+          size="large"
+          filterable
+        />
+      </div>
+      <div class="myanchor-dialog-btn">
+        <div class="Reset" @click="topPositionstate = false">取消</div>
+        <div class="Confirm" @click="topPositionstateConfirm()">确认</div>
+      </div>
+    </div>
+  </el-dialog>
+  <!-- 取消置顶弹窗 -->
+  <el-dialog center v-model="cancelTopPositionstate" title="取消置顶" width="700" align-center>
+    <div class="cancelTopPosition">
+    <div class="cancelTopPosition-content">
+      您确定要取消置顶吗?取消置顶后，该用户将不再享有置顶特权，但仍可继续参与
+      PK挑战。若置顶时长不足1小时，系统将按1小时计算积分扣除。取消后按实际使用时长比例返还剩余积分，是否确认执行此操作?
+    </div>
+    <div class="myanchor-dialog-btn">
+      <div class="Reset" @click="cancelTopPositionstate = false">取消</div>
+      <div class="Confirm" @click="cancelTopPositionstateConfirm()">确认</div>
+    </div>
+  </div>
+  </el-dialog>
 </template>
 
 <script setup>
@@ -245,7 +289,7 @@ import {
   delPkInfo,
   topPkInfo,
   cancelTopPkInfo,
-  getAnchorList
+  getAnchorList,
 } from "@/api/account";
 import { TimestamptolocalTime } from "@/utils/timeConversion.js";
 import { getCountryNamesArray } from "../../utils/countryUtil";
@@ -276,25 +320,88 @@ const modifyDialogstateID = ref(null); // 修改弹窗ID
 const myAnchorDialogVisible = ref(false); // 选择我的主播弹窗
 const anchorLibrary = ref([]); // 我的主播库
 const selectAnchor = ref(null); //选中的主播信息
+const topPositionstate = ref(false); // 置顶弹窗
+const cancelTopPositionstate = ref(false); // 取消置顶弹窗
+const topPositiondata = ref(null); // 置顶or取消置顶数据
+const topPositionvalue = ref(null); // 置顶时长
+const topPositionOptions = ref([]); // 置顶时长选项
 // 选择我的主播
 function selectStreamerLibrary(item) {
-  selectAnchor.value = item
+  selectAnchor.value = item;
+}
+function myAnchorDialogConfirm() {
+  AnchorProfilePicture.value = selectAnchor.value.headerIcon.split("/").pop();
+  anchorName.value = selectAnchor.value.anchorId;
+  gendervalue.value = selectAnchor.value.gender;
+  countryvalue.value = selectAnchor.value.country;
+  myAnchorDialogVisible.value = false;
 }
-
 
 //获取我的主播库数据
 function getMyAnchorLibrary() {
-  getAnchorList({id: user.value.id}).then((res) => {
+  getAnchorList({ id: user.value.id }).then((res) => {
     console.log("anchorLibrary", res);
-    anchorLibrary.value = res
-  })
+    anchorLibrary.value = res;
+  });
 }
 // 置顶or取消置顶
 function topPosition(item) {
-
-
+  if (item.isPin == false) {
+    topPositionstate.value = true;
+    const currentTime = Math.floor(Date.now() / 1000);
+    topPositionOptions.value = generateTimeOptions(currentTime, item.pkTime);
+  } else {
+    cancelTopPositionstate.value = true;
+  }
+  topPositiondata.value = item;
 }
-// 修改
+
+// 确认置顶
+function topPositionstateConfirm() {
+  if (topPositionvalue.value == 0) {
+    topPositionstate.value = false;
+    return;
+  }
+  topPkInfo({
+    articleId: topPositiondata.value.id,
+    pinExpireTime: topPositionvalue.value,
+  }).then((res) => {
+    ElMessage.success("置顶成功");
+    topPositionstate.value = false;
+    list.value = [];
+    page.value = 0;
+    PKInfo();
+  });
+}
+
+// 确认取消置顶
+function cancelTopPositionstateConfirm() {
+  cancelTopPkInfo({articleId: topPositiondata.value.id}).then((res) => {
+    ElMessage.success(res);
+    cancelTopPositionstate.value = false;
+    list.value = [];
+    page.value = 0;
+    PKInfo();
+  });
+}
+
+//计算置顶时长
+function generateTimeOptions(currentTimestamp, targetTimestamp) {
+  const timeDiff = targetTimestamp - currentTimestamp;
+  // 时间差小于0，说明已过期
+  if (timeDiff <= 0) return [{ value: 0, label: "已过期" }];
+  const hours = Math.ceil(timeDiff / 3600);
+  const options = Array.from({ length: hours }, (_, i) => {
+    const hour = i + 1;
+    return {
+      value: currentTimestamp + hour * 3600,
+      label: `${hour}个小时`,
+    };
+  });
+  return options;
+}
+
+//修改
 function modify(item) {
   if (modifyDialogstate.value) {
     cancel();
@@ -311,7 +418,7 @@ function modify(item) {
   sessionnum.value = item.pkNumber;
   remark.value = item.remark;
 }
-// 取消
+// 取消修改
 function cancel() {
   modifyDialogstateID.value = null;
   modifyDialogstate.value = false;
@@ -324,12 +431,14 @@ function cancel() {
   sessionnum.value = null;
   remark.value = null;
 }
+
 // 删除
 const deletePKInfodata = ref(null);
 function deletePKInfo(item) {
   deletePKInfodata.value = item;
   centerDialogVisible.value = true;
 }
+
 // 确认删除
 function deleteAnchor() {
   centerDialogVisible.value = false;
@@ -436,7 +545,7 @@ function Reset() {
   goldvalue.value = null;
   sessionnum.value = null;
   remark.value = null;
-  countryvalue.value = null 
+  countryvalue.value = null;
 }
 
 //输入框失去焦点
@@ -530,7 +639,7 @@ watch(refname, async (newQuestion, oldQuestion) => {
   width: 90%;
   height: 100%;
   border-radius: 10px;
-  background-image: url(../../assets/PKbackground.png);
+  background-image: url(@/assets/PKbackground.png);
   background-size: 100% 100%;
   transition: all 0.4s ease;
   display: flex;
@@ -623,6 +732,10 @@ watch(refname, async (newQuestion, oldQuestion) => {
 .modify-icon:hover {
   transform: scale(1.3);
 }
+.modify-icon:active {
+  transition: all 0.1s ease;
+  transform: scale(0.95) !important;
+}
 .delete-icon {
   width: 20px;
   height: 28px;
@@ -631,6 +744,10 @@ watch(refname, async (newQuestion, oldQuestion) => {
 .delete-icon:hover {
   transform: scale(1.3);
 }
+.delete-icon:active {
+  transition: all 0.1s ease;
+  transform: scale(0.95) !important;
+}
 .add-anchor-library {
   width: 100%;
   height: 100%;
@@ -692,6 +809,10 @@ watch(refname, async (newQuestion, oldQuestion) => {
 .myanchor-btn:hover {
   transform: scale(1.03);
 }
+.myanchor-btn:active {
+  transition: all 0.1s ease;
+  transform: scale(0.95) !important;
+}
 .country {
   width: 90%;
   height: 50px;
@@ -763,6 +884,10 @@ watch(refname, async (newQuestion, oldQuestion) => {
   transition: all 0.4s ease;
   border-radius: 25px;
 }
+.Confirm:active {
+  transition: all 0.1s ease;
+  transform: scale(0.95) !important;
+}
 .Confirm:hover {
   box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.3);
   transform: scale(1.05);
@@ -786,14 +911,18 @@ watch(refname, async (newQuestion, oldQuestion) => {
   transform: scale(1.05);
   opacity: 0.8;
 }
-.myanchor-content{
+.Reset:active {
+  transition: all 0.1s ease;
+  transform: scale(0.95) !important;
+}
+.myanchor-content {
   width: 100%;
   height: 600px;
 }
-.myanchor-list{
+.myanchor-list {
   width: 100%;
   height: 500px;
-  background-color: #E0F4F1;
+  background-color: #e0f4f1;
   border-radius: 16px;
   border: 1px solid #4fcacd;
   overflow: auto;
@@ -801,11 +930,43 @@ watch(refname, async (newQuestion, oldQuestion) => {
 .myanchor-list::-webkit-scrollbar {
   display: none;
 }
-.myanchor-dialog-btn{
+.myanchor-dialog-btn {
   width: 100%;
   height: 100px;
   display: flex;
-  justify-content:space-around;
+  justify-content: space-around;
   align-items: center;
 }
+.topPosition-content {
+  width: 100%;
+  height: 500px;
+  display: flex;
+  align-items: center;
+  flex-direction: column;
+}
+.topPosition-content-title {
+  width: 80%;
+  height: 100px;
+  margin-top: 50px;
+  color: #999999;
+  font-size: 24px;
+}
+.topPosition-input {
+  width: 80%;
+  margin-top: 70px;
+  margin-bottom: 70px;
+}
+.cancelTopPosition{
+  width: 100%;
+  height: 400px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+.cancelTopPosition-content{
+  width: 80%;
+  color: #999999;
+  font-size: 24px;
+  height: 300px;
+}
 </style>
diff --git a/src/components/mineSubComponent/PointsList.vue b/src/components/mineSubComponent/PointsList.vue
index 1d4e64f..240cd92 100644
--- a/src/components/mineSubComponent/PointsList.vue
+++ b/src/components/mineSubComponent/PointsList.vue
@@ -8,23 +8,23 @@
       mode="scaleToFill"
     />
     <div class="points-text">
-      我的积分:
+      我的积分:{{ user.points }}
       <div class="points-alwaysnum">
-        9999999999999999999999999999999
+        
       </div>
     </div>
     </div>
     <div class="points-list" style="overflow: auto;">
     <div class="points-list-item" v-for="(item, index) in pointsList" :key="index">
-      <div class="points-list-content">
+      <div class="points-list-content" :style="{background: item.status == 1 ? '#DFFEFC':'#FBECE9'}">
         <div class="Event">
-          签到增加积分
+          {{ item.info }}
         </div>
         <div class="points-num">
-          +200
+          {{ item.number }}
         </div>
         <div class="time">
-          2025-08-01 14:27
+         {{TimestamptolocalTime(item.time*1000) }}
         </div>
       </div>
     </div>
@@ -41,20 +41,48 @@ import {
   onUpdated, // 组件更新后执行
   onUnmounted, // 组件销毁前执行
 } from "vue";
-const refname = ref('');
-const pointsList = ref([{},{},{},{},{},{},{},{},{},{},{},{},{},{}]);
-watch(refname, async (newQuestion, oldQuestion) => {
-  // 变化后执行
-});
+import {getIntegralDetail} from "@/api/account";
+import { ElMessage } from "element-plus";
+import {getPromiseStorage } from "@/utils/storage.js";
+import { TimestamptolocalTime } from "../../utils/timeConversion";
+const pointsList = ref([]);
+const user = ref({});//用户信息
+const page = ref(0);
+
+//获取积分数据
+function getPointsList () {
+  getIntegralDetail({
+    page: page.value,
+    size: 30,
+    userId: user.value.id,
+  }).then((res) => {
+    console.log(res);
+    pointsList.value.push(...res);
+  })
+}
+
+// 组件挂载完成后执行
 onMounted(() => {
-  // 组件挂载完成后执行
+  getPromiseStorage("user")
+    .then((res) => {
+      user.value = res;
+      getPointsList()
+    })
+    .catch((err) => {
+      console.log(err);
+    });
 });
+
 onUpdated(() => {
   // 组件更新后执行
 });
 onUnmounted(() => {
   // 组件销毁前执行
 });
+const refname = ref('');
+watch(refname, async (newQuestion, oldQuestion) => {
+  // 变化后执行
+});
 </script>
 
 <style scoped lang="less">
@@ -106,7 +134,6 @@ onUnmounted(() => {
   display: flex;
   justify-content: space-around;
   align-items: center;
-  background-color:#E0F4F1;
 }
 .Event{
   color: @Supplementary-text-color;
diff --git a/src/main.js b/src/main.js
index cd461f2..26b2604 100644
--- a/src/main.js
+++ b/src/main.js
@@ -7,8 +7,17 @@ import ElementPlus from 'element-plus'
 import 'element-plus/dist/index.css'
 import zhCn from 'element-plus/dist/locale/zh-cn.mjs'; // 引入中文语言包
 import * as ElementPlusIconsVue from '@element-plus/icons-vue'
+import GoEasy from 'goeasy'
+
+const goeasy = GoEasy.getInstance({
+    host:"hangzhou.goeasy.io",  //若是新加坡区域：singapore.goeasy.io
+    appkey:"您的common key",
+    modules:['pubsub']//根据需要，传入‘pubsub’或'im’，或数组方式同时传入
+});
 
 const app = createApp(App);
+app.config.globalProperties.goeasy = goeasy;
+export { goeasy };
 app.use(ElementPlus, {
     locale: zhCn, // 配置中文
 });
diff --git a/src/router/index.js b/src/router/index.js
index 8d8a7f8..e6b04ac 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,6 +1,7 @@
 import { createRouter, createWebHashHistory, createWebHistory } from 'vue-router'
 import HomeView from '../views/HomeView.vue'
 import emailRegistration from '../views/emailRegistration.vue'
+import ActivateEmail from '../views/ActivateEmail.vue'
 import { setStorage , getStorage } from '@/utils/storage.js';
 const routes = [
   {
@@ -13,6 +14,11 @@ const routes = [
     name: 'emailRegistration',
     component: emailRegistration
   },
+  {
+    path: '/ActivateEmail',
+    name: 'ActivateEmail',
+    component: ActivateEmail
+  },
   {
     path: '/nav',
     name: 'nav',
@@ -47,23 +53,23 @@ const router = createRouter({
   routes
 })
 
-// // 添加导航守卫
-// router.beforeEach((to, from, next) => {
-//   // 假设你有一个方法来检查用户是否已登录
-//   const isAuthenticated = () => {
-//     return localStorage.getItem('token') !== null;
-//   };
+// 添加导航守卫
+router.beforeEach((to, from, next) => {
+  // 假设你有一个方法来检查用户是否已登录
+  const isAuthenticated = () => {
+    return localStorage.getItem('token') !== null;
+  };
 
-//   // 定义需要登录才能访问的路由
-//   const requiresAuth = ['nav', 'pk', 'Forum', 'Message', 'Mine'];
+  // 定义需要登录才能访问的路由
+  const requiresAuth = ['nav', 'pk', 'Forum', 'Message', 'Mine'];
 
-//   // 如果需要登录且用户未登录，则重定向到登录页面
-//   if (requiresAuth.includes(to.name) && !isAuthenticated()) {
-//     next({ name: 'login' });
-//   } else {
-//     next();
-//   }
-// });
+  // 如果需要登录且用户未登录，则重定向到登录页面
+  if (requiresAuth.includes(to.name) && !isAuthenticated()) {
+    next({ name: 'login' });
+  } else {
+    next();
+  }
+});
 
 export default router
 
diff --git a/src/utils/goeasy.js b/src/utils/goeasy.js
new file mode 100644
index 0000000..c471909
--- /dev/null
+++ b/src/utils/goeasy.js
@@ -0,0 +1,21 @@
+import { goeasy } from '../main'
+
+export function goEasyLink(data) {
+    return new Promise((resolve, reject) => {
+        goeasy.connect({
+        id:data.id, //im必填，最大长度60字符
+        data:{"avatar":data.avatar,"nickname":data.nickname},
+        otp:data.key,
+        onSuccess: function () {  //连接成功
+           console.log("连接成功");
+           resolve(true);
+        },
+        onFailed: function (error) { //连接失败
+            console.log("连接失败，错误码：" + error.code + "，错误信息：" + error.content);
+        },
+        onProgress:function(attempts) { //连接或自动重连中
+            console.log("正在重连中..." + attempts);    
+        }
+    });
+    })
+}
\ No newline at end of file
diff --git a/src/utils/storage.js b/src/utils/storage.js
index c07ed31..5b6e9b5 100644
--- a/src/utils/storage.js
+++ b/src/utils/storage.js
@@ -24,7 +24,9 @@ export function getPromiseStorage(key) {
         }
     });
 }
-//清除localStorage
-export function clearStorage() {
-	window.localStorage.clear();
+// 删除特定的localStorage项
+export function clearStorage(key) {
+    if (key) {
+        window.localStorage.removeItem(key);
+    }
 }
diff --git a/src/views/ActivateEmail.vue b/src/views/ActivateEmail.vue
new file mode 100644
index 0000000..d0bc861
--- /dev/null
+++ b/src/views/ActivateEmail.vue
@@ -0,0 +1,95 @@
+<template>
+  <div class="activate-email">
+        <div class="activate-email-content">
+            您的邮箱{{ user.email }},尚未激活，请在您的邮箱中点击激活链接激活您的账号。
+        </div>
+        <div class="activate-email-btn" @click="sendActivateEmail">
+            重发激活邮件
+        </div>
+  </div>
+</template>
+
+<script setup>
+import {
+  ref, // 响应式基础
+  watch, // 侦听器
+  onMounted, // 组件挂载完成后执行
+  onUpdated, // 组件更新后执行
+  onUnmounted, // 组件销毁前执行
+} from "vue";
+import {getPromiseStorage} from '@/utils/storage.js';
+import {resendEmail} from "@/api/account";
+import { useRouter } from 'vue-router';
+import { ElMessage } from "element-plus";
+const router = useRouter();
+const refname = ref('');
+
+function sendActivateEmail() {
+    resendEmail({
+        mailAddress:user.value.email,
+        type:1
+    }).then(res => {
+        ElMessage.success('激活邮件已发送，请注意查收。');
+        router.push('/');
+    }).catch(err => {
+        ElMessage.error('激活邮件发送失败，请稍后再试。');
+    })
+}
+
+
+
+watch(refname, async (newQuestion, oldQuestion) => {
+  // 变化后执行
+});
+const user = ref({});
+onMounted(() => {
+    getPromiseStorage('user').then(res => {
+        console.log(res);
+      user.value = res;
+    });
+});
+onUpdated(() => {
+  // 组件更新后执行
+});
+onUnmounted(() => {
+  // 组件销毁前执行
+});
+</script>
+
+<style scoped>
+.activate-email{
+    padding: 0;
+  margin: 0;
+  width: 100vw;
+  height: 100vh;
+  background-image: url(@/assets/bg.png);
+  background-size: 100% 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+}
+.activate-email-content{
+    font-size: 30px;
+    color: #4FCACD;
+    font-weight: bold;
+}
+.activate-email-btn{
+    background-color: #4FCACD;
+    color: #fff;
+    font-size: 20px;
+    padding: 10px 20px;
+    border-radius: 5px;
+    cursor: pointer;
+    margin-top: 50px;
+}
+.activate-email-btn:hover{
+    box-shadow: 5px 5px 15px rgba(0, 0, 0, 0.3);
+    transform: scale(1.08);
+    opacity: 0.8;
+}
+.activate-email-btn:active{
+    transition: all 0.1s ease;
+    transform: scale(0.95) !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index ea70749..84eb5a3 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -25,7 +25,7 @@
             size="large"
             class="input-text"
             v-model="refEmail"
-            placeholder="请输入邮箱"
+            placeholder="请输入邮箱或用户名"
           />
         </div>
         <div class="input-Password">
@@ -64,6 +64,7 @@ import { useRouter } from "vue-router";
 import { ElMessage } from "element-plus";
 import { tokenStore, UserStore } from '@/stores/notice'
 import { setStorage , getStorage } from '@/utils/storage.js';
+import { goEasyLink } from '@/utils/goeasy.js';
 const router = useRouter();
 const refname = ref("");
 const refEmail = ref(""); // 邮箱
@@ -74,29 +75,42 @@ const token = tokenStore()
 const user = UserStore()
 // 登录
 function EmailLogin() {
-  // 邮箱验证
-  const emailRegex = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;
-  if (!emailRegex.test(refEmail.value)) {
-    ElMessage.error("请输入有效的邮箱地址");
-    return;
-  }
+  // // 邮箱验证
+  // const emailRegex = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;
+  // if (!emailRegex.test(refEmail.value)) {
+  //   ElMessage.error("请输入有效的邮箱地址");
+  //   return;
+  // }
   // 密码验证
   const passwordRegex = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[a-zA-Z\d]{6,16}$/;
   if (!passwordRegex.test(refpassword.value)) {
     ElMessage.error("密码必须包含大小写字母和数字，长度6-16位");
     return;
   }
+  const loading = ElLoading.service({
+    lock: true,
+    text: "登录中.....",
+    background: "rgba(0, 0, 0, 0.7)",
+  });
 
   login({
-    email: refEmail.value,
+    userNameOrEmail: refEmail.value,
+    // email: refEmail.value,
     password: refpassword.value,
   }).then((res) => {
     console.log(res);
     token.setToken(res.token);
     setStorage("token", res.token);
+    setStorage("email", refEmail.value);
+    setStorage("password", refpassword.value);
     user.setUser(res);
     setStorage("user", res);
-    router.push("/nav");
+    // otp/getopt 调用
+    goEasyLink().then(() => {
+      loading.close();
+      router.push("/nav");
+    });
+
   });
 }
 // 登录切换
@@ -145,6 +159,8 @@ watch(refname, async (newQuestion, oldQuestion) => {
 });
 
 onMounted(() => {
+  refEmail.value = getStorage("email");
+  refpassword.value = getStorage("password");
   // 初始化获取二维码
   fetchQrcode();
   // 设置每两分钟轮询一次
@@ -164,7 +180,7 @@ onUnmounted(() => {
   margin: 0;
   width: 100vw;
   height: 100vh;
-  background-image: url(../assets/bg.png);
+  background-image: url(@/assets/bg.png);
   background-size: 100% 100%;
   display: flex;
   flex-direction: column;
diff --git a/src/views/emailRegistration.vue b/src/views/emailRegistration.vue
index 4df879e..b87a4bc 100644
--- a/src/views/emailRegistration.vue
+++ b/src/views/emailRegistration.vue
@@ -17,6 +17,9 @@
       <div class="Email">
         <el-input type="text" size="large" class="input-item" v-model="Email" placeholder="请输入邮箱" />
       </div>
+      <div class="Email">
+        <el-input type="text" size="large" class="input-item" v-model="userName" placeholder="请输入用户名" @blur="userNameBlur"/>
+      </div>
       <div class="Password">
         <el-input type="Password" size="large" class="input-item" v-model="Password" show-password placeholder="请输入密码" />
         <text class="password-tip">您的密码必须包含大小字母和数字，长度在6-16位之间</text>
@@ -26,7 +29,7 @@
       </div>
       <div class="btn">
          <div class="Return" @click="Return">返回</div>
-         <div class="nextStep"@click="nextStep">下一步</div>
+         <div class="nextStep" @click="nextStep" >下一步</div>
       </div>
     </div>
     <!-- 完成注册 -->
@@ -43,7 +46,7 @@
 </template>
 
 <script setup>
-import { register,checkStatus,resendEmail} from "@/api/account"; // 导入登录接口
+import { register,checkStatus,resendEmail,checkUsername} from "@/api/account"; // 导入登录接口
 import { tokenStore, UserStore } from '@/stores/notice'
 import { setStorage , getStorage } from '@/utils/storage.js';
 import {
@@ -58,12 +61,36 @@ import { useRouter } from 'vue-router'
 const router = useRouter()
 const active = ref(0);// 当前步骤
 const Email = ref("");// 邮箱
+const userName = ref("");// 用户名
 const Password = ref("");// 密码
 const ConfirmPassword = ref("");// 确认密码
 const token = tokenStore()
 const user = UserStore()
+const userNamebtn = ref(false)
+// 用户名失去焦点
+function userNameBlur() {
+  if (userName.value.length < 6 || userName.value.length > 16 || userName.value == '' || userName.value == null) {
+    ElMessage.error('用户名长度不能小于2，不能大于16,不能为空');
+    return;
+  }
+  checkUsername({ userName: userName.value }).then(res => {
+    if (res==false) {
+      ElMessage.error('用户名已存在');
+      userNamebtn.value = false
+      return;
+    } else {
+    ElMessage.success('用户名可用');
+    userNamebtn.value = true
+    }
+  })
+}
 //下一步
 function nextStep() {
+  //用户名验证
+  if (userNamebtn.value == false) {
+    ElMessage.error('用户名已存在');
+    return;
+  }
   // 邮箱验证
   const emailRegex = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;
   if (!emailRegex.test(Email.value)) {
@@ -78,12 +105,18 @@ function nextStep() {
     return;
   }
 
+  //用户名验证
+  if (userName.value.length < 6 || userName.value.length > 16 || userName.value == '' || userName.value == null) {
+    ElMessage.error('用户名长度不能小于2，不能大于16,不能为空');
+    return;
+  }
+
   // 确认密码验证
   if (Password.value !== ConfirmPassword.value) {
     ElMessage.error('两次输入的密码不一致');
     return;
   }
-  register({password: Password.value, email: Email.value, nickName: '用户' + Math.floor(Math.random() * 1000000),headerIcon:'181754562968_.pic_hd.jpg'}).then(res => {
+  register({ userName: userName.value,password: Password.value, email: Email.value, nickName: '用户' + Math.floor(Math.random() * 1000000),headerIcon:'181754562968_.pic_hd.jpg'}).then(res => {
     active.value = active.value + 1;
     check(res.id);
     token.setToken(res.token);
@@ -195,14 +228,14 @@ onUnmounted(() => {
     opacity: 0.8;
 }
 .Email{
-  margin-top: 70px;
+  margin-top: 30px;
   width: 90%;
   display: flex;
   justify-content: center;
   align-items: center;
 }
 .Password{
-  margin-top: 50px;
+  margin-top: 30px;
   width: 90%;
   display: flex;
   flex-direction: column;
@@ -210,7 +243,7 @@ onUnmounted(() => {
   align-items: center;
 }
 .ConfirmPassword{
-  margin-top: 50px;
+  margin-top: 30px;
   width: 90%;
   display: flex;
   flex-direction: column;
diff --git a/src/views/hosts/Forum.vue b/src/views/hosts/Forum.vue
index 2ad5110..4a33ada 100644
--- a/src/views/hosts/Forum.vue
+++ b/src/views/hosts/Forum.vue
@@ -89,6 +89,6 @@ onUnmounted(() => {
 }
 .card-body{
   color: #333333;
-  font-size: 24px;
+  font-size: 16px;
 }
 </style>
diff --git a/src/views/hosts/pk.vue b/src/views/hosts/pk.vue
index 8debf50..1a0bb87 100644
--- a/src/views/hosts/pk.vue
+++ b/src/views/hosts/pk.vue
@@ -645,6 +645,10 @@ onUnmounted(() => {
   background-size: 100% 100%;
   transition: all 0.4s ease;
 }
+.search:active {
+  transition: all 0.1s ease;
+  transform: scale(0.95) !important;
+}
 .search:hover {
   transform: scale(1.2);
   opacity: 0.8;
@@ -653,6 +657,10 @@ onUnmounted(() => {
   transform: scale(1.2);
   opacity: 0.8;
 }
+.primary:active {
+  transition: all 0.1s ease;
+  transform: scale(0.95) !important;
+}
 .infinite-list {
   width: 100%;
   height: 100%;