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 @@
- 点击未支付 + 点击未付 {{ getCourseStageCount(3, '点击未支付') }}
@@ -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 || '' }) }