From 3d76e769c7e3462224fab79f1f6ad5dfd16fc2c7 Mon Sep 17 00:00:00 2001
From: hrx <18603305412@163.com>
Date: Fri, 26 Sep 2025 15:51:45 +0800
Subject: [PATCH] uptada

---
 .../views/customer/unsubscribe/BaiduNetdisk.vue/index.vue  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/f/web-kboss/src/views/customer/unsubscribe/BaiduNetdisk.vue/index.vue b/f/web-kboss/src/views/customer/unsubscribe/BaiduNetdisk.vue/index.vue
index 1207845..acdfe4a 100644
--- a/f/web-kboss/src/views/customer/unsubscribe/BaiduNetdisk.vue/index.vue
+++ b/f/web-kboss/src/views/customer/unsubscribe/BaiduNetdisk.vue/index.vue
@@ -124,11 +124,10 @@ export default {
             console.log("退订接口返回:", res);
             if (res.status) {
               this.$message.success('退订成功');
-<<<<<<< HEAD
               this.$router.push({
                 path: '/BaiduNetdisk',
               });
-=======
+
               // 修复页面跳转 - 使用 path 而不是 url
               // this.$router.push({
               //   path: '/customer/unsubscribe/BaiduNetdisk',
@@ -139,8 +138,8 @@ export default {
               } else {
                 window.location.reload(); // 备用方案，直接刷新页面
               }
-              
->>>>>>> 3668499c20c8fb552d134820a7ab606a079a1d2a
+
+
             } else {
               this.$message.error(res.msg || '退订失败，请稍后重试');
             }