From c261594a2554262ecfbf4b0eaad8e393de313bde Mon Sep 17 00:00:00 2001
From: lbw_9527443 <780139497@qq.com>
Date: Mon, 1 Sep 2025 16:40:27 +0800
Subject: [PATCH] =?UTF-8?q?fix(ProblemRanking):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E9=97=AE=E5=8D=B7=E8=B0=83=E6=9F=A5=E4=BF=A1=E6=81=AF=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

refactor(UserDropdown): 改进退出登录处理流程，增加错误处理

style(SalesTimelineWithTaskList): 统一"点击未支付"显示文本为"点击未付"
---
 my-vue-app/src/components/UserDropdown.vue    | 24 ++++++++++++-------
 .../components/SalesTimelineWithTaskList.vue  |  4 ++--
 .../secondTop/components/ProblemRanking.vue   |  5 ++--
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/my-vue-app/src/components/UserDropdown.vue b/my-vue-app/src/components/UserDropdown.vue
index b34df7c..f9c90e6 100644
--- a/my-vue-app/src/components/UserDropdown.vue
+++ b/my-vue-app/src/components/UserDropdown.vue
@@ -319,15 +319,21 @@ const handleLogout = () => {
 const confirmLogout = () => {
   console.log('用户确认退出登录')
   
-  // 清除用户信息（如果有的话）
-  // localStorage.removeItem('token')
-  // sessionStorage.clear()
-  
-  // 关闭弹窗
-  showLogoutModal.value = false
-  
-  // 跳转到登录页面
-  router.push('/login')
+  try {
+    // 清除用户状态
+    userStore.logout()
+    
+    // 关闭弹窗
+    showLogoutModal.value = false
+    
+    // 跳转到登录页面
+    router.push('/login')
+  } catch (error) {
+    console.error('退出登录失败:', error)
+    // 即使出错也要关闭弹窗并跳转
+    showLogoutModal.value = false
+    router.push('/login')
+  }
 }
 
 // 取消退出登录
diff --git a/my-vue-app/src/views/person/components/SalesTimelineWithTaskList.vue b/my-vue-app/src/views/person/components/SalesTimelineWithTaskList.vue
index 4e2a187..cecc573 100644
--- a/my-vue-app/src/views/person/components/SalesTimelineWithTaskList.vue
+++ b/my-vue-app/src/views/person/components/SalesTimelineWithTaskList.vue
@@ -123,7 +123,7 @@
             <div class="mini-stage" :class="{ active: getCourseStageCount(3, '点击未支付') > 0 }" @click="selectCourseStage(3, '点击未支付')">
               <div class="mini-marker"></div>
               <div class="mini-content">
-                <span class="mini-title">点击未支付</span>
+                <span class="mini-title">点击未付</span>
                 <span class="mini-count">{{ getCourseStageCount(3, '点击未支付') }}</span>
               </div>
             </div>
@@ -541,7 +541,7 @@ const stages = computed(() => {
     { id: 4, name: '待联系', displayName: '待联系', count: getStageCount('待联系'), color: '#bbdefb' },
     { id: 5, name: '待到课', displayName: '待到课', count: getStageCount('待到课'), color: '#bbdefb'},
     { id: 6, name: '课1-4', displayName: '课1-4', count: getStageCount('课1-4'), color: '#81c784' },
-    { id: 7, name: '点击支付', displayName: '点击支付', count: getStageCount('点击未支付'), color: '#42a5f5' },
+    { id: 7, name: '点击未支付', displayName: '点击未付', count: getStageCount('点击未支付'), color: '#42a5f5' },
     { id: 8, name: '付定金', displayName: '付定金', count: getStageCount('付定金'), color: '#2196f3' },
     { id: 9, name: '定金转化', displayName: '定金转化', count: getStageCount('定金转化'), color: '#1e88e5' },
     { id: 10, name: '成交', displayName: '成交', count: getStageCount('成交'), color: '#1976d2' }
diff --git a/my-vue-app/src/views/secondTop/components/ProblemRanking.vue b/my-vue-app/src/views/secondTop/components/ProblemRanking.vue
index 1c85eaf..283f25b 100644
--- a/my-vue-app/src/views/secondTop/components/ProblemRanking.vue
+++ b/my-vue-app/src/views/secondTop/components/ProblemRanking.vue
@@ -127,9 +127,8 @@ async function exportData() {
         
         // 处理问卷调查信息
         if (customer.wechat_form && customer.wechat_form.additional_info) {
-          customer.wechat_form.additional_info.forEach((item, index) => {
-            flatData[`问题${index + 1}`] = item.topic || ''
-            flatData[`答案${index + 1}`] = item.answer || ''
+          customer.wechat_form.additional_info.forEach((item) => {
+            flatData[item.topic || ''] = item.answer || ''
           })
         }