From 3b75028a9c9bf7ad4f9732584b541d637e3b9c18 Mon Sep 17 00:00:00 2001
From: zry <18990852002@163.com>
Date: Tue, 15 Jul 2025 11:28:37 +0800
Subject: [PATCH] secondary push of the password

---
 src/components/changePassword.vue      | 25 ++++++++-----------------
 src/router/index.js                    | 20 +++++++++++++-------
 src/views/recharge/addCoinRecharge.vue |  4 ++--
 3 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/src/components/changePassword.vue b/src/components/changePassword.vue
index 75ebb68..1e610ce 100644
--- a/src/components/changePassword.vue
+++ b/src/components/changePassword.vue
@@ -177,24 +177,15 @@ const changePassword = async function () {
 
     const result = await API({url: '/admin/password', data: params})
     console.log('@@@@@@@@@@@修改密码结果:', result)
-    if(result.code === 200){
-      // 显示成功弹窗
-      console.log('AAA')
-      router.replace('/PasswordSuccess')
-        .then(() => {
-          console.log('路由跳转成功');
-        })
-        .catch((error) => {
-          console.error('路由跳转失败:', error);
-          ElMessage.error('跳转失败，请重试');
-        });
-      ElMessage.success('修改密码成功')
-      // 重置表单字段
-      resetFields()
-      console.log('BBB')
+    if (result.code === 200) {
+      // 使用命名路由跳转更可靠
+      await router.push({ name: 'PasswordSuccess' });
       
-      console.log('CCC')
-      return result
+      // 或者使用路径跳转（确保大小写完全匹配）
+      // await router.push('/PasswordSuccess');
+      
+      ElMessage.success('修改密码成功');
+      resetFields();
     }else if(result.code === 400){
       // 显示失败弹窗
       console.log('修改密码失败')
diff --git a/src/router/index.js b/src/router/index.js
index d167a13..69191b2 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -81,11 +81,17 @@ const router = createRouter({
 });
 
 router.beforeEach((to, from, next) => {
-    const token = localStorage.getItem("token");
-    const machineId = localStorage.getItem("machineId");
-    if (to.name != "login" && !token) {
-        next('/login?machineId=' + machineId);
-    }
-    next();
-})
+  const token = localStorage.getItem("token");
+  const machineId = localStorage.getItem("machineId");
+  
+  // 允许无token访问的路由
+  const publicRoutes = ['Login', 'PasswordSuccess'];
+  
+  if (!publicRoutes.includes(to.name) && !token) {
+    next(`/login?machineId=${machineId}`);
+    return;
+  }
+  
+  next();
+});
 export default router;
diff --git a/src/views/recharge/addCoinRecharge.vue b/src/views/recharge/addCoinRecharge.vue
index 620b0ab..cbe4400 100644
--- a/src/views/recharge/addCoinRecharge.vue
+++ b/src/views/recharge/addCoinRecharge.vue
@@ -501,7 +501,7 @@ const payModel = [
 function handleActivityChange(value) {
   // 在这里执行你的逻辑，例如获取选中的值
   console.log('选中的值：', value)
-  getActivityById(value)
+  // getActivityById(value)
   console.log('看看', recharge.value)
 }
 
@@ -526,7 +526,7 @@ const deleteRecharge = function () {
 onMounted(async function () {
   await getAdminData()
   // await getCurrency()
-  await getActivity()// 现在的活动就是文字输入框，不需要请求接口，具体等后续需求
+  // await getActivity()// 现在的活动就是文字输入框，不需要请求接口，具体等后续需求
   
 })
 onMounted(() => {