diff --git a/src/components/common/Sidebar.vue b/src/components/common/Sidebar.vue
index fbb2ab1..901975e 100644
--- a/src/components/common/Sidebar.vue
+++ b/src/components/common/Sidebar.vue
@@ -18,14 +18,14 @@
                             <span slot="title"> {{ item.title }}</span>
                         </template>
                         <template v-for="subItem in item.subs">
-                            <el-submenu v-if="subItem.subs" :index="subItem.index" :key="subItem.index">
+                            <el-submenu v-if="subItem.subs" :index="subItem.index" :key="subItem.index + '-submenu'">
                                 <template slot="title">
                                     {{ subItem.title }}
                                     <!-- <el-badge is-dot :hidden="false">{{ subItem.title }}</el-badge> -->
                                 </template>
 
                                 <template v-for="(threeItem, i) in subItem.subs">
-                                    <el-submenu v-if="threeItem.subs" :index="threeItem.index" :key="threeItem.index">
+                                    <el-submenu v-if="threeItem.subs" :index="threeItem.index" :key="threeItem.index + '-submenu'">
                                         <template slot="title">
                                             {{ threeItem.title }}
                                             <!-- <el-badge is-dot :hidden="false">{{ subItem.title }}</el-badge> -->
@@ -35,12 +35,12 @@
                                             {{ fourItem.title }}
                                         </el-menu-item>
                                     </el-submenu>
-                                    <el-menu-item v-else :index="threeItem.index" :key="threeItem.index"
+                                    <el-menu-item v-else :index="threeItem.index" :key="threeItem.index + '-item'"
                                         >{{ threeItem.title }}
                                     </el-menu-item>
                                 </template>
                             </el-submenu>
-                            <el-menu-item v-else :index="subItem.index" :key="subItem.index">{{ subItem.title }} </el-menu-item>
+                            <el-menu-item v-else :index="subItem.index" :key="subItem.index + '-item'">{{ subItem.title }} </el-menu-item>
                         </template>
                     </el-submenu>
                 </template>
@@ -160,6 +160,7 @@
                     <el-menu-item index="expertDatabase">
                         {{ $t('sidebar.expertDatabase')  }}
                     </el-menu-item>
+                   
                     <el-menu-item index="mailboxConfig">
                         {{ $t('sidebar.mailboxManagement') }}
                     </el-menu-item>
@@ -169,6 +170,9 @@
                     <el-menu-item index="mailboxMould">
                         {{ $t('sidebar.emailTemplates') }}
                     </el-menu-item>
+                    <el-menu-item index="autoPromotion">
+                        {{ $t('sidebar.autoPromotion') }}
+                    </el-menu-item>
                     
                 </el-submenu>
               
@@ -899,10 +903,10 @@ export default {
     border-right: 0;
 }
 
-.el-menu-item:hover {
-    /* 	color: #006699 !important;
-		background-color: #e3e9ef !important; */
-}
+/* .el-menu-item:hover {
+    color: #006699 !important;
+    background-color: #e3e9ef !important;
+} */
 
 .el-submenu__title i {
     color: #fff !important;
diff --git a/src/components/common/Tags.vue b/src/components/common/Tags.vue
index 1ab666d..66e3cf2 100644
--- a/src/components/common/Tags.vue
+++ b/src/components/common/Tags.vue
@@ -111,7 +111,27 @@
                         break;
                     }
                 }
-            })
+            });
+
+            // 按路径关闭指定标签（用于主动销毁 keep-alive 页面）
+            bus.$on('close_tag_by_path', (payload) => {
+                const targetPath = payload && payload.path ? payload.path : '';
+                const fallbackPath = payload && payload.fallback ? payload.fallback : '/';
+                const silent = payload && payload.silent === true;
+                if (!targetPath) return;
+                for (let i = 0, len = this.tagsList.length; i < len; i++) {
+                    const item = this.tagsList[i];
+                    if (item.path === targetPath) {
+                        this.tagsList.splice(i, 1);
+                        // 如果关闭的是当前激活标签，则跳到指定兜底路由
+                        if (!silent && this.$route.fullPath === targetPath) {
+                            this.$router.push(fallbackPath);
+                        }
+                        break;
+                    }
+                }
+                bus.$emit('tags', this.tagsList);
+            });
         },
 //         beforeDestroy() {
 //     // 销毁监听，防止内存泄漏
diff --git a/src/components/common/langs/en.js b/src/components/common/langs/en.js
index c4089e0..442418b 100644
--- a/src/components/common/langs/en.js
+++ b/src/components/common/langs/en.js
@@ -129,7 +129,9 @@ const en = {
 		doubleConfirmContent: 'Are you sure you want to authorize this rate change? This adjustment will immediately synchronize with the billing system and impact all future financial settlements.',
 		
 		// 3. 反馈
-		updateSuccess: 'The journal APC standard has been successfully updated.'
+		updateSuccess: 'The journal APC standard has been successfully updated.',
+		executiveEditor:'Executive Editor',
+		databases:'Database inclusion',
 
 	},
 
@@ -272,8 +274,10 @@ const en = {
 		emailStyles: 'Email Styles',
 		tools: 'Assistant tools',
 		mailboxManagement: 'Mailbox Management',
+		mailboxConfig: 'Mailbox Management',
 		scholarCrawlers: 'Scholar Crawlers',
 		expertDatabase: 'Expert Database',
+		autoPromotion: 'Auto Promotion',
 		ReArticles: 'Rejected Manuscripts',     // 被拒稿件
 		editorialBoard: 'Boss System',
 		editorialBoard1: 'Board Management',
@@ -287,15 +291,40 @@ const en = {
 		mailboxCollect: 'Email List',
 		promotionManagement: 'Promotion Management',
 	},
+	expertDatabase: {
+		fieldSelectPlaceholder: 'Please select field',
+		keywordPlaceholder: 'Name / Email / Affiliation',
+		searchBtn: 'Search',
+		resetBtn: 'Reset',
+		downloadExcelBtn: 'Download Excel',
+		table: {
+			no: 'No.'
+		},
+		columns: {
+			baseInfo: 'Base Information',
+			affiliation: 'Affiliation',
+			researchAreas: 'Research areas'
+		},
+		fields: {
+			nameLabel: 'Name:',
+			emailLabel: 'Email:',
+			acquisitionTimeLabel: 'Acquisition Time:'
+		},
+		exportWarn: 'Please select a research area or enter a keyword before exporting.',
+		exportFailed: 'Export failed'
+	},
 	mailboxConfig: {
 		mailSystem: 'Mailbox system',
 		title: 'Mailbox config',
 		journal: 'Journal',
 		allJournal: 'All journals',
 		query: 'Search',
+		refresh: 'Refresh',
 		addAccount: 'Add email account',
 		noData: 'No data',
-		smtpFromName: 'Sender name',
+		no: 'No.',
+		loading: 'Loading...',
+		smtpFromName: 'Name',
 		smtpFromNamePlaceholder: 'Display name when sending',
 		smtpHost: 'SMTP host',
 		smtpPort: 'SMTP port',
@@ -313,7 +342,7 @@ const en = {
 		operation: 'Operation',
 		edit: 'Edit',
 		delete: 'Delete',
-		mailManage: 'Mail manage',
+		mailManage: 'Email List',
 		dialogAdd: 'Add email account',
 		dialogEdit: 'Edit email account',
 		selectJournal: 'Select journal',
@@ -331,6 +360,7 @@ const en = {
 		cancel: 'Cancel',
 		save: 'Save',
 		deleteConfirm: 'Delete this email config?',
+		deleteTitle: 'Delete email account',
 		confirm: 'Confirm',
 		addSuccess: 'Added successfully',
 		editSuccess: 'Updated successfully',
@@ -356,6 +386,7 @@ const en = {
 	mailboxMould: {
 		title: 'Email Templates',
 		subtitle: 'Manage and customize your journal email templates.',
+		no: 'No.',
 		searchPlaceholder: 'Search by title or scene...',
 		journalPlaceholder: 'Journal',
 		scenePlaceholder: 'Scene',
@@ -366,8 +397,8 @@ const en = {
 		languagePlaceholder: 'Language',
 		searchBtn: 'Search',
 		createTemplate: 'Create Template',
-		colTitle: 'Subject',
-		colSubject: 'Mail title',
+colTitle: 'Template title',
+		colSubject: 'Email subject',
 		colScene: 'Scene',
 		colLanguage: 'Language',
 		colVersion: 'Version',
@@ -386,6 +417,7 @@ const en = {
 	mailboxStyle: {
 		title: 'Email Styles',
 		subtitle: 'Manage email header and footer styles.',
+		no: 'No.',
 		searchPlaceholder: 'Search by name or description...',
 		journalPlaceholder: 'Journal',
 		scenePlaceholder: 'Scene',
@@ -472,6 +504,7 @@ const en = {
 		time: 'Time',
 		look: 'Look',
 		emptyText: 'New messages (0)',
+		loading: 'Loading...',
 		detailTitle: 'Mail detail',
 		from: 'From',
 		to: 'To',
@@ -489,12 +522,14 @@ const en = {
 		nameColumn: 'Name',
 		switchColumn: 'Switch',
 		useBtn: 'Switch',
+		currentAccountText: 'Current account',
 		changeAccountBtn: 'Change account',
 		syncSuccess: 'Sync succeeded',
 		syncFail: 'Sync failed',
 		operation: 'Operation',
 		loadingMore: 'Loading more...',
 		noMore: 'No more',
+		yesterday: 'Yesterday',
 		selectAccountTip: 'Please select an email account first.'
 	},
 	mailboxSend: {
@@ -508,6 +543,7 @@ const en = {
 		templateSelection: 'Template selection',
 		sender: 'Sender:',
 		send: 'Send',
+		sending: 'Sending...',
 		selectUser: 'Select User',
 		batchSelection: 'Batch selection',
 		email: 'Email',
@@ -534,7 +570,10 @@ const en = {
 		sendFail: 'Send failed',
 		sendMock: 'Send (mock): will really send when api/Mail/sendMail is ready',
 		needAccount: 'Please select a sender account from the mailbox list first',
-		backToInbox: 'Back to inbox',
+		selectTemplateStyleFirst: 'Please select template and style first',
+		recipientLimit: 'You can add up to {count} recipient(s)',
+		recipientLimitPlaceholder: 'Limit reached (max {count})',
+		backToInbox: 'Back to email list',
 	},
 	home: {
 		authortop: 'Author guide',
@@ -821,8 +860,93 @@ const en = {
 		  "imgLabel": "Img"
 		},
 		mailTemplate: {
-			noTemplateTip: 'No templates are available for the current journal. Please select another journal or contact the administrator to configure templates.'
-		  }
+			noTemplateTip: 'No templates are available for the current journal. Please select another journal or go add templates first.',
+			addTemplateBtn: 'Go add templates',
+			templateTab: 'Template',
+			styleTab: 'Style',
+			loading: 'Loading...',
+			refresh: 'Refresh'
+		  },
+		autoPromotion: {
+			title: 'Auto Promotion',
+			journal: 'Journal',
+			logs: 'Promotion History',
+			saved: 'Saved',
+			loading: 'Loading...',
+			refresh: 'Refresh',
+			autoSolicit: 'Auto Solicitation',
+			editConfig: 'Edit Configuration',
+			running: 'Running',
+			emailTemplate: 'Email Template',
+			emailStyle: 'Email Style',
+			notStarted: 'Auto solicitation plan is not enabled',
+			notInitializedTip: 'Auto solicitation is not enabled. Please configure template and style first, then enable the plan.',
+			journalManage: 'Journal Management',
+			loadListFailed: 'Failed to load journal list',
+			goConfig: 'Configure',
+			goManagePlan: 'Manage Plan',
+			startPlan: 'Start Plan',
+			startedPlan: 'plan enabled',
+			updateRetryFailed: 'Update failed, please try again later',
+			selectTemplateStyleFirst: 'Please select template and style before confirming',
+			configSaved: 'Configuration saved',
+			saveFailed: 'Save failed',
+			notInitializedSwitchTip: 'Auto solicitation is not initialized. Please configure templates first',
+			planEnabled: 'Plan enabled',
+			planDisabled: 'Plan disabled',
+			updateFailed: 'Update failed',
+			cancel: 'Cancel',
+			saveAndApply: 'Save and apply configuration',
+			selectTemplateStyleTitle: 'Choose journal template and style',
+			clickToChooseTemplate: 'Click to choose journal email template',
+			noPreview: 'No Preview',
+			templateName: 'Template Name',
+			styleName: 'Style Name',
+			defaultStyle: 'Default',
+			changeTemplate: 'Change Template',
+			confirmAndEnable: 'Confirm and Enable',
+			onlySaveConfig: 'Save configuration only',
+			enableNowNextDay: 'Enable auto promotion now (starts next day)'
+		}
+	  ,
+	  autoPromotionLogs: {
+		detail: 'Auto Promotion Details',
+		configured: 'Configured',
+		editConfig: 'Edit auto promotion configuration',
+		startConfig: 'Start auto promotion configuration',
+		notConfigured: 'Not configured',
+		searchPlaceholder: 'Name / Email',
+		searchBtn: 'Search',
+		index: 'No.',
+		expertInfo: 'Expert Info',
+		templateStyle: 'Template / Style',
+		stylePrefix: 'Style',
+		runAt: 'Execution time',
+		status: 'Status',
+		paused: 'Paused',
+		toRun: 'To run',
+		operation: 'Operation',
+		preview: 'Preview',
+		enable: 'Enable',
+		pause: 'Pause',
+		previewEditTitle: 'Preview and edit promotion email',
+		receiver: 'Receiver:',
+		receiverImmutablePlaceholder: 'Receiver email cannot be changed',
+		subject: 'Subject:',
+		subjectPlaceholder: 'Please enter mail subject',
+		runAtPlaceholder: 'Please select execution time',
+		cancel: 'Cancel',
+		confirmEdit: 'Confirm Edit',
+		mailContentSaved: 'Mail content has been saved. It will be sent with this content.',
+		templateNotSelected: 'No template selected',
+		selectTemplateWarning: 'Please select a template before confirming',
+		configUpdated: 'Configuration updated',
+		pauseSuccess: 'Paused',
+		enableSuccess: 'Enabled',
+		deletedSuccess: 'Deleted',
+		mockPromotionSubject: 'Promotion for {journal}',
+		mockPromotionContent: '<p>Dear {name},</p><p>Check out our latest journal updates...</p>'
+	  }
 	  
 	
 
diff --git a/src/components/common/langs/zh.js b/src/components/common/langs/zh.js
index 61506b9..443120e 100644
--- a/src/components/common/langs/zh.js
+++ b/src/components/common/langs/zh.js
@@ -122,7 +122,10 @@ const zh = {
   cancel: '取消',
   doubleConfirmTitle: '最终操作确认',
   doubleConfirmContent: '确定要授权此项金额变更吗？此操作具有法律效力上的即时性，将直接影响后续所有财务结算流程。',
-  updateSuccess: '期刊计费标准已成功更新。'
+  updateSuccess: '期刊计费标准已成功更新。',
+  executiveEditor:'责任编辑',
+  databases:'收录数据库',
+
 	},
 	paperArticleCount: {
 		Periodroll: '期卷',
@@ -262,6 +265,7 @@ const zh = {
 		
 		scholarCrawlers: '学者数据库',
 		expertDatabase: '专家库',
+		autoPromotion: '自动推广',
 		ReArticles: '被拒稿件',     // 被拒稿件
 		editorialBoard: '编委管理',
 		editorialBoard1: '编委列表',
@@ -276,15 +280,40 @@ const zh = {
 		promotionManagement: '推广管理',
 
 	},
+	expertDatabase: {
+		fieldSelectPlaceholder: '请选择研究领域',
+		keywordPlaceholder: '姓名 / 邮箱 / 单位',
+		searchBtn: '搜索',
+		resetBtn: '重置',
+		downloadExcelBtn: '下载 Excel',
+		table: {
+			no: '序号'
+		},
+		columns: {
+			baseInfo: '基础信息',
+			affiliation: '单位',
+			researchAreas: '研究领域'
+		},
+		fields: {
+			nameLabel: '姓名：',
+			emailLabel: '邮箱：',
+			acquisitionTimeLabel: '采集时间：'
+		},
+		exportWarn: '请选择研究领域或输入关键词后再导出。',
+		exportFailed: '导出失败'
+	},
 	mailboxConfig: {
 		mailSystem: '邮件系统',
-		title: '邮箱配置管理',
+		title: '邮箱账号管理',
 		journal: '所属期刊',
 		allJournal: '全部期刊',
 		query: '搜索',
+		refresh: '刷新',
 		addAccount: '添加邮箱账号',
 		noData: '暂无数据',
-		smtpFromName: '发件人名称',
+		no: '序号',
+		loading: '加载中...',
+		smtpFromName: '名称',
 		smtpFromNamePlaceholder: '发信时显示的名称',
 		smtpHost: 'SMTP 地址',
 		smtpPort: 'SMTP 端口',
@@ -302,7 +331,7 @@ const zh = {
 		operation: '操作',
 		edit: '编辑',
 		delete: '删除',
-		mailManage: '邮箱管理',
+		mailManage: '邮件列表',
 		dialogAdd: '添加邮箱账号',
 		dialogEdit: '修改邮箱账号信息',
 		selectJournal: '请选择期刊',
@@ -319,7 +348,8 @@ const zh = {
 		primaryTip: '每个期刊有且仅有一个主邮箱，用于默认发信与收信。',
 		cancel: '取消',
 		save: '保存',
-		deleteConfirm: '确定删除该邮箱配置？',
+		deleteConfirm: '确定删除该邮箱账号？',
+		deleteTitle: '删除邮箱账号',
 		confirm: '确定',
 		addSuccess: '添加成功',
 		editSuccess: '修改成功',
@@ -345,6 +375,7 @@ const zh = {
 	mailboxMould: {
 		title: '邮件模板',
 		subtitle: '管理并自定义期刊邮件模板。',
+		no: '序号',
 		searchPlaceholder: '按标题或场景搜索...',
 		journalPlaceholder: '期刊',
 		scenePlaceholder: '场景',
@@ -355,8 +386,8 @@ const zh = {
 		languagePlaceholder: '语言',
 		searchBtn: '搜索',
 		createTemplate: '新建模板',
-		colTitle: '主题',
-		colSubject: '邮件标题',
+		colTitle: '模版标题',
+		colSubject: '邮件主题',
 		colScene: '场景',
 		colLanguage: '语言',
 		colVersion: '版本',
@@ -375,6 +406,7 @@ const zh = {
 	mailboxStyle: {
 		title: '邮件风格',
 		subtitle: '管理邮件头部和尾部样式。',
+		no: '序号',
 		searchPlaceholder: '按名称或描述搜索...',
 		journalPlaceholder: '期刊',
 		scenePlaceholder: '场景',
@@ -461,6 +493,7 @@ const zh = {
 		time: '时间',
 		look: '查看',
 		emptyText: '暂无邮件',
+		loading: '加载中...',
 		detailTitle: '邮件详情',
 		from: '发件人',
 		to: '收件人',
@@ -478,12 +511,14 @@ const zh = {
 		nameColumn: '名称',
 		switchColumn: '切换',
 		useBtn: '切换',
+		currentAccountText: '当前账号',
 		changeAccountBtn: '切换邮箱账号',
 		syncSuccess: '同步成功',
 		syncFail: '同步失败',
 		operation: '操作',
 		loadingMore: '加载更多...',
 		noMore: '没有更多了',
+		yesterday: '昨天',
 		selectAccountTip: '请先选择一个邮箱账号.',
 	},
 	mailboxSend: {
@@ -497,6 +532,7 @@ const zh = {
 		templateSelection: '模板选择',
 		sender: '发件人：',
 		send: '发送',
+		sending: '发送中...',
 		selectUser: '选择用户',
 		batchSelection: '批量选择',
 		email: '邮箱',
@@ -523,6 +559,9 @@ const zh = {
 		sendFail: '发送失败',
 		sendMock: '发送（模拟）：接口 api/Mail/sendMail 就绪后将真实发送',
 		needAccount: '请从邮箱列表选择发件账号后再发送',
+		selectTemplateStyleFirst: '请先选择模板和风格',
+		recipientLimit: '最多只能添加 {count} 个收件人',
+		recipientLimitPlaceholder: '已达上限（最多 {count} 个）',
 		backToInbox: '返回收件箱',
 	},
 	home: {
@@ -806,7 +845,92 @@ const zh = {
 	  },
 	  mailTemplate: {
 		// 如果已经有 mailTemplate，就只加这一行
-		noTemplateTip: '当前期刊暂无可用模板，请重新选择期刊或联系管理员配置模板。'
+		noTemplateTip: '当前期刊暂无可用模板，请重新选择期刊或先去新增模板。',
+		addTemplateBtn: '去新增模板',
+		templateTab: '模版',
+		styleTab: '样式',
+		loading: '加载中...',
+		refresh: '刷新'
+	  },
+	  autoPromotion: {
+		title: '自动推广',
+		journal: '期刊',
+		logs: '历史推广记录',
+		saved: '已保存',
+		loading: '加载中...',
+		refresh: '刷新',
+		autoSolicit: '自动约稿',
+		editConfig: '修改配置',
+		running: '运行中',
+		emailTemplate: '邮件模板',
+		emailStyle: '邮件风格',
+		notStarted: '未开启自动约稿计划',
+		notInitializedTip: '自动约稿未启用，请先完成期刊模版风格配置并开启计划',
+		journalManage: '期刊管理',
+		loadListFailed: '期刊列表加载失败',
+		goConfig: '去配置',
+		goManagePlan: '去管理约稿计划',
+		startPlan: '开启约稿计划',
+		startedPlan: '已开启约稿计划',
+		updateRetryFailed: '更新失败，请稍后重试',
+		selectTemplateStyleFirst: '请选择模板和风格后再确认',
+		configSaved: '约稿配置已保存',
+		saveFailed: '保存失败',
+		notInitializedSwitchTip: '自动化约稿没有初始化，请先配置模版',
+		planEnabled: '已开启约稿计划',
+		planDisabled: '已关闭约稿计划',
+		updateFailed: '更新失败',
+		cancel: '取消',
+		saveAndApply: '保存并应用配置',
+		selectTemplateStyleTitle: '选择期刊模版风格',
+		clickToChooseTemplate: '点击选择期刊邮件模版',
+		noPreview: '暂无预览',
+		templateName: '模版名称',
+		styleName: '风格名称',
+		defaultStyle: '默认风格',
+		changeTemplate: '更换模版',
+		confirmAndEnable: '确认并开启',
+		onlySaveConfig: '仅保存配置',
+		enableNowNextDay: '立即激活自动推广（次日开始自动推广）'
+	  }
+	  ,
+	  autoPromotionLogs: {
+		detail: '自动推广详情',
+		configured: '已配置',
+		editConfig: '修改期刊自动推广配置',
+		startConfig: '立即开始期刊自动推广配置',
+		notConfigured: '尚未配置',
+		searchPlaceholder: '姓名 / 邮箱',
+		searchBtn: '搜索',
+		index: '序号',
+		expertInfo: '专家信息',
+		templateStyle: '模板 / 风格',
+		stylePrefix: '风格',
+		runAt: '执行时间',
+		status: '状态',
+		paused: '已暂停',
+		toRun: '待执行',
+		operation: '操作',
+		preview: '查看预览',
+		enable: '开启',
+		pause: '暂停',
+		previewEditTitle: '预览并修改推广邮件',
+		receiver: '收件人:',
+		receiverImmutablePlaceholder: '收件人邮箱不可更改',
+		subject: '主题:',
+		subjectPlaceholder: '请输入邮件主题',
+		runAtPlaceholder: '请选择执行时间',
+		cancel: '取消',
+		confirmEdit: '确认修改',
+		mailContentSaved: '邮件内容已保存，将按此内容执行发送',
+		templateNotSelected: '未选择模板',
+		selectTemplateWarning: '请选择一个模板后再确认',
+		configUpdated: '配置已更新',
+		pauseSuccess: '已暂停',
+		enableSuccess: '已开启',
+		deletedSuccess: '已删除',
+		mockPromotionSubject: '自动推广：{journal}',
+		mockPromotionContent: '<p>亲爱的 {name}，</p><p>请查看我们最新的期刊更新...</p>'
 	  }
    
 	  
diff --git a/src/components/page/JournalManagement/JournalManagement/common.vue b/src/components/page/JournalManagement/JournalManagement/common.vue
index cc414e3..0ae93f0 100644
--- a/src/components/page/JournalManagement/JournalManagement/common.vue
+++ b/src/components/page/JournalManagement/JournalManagement/common.vue
@@ -37,6 +37,10 @@
                                 <span class="title">{{ $t('JournalCitationAnalysis.editorinchief') }} :</span
                                 ><span>{{ scope.row.editorinchief }}</span>
                             </div>
+                            <div class="item">
+                                <span class="title">{{ $t('JournalCitationAnalysis.executiveEditor') }} :</span
+                                ><span>{{ scope.row.editor_name }}</span>
+                            </div>
                             <div class="item">
                                 <span class="title">{{ $t('JournalCitationAnalysis.email') }} :</span><span>{{ scope.row.email }}</span>
                             </div>
@@ -46,6 +50,9 @@
                             <div class="item">
                                 <span class="title">{{ $t('JournalCitationAnalysis.level') }} :</span><span>{{ scope.row.level }}</span>
                             </div>
+                            <div class="item">
+                                <span class="title">{{ $t('JournalCitationAnalysis.databases') }} :</span><span>{{ scope.row.databases }}</span>
+                            </div>
 
                             <div class="item" v-if="scope.row.journal_topic">
                                 <span class="title">{{ $t('JournalCitationAnalysis.journal_topic') }} :</span
@@ -228,6 +235,12 @@
                 <el-form-item label="Journal publisher :" prop="publish_author">
                     <el-input v-model="detailForm.publish_author" placeholder="eg:TMR编辑部"></el-input>
                 </el-form-item>
+                <el-form-item label="Journal executive editor :" prop="editor_name">
+                    <el-input v-model="detailForm.editor_name" placeholder=""></el-input>
+                </el-form-item>
+                <el-form-item label="Database inclusion :" prop="databases">
+                    <el-input v-model="detailForm.databases" placeholder=""></el-input>
+                </el-form-item>
 
                 <el-form-item label="WeChat Code :" prop="editor_qrcode">
                     <div class="portrait WeChatCode">
@@ -470,6 +483,20 @@ export default {
                         trigger: 'blur'
                     }
                 ],
+                editor_name: [
+                    {
+                        required: true,
+                        message: 'Please input journal executive editor',
+                        trigger: 'blur'
+                    }
+                ],
+                databases: [
+                    {
+                        required: true,
+                        message: 'Please input database inclusion',
+                        trigger: 'blur'
+                    }
+                ],
                 kfen: [
                     {
                         required: true,
@@ -666,6 +693,7 @@ export default {
         handleEdit() {
             this.$refs.detail_form.validate((valid) => {
                 if (valid) {
+                   
                     if (this.detailForm.editor_qrcode == '' || !this.detailForm.editor_qrcode) {
                         this.$message.error('Please upload WeChat Code!');
                         return false;
@@ -861,6 +889,7 @@ export default {
                 publish_author: data.publish_author,
                 wechat_name: data.wechat_name,
                 wechat_app_id: data.wechat_app_id,
+                editor_name: data.editor_name,
                 wechat_app_secret: data.wechat_app_secret,
                 areas: data.journal_topic ? data.journal_topic.split(',') : ['']
             };
diff --git a/src/components/page/autoPromotion.vue b/src/components/page/autoPromotion.vue
new file mode 100644
index 0000000..90139a5
--- /dev/null
+++ b/src/components/page/autoPromotion.vue
@@ -0,0 +1,457 @@
+<template>
+  <div class="auto-promo-container" v-loading="loading" :element-loading-text="$t('autoPromotion.loading')">
+    <div class="page-header">
+      <el-breadcrumb separator="/">
+        <el-breadcrumb-item>
+          <i class="el-icon-s-promotion"></i> {{ $t('autoPromotion.title') }}
+        </el-breadcrumb-item>
+      </el-breadcrumb>
+      <el-button
+        type="text"
+        icon="el-icon-refresh"
+        class="auto-promo-refresh-btn"
+        :disabled="loading"
+        :title="$t('autoPromotion.refresh')"
+        @click="refreshAll"
+      />
+    </div>
+
+    <div class="journal-grid">
+      <div v-for="journal in allJournals" :key="journal.journal_id" class="journal-item">
+        
+        <div class="item-header">
+          <div class="journal-info">
+            <div class="icon-box">
+              <i class="el-icon-notebook-2"></i>
+            </div>
+            <span class="journal-name">{{ journal.title }}</span>
+          </div>
+        </div>
+
+        <div class="module-wrapper">
+          <div :class="['module-card', journal.solicit.initialized ? 'is-solicit-active' : 'is-empty']">
+            <div class="module-top">
+              <div class="module-top-left">
+                <span class="module-title">{{ $t('autoPromotion.autoSolicit') }}</span>
+                <el-button
+                  v-if="journal.solicit.initialized"
+                  type="text"
+                  size="mini"
+                  icon="el-icon-refresh"
+                  class="config-inline-btn"
+                  :disabled="promotionUpdating && String(promotionUpdatingJournalId) === String(journal.journal_id)"
+                  @click="openWizardForJournal(journal)"
+                >
+                  {{ $t('autoPromotion.editConfig') }}
+                </el-button>
+              </div>
+              <el-switch 
+                v-model="journal.solicit.enabled" 
+                active-color="#409EFF" 
+                @change="handleSwitch(journal, 'solicit', $event)" 
+                size="small" 
+                :disabled="promotionUpdating && String(promotionUpdatingJournalId) === String(journal.journal_id)"
+              />
+            </div>
+
+            <div class="module-content">
+              <template v-if="journal.solicit.initialized">
+                <div class="status-row" v-if="journal.solicit.enabled">
+                  <span class="dot-running"></span>
+                  <span class="status-text">{{ $t('autoPromotion.running') }}</span>
+                </div>
+                <div class="template-info-row">
+                  <div>
+                    <div class="template-info blue-text">{{ $t('autoPromotion.emailTemplate') }}: {{ journal.solicit.templateName || '-' }}</div>
+                    <div class="template-info blue-text">{{ $t('autoPromotion.emailStyle') }}: {{ journal.solicit.styleName || '-' }}</div>
+                  </div>
+                </div>
+              </template>
+              <div v-else class="empty-text">
+                {{ isSolicitConfigured(journal) ? $t('autoPromotion.notStarted') : $t('autoPromotion.notInitializedTip') }}
+              </div>
+            </div>
+
+            <div class="module-footer">
+              <button
+                class="action-btn btn-blue"
+                :disabled="promotionUpdating && String(promotionUpdatingJournalId) === String(journal.journal_id)"
+                @click="handleSolicitAction(journal)"
+              >
+                <span v-if="promotionUpdating && String(promotionUpdatingJournalId) === String(journal.journal_id)">
+                  {{ $t('autoPromotion.loading') }}
+                </span>
+                <span v-else>
+                  {{ getSolicitActionText(journal) }}
+                </span>
+              </button>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <journal-detail-dialog v-if="detailVisible" :visible.sync="detailVisible" :journal="currentJournal" />
+
+    <auto-promotion-wizard
+      mode="dialog"
+      :visible.sync="showWizardDialog"
+      :config="wizardConfig"
+      :wizardStartDate.sync="wizardStartDate"
+      :currentJournalName="wizardJournal ? wizardJournal.title : ''"
+      :selectedTemplateThumbHtml="selectedTemplateThumbHtml"
+      :selectedTemplateName="selectedTemplateName"
+      :selectedStyleName="selectedStyleName"
+      :saving="saving"
+      :title="`${$t('autoPromotion.journalManage')}: ${wizardJournal ? wizardJournal.title : ''}`"
+      @open-template-selector="showTemplateDialog = true"
+      @cancel="showWizardDialog = false"
+      @confirm="saveWizardConfig"
+    />
+
+    <template-selector-dialog
+      v-if="showTemplateDialog"
+      :visible.sync="showTemplateDialog"
+      :journalId="wizardJournal ? wizardJournal.journal_id : ''"
+      :journalLabel="wizardJournal ? wizardJournal.title : ''"
+      :return-source="'autoPromotion'"
+      @confirm="handleTemplateApply"
+      @close-all-dialogs="closeAllDialogs"
+    />
+  </div>
+</template>
+
+<script>
+import JournalDetailDialog from './components/autoPromotion/JournalDetailDialog.vue';
+import AutoPromotionWizard from './components/autoPromotion/AutoPromotionWizard.vue';
+import TemplateSelectorDialog from '@/components/page/components/email/TemplateSelectorDialog.vue';
+
+export default {
+  components: { JournalDetailDialog, AutoPromotionWizard, TemplateSelectorDialog },
+  data() {
+    return {
+      loading: true,
+      detailVisible: false,
+      currentJournal: null,
+      showWizardDialog: false,
+      showTemplateDialog: false,
+      saving: false,
+      promotionUpdating: false,
+      promotionUpdatingJournalId: '',
+      wizardJournal: null,
+      wizardStartDate: '',
+      wizardConfig: {
+        defaultTemplateId: '',
+        defaultStyleId: '',
+        enabled: false
+      },
+      selectedTemplateThumbHtml: '',
+      selectedTemplateName: '',
+      selectedStyleName: '',
+      templateNameMap: {},
+      allJournals: []
+    };
+  },
+  created() {
+    this.fetchPromotionJournals();
+  },
+  methods: {
+    closeAllDialogs() {
+      // 进入“新增模板/跳转列表页”前，先关闭当前页所有弹窗，减少卡顿
+      this.showWizardDialog = false;
+      this.showTemplateDialog = false;
+      this.detailVisible = false;
+    },
+    /**
+     * 核心逻辑抽象：统一解析详情接口返回的数据结构
+     */
+    _parseJournalDetail(data) {
+      const journalInfo = data.journal || data || {};
+      const tpl = journalInfo.template || data.template || {};
+      const style = journalInfo.style || data.style || {};
+      
+      const tplId = String(journalInfo.default_template_id || '0');
+      const styleId = String(journalInfo.default_style_id || '0');
+      
+      return {
+        title: journalInfo.title || journalInfo.journal_title || '',
+        templateId: tplId,
+        styleId: styleId,
+        templateName: tpl.name || tpl.title || journalInfo.default_template_name || (tplId !== '0' ? `模板#${tplId}` : ''),
+        styleName: style.name || style.title || journalInfo.default_style_name || (styleId !== '0' ? `风格#${styleId}` : ''),
+        html: `${style.header_html || ''}${tpl.body_html || ''}${style.footer_html || ''}`,
+        enabled: String(journalInfo.start_promotion || '0') === '1',
+        initialized: tplId !== '0' && styleId !== '0'
+      };
+    },
+
+    async fetchPromotionJournals() {
+      this.loading = true;
+      try {
+        const userId = localStorage.getItem('U_id') || '';
+        const res = await this.$api.post('api/email_client/getPromotionJournalList', { user_id: userId });
+        const raw = (res && res.data && (res.data.list || res.data.journals || res.data)) || [];
+        
+        if (Array.isArray(raw) && raw.length) {
+          this.allJournals = await Promise.all(raw.map(async (item) => {
+            const journalId = item.journal_id || item.id;
+            const tplId = String(item.default_template_id || item.template_id || '0');
+            const styleId = String(item.default_style_id || item.style_id || '0');
+            const initialized = tplId !== '0' && styleId !== '0';
+            const enabled = String(item.start_promotion || item.enabled || '0') === '1';
+
+            // 初始简单结构：先用列表接口回填基础状态
+            let journalObj = {
+              journal_id: journalId,
+              title: item.title || item.journal_title || item.name || `Journal ${journalId}`,
+              solicit: {
+                enabled,
+                initialized,
+                templateId: tplId,
+                styleId: styleId,
+                templateName: '',
+                styleName: '',
+                html: ''
+              }
+            };
+
+            // 只有在“有模板id和风格id”时，才拉取详情（避免未初始化期刊的无意义请求）
+            if (initialized) {
+              await this.refreshJournalByDetail(journalObj);
+            }
+            return journalObj;
+          }));
+        } else {
+          this.allJournals = [];
+        }
+      } catch (e) {
+        this.$message.error(this.$t('autoPromotion.loadListFailed'));
+      } finally {
+        this.loading = false;
+      }
+    },
+
+    // 右上角刷新：重新拉取列表，并重新拉取每个期刊对应的模版/风格详情
+    async refreshAll() {
+      this.templateNameMap = {};
+      this.allJournals = [];
+      await this.fetchPromotionJournals();
+    },
+
+    async refreshJournalByDetail(journal) {
+      if (!journal || !journal.journal_id) return;
+      const journalId = String(journal.journal_id);
+      
+      try {
+        const res = await this.$api.post('api/email_client/getPromotionJournalDetail', { journal_id: journalId });
+        const detail = this._parseJournalDetail(res.data);
+        
+        // 更新缓存（供原本的 fetchJournalTemplateAndStyleNames 逻辑兼容）
+        this.$set(this.templateNameMap, 'j_' + journalId, detail);
+
+        // 使用 $set 确保响应式更新
+        this.$set(journal, 'title', detail.title || journal.title);
+        this.$set(journal, 'solicit', {
+          ...(journal.solicit || {}),
+          enabled: detail.enabled,
+          initialized: detail.initialized,
+          templateId: detail.templateId,
+          styleId: detail.styleId,
+          templateName: detail.templateName,
+          styleName: detail.styleName,
+          html: detail.html
+        });
+      } catch (e) {
+        console.error('Refresh detail failed:', e);
+      }
+    },
+
+    // 保持此方法以兼容 wizard 内的逻辑（实际上逻辑已被 _parseJournalDetail 整合）
+    async fetchJournalTemplateAndStyleNames(journalId) {
+      const cacheKey = 'j_' + journalId;
+      if (this.templateNameMap[cacheKey]) return this.templateNameMap[cacheKey];
+      
+      try {
+        const res = await this.$api.post('api/email_client/getPromotionJournalDetail', { journal_id: String(journalId) });
+        const detail = this._parseJournalDetail(res.data);
+        this.$set(this.templateNameMap, cacheKey, detail);
+        return detail;
+      } catch (e) {
+        return { templateName: '', styleName: '', html: '' };
+      }
+    },
+
+    isSolicitConfigured(journal) {
+      const s = journal && journal.solicit ? journal.solicit : {};
+      return !!(s.initialized && s.templateId !== '0' && s.styleId !== '0');
+    },
+
+    getSolicitActionText(journal) {
+      if (!this.isSolicitConfigured(journal)) return this.$t('autoPromotion.goConfig');
+      return journal && journal.solicit && journal.solicit.enabled
+        ? this.$t('autoPromotion.goManagePlan')
+        : this.$t('autoPromotion.startPlan');
+    },
+
+    async handleSolicitAction(journal) {
+      if (!this.isSolicitConfigured(journal)) {
+        this.openWizardForJournal(journal);
+        return;
+      }
+      // 未开启时：必须等待 setDefaultPromotion 成功后才继续打开详情
+      if (!journal.solicit.enabled) {
+        const journalId = journal && journal.journal_id ? String(journal.journal_id) : '';
+        this.promotionUpdating = true;
+        this.promotionUpdatingJournalId = journalId;
+        try {
+          const userId = localStorage.getItem('U_id') || '';
+          await this.$api.post('api/email_client/setDefaultPromotion', {
+            journal_id: String(journal.journal_id),
+            default_template_id: String(journal.solicit.templateId),
+            default_style_id: String(journal.solicit.styleId),
+            start_promotion: '1',
+            user_id: userId
+          });
+          this.$message.success(`${journal.title} ${this.$t('autoPromotion.startedPlan')}`);
+          await this.refreshJournalByDetail(journal);
+          this.openDetail(journal);
+        } catch (e) {
+          // 接口失败时不要做后续动作（避免进入详情后数据未就绪）
+          this.$message.error(this.$t('autoPromotion.updateRetryFailed'));
+          return;
+        } finally {
+          this.promotionUpdating = false;
+          this.promotionUpdatingJournalId = '';
+        }
+        return;
+      }
+
+      // 已开启：直接打开详情
+      this.openDetail(journal);
+    },
+
+    openWizardForJournal(journal) {
+      this.wizardJournal = journal;
+      const s = journal.solicit || {};
+      this.wizardConfig = {
+        defaultTemplateId: s.templateId !== '0' ? s.templateId : '',
+        defaultStyleId: s.styleId !== '0' ? s.styleId : '',
+        enabled: !!s.enabled
+      };
+      this.selectedTemplateName = s.templateName || '';
+      this.selectedStyleName = s.styleName || '';
+      this.selectedTemplateThumbHtml = `<div style="zoom:0.18; pointer-events:none; user-select:none;">${s.html || ''}</div>`;
+      this.showWizardDialog = true;
+    },
+
+    handleTemplateApply(payload) {
+      if (!payload || !payload.template_id || !payload.style_id) {
+        this.$message.warning(this.$t('autoPromotion.selectTemplateStyleFirst'));
+        return;
+      }
+      this.wizardConfig.defaultTemplateId = String(payload.template_id);
+      this.wizardConfig.defaultStyleId = String(payload.style_id);
+      this.selectedTemplateName = payload.template && payload.template.name ? payload.template.name : '';
+      this.selectedStyleName = payload.style && payload.style.name ? payload.style.name : '';
+      this.selectedTemplateThumbHtml = `<div style="zoom:0.18; pointer-events:none; user-select:none;">${payload.html || ''}</div>`;
+      this.showTemplateDialog = false;
+    },
+
+    async saveWizardConfig() {
+      if (!this.wizardJournal || !this.wizardJournal.solicit) return;
+      if (!this.wizardConfig.defaultTemplateId || !this.wizardConfig.defaultStyleId) {
+        this.$message.warning(this.$t('autoPromotion.selectTemplateStyleFirst'));
+        return;
+      }
+      this.saving = true;
+      try {
+        const userId = localStorage.getItem('U_id') || '';
+        await this.$api.post('api/email_client/setDefaultPromotion', {
+          journal_id: String(this.wizardJournal.journal_id),
+          default_template_id: this.wizardConfig.defaultTemplateId,
+          default_style_id: this.wizardConfig.defaultStyleId,
+          start_promotion: this.wizardConfig.enabled ? '1' : '0',
+          user_id: userId
+        });
+        await this.refreshJournalByDetail(this.wizardJournal);
+        this.$message.success(this.$t('autoPromotion.configSaved'));
+        this.showWizardDialog = false;
+      } catch (e) {
+        this.$message.error(this.$t('autoPromotion.saveFailed'));
+      } finally {
+        this.saving = false;
+      }
+    },
+
+    openDetail(journal) {
+      this.$router.push({
+        path: '/autoPromotionLogs',
+        query: { journal_id: journal && journal.journal_id ? String(journal.journal_id) : '' }
+      });
+    },
+
+    async handleSwitch(journal, type, nextVal) {
+      if (!this.isSolicitConfigured(journal)) {
+        this.$set(journal.solicit, 'enabled', false);
+        this.$message.warning(this.$t('autoPromotion.notInitializedSwitchTip'));
+        return;
+      }
+      try {
+        this.promotionUpdating = true;
+        this.promotionUpdatingJournalId = journal && journal.journal_id ? String(journal.journal_id) : '';
+        const userId = localStorage.getItem('U_id') || '';
+        await this.$api.post('api/email_client/setDefaultPromotion', {
+          journal_id: String(journal.journal_id),
+          default_template_id: String(journal.solicit.templateId),
+          default_style_id: String(journal.solicit.styleId),
+          start_promotion: nextVal ? '1' : '0',
+          user_id: userId
+        });
+        this.$message.success(nextVal ? this.$t('autoPromotion.planEnabled') : this.$t('autoPromotion.planDisabled'));
+      } catch (e) {
+        this.$set(journal.solicit, 'enabled', !nextVal);
+        this.$message.error(this.$t('autoPromotion.updateFailed'));
+      } finally {
+        this.promotionUpdating = false;
+        this.promotionUpdatingJournalId = '';
+      }
+    }
+  }
+};
+</script>
+
+<style scoped>
+/* 保持您原始的 CSS 样式不变 */
+.auto-promo-container { padding: 20px 24px; background-color: #f5f7f9; min-height: 100vh; font-family: -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", Roboto; }
+.page-header { margin-bottom: 16px; display: flex; justify-content: flex-start; align-items: center; }
+.auto-promo-refresh-btn { margin-left: 12px; }
+.journal-grid { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 16px; }
+.journal-item { background: #fff; border-radius: 10px; padding: 16px; border: 1px solid #ebedf0; box-shadow: 0 2px 6px rgba(0,0,0,0.03); }
+.item-header { display: flex; justify-content: space-between; align-items: center; margin-bottom: 14px; }
+.journal-info { display: flex; align-items: center; }
+.icon-box { width: 28px; height: 28px; background: #edf5ff; border-radius: 4px; display: flex; align-items: center; justify-content: center; margin-right: 10px; }
+.icon-box i { color: #409eff; font-size: 14px; }
+.journal-name { font-size: 16px; font-weight: 600; color: #1f2d3d; }
+.module-wrapper { display: grid; grid-template-columns: 1fr; }
+.module-card { border-radius: 6px; padding: 14px; display: flex; flex-direction: column; min-height: 160px; border: 1px solid transparent; }
+.is-solicit-active { background: #f4f9ff; border-color: #e1eeff; }
+.is-empty { background: #fafafa; border-color: #f0f0f0; }
+.module-top { display: flex; justify-content: space-between; align-items: center; margin-bottom: 10px; }
+.module-top-left { display: flex; align-items: center; gap: 8px; }
+.module-title { font-size: 14px; font-weight: 600; color: #333; }
+.config-inline-btn { padding: 0; }
+.module-content { flex: 1; }
+.status-row { display: flex; align-items: center; margin-bottom: 4px; }
+.status-text { font-size: 12px; font-weight: 600; color: #52c41a; }
+.template-info { font-size: 12px; color: #bbb; margin-bottom: 2px; }
+.blue-text { color: #409eff; }
+.template-info-row { display: flex; justify-content: space-between; align-items: center; margin-bottom: 8px; }
+.empty-text { font-size: 12px; color: #bbb; height: 60px; display: flex; align-items: center; }
+.dot-running { width: 6px; height: 6px; background: #52c41a; border-radius: 50%; margin-right: 6px; }
+.module-footer { margin-top: 12px; }
+.action-btn { width: 100%; padding: 6px 0; border: none; border-radius: 4px; font-size: 12px; font-weight: 600; cursor: pointer; transition: 0.2s; }
+.btn-blue { background: #e8f3ff; color: #409eff; }
+.btn-blue:hover { background: #409eff; color: #fff; }
+@media (min-width: 1280px) { .journal-grid { grid-template-columns: repeat(3, minmax(0, 1fr)); } }
+@media (min-width: 1680px) { .journal-grid { grid-template-columns: repeat(4, minmax(0, 1fr)); } }
+</style>
\ No newline at end of file
diff --git a/src/components/page/autoPromotionLogs.vue b/src/components/page/autoPromotionLogs.vue
new file mode 100644
index 0000000..0e9a29e
--- /dev/null
+++ b/src/components/page/autoPromotionLogs.vue
@@ -0,0 +1,892 @@
+<template>
+  <div class="auto-promo-container">
+    <div class="crumbs">
+      <div class="page-header">
+      <el-breadcrumb separator="/">
+        <el-breadcrumb-item><i class="el-icon-s-promotion"></i> {{ $t('autoPromotion.title') }}</el-breadcrumb-item>
+        <el-breadcrumb-item>
+          {{ $t('autoPromotionLogs.detail') }}
+        </el-breadcrumb-item>
+       
+      </el-breadcrumb>
+    </div>
+ 
+    </div>
+
+    <el-card shadow="never" class="journal-header-card">
+      <div class="config-bar">
+        <div class="left">
+          <span class="label">{{ $t('autoPromotion.journal') }} : </span>
+         {{currentJournalName}}
+
+         <template v-if="config.initialized">
+ <el-tag  type="success" size="small" effect="plain" style="margin-left: 10px">
+              <i class="el-icon-circle-check"></i> {{ $t('autoPromotionLogs.configured') }}
+            </el-tag>
+            <el-button 
+              type="text" 
+              size="small" 
+              style="margin-left: 10px" 
+              @click="openWizardDialog"
+            >
+            <i class="el-icon-edit"></i>
+              {{
+                config.initialized
+                  ? $t('autoPromotionLogs.editConfig')
+                  : $t('autoPromotionLogs.startConfig')
+              }}
+            </el-button>
+       
+         </template>
+         
+            <el-tag v-else type="info" size="small" effect="plain" style="margin-left: 10px">
+              <i class="el-icon-info"></i> {{ $t('autoPromotionLogs.notConfigured') }}
+            </el-tag>
+
+        </div>
+        <div class="right" v-if="config.initialized">
+          <el-button size="small" icon="el-icon-document" @click="openLogs">
+            {{ $t('autoPromotion.logs') }}
+          </el-button>
+        </div>
+      </div>
+    </el-card>
+
+    <div v-loading="loading" class="main-body">
+      <el-card v-if="!config.initialized" shadow="never" class="wizard-card">
+        <auto-promotion-wizard
+          mode="inline"
+          :config="config"
+          :wizardStartDate.sync="wizardStartDate"
+          :currentJournalName="currentJournalName"
+          :selectedTemplateThumbHtml="selectedTemplateThumbHtml"
+          :selectedTemplateName="selectedTemplateName"
+          :selectedStyleName="selectedStyleName"
+          :saving="saving"
+          :title="$t('autoPromotion.title')"
+          @open-template-selector="showTemplateDialog = true"
+          @confirm="completeInitialization"
+        />
+      </el-card>
+
+      <div v-else class="manage-mode" style="display: none;">
+       
+
+        <el-card shadow="never" class="list-card">
+          <div class="list-header">
+            <el-input
+              v-model="query.keyword"
+              size="small"
+              clearable
+              style="width: 300px"
+              :placeholder="$t('autoPromotionLogs.searchPlaceholder')"
+              @keyup.enter.native="fetchList"
+            >
+              
+            </el-input>
+            <el-button type="primary" size="small"  icon="el-icon-search" style="margin-left: 20px;" @click="fetchList">{{ $t('autoPromotionLogs.searchBtn') }}</el-button>
+          </div>
+
+          <el-table :data="list" border stripe size="small" class="custom-table">
+  <el-table-column type="index" :label="$t('autoPromotionLogs.index')" width="70" align="center"></el-table-column>
+  <el-table-column :label="$t('autoPromotionLogs.expertInfo')" min-width="180">
+    <template slot-scope="scope">
+      <div class="user-info">
+        <div class="name">{{ scope.row.name }}</div>
+        <div class="email">{{ scope.row.email }}</div>
+      </div>
+    </template>
+  </el-table-column>
+
+  <el-table-column :label="$t('autoPromotionLogs.templateStyle')" min-width="200">
+    <template slot-scope="scope">
+      <div class="template-info-cell">
+        <div class="text-content">
+          <div class="tpl-main">{{ getTemplateName(scope.row.template_id) }}</div>
+          <div class="tpl-sub">{{ $t('autoPromotionLogs.stylePrefix') }}: {{ getStyleDisplay(scope.row) }}</div>
+        </div>
+        <el-button 
+          type="text" 
+          icon="el-icon-edit-outline" 
+          class="edit-icon-btn"
+          @click="handleEditRowTemplate(scope.row)"
+        ></el-button>
+      </div>
+    </template>
+  </el-table-column>
+
+  <el-table-column prop="run_at" :label="$t('autoPromotionLogs.runAt')" width="180">
+    <template slot-scope="scope">
+      <span class="time-cell">
+        <i class="el-icon-time"></i> {{ scope.row.run_at }}
+      </span>
+    </template>
+  </el-table-column>
+
+  <el-table-column :label="$t('autoPromotionLogs.status')" width="120">
+    <template slot-scope="scope">
+      <span :class="['status-badge', scope.row.paused ? 'is-paused' : 'is-waiting']">
+        {{ scope.row.paused ? $t('autoPromotionLogs.paused') : $t('autoPromotionLogs.toRun') }}
+      </span>
+    </template>
+  </el-table-column>
+
+  <el-table-column :label="$t('autoPromotionLogs.operation')" width="150" align="center">
+    <template slot-scope="scope">
+      <div class="action-btns">
+        <el-tooltip :content="$t('autoPromotionLogs.preview')" placement="top">
+          <el-button type="text" icon="el-icon-view" @click="previewRow(scope.row)"></el-button>
+        </el-tooltip>
+        
+        <el-tooltip :content="scope.row.paused ? $t('autoPromotionLogs.enable') : $t('autoPromotionLogs.pause')" placement="top">
+          <el-button 
+            type="text" 
+            :icon="scope.row.paused ? 'el-icon-video-play' : 'el-icon-video-pause'" 
+            @click="togglePause(scope.row)"
+          ></el-button>
+        </el-tooltip>
+
+       
+          <el-button 
+            type="text" 
+            icon="el-icon-delete" 
+            class="delete-btn" 
+            @click="deleteRow(scope.row)"
+          ></el-button>
+     
+      </div>
+    </template>
+  </el-table-column>
+</el-table>
+          
+          <div class="pagination">
+            <el-pagination
+              background
+              layout="total, prev, pager, next"
+              :current-page="query.pageIndex"
+              :page-size="query.pageSize"
+              :total="total"
+              @current-change="handlePageChange"
+            />
+          </div>
+        </el-card>
+      </div>
+    </div>
+
+    <auto-promotion-wizard
+      mode="dialog"
+      :visible.sync="showWizardDialog"
+      :config="config"
+      :wizardStartDate.sync="wizardStartDate"
+      :currentJournalName="currentJournalName"
+      :selectedTemplateThumbHtml="selectedTemplateThumbHtml"
+      :selectedTemplateName="selectedTemplateName"
+      :selectedStyleName="selectedStyleName"
+      :saving="saving"
+      :title="$t('autoPromotion.title')"
+      @open-template-selector="showTemplateDialog = true"
+      @cancel="showWizardDialog = false"
+      @confirm="completeInitialization"
+    />
+
+    <template-selector-dialog
+      v-if="showTemplateDialog"
+      :visible.sync="showTemplateDialog"
+      :journalId="selectedJournalId"
+      :journalLabel="currentJournalName"
+      :initial-style-id="templateDialogInitialStyleId"
+      :initial-template-id="templateDialogInitialTemplateId"
+      :return-source="'autoPromotion'"
+      @confirm="handleTemplateApply"
+      @close-all-dialogs="closeAllDialogs"
+    />
+    <el-dialog :title="$t('autoPromotionLogs.previewEditTitle')" :visible.sync="showPreviewDialog" width="1200px" top="5vh">
+  <div class="mail-edit-wrapper" v-if="previewForm">
+    <el-form label-width="80px" size="small">
+      <el-form-item :label="$t('autoPromotionLogs.receiver')">
+        <el-input v-model="previewForm.email" disabled :placeholder="$t('autoPromotionLogs.receiverImmutablePlaceholder')" />
+      </el-form-item>
+      <el-form-item :label="$t('autoPromotionLogs.subject')">
+        <el-input v-model="previewForm.subject" :placeholder="$t('autoPromotionLogs.subjectPlaceholder')" />
+      </el-form-item>
+      <el-form-item :label="$t('autoPromotionLogs.runAt')">
+        <el-date-picker
+          v-model="previewForm.run_at"
+          type="datetime"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          :placeholder="$t('autoPromotionLogs.runAtPlaceholder')"
+          style="width: 100%;"
+        />
+      </el-form-item>
+      <CkeditorMail v-model="previewForm.content" />
+    
+    </el-form>
+  </div>
+  <div slot="footer">
+    <el-button size="small" @click="showPreviewDialog = false">{{ $t('autoPromotionLogs.cancel') }}</el-button>
+    <el-button size="small" type="primary" @click="saveMailContent" :loading="saving">{{ $t('autoPromotionLogs.confirmEdit') }}</el-button>
+  </div>
+</el-dialog>
+  </div>
+</template>
+
+<script>
+import CkeditorMail from '@/components/page/components/email/CkeditorMail.vue';
+import TemplateSelectorDialog from '@/components/page/components/email/TemplateSelectorDialog.vue'
+import AutoPromotionWizard from '@/components/page/components/autoPromotion/AutoPromotionWizard.vue'
+// 这里假设你已经定义了 API 地址
+const API = {
+  getAllJournal: 'api/email_client/getPromotionJournalList',
+  listTemplates: 'api/mail_template/listTemplates',
+  getConfig: 'api/auto_promotion/getConfig',
+  saveConfig: 'api/email_client/setDefaultPromotion',
+  list: 'api/auto_promotion/getList',
+};
+
+export default {
+  name: 'autoPromotion',
+  components: { TemplateSelectorDialog, AutoPromotionWizard, CkeditorMail },
+  data() {
+    return {
+      // 基础数据
+      journalOptions: [],
+      selectedJournalId: '',
+      templateOptions: [],
+      
+      // 配置对象
+      config: {
+        initialized: false, // 核心：控制向导与列表的显示
+        enabled: false,
+        defaultTemplateId: '',
+        defaultTime: '09:00:00'
+      },
+
+      // 向导控制
+      wizardStep: 0,
+      wizardStartDate: '',
+      showTemplateDialog: false,
+      selectedTemplateThumbHtml: '',
+      selectedTemplateName: '',
+      selectedStyleName: '',
+
+      // 列表数据
+      query: { keyword: '', pageIndex: 1, pageSize: 15 },
+      list: [],
+      total: 0,
+      
+      // 状态控制
+      loading: false,
+      saving: false,
+currentJournalName: '',
+      // 向导弹窗（用于编辑已初始化配置）
+      showWizardDialog: false,
+      showPreviewDialog: false,
+      currentRow: null,
+      templateDialogInitialStyleId: '',
+      templateDialogInitialTemplateId: '',
+    previewForm: {
+      id: '',
+      email: '',
+      run_at: '',
+      subject: '',
+      content: ''
+    },
+    };
+  },
+  computed: {
+  
+  },
+  created() {
+    this.initPage();
+  },
+  methods: {
+    closeAllDialogs() {
+      // 点击“去新增模板”后：关闭当前页面所有可能的弹窗
+      this.showWizardDialog = false;
+      this.showTemplateDialog = false;
+      this.showPreviewDialog = false;
+      this.currentRow = null;
+    },
+    openLogs() {
+      this.$router.push({
+        path: '/autoPromotionLogs',
+        query: { journal_id: this.selectedJournalId || '' }
+      });
+    },
+    // 点击列表“查看”图标
+  previewRow(row) {
+    this.previewForm = {
+      id: row.id,
+      email: row.email,
+      run_at: row.run_at || '',
+      // 假设后端或mock数据里有这些字段，没有则赋初始值
+      subject:
+        row.subject ||
+        this.$t('autoPromotionLogs.mockPromotionSubject', { journal: this.currentJournalName }),
+      content:
+        row.mail_content ||
+        this.$t('autoPromotionLogs.mockPromotionContent', { name: row.name || '' })
+    };
+    this.showPreviewDialog = true;
+  },
+
+  // 保存修改后的邮件内容
+  async saveMailContent() {
+    this.saving = true;
+    try {
+      // 模拟调用 API
+      // await this.$api.post(API.updateMailDetail, this.previewForm);
+      
+      // 同步到本地 list 中（Mock 效果）
+      const index = this.list.findIndex(item => item.id === this.previewForm.id);
+      if (index !== -1) {
+        this.$set(this.list[index], 'run_at', this.previewForm.run_at);
+        this.$set(this.list[index], 'subject', this.previewForm.subject);
+        this.$set(this.list[index], 'mail_content', this.previewForm.content);
+      }
+      
+      this.$message.success(this.$t('autoPromotionLogs.mailContentSaved'));
+      this.showPreviewDialog = false;
+    } finally {
+      this.saving = false;
+    }
+  },
+  
+  // 修改 handleEditRowTemplate 使其调用你已有的选择器
+  handleEditRowTemplate(row) {
+    this.currentRow = row;
+    this.showTemplateDialog = true;
+  },
+    // 处理表格内点击编辑图标
+  handleEditRowTemplate(row) {
+    this.currentRow = row; // 记录当前正在操作哪一行
+    this.templateDialogInitialStyleId = row && row.style_id ? String(row.style_id) : '';
+    this.templateDialogInitialTemplateId = row && row.template_id ? String(row.template_id) : '';
+    this.showTemplateDialog = true;
+  },
+
+  // 修改原有的 handleTemplateApply 方法，使其兼容向导和表格修改
+  handleTemplateApply(payload) {
+    const templateObj = payload && payload.template ? payload.template : {};
+    const styleObj = payload && payload.style ? payload.style : {};
+    const templateId = templateObj.id || (payload && payload.template_id) || '';
+    const templateName = templateObj.name || '';
+    const styleName = styleObj.name || '';
+
+    if (this.currentRow) {
+      // 说明是修改表格里的某一行
+      this.currentRow.template_id = String(templateId);
+      this.currentRow.template_name = templateName;
+      this.currentRow.style_name = styleName;
+      this.updateRow(this.currentRow); // 提交保存
+      this.currentRow = null; // 清空引用
+    } else {
+      // 说明是向导模式在选择
+      this.config.defaultTemplateId = String(templateId);
+      this.selectedTemplateName = templateName;
+      this.selectedStyleName = styleName;
+      this.selectedTemplateThumbHtml = `<div style="zoom:0.18; pointer-events:none;">${payload.html}</div>`;
+    }
+    this.showTemplateDialog = false;
+  },
+
+  getTemplateName(id) {
+    const found = this.templateOptions.find(t => String(t.template_id) === String(id));
+    return found ? found.title : id || this.$t('autoPromotionLogs.templateNotSelected');
+  },
+  getStyleDisplay(row) {
+    if (!row) return '-';
+    if (row.style_name) return row.style_name;
+    if (row.style_id) return String(row.style_id);
+    return '-';
+  },
+  
+ 
+    async initPage() {
+      var journal_id = (this.$route.query && this.$route.query.journal_id) || '';
+      this.selectedJournalId = String(journal_id);
+      this.loading = true;
+      try {
+        await this.fetchJournalDetail();
+        if (this.config.initialized) {
+          await this.fetchTemplates();
+          await this.fetchList();
+        }
+      } finally {
+        this.loading = false;
+      }
+    },
+    _parseJournalDetail(data) {
+      const journalInfo = data.journal || data || {};
+      const tpl = journalInfo.template || data.template || {};
+      const style = journalInfo.style || data.style || {};
+      
+      const tplId = String(journalInfo.default_template_id || '0');
+      const styleId = String(journalInfo.default_style_id || '0');
+      
+      return {
+        title: journalInfo.title || journalInfo.journal_title || '',
+        templateId: tplId,
+        styleId: styleId,
+        templateName: tpl.name || tpl.title || journalInfo.default_template_name || '',
+        styleName: style.name || style.title || journalInfo.default_style_name || '',
+        html: `${style.header_html || ''}${tpl.body_html || ''}${style.footer_html || ''}`,
+        enabled: String(journalInfo.start_promotion || '0') === '1',
+        initialized: tplId !== '0' && styleId !== '0'
+      };
+    },
+    async fetchJournalDetail() {
+      if (!this.selectedJournalId) {
+        this.config.initialized = false;
+        return;
+      }
+      try {
+        var res = await this.$api.post('api/email_client/getPromotionJournalDetail', {
+          journal_id: this.selectedJournalId
+        });
+        var data = (res && res.data) || {};
+        var detail = this._parseJournalDetail(data);
+        var journalInfo = data.journal || data || {};
+
+        this.currentJournalName = detail.title || this.currentJournalName || '';
+        this.config = {
+          initialized: detail.initialized,
+          enabled: detail.enabled, // 回显“是否立即推广”
+          defaultTemplateId: detail.initialized ? detail.templateId : '',
+          defaultStyleId: detail.initialized ? detail.styleId : '',
+          defaultTime: journalInfo.default_time || this.config.defaultTime || ''
+        };
+
+        // 回显默认模板/风格（用于“修改默认配置”）
+        this.selectedTemplateName = detail.initialized ? (detail.templateName || '') : '';
+        this.selectedStyleName = detail.initialized ? (detail.styleName || '') : '';
+        this.selectedTemplateThumbHtml = detail.initialized && detail.html
+          ? `<div style="zoom:0.18; pointer-events:none; user-select:none;">${detail.html}</div>`
+          : '';
+
+        // 打开模板选择弹窗时，默认选中当前配置
+        this.templateDialogInitialTemplateId = detail.initialized ? String(detail.templateId || '') : '';
+        this.templateDialogInitialStyleId = detail.initialized ? String(detail.styleId || '') : '';
+      } catch (e) {
+        this.config.initialized = false;
+      }
+    },
+
+    // 打开向导弹窗：用于“修改期刊自动推广配置”
+    openWizardDialog() {
+      this.showWizardDialog = true;
+      this.wizardStep = 0;
+      // 尽量从已加载的 config 里取开始日期（没有就保持空）
+      if (this.config && this.config.start_date) {
+        this.wizardStartDate = this.config.start_date;
+      }
+    },
+
+    // 切换期刊逻辑
+    async handleJournalChange() {
+      this.loading = true;
+      // 切换期刊时：先清空“已选模板/缩略图/风格名”，再判断该期刊是否初始化
+      this.showTemplateDialog = false;
+      this.selectedTemplateThumbHtml = '';
+      this.selectedTemplateName = '';
+      this.selectedStyleName = '';
+      this.config.defaultTemplateId = '';
+      this.wizardStartDate = '';
+      this.wizardStep = 0;
+      try {
+        await this.fetchTemplates(); // 获取对应期刊的模版
+        await this.loadConfig();    // 获取该期刊的初始化状态
+        if (!this.config.initialized) {
+          // 未初始化：确保默认模板为空（保持向导第一步）
+          this.config.defaultTemplateId = '';
+        } else if (this.config.initialized) {
+          await this.fetchList();   // 已初始化的直接加载列表
+        }
+      } finally {
+        this.loading = false;
+      }
+    },
+
+    async fetchJournals() {
+      const res = await this.$api.post(API.getAllJournal, {user_id: localStorage.getItem('U_id')});
+      this.journalOptions = res.data.journals || [];
+    },
+
+    async fetchTemplates() {
+      const res = await this.$api.post(API.listTemplates, { journal_id: this.selectedJournalId });
+      this.templateOptions = (res.data.list || []).map(t => ({
+        template_id: t.template_id || t.id,
+        title: t.title || t.name
+      }));
+    },
+
+    async loadConfig() {
+      await this.fetchJournalDetail();
+    },
+
+    // 接收模版选择：兼容向导与列表行编辑
+    handleTemplateApply(payload) {
+      // payload 兼容：可能是 string(html) 或对象
+      const html = payload && typeof payload === 'object' ? payload.html : String(payload || '');
+      const templateId =
+        payload && typeof payload === 'object'
+          ? (payload.template_id || payload.id || (payload.template && (payload.template.id || payload.template.template_id)) || '')
+          : '';
+      const styleId =
+        payload && typeof payload === 'object'
+          ? (payload.style_id || (payload.style && payload.style.id) || '')
+          : '';
+      const templateName = payload && typeof payload === 'object' && payload.template ? payload.template.name : '';
+      const styleName = payload && typeof payload === 'object' && payload.style ? payload.style.name : '';
+
+      // 必须选到模板（template_id）才允许“下一步”解除置灰
+      if (!templateId) {
+        this.$message.warning(this.$t('autoPromotionLogs.selectTemplateWarning'));
+        return;
+      }
+      if (this.currentRow) {
+        this.currentRow.template_id = String(templateId);
+        this.currentRow.template_name = templateName || this.getTemplateName(templateId);
+        this.currentRow.style_id = styleId ? String(styleId) : this.currentRow.style_id;
+        this.currentRow.style_name = styleName || this.currentRow.style_name || '';
+        this.updateRow(this.currentRow);
+        this.currentRow = null;
+      } else {
+        this.config.defaultTemplateId = String(templateId);
+        this.selectedTemplateName = templateName || '';
+        this.selectedStyleName = styleName || '';
+        // 生成缩略图 HTML（禁用交互，避免点击跳转）
+        this.selectedTemplateThumbHtml = `<div style="zoom:0.18; pointer-events:none; user-select:none;">${html}</div>`;
+      }
+      this.templateDialogInitialStyleId = '';
+      this.templateDialogInitialTemplateId = '';
+      this.showTemplateDialog = false;
+      // this.$message.success(this.$t('autoPromotion.saved') || 'Saved');
+    },
+
+    // 最终提交初始化
+    async completeInitialization() {
+      this.saving = true;
+      try {
+        const payload = {
+          journal_id: String(this.selectedJournalId || ''),
+          default_template_id: String(this.config.defaultTemplateId || ''),
+          default_style_id: String(this.config.defaultStyleId || ''),
+          start_promotion: this.config.enabled ? '1' : '0'
+        };
+        this.config.initialized = true; // 切换到管理模式
+        this.showWizardDialog = false;
+        this.fetchList();
+        await this.$api.post(API.saveConfig, payload);
+        this.$message.success(this.$t('autoPromotionLogs.configUpdated'));
+        
+      } finally {
+        this.saving = false;
+      }
+    },
+
+    async saveConfig() {
+      // 用于管理模式下的快捷修改保存
+      await this.$api.post(API.saveConfig, {
+        journal_id: String(this.selectedJournalId || ''),
+        default_template_id: String(this.config.defaultTemplateId || ''),
+        default_style_id: String(this.config.defaultStyleId || ''),
+        start_promotion: this.config.enabled ? '1' : '0'
+      });
+      this.$message.success(this.$t('autoPromotionLogs.configUpdated'));
+    },
+
+    async fetchList() {
+      this.loading = true;
+      try {
+        // 当前接口未联通：直接使用本地假数据
+        const mock = this.generateMockList();
+        this.list = mock.list;
+        this.total = mock.total;
+      } finally {
+        this.loading = false;
+      }
+    },
+
+    // 生成用于页面展示的假数据（mock）
+    generateMockList() {
+      const tpl1 = this.templateOptions && this.templateOptions.length ? String(this.templateOptions[0].template_id) : '1';
+      const tpl2 = this.templateOptions && this.templateOptions.length > 1 ? String(this.templateOptions[1].template_id) : tpl1;
+
+      const baseDate = new Date();
+      // 使用固定的偏移，保证每次打开都有“未来”的时间
+      const d1 = new Date(baseDate.getTime() + 86400000 * 2);
+      const d2 = new Date(baseDate.getTime() + 86400000 * 3);
+      const d3 = new Date(baseDate.getTime() + 86400000 * 4);
+      const d4 = new Date(baseDate.getTime() + 86400000 * 5);
+      const d5 = new Date(baseDate.getTime() + 86400000 * 6);
+
+      const fmt = (d) => {
+        const yyyy = d.getFullYear();
+        const mm = String(d.getMonth() + 1).padStart(2, '0');
+        const dd = String(d.getDate()).padStart(2, '0');
+        return `${yyyy}-${mm}-${dd} 09:00:00`;
+      };
+
+      const mk = (idx, name, email, template_id, style_id, style_name, paused, run_at) => ({
+        id: `mock_${idx}`,
+        name,
+        email,
+        template_id: String(template_id),
+        style_id: String(style_id),
+        style_name: style_name || '',
+        paused: Boolean(paused),
+        run_at
+      });
+
+      const list = [
+        mk(1, '张三', 'zhangsan@example.com', tpl1, 1, '简约风格', false, fmt(d1)),
+        mk(2, '李四', 'lisi@example.com', tpl2, 2, '商务风格', true, fmt(d2)),
+        mk(3, '王五', 'wangwu@example.com', tpl1, 1, '简约风格', false, fmt(d3)),
+        mk(4, '赵六', 'zhaoliu@example.com', tpl2, 3, '学术风格', false, fmt(d4)),
+        mk(5, '钱七', 'qianqi@example.com', tpl1, 2, '商务风格', true, fmt(d5)),
+      ];
+
+      return { list, total: list.length };
+    },
+
+    // 模板切换（mock：仅更新本行数据，不做后端请求）
+    updateRow(row) {
+      if (!row) return;
+      row.template_id = row.template_id == null ? '' : String(row.template_id);
+      this.$message.success(this.$t('autoPromotion.saved') || 'Saved');
+    },
+
+    // 暂停/开启（mock：切换 paused）
+    togglePause(row) {
+      if (!row) return;
+      row.paused = !row.paused;
+      if (row.paused) {
+        this.$message({
+          type: 'info',
+          message: this.$t('autoPromotionLogs.pauseSuccess')
+        });
+      } else {
+        this.$message.success(this.$t('autoPromotionLogs.enableSuccess'));
+      }
+    },
+
+    // 删除（mock：从列表移除）
+    deleteRow(row) {
+      if (!row) return;
+      this.list = (this.list || []).filter(item => item !== row);
+      this.total = this.list.length;
+      this.$message.success(this.$t('autoPromotionLogs.deletedSuccess'));
+    },
+
+    handlePageChange(p) {
+      this.query.pageIndex = p;
+      this.fetchList();
+    }
+  }
+};
+</script>
+
+<style scoped>
+.auto-promo-container {  background: #f9fafc; min-height: 90%; }
+.journal-header-card { margin-bottom: 15px; }
+.config-bar { display: flex; justify-content: space-between; align-items: center; }
+
+/* 向导样式 */
+.wizard-card { margin-top: 10px; min-height: 500px; }
+.wizard-header { padding: 20px 0 40px; border-bottom: 1px solid #f0f2f5; }
+.wizard-body { padding: 40px 0; }
+.step-content { text-align: center; }
+.step-tips { margin-bottom: 30px; }
+.step-tips i { font-size: 40px; color: #409EFF; margin-bottom: 15px; }
+
+.template-placeholder {
+  width: 520px;
+  max-width: 100%;
+  border: 2px dashed #dcdfe6;
+  margin: 0 auto;
+  border-radius: 8px;
+  padding: 14px;
+  cursor: pointer;
+  transition: 0.3s;
+}
+.template-placeholder:hover { border-color: #409EFF; color: #409EFF; background: #f5f7fa; }
+.template-placeholder .inner { display: flex; flex-direction: column; align-items: center; justify-content: center; min-height: 150px; }
+.template-placeholder .inner.selected { display: block; min-height: unset; color: #333; }
+.template-placeholder .inner i { font-size: 30px; }
+.thumb-box {
+  border: 1px solid #ebeef5;
+  border-radius: 6px;
+  overflow: hidden;
+  background: #fff;
+  height: 120px;
+  margin-bottom: 10px;
+}
+.thumb-content { transform-origin: top left; }
+.selected-meta { display: flex; align-items: center; gap: 10px; }
+.selected-text { flex: 1; min-width: 0; }
+.tpl-line { color: #606266; line-height: 20px; }
+.style-line { color: #909399; font-size: 12px; line-height: 18px; margin-top: 2px; }
+
+.wizard-footer { text-align: center; padding-top: 30px; border-top: 1px solid #f0f2f5; }
+
+/* 管理模式样式 */
+.config-card { margin-bottom: 15px; background: #fff; }
+.list-card { background: #fff; }
+.list-header { margin-bottom: 15px; }
+.pagination { margin-top: 20px; text-align: right; }
+.final-check { margin-top: 15px; line-height: 2; }
+/* 弹窗容器布局 */
+.vertical-wizard-container {
+  display: flex;
+  gap: 30px;
+  padding: 10px;
+}
+
+.side-nav {
+  width: 120px;
+  flex-shrink: 0;
+  padding-top: 10px;
+}
+
+.main-form-content {
+  flex: 1;
+  max-height: 60vh; /* 开启滚动条防止内容过长 */
+  overflow-y: auto;
+  padding-right: 15px;
+}
+
+/* 每一个小节的样式 */
+.form-section {
+  margin-bottom: 10px;
+}
+
+.section-title {
+  margin: 0 0 20px 0;
+  font-size: 15px;
+  color: #303133;
+  display: flex;
+  align-items: center;
+}
+
+.section-title i {
+  margin-right: 8px;
+  color: #409EFF;
+  font-size: 18px;
+}
+
+/* 优化后的模板选择框 */
+.template-placeholder.mini-mode {
+  width: 100%;
+  padding: 15px;
+  min-height: 60px;
+  background: #f8f9fb;
+}
+
+.thumb-box-mini {
+  width: 100px;
+  height: 60px;
+  border: 1px solid #ddd;
+  overflow: hidden;
+  background: #fff;
+  border-radius: 4px;
+  margin-right: 15px;
+}
+
+.status-confirm-box {
+  padding: 15px;
+  background: #f0f9eb;
+  border-radius: 4px;
+  border: 1px inset #e1f3d8;
+}
+
+.selected-meta {
+  display: flex;
+  align-items: center;
+}
+
+/* 调整分割线间距 */
+.el-divider--horizontal {
+  margin: 24px 0;
+}
+/* 表格内容排版 */
+.user-info .name { font-weight: bold; color: #303133; margin-bottom: 2px; }
+.user-info .email { color: #909399; font-size: 12px; }
+
+.template-info-cell { display: flex; align-items: center; justify-content: space-between; }
+.tpl-main { font-weight: 600; color: #409EFF; font-size: 13px; }
+.tpl-sub { color: #909399; font-size: 12px; margin-top: 2px; }
+.edit-icon-btn { font-size: 16px; margin-left: 8px; color: #909399; }
+.edit-icon-btn:hover { color: #409EFF; }
+
+.time-cell { color: #606266; display: flex; align-items: center; gap: 5px; }
+
+/* 状态标签 (带圆点) */
+.status-badge {
+  display: inline-flex;
+  align-items: center;
+  padding: 2px 10px;
+  border-radius: 12px;
+  font-size: 12px;
+}
+.status-badge::before {
+  content: '';
+  width: 6px;
+  height: 6px;
+  border-radius: 50%;
+  margin-right: 6px;
+}
+
+.is-waiting { color: #e67e22; background: #fff3e6; }
+.is-waiting::before { background: #e67e22; }
+
+.is-paused { color: #909399; background: #f4f4f5; }
+.is-paused::before { background: #909399; }
+
+/* 操作按钮 */
+.action-btns .el-button {
+  font-size: 18px;
+  padding: 0 5px;
+  color: #606266;
+}
+.action-btns .el-button:hover { color: #409EFF; }
+.action-btns .delete-btn { color: #F56C6C; }
+.action-btns .delete-btn:hover { color: #F56C6C; }
+.action-btns .delete-btn.el-button--text { color: #F56C6C !important; }
+
+/* 深度选择器处理表格边距 */
+.custom-table >>> .el-table__cell { padding: 12px 0; }
+/* 邮件编辑弹窗专用样式 */
+.mail-edit-wrapper {
+  padding: 10px 20px;
+}
+
+.editor-container {
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
+  background: #fff;
+}
+
+/* 模拟富文本编辑器的工具栏感 (如果你没有引入富文本) */
+.editor-container >>> .el-textarea__inner {
+  border: none;
+  padding: 15px;
+  font-family: "Helvetica Neue", Helvetica, "PingFang SC", sans-serif;
+  line-height: 1.6;
+}
+
+/* 让 Dialog 的 footer 更靠右 */
+.el-dialog__footer {
+  padding: 20px;
+  border-top: 1px solid #f0f2f5;
+}
+
+/* 列表内的主题预览小字（可选） */
+.tpl-sub.mail-subject {
+  max-width: 200px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  color: #8c939d;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/page/components/autoPromotion/AutoPromotionWizard.vue b/src/components/page/components/autoPromotion/AutoPromotionWizard.vue
new file mode 100644
index 0000000..8f14345
--- /dev/null
+++ b/src/components/page/components/autoPromotion/AutoPromotionWizard.vue
@@ -0,0 +1,133 @@
+<template>
+  <el-dialog
+    v-if="mode === 'dialog'"
+    :visible.sync="dialogVisible"
+    :close-on-click-modal="false"
+    width="1000px"
+    top="5vh"
+    destroy-on-close
+    :title="title"
+    custom-class="vertical-wizard-dialog"
+  >
+    <auto-promotion-wizard-content
+      :config="config"
+      :wizardStartDate="wizardStartDateProxy"
+      :currentJournalName="currentJournalName"
+      :selectedTemplateThumbHtml="selectedTemplateThumbHtml"
+      :selectedTemplateName="selectedTemplateName"
+      :selectedStyleName="selectedStyleName"
+      @open-template-selector="emitOpenTemplateSelector"
+      @update:wizardStartDate="onWizardStartDateUpdate"
+    />
+
+    <div slot="footer" class="dialog-footer">
+      <el-button size="small" @click="handleCancel">{{ $t('autoPromotion.cancel') }}</el-button>
+      <el-button
+        type="success"
+        size="small"
+        :loading="saving"
+        :disabled="!canConfirm"
+        @click="handleConfirm"
+      >
+        {{ $t('autoPromotion.saveAndApply') }}
+      </el-button>
+    </div>
+  </el-dialog>
+
+  <!-- inline 模式：直接渲染内容，不包裹 el-dialog -->
+  <div v-else class="vertical-wizard-inline">
+    <auto-promotion-wizard-content
+      :config="config"
+      :wizardStartDate="wizardStartDateProxy"
+      :currentJournalName="currentJournalName"
+      :selectedTemplateThumbHtml="selectedTemplateThumbHtml"
+      :selectedTemplateName="selectedTemplateName"
+      :selectedStyleName="selectedStyleName"
+      @open-template-selector="emitOpenTemplateSelector"
+      @update:wizardStartDate="onWizardStartDateUpdate"
+    />
+    <div class="dialog-footer">
+      <el-button
+        type="success"
+        size="small"
+        :loading="saving"
+        :disabled="!canConfirm"
+        @click="handleConfirm"
+      >
+        {{ $t('autoPromotion.saveAndApply') }}
+      </el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import AutoPromotionWizardContent from '@/components/page/components/autoPromotion/AutoPromotionWizardContent.vue'
+
+export default {
+  name: 'AutoPromotionWizard',
+  components: { AutoPromotionWizardContent },
+  props: {
+    mode: { type: String, default: 'dialog' }, // 'dialog' | 'inline'
+    visible: { type: Boolean, default: false },
+    title: { type: String, default: '' },
+
+    config: { type: Object, required: true },
+    wizardStartDate: { type: [String, Date], default: '' },
+    currentJournalName: { type: String, default: '' },
+    selectedTemplateThumbHtml: { type: String, default: '' },
+    selectedTemplateName: { type: String, default: '' },
+    selectedStyleName: { type: String, default: '' },
+    saving: { type: Boolean, default: false }
+  },
+  computed: {
+    dialogVisible: {
+      get() {
+        return this.visible;
+      },
+      set(val) {
+        this.$emit('update:visible', val);
+      }
+    },
+    wizardStartDateProxy: {
+      get() {
+        return this.wizardStartDate;
+      },
+      set(val) {
+        this.$emit('update:wizardStartDate', val);
+      }
+    },
+    canConfirm() {
+      const id = this.config && this.config.defaultTemplateId != null ? String(this.config.defaultTemplateId) : '';
+      return id !== '' && id !== '0';
+    }
+  },
+  methods: {
+    emitOpenTemplateSelector() {
+      this.$emit('open-template-selector');
+    },
+    onWizardStartDateUpdate(val) {
+      // 由内容组件回传日期，继续走父组件的 .sync 链路
+      this.wizardStartDateProxy = val;
+    },
+    handleCancel() {
+      this.$emit('cancel');
+      if (this.mode === 'dialog') {
+        this.$emit('update:visible', false);
+      }
+    },
+    handleConfirm() {
+      this.$emit('confirm');
+    }
+  }
+};
+</script>
+
+<style scoped>
+.dialog-footer {
+  display: flex;
+  justify-content: flex-end;
+  gap: 10px;
+  align-items: center;
+}
+</style>
+
diff --git a/src/components/page/components/autoPromotion/AutoPromotionWizardContent.vue b/src/components/page/components/autoPromotion/AutoPromotionWizardContent.vue
new file mode 100644
index 0000000..f26197f
--- /dev/null
+++ b/src/components/page/components/autoPromotion/AutoPromotionWizardContent.vue
@@ -0,0 +1,410 @@
+<template>
+  <div class="vertical-wizard-container">
+   
+
+    <div class="main-form-content">
+      <section class="form-section">
+  <h4 class="section-title">
+    <i class="el-icon-magic-stick"></i> 1. {{ $t('autoPromotion.selectTemplateStyleTitle') }}
+  </h4>
+
+  <div class="template-card" @click="emitOpenTemplateSelector">
+    <div v-if="!hasSelectedTemplate" class="empty-state">
+      <i class="el-icon-plus"></i>
+      <p>{{ $t('autoPromotion.clickToChooseTemplate') }}</p>
+    </div>
+
+    <div v-else class="selected-content">
+      <div class="thumb-wrapper">
+        <div class="thumb-box-mini" v-if="selectedTemplateThumbHtml" >
+        
+        <div v-html="selectedTemplateThumbHtml" style="zoom:0.7; pointer-events:none; user-select:none;">
+
+
+        </div></div>
+        <div v-else class="thumb-placeholder">{{ $t('autoPromotion.noPreview') }}</div>
+      </div>
+      
+      <div class="info-wrapper">
+        <div class="tpl-name">{{ $t('autoPromotion.templateName') }}: {{ displayTemplateName }}</div>
+        <div class="tpl-style">{{ $t('autoPromotion.styleName') }}: {{ selectedStyleName || $t('autoPromotion.defaultStyle') }}</div>
+      </div>
+
+      <div class="action-wrapper">
+        <el-button type="primary" size="small" plain icon="el-icon-refresh">{{ $t('autoPromotion.changeTemplate') }}</el-button>
+      </div>
+    </div>
+  </div>
+</section>
+
+      <!-- <el-divider></el-divider>
+
+      <section class="form-section">
+        <h4 class="section-title">
+          <i class="el-icon-date"></i> 2. 规划发送计划
+        </h4>
+
+        <el-form label-width="120px" size="small">
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="每日执行时间">
+                <el-time-picker
+                  v-model="config.defaultTime"
+                  value-format="HH:mm:ss"
+                  placeholder="选择时间"
+                  style="width: 100%"
+                />
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="任务生效日期">
+                <el-date-picker
+                  :value="wizardStartDate"
+                  type="date"
+                  placeholder="选择开始日期"
+                  style="width: 100%"
+                  @input="$emit('update:wizardStartDate', $event)"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </section> -->
+
+      <el-divider></el-divider>
+
+      <section class="form-section">
+        <h4 class="section-title">
+          <i class="el-icon-finished"></i> 2. {{ $t('autoPromotion.confirmAndEnable') }}
+        </h4>
+
+        <div class="status-confirm-box">
+         
+          <el-radio-group v-model="config.enabled">
+            <el-radio :label="false">{{ $t('autoPromotion.onlySaveConfig') }}</el-radio>
+            <el-radio :label="true">{{ $t('autoPromotion.enableNowNextDay') }}</el-radio>
+          </el-radio-group>
+        </div>
+      </section>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'AutoPromotionWizardContent',
+  props: {
+    config: { type: Object, required: true },
+    wizardStartDate: { type: [String, Date], default: '' },
+    currentJournalName: { type: String, default: '' },
+    selectedTemplateThumbHtml: { type: String, default: '' },
+    selectedTemplateName: { type: String, default: '' },
+    selectedStyleName: { type: String, default: '' }
+  },
+  computed: {
+    hasSelectedTemplate() {
+      const id = this.config && this.config.defaultTemplateId != null ? String(this.config.defaultTemplateId) : '';
+      return id !== '' && id !== '0';
+    },
+    displayTemplateName() {
+      return this.selectedTemplateName || (this.hasSelectedTemplate ? String(this.config.defaultTemplateId) : '');
+    }
+  },
+  methods: {
+    emitOpenTemplateSelector() {
+      this.$emit('open-template-selector');
+    }
+  }
+};
+</script>
+
+<style scoped>
+.template-placeholder .inner {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  min-height: 150px;
+}
+
+.template-placeholder .inner.selected {
+  display: block;
+  min-height: unset;
+  color: #333;
+}
+
+.template-placeholder .inner i {
+  font-size: 30px;
+}
+
+.selected-text {
+  flex: 1;
+  min-width: 0;
+}
+
+.tpl-line {
+  color: #606266;
+  line-height: 20px;
+}
+
+.style-line {
+  color: #909399;
+  font-size: 12px;
+  line-height: 18px;
+  margin-top: 2px;
+}
+
+.vertical-wizard-container {
+  display: flex;
+  gap: 30px;
+  padding: 0;
+  align-items: flex-start;
+}
+
+.side-nav {
+  width: 120px;
+  flex-shrink: 0;
+  padding-top: 0;
+}
+
+.main-form-content {
+  flex: 1;
+  max-height: 80vh;
+  padding-top: 0;
+  padding-right: 15px;
+}
+
+.form-section {
+  margin-bottom: 10px;
+}
+
+.section-title {
+  margin: 0 0 20px 0;
+  font-size: 15px;
+  color: #303133;
+  display: flex;
+  align-items: center;
+}
+
+.section-title i {
+  margin-right: 8px;
+  color: #409EFF;
+  font-size: 18px;
+}
+
+/* 优化后的模板选择框 */
+.template-placeholder.mini-mode {
+  width: 100%;
+  padding: 15px;
+  min-height: 60px;
+  box-sizing: border-box;
+  background: #f8f9fb;
+}
+
+.template-placeholder.mini-mode .inner {
+  min-height: 60px;
+}
+
+
+.status-confirm-box {
+  padding: 15px;
+  /* background: #f0f9eb; */
+  border-radius: 4px;
+  /* border: 1px inset #e1f3d8; */
+}
+
+.selected-meta {
+  display: flex;
+  align-items: center;
+}
+
+/* 调整分割线间距 */
+.el-divider--horizontal {
+  margin: 24px 0;
+}
+.vertical-wizard-container {
+  display: flex;
+  gap: 40px;
+  padding: 20px;
+  background: #fff;
+}
+
+/* 侧边导航核心样式 */
+.side-nav {
+  width: 240px; /* 调宽一点以容纳副标题 */
+  flex-shrink: 0;
+}
+
+.step-item {
+  display: flex;
+  gap: 15px;
+  min-height: 80px; /* 虚线的高度由这个控制 */
+}
+
+.step-node {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  width: 32px;
+}
+
+/* 圆圈样式 */
+.step-node .circle {
+  width: 28px;
+  height: 28px;
+  border: 2px solid #555; /* 默认深灰色 */
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 14px;
+  font-weight: bold;
+  color: #555;
+  background: #fff;
+  z-index: 2;
+}
+
+/* 激活状态的蓝色圆圈 */
+.step-item.active .circle {
+  background: #006699; /* 对应图片里的蓝色 */
+  border-color: #006699;
+  color: #fff;
+}
+
+/* 虚线连接 */
+.step-node .line {
+  flex: 1;
+  width: 0;
+  border-left: 2px dotted #ccc; /* 灰色虚线 */
+  margin: 4px 0;
+}
+
+/* 文字内容 */
+.step-content {
+  padding-top: 2px;
+}
+
+.step-content .title {
+  font-family: "Georgia", serif; /* 模仿图片里的衬线字体感 */
+  font-size: 16px;
+  font-weight: bold;
+  color: #333;
+  margin-bottom: 4px;
+}
+
+.step-item.active .step-content .title {
+  color: #006699;
+}
+
+.step-content .sub {
+  font-size: 13px;
+  color: #999;
+  line-height: 1.4;
+}
+
+/* 最后一个节点不需要虚线 */
+.step-item.last {
+  min-height: auto;
+}
+
+/* 右侧内容滚动优化 */
+.main-form-content {
+  flex: 1;
+  max-height: 80vh;
+  overflow-y: auto;
+}
+/* 模板选择卡片整体 */
+.template-card {
+  border: 1px solid #ebeef5;
+  border-radius: 8px;
+  background: #fcfdfe;
+  transition: all 0.3s;
+  cursor: pointer;
+  overflow: hidden;
+}
+
+.template-card:hover {
+  border-color: #006699;
+  box-shadow: 0 4px 12px rgba(0, 102, 153, 0.1);
+}
+
+/* 空状态 */
+.empty-state {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 40px 0;
+  color: #909399;
+}
+.empty-state i {
+  font-size: 28px;
+  margin-bottom: 10px;
+}
+
+/* 已选择内容布局 */
+.selected-content {
+  display: flex;
+  align-items: center;
+  padding: 16px 20px;
+}
+
+/* 缩略图容器 - 保持比例 */
+.thumb-wrapper {
+  margin-right: 20px;
+}
+.thumb-box-mini {
+  width: 120px;   /* 稍微调小一点，显得精致 */
+  height: 160px;
+ 
+  border: 1px solid #e4e7ed;
+  border-radius: 4px;
+  overflow: hidden;
+  background: #fff;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+/* 处理 v-html 内部图片的样式 */
+.thumb-box-mini >>> img {
+  width: 100%;
+  height: 100%;
+  object-fit: contain;
+}
+
+/* 文字信息 */
+.info-wrapper {
+  flex: 1;
+}
+.tpl-name {
+  font-size: 16px;
+  font-weight: 600;
+  color: #303133;
+  margin-bottom: 6px;
+  font-family: "Georgia", serif;
+}
+.tpl-style {
+  font-size: 13px;
+  color: #909399;
+}
+
+/* 操作按钮靠右 */
+.action-wrapper {
+  margin-left: auto;
+}
+
+/* 激活自动推广的 Radio 样式美化 */
+.status-confirm-box {
+  padding: 20px;
+  background: #f4f7f9;
+  border-radius: 6px;
+}
+
+/* 覆盖 Element Radio 样式，使其更醒目 */
+.status-confirm-box >>> .el-radio-group {
+  display: flex;
+  gap: 30px;
+}
+</style>
+
diff --git a/src/components/page/components/autoPromotion/JournalDetailDialog.vue b/src/components/page/components/autoPromotion/JournalDetailDialog.vue
new file mode 100644
index 0000000..332edc4
--- /dev/null
+++ b/src/components/page/components/autoPromotion/JournalDetailDialog.vue
@@ -0,0 +1,68 @@
+<template>
+    <el-dialog
+      :title="`期刊管理: ${journal.title}`"
+      :visible.sync="localVisible"
+      width="1200px"
+      top="5vh"
+      destroy-on-close
+    >
+      <div v-if="mode === 'wizard' || mode === 'config'" class="wizard-container">
+         <auto-promotion-wizard
+           mode="inline"
+           :config="config"
+           @confirm="handleConfigSuccess"
+         />
+      </div>
+  
+      <div v-else class="manage-container">
+         <div class="list-header" style="margin-bottom: 20px;">
+            <el-button size="small" icon="el-icon-back" @click="mode = 'config'">修改全局配置</el-button>
+            <el-button size="small" type="primary" icon="el-icon-plus" style="float:right">添加特例任务</el-button>
+         </div>
+         
+         <el-table :data="list" border stripe size="small">
+            </el-table>
+         
+         </div>
+    </el-dialog>
+  </template>
+  
+  <script>
+  import AutoPromotionWizard from './AutoPromotionWizard.vue';
+  
+  export default {
+    components: { AutoPromotionWizard },
+    props: {
+      visible: Boolean,
+      journal: Object,
+      initialMode: String // 'list' | 'wizard' | 'config'
+    },
+    data() {
+      return {
+        mode: this.initialMode,
+        list: [], // 列表数据
+        config: { initialized: false } // 配置数据
+      };
+    },
+    computed: {
+      localVisible: {
+        get() { return this.visible; },
+        set(val) { this.$emit('update:visible', val); }
+      }
+    },
+    mounted() {
+      this.initData();
+    },
+    methods: {
+      async initData() {
+        // 1. 加载 Config
+        // 2. 如果是 list 模式，加载 fetchList
+      },
+      handleConfigSuccess() {
+        this.$message.success("配置更新成功");
+        this.mode = 'list'; // 自动切换回列表模式
+        this.$emit('refresh'); // 通知父级刷新大盘状态
+      }
+    }
+  }
+  </script>
\ No newline at end of file
diff --git a/src/components/page/components/email/MailDetail.vue b/src/components/page/components/email/MailDetail.vue
index 79b013d..ba8f605 100644
--- a/src/components/page/components/email/MailDetail.vue
+++ b/src/components/page/components/email/MailDetail.vue
@@ -2,10 +2,7 @@
     <div class="mail-detail-container">
       <div class="detail-toolbar">
         <div class="toolbar-left">
-          <!-- <el-tooltip content="回复" placement="bottom"><i class="el-icon-chat-line-square action-icon"></i></el-tooltip>
-          <el-tooltip content="转发" placement="bottom"><i class="el-icon-position action-icon"></i></el-tooltip>
-          <el-tooltip content="删除" placement="bottom"><i class="el-icon-delete action-icon" style="color: #fb2c36;"></i></el-tooltip>
-         -->
+          <h1 class="mail-subject-top">{{ $t('mailboxCollect.subject') }}：{{ mailData.subject }}</h1>
         </div>
         <div class="toolbar-right">
           <!-- <i class="el-icon-star-off action-icon"></i> -->
@@ -14,8 +11,6 @@
       </div>
   
       <div class="detail-scroll-content">
-        <h1 class="mail-subject">{{ mailData.subject }}</h1>
-  
         <div class="mail-header-info">
           <el-avatar :size="40" class="sender-avatar">{{ (mailData.from_name || 'U')[0] }}</el-avatar>
           <div class="info-main">
@@ -112,9 +107,8 @@
   
   // 提取日期信息用于比较
   const dateYear = date.getFullYear();
-  const dateMonth = date.getMonth() + 1;
-  const dateDay = date.getDate();
   const nowYear = now.getFullYear();
+  const lang = localStorage.getItem('langs') === 'zh' ? 'zh-CN' : 'en-US';
   
   // 获取昨天日期
   const yesterday = new Date(now);
@@ -134,15 +128,17 @@
 
   // 2. 如果是昨天：只显示 "昨天"
   if (date.toDateString() === yesterday.toDateString()) {
-    return '昨天';
+    return this.$t('mailboxCollect.yesterday');
   }
 
-  // 3. 如果是今年（非今天/昨天）：显示 "月-日"，如 "3月8日"
+  // 3. 如果是今年（非今天/昨天）：按语言显示月日
   if (dateYear === nowYear) {
-    return `${dateMonth}月${dateDay}日`;
+    return new Intl.DateTimeFormat(lang, { month: 'short', day: 'numeric' }).format(date);
   }
 
   // 4. 如果是往年：显示完整年月日，如 "2025-12-05"
+  const dateMonth = date.getMonth() + 1;
+  const dateDay = date.getDate();
   const fullMonth = dateMonth.toString().padStart(2, '0');
   const fullDay = dateDay.toString().padStart(2, '0');
   return `${dateYear}-${fullMonth}-${fullDay}`;
@@ -161,14 +157,21 @@
   
   /* 顶部工具栏 */
   .detail-toolbar { padding: 10px 20px; border-bottom: 1px solid #f0f0f0; display: flex; justify-content: space-between; align-items: center; }
-  .action-icon { font-size: 18px; color: #606266; cursor: pointer; margin-right: 20px; }
+  .toolbar-left { flex: 1; min-width: 0; }
+  .mail-subject-top {
+    margin: 0;
+    font-size: 18px;
+    font-weight: bold;
+    color: #303133;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+  .action-icon { font-size: 18px; color: #606266; cursor: pointer; }
   .action-icon:hover { color: #409EFF; }
   
   .detail-scroll-content { flex: 1; overflow-y: auto; padding: 20px 40px; }
   
-  /* 邮件标题 */
-  .mail-subject { font-size: 20px; font-weight: bold; margin-bottom: 25px; color: #303133; }
-  
   /* 头部信息 */
   .mail-header-info { display: flex; margin-bottom: 30px; }
   .info-main { flex: 1; margin-left: 15px; }
diff --git a/src/components/page/components/email/TemplateSelectorDialog.vue b/src/components/page/components/email/TemplateSelectorDialog.vue
index fbe088e..fae3e44 100644
--- a/src/components/page/components/email/TemplateSelectorDialog.vue
+++ b/src/components/page/components/email/TemplateSelectorDialog.vue
@@ -1,274 +1,534 @@
 <template>
     <el-dialog
-      title="Template Selection"
-      :visible.sync="visible"
-      :close-on-click-modal="false"
-      width="90%"
-      top="5vh"
-      destroy-on-close
-      :before-close="handleClose"
-      custom-class="template-modal"
+        :title="dialogTitle"
+        :visible.sync="visible"
+        :close-on-click-modal="false"
+        width="90%"
+        top="5vh"
+        destroy-on-close
+        :before-close="handleClose"
+        custom-class="template-modal"
     >
-      <div class="template-wrapper">
-        <div class="selection-panel">
-        
-          <el-tabs v-model="activeStep">
-            <el-tab-pane label="1.Choose Style" name="style">
-              <div class="card-grid">
-                <div 
-                  v-for="(item,index) in headerStyles" :key="item.id"
-                  :class="['card-item', { active: selectedHeaderId === item.id }]"
-                  @click="selectedHeaderId = item.id"
+        <div class="template-wrapper">
+            <div class="selection-panel">
+                <div class="selection-header">
+                    <el-button
+                        type="text"
+                        size="mini"
+                        icon="el-icon-refresh"
+                        :disabled="initLoading || contentLoading || !selectedJournalId"
+                        :title="$t('mailTemplate.refresh')"
+                        @click="refreshTemplatesAndStyles"
+                    />
+                </div>
+                <el-tabs v-model="activeStep">
+                    <el-tab-pane :label="$t('mailTemplate.templateTab')" name="content">
+                        <div class="card-grid" v-loading="contentLoading">
+                            <div
+                                v-for="(item, index) in contentTemplates"
+                                :key="item.id"
+                                :class="['card-item', { active: selectedContentId === item.id }]"
+                                @click="selectedContentId = item.id"
+                            >
+                                <p class="card-title" style="text-align: left; margin-top: 0">
+                                    <span>{{ index + 1 }}. </span>{{ item.name }}<br /><span style="color: #888">{{ item.subject }}</span>
+                                </p>
+                            </div>
+                        </div>
+                    </el-tab-pane>
+
+                    <el-tab-pane :label="$t('mailTemplate.styleTab')" name="style">
+                        <div class="card-grid">
+                            <div
+                                v-for="(item, index) in headerStyles"
+                                :key="item.id"
+                                :class="['card-item', { active: selectedHeaderId === item.id }]"
+                                @click="selectedHeaderId = item.id"
+                            >
+                                <div class="card-img" @click.stop="selectedHeaderId = item.id">
+                                    <div
+                                        v-html="item.htmlHeader + item.htmlFooter"
+                                        style="zoom: 0.15; pointer-events: none; user-select: none"
+                                    ></div>
+                                </div>
+
+                                <p class="card-title">
+                                    <span>{{ index + 1 }}. </span>{{ item.name }}
+                                </p>
+                                <p class="card-desc" :class="{ expanded: expandedHeaderId === item.id }" @click.stop="toggleDesc(item.id)">
+                                    {{ item.description }}
+                                </p>
+                            </div>
+                        </div>
+                    </el-tab-pane>
+
+                </el-tabs>
+            </div>
+
+            <div class="preview-panel">
+                <div class="preview-head">
+                    <div class="preview-label">LIVE PREVIEW</div>
+                    <div class="selected-info-inline">Selected: <strong>{{ currentSelectionText }}</strong></div>
+                </div>
+                <div class="preview-container" v-loading="initLoading" :element-loading-text="$t('mailTemplate.loading')">
+                    <div v-if="!initLoading && !hasValidPreview" class="preview-empty-state">
+                        <div class="preview-empty-text">{{ $t('mailTemplate.noTemplateTip') }}</div>
+                        <el-button type="primary" size="mini" class="preview-empty-btn" @click="goToMailTemplateList">
+                            {{ $t('mailTemplate.addTemplateBtn') }}
+                        </el-button>
+                    </div>
+                    <div v-else-if="hasValidPreview" class="mail-render-box" v-html="combinedHtml"></div>
+                </div>
+            </div>
+        </div>
+
+        <div slot="footer" class="dialog-footer">
+            <div>
+                <el-button @click="handleClose" style="">Cancel</el-button>
+                <el-button
+                    type="primary"
+                    icon="el-icon-check"
+                    :disabled="applyDisabled"
+                    :class="{ 'apply-btn-disabled-soft': applyDisabled }"
+                    @click="submit"
                 >
-                <div class="card-img" @click.stop="selectedHeaderId = item.id">
-<div v-html="item.htmlHeader+item.htmlFooter" style="zoom: 0.15;pointer-events: none; user-select: none;"></div>
-                </div>
-                 
-                  <p class="card-title"><span>{{ index+1 }}. </span>{{ item.name }}</p>
-                  <p 
-                    class="card-desc"
-                    :class="{ expanded: expandedHeaderId === item.id }"
-                    @click.stop="toggleDesc(item.id)"
-                  >
-                    {{ item.description }}
-                  </p>
-                </div>
-              </div>
-            </el-tab-pane>
-  
-            <el-tab-pane label="2.Choose Template" name="content">
-              <div style="margin-bottom: 15px; padding: 0 5px;">
-    <p style="font-size: 12px; color: #999; margin-bottom: 5px;">Journal:</p>
-    <el-select 
-      v-model="selectedJournalId" 
-      placeholder="All Journals" 
-      clearable 
-      size="small" 
-      style="width: 100%"
-      @change="handleJournalChange"
-    >
-      <el-option
-        v-for="item in journalOptions"
-        :key="item.id"
-        :label="item.label"
-        :value="item.id"
-      />
-    </el-select>
-  </div>
-              <div
-                class="card-grid"
-                v-loading="contentLoading"
-              >
-                <div 
-                  v-for="(item,index) in contentTemplates" :key="item.id"
-                  :class="['card-item', { active: selectedContentId === item.id }]"
-                  @click="selectedContentId = item.id"
-                >
-               
-                  <p class="card-title" style="text-align: left;margin-top: 0;"><span>{{ index+1 }}. </span>{{ item.name }}<br><span style="color:#888 ;">{{ item.subject }}</span></p>
-                </div>
-              </div>
-            </el-tab-pane>
-          </el-tabs>
+                    Apply Template
+                </el-button>
+            </div>
         </div>
-  
-        <div class="preview-panel">
-          <div class="preview-label">LIVE PREVIEW</div>
-          <div class="preview-container">
-            <div class="mail-render-box" v-html="combinedHtml"></div>
-          </div>
-        </div>
-      </div>
-  
-      <div slot="footer" class="dialog-footer">
-        <div class="footer-info">
-          Selected: <strong>{{ currentSelectionText }}</strong>
-        </div>
-        <div>
-          <el-button @click="handleClose" style="">Cancel</el-button>
-        <el-button type="primary" icon="el-icon-check" @click="submit">Apply Template</el-button>
-        </div>
-        
-      </div>
     </el-dialog>
-  </template>
-  
-  <script>
-  export default {
+</template>
+
+<script>
+export default {
     props: {
-      visible: Boolean
+        visible: Boolean,
+        // 非发送邮件页面可由父组件显式传入期刊 ID；发送邮件页不传则自动读取本地缓存
+        journalId: { type: [String, Number], default: '' },
+        // 可选：由父组件传入期刊名称，避免单期刊场景显示为 journal_id
+        journalLabel: { type: String, default: '' },
+        // 可选：打开时回显的风格/模板
+        initialStyleId: { type: [String, Number], default: '' },
+        initialTemplateId: { type: [String, Number], default: '' },
+        // 可选：来源页面标识，用于回跳时决定 mailboxMouldDetail 返回到哪里
+        // 例如：'autoPromotion'：返回自动化推广；默认返回邮件模版列表
+        returnSource: { type: String, default: '' }
     },
     data() {
-      return {
-        activeStep: 'style',
-        // 期刊过滤
-        journalOptions: [],
-        selectedJournalId: null,
-        selectedHeaderId: null,
-        selectedContentId: null,
-        expandedHeaderId: null,
-        // 头部样式列表（通过接口获取）
-      headerStyles: [],
-      contentTemplates: [],
-      contentLoading: false
-      };
+        return {
+            activeStep: 'content',
+            // 期刊过滤
+            journalOptions: [],
+            selectedJournalId: null,
+            selectedHeaderId: null,
+            selectedContentId: null,
+            expandedHeaderId: null,
+            // 头部样式列表（通过接口获取）
+            headerStyles: [],
+            contentTemplates: [],
+            contentLoading: false,
+            // 右侧预览整体加载态：等风格/模版接口都返回后再展示“无数据提示”
+            initLoading: false
+        };
+    },
+    watch: {
+        // 父组件动态切换期刊时，弹窗内同步刷新（不依赖地址栏）
+        journalId: {
+            handler(val) {
+                if (val == null || val === '') return;
+                const next = String(val);
+                if (String(this.selectedJournalId) === next) return;
+                // 不依赖期刊列表：直接切换期刊并刷新样式/模板
+                this.selectedJournalId = Number(next);
+                if (!Array.isArray(this.journalOptions) || !this.journalOptions.some((j) => String(j.id) === next)) {
+                    const label = this.journalLabel ? this.journalLabel : next;
+                    this.journalOptions = [{ id: this.selectedJournalId, label: label }];
+                }
+                this.handleJournalChange();
+            },
+            immediate: false
+        },
+        visible(val) {
+            if (val) this.applyInitialSelection();
+        }
     },
     created() {
-      this.fetchJournals();
-      this.fetchHeaderStyles();
-      
+        // 初始化：优先父组件传入 journalId，其次本地缓存（发送邮件页），最后默认第一本期刊
+        if (this.journalId != null && this.journalId !== '') {
+            this.initForSingleJournal();
+        } else {
+            this.fetchJournals();
+        }
     },
     computed: {
-      // 【关键】拼接 HTML
-      combinedHtml() {
-        const header = this.headerStyles.find(h => h.id === this.selectedHeaderId);
-        const content = this.contentTemplates.find(c => c.id === this.selectedContentId);
-        
-        // 没有可用模板时，右侧显示提示文案（走国际化）
-        if (!header || !content) {
-          const msg = this.$t('mailTemplate.noTemplateTip');
-          return `<div style="padding: 40px; text-align: center; color: #999; font-size: 14px;">
-            ${msg}
-          </div>`;
+        applyDisabled() {
+            return this.initLoading || this.contentLoading || !this.selectedHeaderId || !this.selectedContentId;
+        },
+        hasValidPreview() {
+            const header = this.headerStyles.find((h) => h.id === this.selectedHeaderId);
+            const content = this.contentTemplates.find((c) => c.id === this.selectedContentId);
+            return !!(header && content);
+        },
+        // 【关键】拼接 HTML
+        combinedHtml() {
+            if (this.initLoading) return '';
+            if (!this.hasValidPreview) return '';
+            const header = this.headerStyles.find((h) => h.id === this.selectedHeaderId);
+            const content = this.contentTemplates.find((c) => c.id === this.selectedContentId);
+            return `${header.htmlHeader}${content.bodyHtml}${header.htmlFooter}`;
+        },
+        currentSelectionText() {
+            const h = this.headerStyles.find((h) => h.id === this.selectedHeaderId);
+            const c = this.contentTemplates.find((c) => c.id === this.selectedContentId);
+            return `${c ? c.name : ''} + ${h ? h.name : ''}`;
+        },
+        currentJournalLabel() {
+            const j = (this.journalOptions || []).find((item) => String(item.id) === String(this.selectedJournalId));
+            return j ? j.label : '-';
+        },
+        dialogTitle() {
+            return `Template Selection - ${this.currentJournalLabel}`;
         }
-  
-        // 返回完整的拼接代码，使用内联样式以兼容邮件
-        return `${header.htmlHeader}${content.bodyHtml}${header.htmlFooter}`;
-      },
-      currentSelectionText() {
-        const h = this.headerStyles.find(h => h.id === this.selectedHeaderId);
-        const c = this.contentTemplates.find(c => c.id === this.selectedContentId);
-        return `${h ? h.name : ''} + ${c ? c.name : ''}`;
-      }
     },
     methods: {
-      // 获取期刊列表用于过滤模板
-      async fetchJournals() {
-        try {
-          const res = await this.$api.post('api/Journal/getAllJournal', {});
-          if (!res || res.code !== 0) {
-            return;
-          }
-          this.journalOptions = res.data.journals.map(j => ({
-            id: j.journal_id,
-            label:j.title,
-          }));
-          if (this.journalOptions.length && !this.selectedJournalId) {
-            this.selectedJournalId = this.journalOptions[0].id;
-       
-            this.fetchContentTemplates();
-          }
-        } catch (e) {
-          // 静默失败
-        }
-      },
-      toggleDesc(id) {
-        this.expandedHeaderId = this.expandedHeaderId === id ? null : id;
-      },
-   async   handleJournalChange() {
-        // 切换期刊时重新拉取样式和模板（按需可改为带 journal_id 过滤）
-    this.contentTemplates=[]
-       await this.fetchContentTemplates();
-        if (this.contentTemplates.length) {
-            this.selectedContentId = this.contentTemplates[0].id;
-          }
-      },
-      // 调用接口获取头部样式列表
-      async fetchHeaderStyles() {
-        try {
-          const res = await this.$api.post('api/mail_template/listStyles', {
-            journal_id: this.selectedJournalId
-          });
-          if (!res || res.code !== 0 ) {
-            return;
-          }
+        async refreshTemplatesAndStyles() {
+            if (!this.selectedJournalId) return;
+            this.initLoading = true;
+            try {
+                // 清空后重新拉取，避免接口数据变更后列表仍展示旧内容
+                this.headerStyles = [];
+                this.contentTemplates = [];
+                this.selectedHeaderId = null;
+                this.selectedContentId = null;
 
-          // 后端返回字段：style_id, name, header_html, footer_html
-        
-          this.headerStyles = res.data.list.map(item => ({
-            id: item.style_id,
-            name: item.name,
-            description:item.description || '',
-            htmlHeader: item.header_html || '',
-            htmlFooter: item.footer_html || ''
-          }));
-          console.log("🚀 ~ headerStyles:", this.headerStyles);
-          // 默认选中第一条
-          if (this.headerStyles.length && !this.selectedHeaderId) {
-            this.selectedHeaderId = this.headerStyles[0].id;
-          }
-        } catch (e) {
-          // 静默失败，避免打断用户流程
-        }
-      },
-      // 调用接口获取内容模板列表
-      async fetchContentTemplates() {
-        try {
-      this.contentLoading = true;
-          const res = await this.$api.post('api/mail_template/listTemplates', {
-            journal_id: this.selectedJournalId
-          });
-          if (!res || res.code !== 0 ) {
-            return;
-          }
+                await this.fetchHeaderStyles();
+                await this.fetchContentTemplates();
 
-          // 后端返回字段：template_id, title, body_html 等
-          this.contentTemplates = res.data.list.map(item => ({
-            id: item.template_id,
-            name: item.title,
-            subject: item.subject,
-            bodyHtml: item.body_html || ''
-          }));
+                // 优先按父组件传入的初始 id 回填；如果找不到就使用默认第一条
+                this.applyInitialSelection();
+            } finally {
+                this.initLoading = false;
+            }
+        },
+        async initForSingleJournal() {
+            const idStr = this.journalId != null ? String(this.journalId) : '';
+            if (!idStr) return;
 
-          // 默认选中第一条
-          if (this.contentTemplates.length && !this.selectedContentId) {
-            this.selectedContentId = this.contentTemplates[0].id;
-          }
-        } catch (e) {
-          // 静默失败
-    } finally {
-      this.contentLoading = false;
+            this.initLoading = true;
+            try {
+                this.selectedJournalId = Number(idStr);
+                // 单期刊场景：不需要拉取期刊列表
+                const label = this.journalLabel ? this.journalLabel : idStr;
+                this.journalOptions = [{ id: this.selectedJournalId, label: label }];
+
+                await this.fetchHeaderStyles();
+                await this.fetchContentTemplates();
+                this.applyInitialSelection();
+            } finally {
+                this.initLoading = false;
+            }
+        },
+        // 获取期刊列表用于过滤模板
+        async fetchJournals() {
+            this.initLoading = true;
+            try {
+                const res = await this.$api.post('api/Journal/getAllJournal', {});
+                if (!res || res.code !== 0) {
+                    return;
+                }
+                this.journalOptions = res.data.journals.map((j) => ({
+                    id: j.journal_id,
+                    label: j.title
+                }));
+
+                if (this.journalOptions.length) {
+                    // 选择期刊优先级：父组件传入 > 本地缓存 > 第一条
+                    const propJournalId = this.journalId != null && this.journalId !== '' ? String(this.journalId) : '';
+                    const storedJournalId = localStorage.getItem('mailboxCollect_journal_id') || '';
+
+                    const hasProp = propJournalId && this.journalOptions.some((j) => String(j.id) === propJournalId);
+                    const hasStored = storedJournalId && this.journalOptions.some((j) => String(j.id) === String(storedJournalId));
+
+                    this.selectedJournalId = hasProp
+                        ? Number(propJournalId)
+                        : hasStored
+                        ? Number(storedJournalId)
+                        : this.journalOptions[0].id;
+
+                    // 根据选中的期刊加载风格与模板
+                    await this.fetchHeaderStyles();
+                    await this.fetchContentTemplates();
+                    this.applyInitialSelection();
+                }
+            } catch (e) {
+                // 静默失败
+            } finally {
+                this.initLoading = false;
+            }
+        },
+        toggleDesc(id) {
+            this.expandedHeaderId = this.expandedHeaderId === id ? null : id;
+        },
+        async handleJournalChange() {
+            // 切换期刊时重新拉取样式和模板
+            this.contentTemplates = [];
+            this.selectedContentId = null;
+            this.initLoading = true;
+            try {
+                await this.fetchHeaderStyles();
+                await this.fetchContentTemplates();
+                this.applyInitialSelection();
+                if (this.contentTemplates.length && !this.selectedContentId) {
+                    this.selectedContentId = this.contentTemplates[0].id;
+                }
+            } finally {
+                this.initLoading = false;
+            }
+        },
+        // 调用接口获取头部样式列表
+        async fetchHeaderStyles() {
+            try {
+                const res = await this.$api.post('api/mail_template/listStyles', {
+                    journal_id: this.selectedJournalId
+                });
+                if (!res || res.code !== 0) {
+                    return;
+                }
+
+                // 后端返回字段：style_id, name, header_html, footer_html
+
+                this.headerStyles = res.data.list.map((item) => ({
+                    id: item.style_id,
+                    name: item.name,
+                    description: item.description || '',
+                    htmlHeader: item.header_html || '',
+                    htmlFooter: item.footer_html || ''
+                }));
+               
+                // 默认选中第一条
+                if (this.headerStyles.length && !this.selectedHeaderId) {
+                    this.selectedHeaderId = this.headerStyles[0].id;
+                }
+            } catch (e) {
+                // 静默失败，避免打断用户流程
+            }
+        },
+        // 调用接口获取内容模板列表
+        async fetchContentTemplates() {
+            try {
+                this.contentLoading = true;
+                const res = await this.$api.post('api/mail_template/listTemplates', {
+                    journal_id: this.selectedJournalId
+                });
+                if (!res || res.code !== 0) {
+                    return;
+                }
+
+                // 后端返回字段：template_id, title, body_html 等
+                this.contentTemplates = res.data.list.map((item) => ({
+                    id: item.template_id,
+                    name: item.title,
+                    subject: item.subject,
+                    bodyHtml: item.body_html || ''
+                }));
+
+                // 默认选中第一条
+                if (this.contentTemplates.length && !this.selectedContentId) {
+                    this.selectedContentId = this.contentTemplates[0].id;
+                }
+            } catch (e) {
+                // 静默失败
+            } finally {
+                this.contentLoading = false;
+            }
+        },
+        applyInitialSelection() {
+            const initStyle = this.initialStyleId != null && this.initialStyleId !== '' ? String(this.initialStyleId) : '';
+            const initTpl = this.initialTemplateId != null && this.initialTemplateId !== '' ? String(this.initialTemplateId) : '';
+
+            if (initStyle && Array.isArray(this.headerStyles)) {
+                const matchedStyle = this.headerStyles.find((h) => String(h.id) === initStyle);
+                if (matchedStyle) this.selectedHeaderId = matchedStyle.id;
+            }
+            if (initTpl && Array.isArray(this.contentTemplates)) {
+                const matchedTpl = this.contentTemplates.find((t) => String(t.id) === initTpl);
+                if (matchedTpl) this.selectedContentId = matchedTpl.id;
+            }
+        },
+        goToMailTemplateList() {
+            // 点击“去新增模板”时：除了关闭自身弹窗，还通知父级关闭其它弹窗，避免路由跳转时卡顿
+            this.$emit('close-all-dialogs');
+            this.handleClose();
+            this.$nextTick(() => {
+                const journalId =
+                    this.selectedJournalId != null && this.selectedJournalId !== ''
+                        ? String(this.selectedJournalId)
+                        : this.journalId != null && this.journalId !== ''
+                        ? String(this.journalId)
+                        : '';
+                this.$router.push({
+                    path: '/mailboxMouldDetail',
+                    query: Object.assign(
+                        {},
+                        journalId ? { journal_id: journalId } : {},
+                        this.returnSource === 'autoPromotion' ? { from_auto_promotion: '1' } : {}
+                    ),
+                });
+            });
+        },
+        handleClose() {
+            this.$emit('update:visible', false);
+        },
+        submit() {
+            if (this.applyDisabled) return;
+            // 将拼接好的 HTML 及选择信息抛给父组件（兼容：父组件也可只用 html）
+            const header = this.headerStyles.find((h) => h.id === this.selectedHeaderId);
+            const content = this.contentTemplates.find((c) => c.id === this.selectedContentId);
+            this.$emit('confirm', {
+                html: this.combinedHtml,
+                journal_id: this.selectedJournalId,
+                style_id: this.selectedHeaderId,
+                template_id: this.selectedContentId,
+                style: header || null,
+                template: content || null
+            });
+            this.handleClose();
         }
-      },
-      handleClose() {
-        this.$emit('update:visible', false);
-      },
-      submit() {
-        // 将拼接好的 HTML 抛给父组件
-        this.$emit('confirm', this.combinedHtml);
-        this.handleClose();
-      }
     }
-  };
-  </script>
-  
-  <style scoped>
-  .template-wrapper { display: flex; height: 70vh; gap: 20px; }
-  .selection-panel { width: 260px; border-right: 1px solid #eee; padding-right: 10px; overflow-y: auto; }
-  .journal-filter-form { padding-right: 8px; }
-  .preview-panel { flex: 1; background: #f4f6f8; padding: 20px; display: flex; flex-direction: column; }
-  .preview-label { font-weight: bold; color: #999; font-size: 12px; margin-bottom: 10px; }
-  .preview-container { background: #fff; flex: 1; border-radius: 4px; overflow-y: auto; box-shadow: 0 4px 12px rgba(0,0,0,0.05); }
-  
-  .card-grid { display: flex; flex-direction: column; gap: 12px; margin-top: 15px; }
-  .card-item { border: 1px solid #ddd; border-radius: 8px; padding: 8px; cursor: pointer; transition: 0.3s; }
-  .card-item.active { border-color: #6366f1; background: #f5f7ff; outline: 1px solid #6366f1; }
-  .card-img { width: 100%; height: auto; border-radius: 4px; }
-  .card-title { font-size: 13px; margin: 8px 0 0; text-align: center; color: #666; }
+};
+</script>
+
+<style scoped>
+.template-wrapper {
+    display: flex;
+    height: 70vh;
+    gap: 20px;
+}
+.selection-panel {
+    width: 260px;
+    border-right: 1px solid #eee;
+    padding-right: 10px;
+    overflow-y: auto;
+    position: relative;
+}
+.selection-header {
+    position: absolute;
+    top: 8px;
+    right: 8px;
+    padding: 0;
+    display: flex;
+    justify-content: flex-end;
+    z-index: 2;
+}
+.journal-filter-form {
+    padding-right: 8px;
+}
+.preview-panel {
+    flex: 1;
+    background: #f4f6f8;
+    padding: 20px;
+    display: flex;
+    flex-direction: column;
+}
+.preview-label {
+    font-weight: bold;
+    color: #999;
+    font-size: 12px;
+}
+.preview-head {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-bottom: 10px;
+}
+.selected-info-inline {
+    color: #666;
+    font-size: 12px;
+    white-space: nowrap;
+}
+.preview-container {
+    background: #fff;
+    flex: 1;
+    border-radius: 4px;
+    overflow-y: auto;
+    box-shadow: 0 4px 12px rgba(0, 0, 0, 0.05);
+}
+
+.preview-empty-state {
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    padding: 40px 20px;
+    color: #999;
+    text-align: center;
+}
+
+.preview-empty-text {
+    font-size: 14px;
+    line-height: 1.6;
+    margin-bottom: 14px;
+}
+
+.preview-empty-btn {
+    margin-top: 0;
+}
+
+.card-grid {
+    display: flex;
+    flex-direction: column;
+    gap: 12px;
+    margin-top: 15px;
+}
+.card-item {
+    border: 1px solid #ddd;
+    border-radius: 8px;
+    padding: 8px;
+    cursor: pointer;
+    transition: 0.3s;
+}
+.card-item.active {
+    border-color: #6366f1;
+    background: #f5f7ff;
+    outline: 1px solid #6366f1;
+}
+.card-img {
+    width: 100%;
+    height: auto;
+    border-radius: 4px;
+}
+.card-title {
+    font-size: 13px;
+    margin: 8px 0 0;
+    text-align: center;
+    color: #666;
+}
 .card-desc {
-  font-size: 12px;
-  color: #888;
-  margin-top: 4px;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  cursor: pointer;
+    font-size: 12px;
+    color: #888;
+    margin-top: 4px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    cursor: pointer;
 }
 .card-desc.expanded {
-  white-space: normal;
-  overflow: visible;
+    white-space: normal;
+    overflow: visible;
 }
-  
-  .dialog-footer { display: flex; justify-content: space-between; align-items: center; width: 100%; }
-  .footer-info { color: #666; font-size: 14px; }
-  </style>
\ No newline at end of file
+
+.dialog-footer {
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+    width: 100%;
+}
+
+/* 加载中/未选择时：按钮禁用且浅蓝色 */
+.apply-btn-disabled-soft.is-disabled {
+    background-color: #d9ecff !important;
+    border-color: #d9ecff !important;
+    color: #8fbef5 !important;
+}
+</style>
diff --git a/src/components/page/expertDatabase.vue b/src/components/page/expertDatabase.vue
index 94d38eb..f134573 100644
--- a/src/components/page/expertDatabase.vue
+++ b/src/components/page/expertDatabase.vue
@@ -3,7 +3,7 @@
         <div class="crumbs">
             <el-breadcrumb separator="/">
                 <el-breadcrumb-item>
-                    <i class="el-icon-user"></i> Expert Database
+                    <i class="el-icon-user"></i> {{ $t('sidebar.expertDatabase') }}
                 </el-breadcrumb-item>
             </el-breadcrumb>
         </div>
@@ -15,7 +15,7 @@
                             ref="cascader"
                             @change="handleChange"
                             v-model="major_id"
-                            :placeholder="'Please select field'"
+                            :placeholder="$t('expertDatabase.fieldSelectPlaceholder')"
                             :options="options"
                             :props="getProps()"
                             style="width: 260px"
@@ -24,7 +24,7 @@
                     <el-form-item label="">
                         <el-input
                             v-model="query.keyword"
-                            placeholder="Name / Email / Affiliation"
+                            :placeholder="$t('expertDatabase.keywordPlaceholder')"
                             clearable
                             style="width: 260px"
                         />
@@ -32,32 +32,33 @@
 
                     <el-form-item>
                         <el-button type="primary" icon="el-icon-search" :loading="loading" @click="handleSearch">
-                            Search
+                            {{ $t('expertDatabase.searchBtn') }}
                         </el-button>
-                        <el-button @click="handleReset">Reset</el-button>
+                        <el-button @click="handleReset">{{ $t('expertDatabase.resetBtn') }}</el-button>
                     </el-form-item>
                 </el-form>
             </div>
             <div class="actions">
                 <el-button type="success" icon="el-icon-download" @click="handleExport" :loading="exportLoading">
-                    Download Excel
+                    {{ $t('expertDatabase.downloadExcelBtn') }}
                 </el-button>
             </div>
         </div>
 
         <el-card class="table-card" shadow="never">
             <el-table :data="list" border stripe v-loading="loading" header-row-class-name="dark-table-header">
-                <el-table-column prop="name" label="Base Information" min-width="220">
+                <el-table-column type="index" :label="$t('expertDatabase.table.no')" width="70" align="center"></el-table-column>
+                <el-table-column prop="name" :label="$t('expertDatabase.columns.baseInfo')" min-width="220">
                     <template slot-scope="scope">
                         <div>
                             <p class="info-row">
-                                <span class="label">Name: </span><span class="value bold">{{ scope.row.name }}</span>
+                                <span class="label">{{ $t('expertDatabase.fields.nameLabel') }}</span><span class="value bold">{{ scope.row.name }}</span>
                             </p>
                             <p class="info-row">
-                                <span class="label">Email: </span><span class="value link">{{ scope.row.email }}</span>
+                                <span class="label">{{ $t('expertDatabase.fields.emailLabel') }}</span><span class="value link">{{ scope.row.email }}</span>
                             </p>
                             <p class="info-row" style="margin-top: 10px; font-size: 12px">
-                                <span class="label">Acquisition Time:</span>
+                                <span class="label">{{ $t('expertDatabase.fields.acquisitionTimeLabel') }}</span>
                                 <span class="value time">{{ scope.row.ctime_text ? scope.row.ctime_text : '-' }}</span>
                             </p>
 
@@ -66,8 +67,8 @@
                     </template>
                 </el-table-column>
 
-                <el-table-column prop="affiliation" label="Affiliation" min-width="260" />
-                <el-table-column prop="fieldDisplay" label="Research areas" min-width="200">
+                <el-table-column prop="affiliation" :label="$t('expertDatabase.columns.affiliation')" min-width="260" />
+                <el-table-column prop="fieldDisplay" :label="$t('expertDatabase.columns.researchAreas')" min-width="200">
                     <template slot-scope="scope">
                         <div v-for="(field, index) in scope.row.fields" :key="index">
                             <span>
@@ -217,7 +218,7 @@ export default {
         },
         async handleExport() {
             if (!this.query.major_id && !this.query.keyword) {
-                this.$message.warning('Please select a research area or enter a keyword before exporting.');
+                this.$message.warning(this.$t('expertDatabase.exportWarn'));
                 return;
             }
             this.exportLoading = true;
@@ -230,10 +231,10 @@ export default {
                 if (res && res.code === 0 && res.data && res.data.file_url) {
                     window.open(this.mediaUrl + res.data.file_url, '_blank');
                 } else {
-                    this.$message.error(res.msg || 'Export failed');
+                    this.$message.error(res.msg || this.$t('expertDatabase.exportFailed'));
                 }
             } catch (e) {
-                this.$message.error(e.msg || 'Export failed');
+                this.$message.error(e.msg || this.$t('expertDatabase.exportFailed'));
             } finally {
                 this.exportLoading = false;
             }
diff --git a/src/components/page/mailboxCollect.vue b/src/components/page/mailboxCollect.vue
index 9943eca..2bec5b4 100644
--- a/src/components/page/mailboxCollect.vue
+++ b/src/components/page/mailboxCollect.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="mail-container">
     <div class="mail-sidebar">
-      <div class="p-10" style="padding-left: 0px;padding-right: 0px;">
+      <div class="p-10">
         <div class="sidebar-top-actions">
           <el-button type="primary" icon="el-icon-plus" class="write-btn" @click="handleWrite">
             {{ $t('mailboxCollect.writeBtn')  }}
@@ -51,7 +51,13 @@
         <el-button icon="el-icon-refresh" circle :loading="syncLoading" @click="handleSyncInbox" style="margin-left: 10px;"></el-button> 
       </div> -->
 
-      <div ref="listScrollArea" class="list-scroll-area" @scroll="onListScroll">
+      <div
+        ref="listScrollArea"
+        class="list-scroll-area"
+        @scroll="onListScroll"
+        v-loading="inboxLoading"
+        :element-loading-text="$t('mailboxCollect.loading')"
+      >
         <template v-if="displayList.length > 0">
           <div 
             v-for="item in displayList" 
@@ -137,11 +143,10 @@
       <el-table :data="accountList" v-loading="accountLoading" size="small">
         <el-table-column prop="smtp_user" :label="$t('mailboxCollect.accountColumn')" />
         <el-table-column prop="smtp_from_name" :label="$t('mailboxCollect.nameColumn')" />
-        <el-table-column :label="$t('mailboxCollect.operation')" width="100">
+        <el-table-column :label="$t('mailboxCollect.operation')" width="140">
           <template slot-scope="scope">
-            <el-button type="primary" size="mini" @click="chooseAccount(scope.row)">
-              {{ $t('mailboxCollect.useBtn')  }}
-            </el-button>
+            <span v-if="isCurrentAccount(scope.row)" class="current-account-text">{{ $t('mailboxCollect.currentAccountText') }}</span>
+            <el-button v-else type="primary" size="mini" @click="chooseAccount(scope.row)">{{ $t('mailboxCollect.switchColumn') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -156,7 +161,7 @@ const API = {
   syncInbox: 'api/email_client/syncInbox',
   getAccounts: 'api/email_client/getAccounts',
   getOneEmail: 'api/email_client/getOneEmail',
-  getAllJournal: 'api/Journal/getAllJournal',
+  getAllJournal: 'api/Article/getJournal',
 };
 import MailDetail from '../../components/page/components/email/MailDetail.vue';
 export default {
@@ -175,6 +180,7 @@ export default {
       inboxTotalPages: 1,
       inboxTotal: 0,
       inboxLoadingMore: false,
+      inboxLoading: false,
       listWidth: 350,
       minWidth: 260,
       maxWidth: 600,
@@ -198,6 +204,7 @@ export default {
     }
   },
   created() {
+    this.loadJournals();
     this.initAccountSelection();
   },
   methods: {
@@ -248,51 +255,32 @@ export default {
       // 3. 都没有则弹出选择账号弹窗
       this.openAccountDialog();
     },
-    loadDefaultAccount() {
-      this.$api.post(API.getAllJournal, {}).then(res => {
-        const journals = (res && res.data && res.data.journals) || res.data || [];
-        const list = (Array.isArray(journals) ? journals : []).map(i => ({
-          journal_id: i.journal_id || i.id,
-          title: i.title || i.name || ''
-        }));
-        this.journalList = list;
-        if (!list.length) {
-          this.openAccountDialog();
-          return;
-        }
-        const firstJournalId = list[0].journal_id;
-        this.accountJournalId = firstJournalId;
-        this.accountLoading = true;
-        this.$api.post(API.getAccounts, { journal_id: firstJournalId }).then(accRes => {
-          this.accountLoading = false;
-          const accounts = accRes && accRes.data ? accRes.data : [];
-          if (Array.isArray(accounts) && accounts.length > 0) {
-            this.selectedAccount = accounts[0];
+    loadAccountById(jEmailId) {
+      this.$api
+        .post(API.getOneEmail, { j_email_id: jEmailId })
+        .then(res => {
+          const email = res && res.data ? res.data.email : null;
+          if (res && res.code === 0 && email) {
+            this.selectedAccount = email;
             this.fetchData();
-          } else {
-            this.accountList = accounts || [];
-            this.openAccountDialog();
+            return;
           }
-        }).catch(() => {
-          this.accountLoading = false;
+          // 接口返回 null/非 0：回退到选择账号弹窗
+          this.selectedAccount = null;
+          this.openAccountDialog();
+        })
+        .catch(() => {
+          // 请求失败：同样回退到选择账号弹窗
+          this.selectedAccount = null;
           this.openAccountDialog();
         });
-      }).catch(() => {
-        this.openAccountDialog();
-      });
-    },
-    loadAccountById(jEmailId) {
-      this.$api.post(API.getOneEmail, { j_email_id: jEmailId }).then(res => {
-        const email = res.data.email;
-        if (res.code === 0 && email) {
-          this.selectedAccount = email;
-          this.fetchData();
-        }
-      }).catch(() => {});
     },
     openAccountDialog() {
       this.accountDialogVisible = true;
-      this.loadJournals();
+      // 期刊列表进入页面时已加载；仅在首次为空时补拉，避免每次切换账号都请求
+      if (!this.journalList || this.journalList.length === 0) {
+        this.loadJournals();
+      }
       if (this.selectedAccount && this.selectedAccount.journal_id) {
         this.accountJournalId = this.selectedAccount.journal_id;
         this.loadAccountsForJournal(this.selectedAccount.journal_id);
@@ -301,9 +289,9 @@ export default {
     loadJournals() {
       this.journalLoading = true;
       this.$api
-        .post(API.getAllJournal, {})
+        .post(API.getAllJournal, {username: localStorage.getItem('U_name')})
         .then(res => {
-          this.journalList = (res.data.journals || res.data || []).map(i => ({
+          this.journalList = (res || []).map(i => ({
             journal_id: i.journal_id || i.id,
             title: i.title || i.name || ''
           }));
@@ -323,6 +311,10 @@ export default {
         this.accountList = res.data || [];
       });
     },
+    isCurrentAccount(row) {
+      if (!row || !this.selectedAccount) return false;
+      return String(row.j_email_id || '') === String(this.selectedAccount.j_email_id || '');
+    },
     chooseAccount(row) {
       this.selectedAccount = row;
       this.accountDialogVisible = false;
@@ -354,6 +346,10 @@ export default {
       const isFirstPage = page === 1 || page == null;
       if (isFirstPage) {
         this.inboxPage = 1;
+        // 首次拉取：显示加载中
+        this.inboxLoading = true;
+        // 避免复用旧列表造成“先空后满”的闪烁
+        this.tableData_in = [];
       }
       const params = {
         j_email_id: this.selectedAccount.j_email_id,
@@ -390,8 +386,10 @@ export default {
         this.inboxTotal = data.total != null ? Number(data.total) : this.tableData_in.length;
         this.queryIn.num = this.inboxTotal;
         this.inboxLoadingMore = false;
+        if (isFirstPage) this.inboxLoading = false;
       }).catch(() => {
         this.inboxLoadingMore = false;
+        if (isFirstPage) this.inboxLoading = false;
       });
     },
     switchFolder(f) { this.currentFolder = f; this.activeMailId = null; },
@@ -447,9 +445,8 @@ export default {
   
   // 提取日期信息用于比较
   const dateYear = date.getFullYear();
-  const dateMonth = date.getMonth() + 1;
-  const dateDay = date.getDate();
   const nowYear = now.getFullYear();
+  const lang = localStorage.getItem('langs') === 'zh' ? 'zh-CN' : 'en-US';
   
   // 获取昨天日期
   const yesterday = new Date(now);
@@ -469,15 +466,17 @@ export default {
 
   // 2. 如果是昨天：只显示 "昨天"
   if (date.toDateString() === yesterday.toDateString()) {
-    return '昨天';
+    return this.$t('mailboxCollect.yesterday');
   }
 
-  // 3. 如果是今年（非今天/昨天）：显示 "月-日"，如 "3月8日"
+  // 3. 如果是今年（非今天/昨天）：按语言显示月日
   if (dateYear === nowYear) {
-    return `${dateMonth}月${dateDay}日`;
+    return new Intl.DateTimeFormat(lang, { month: 'short', day: 'numeric' }).format(date);
   }
 
   // 4. 如果是往年：显示完整年月日，如 "2025-12-05"
+  const dateMonth = date.getMonth() + 1;
+  const dateDay = date.getDate();
   const fullMonth = dateMonth.toString().padStart(2, '0');
   const fullDay = dateDay.toString().padStart(2, '0');
   return `${dateYear}-${fullMonth}-${fullDay}`;
@@ -486,10 +485,7 @@ export default {
     handleWrite() {
       if (!this.selectedAccount) return;
       this.$router.push(
-        '/mailboxSend?journal_id=' +
-          this.selectedAccount.journal_id +
-          '&j_email_id=' +
-          this.selectedAccount.j_email_id
+        '/mailboxSend'
       );
     },
     handleSearch() { this.fetchData(1); },
@@ -502,7 +498,7 @@ export default {
         this.fetchData(this.inboxPage + 1);
       }
     },
-    notImplemented() { this.$message.info('开发中...'); }
+    notImplemented() { this.$message.info(this.$t('mailboxCollect.featureDev')); }
   }
 };
 </script>
@@ -517,7 +513,7 @@ export default {
 
 /* 1. 左侧栏 */
 .mail-sidebar {
-  width: 220px;
+  width: 240px;
   background-color: #f8f9fa;
   border-right: 1px solid #eaeaea;
   flex-shrink: 0;
@@ -526,9 +522,9 @@ export default {
 }
 .p-10 { padding: 10px; }
 .p-20 { padding: 20px; }
-.sidebar-top-actions { display: flex; gap: 10px; }
-.write-btn { flex: 1; width: auto; border-radius: 8px; font-weight: bold;padding-left: 0px;padding-right: 0px; }
-.receive-btn { flex: 1; width: auto; border-radius: 8px; font-weight: bold;margin-left: 0px;padding-left: 0px;padding-right: 0px; }
+.sidebar-top-actions { display: flex; gap: 10px; padding: 0 6px; }
+.write-btn { flex: 1; width: auto; border-radius: 8px; font-weight: bold; padding-left: 10px; padding-right: 10px; }
+.receive-btn { flex: 1; width: auto; border-radius: 8px; font-weight: bold; margin-left: 0px; padding-left: 10px; padding-right: 10px; }
 .folder-list { list-style: none; padding: 0; margin: 0; flex: 1; }
 .folder-list li {
   padding: 12px 20px;
@@ -538,7 +534,7 @@ export default {
   align-items: center;
 }
 .folder-list li i { margin-right: 12px; font-size: 18px; }
-.folder-list li.active { background: #edeef0; color: #006699; font-weight: bold; border-right: 3px solid #006699; }
+.folder-list li.active { background: #edeef0; color: #006699; font-weight: bold; border-left: 3px solid #006699; }
 .badge { margin-left: auto; background: #ddd; padding: 2px 8px; border-radius: 10px; font-size: 12px; }
 
 .sidebar-footer { padding: 10px 0px; border-top: 1px solid #eee; background: #f8f9fa; }
@@ -573,13 +569,15 @@ export default {
 .mail-excerpt { font-size: 12px; color: #606266; margin: 0; display: -webkit-box; -webkit-line-clamp: 2; line-clamp: 2; -webkit-box-orient: vertical; overflow: hidden; }
 .load-more-tip { text-align: center; padding: 12px; font-size: 12px; color: #909399; }
 .load-more-tip.no-more { color: #c0c4cc; }
+.current-account-text { color: #006699; font-size: 12px; }
 
 /* 拖拽条 */
 .list-resizer { width: 4px; cursor: col-resize; border-left: 1px solid #eaeaea; transition: background 0.2s; }
 .list-resizer:hover { background: #409eff; }
 
 /* 3. 右侧详情 */
-.mail-content-panel { flex: 1; display: flex; flex-direction: column; overflow: hidden; }
+.mail-content-panel { flex: 1; min-height: 0; display: flex; flex-direction: column; overflow: hidden; }
+.mail-page { flex: 1; min-height: 0; overflow-y: auto; }
 .detail-toolbar { padding: 10px 20px; border-bottom: 1px solid #eee; display: flex; justify-content: space-between; }
 .detail-content { padding: 30px 40px; overflow-y: auto; }
 .mail-title { font-size: 24px; margin-bottom: 20px; }
diff --git a/src/components/page/mailboxConfig.vue b/src/components/page/mailboxConfig.vue
index 610bec9..690ae98 100644
--- a/src/components/page/mailboxConfig.vue
+++ b/src/components/page/mailboxConfig.vue
@@ -2,8 +2,8 @@
 	<div>
 		<div class="crumbs">
 			<el-breadcrumb separator="/">
-				<el-breadcrumb-item><i class="el-icon-setting"></i> {{ $t('mailboxConfig.mailSystem') }}</el-breadcrumb-item>
-				<el-breadcrumb-item>{{ $t('mailboxConfig.title') }}</el-breadcrumb-item>
+				<el-breadcrumb-item><i class="el-icon-setting"></i> {{ $t('sidebar.promotionManagement') }}</el-breadcrumb-item>
+				<el-breadcrumb-item>{{ $t('sidebar.mailboxManagement') }}</el-breadcrumb-item>
 			</el-breadcrumb>
 		</div>
 		<div class="container">
@@ -15,13 +15,25 @@
 						</el-select>
 					</el-form-item>
 					<el-form-item>
-						<el-button type="primary" icon="el-icon-search" @click="getList">{{ $t('mailboxConfig.query') }}</el-button>
-						<el-button type="primary" icon="el-icon-plus" @click="handleAdd">{{ $t('mailboxConfig.addAccount') }}</el-button>
+						<el-button type="primary" icon="el-icon-refresh" @click="getList">{{ $t('mailboxConfig.refresh') }}</el-button>
+						<el-button type="primary" plain icon="el-icon-plus" class="add-account-btn" @click="handleAdd">
+							{{ $t('mailboxConfig.addAccount') }}
+						</el-button>
 					</el-form-item>
 				</el-form>
 			</div>
-			<el-table :data="tableData" border stripe class="table" header-cell-class-name="table-header" :empty-text="$t('mailboxConfig.noData')">
+			<el-table
+				:data="tableData"
+				border
+				stripe
+				class="table"
+				header-cell-class-name="table-header"
+				:empty-text="$t('mailboxConfig.noData')"
+				v-loading="loading"
+				:element-loading-text="$t('mailboxConfig.loading')"
+			>
 				<!-- <el-table-column prop="journal_name" :label="$t('mailboxConfig.journal')" min-width="140"></el-table-column> -->
+				<el-table-column type="index" :label="$t('mailboxConfig.no')" width="70" align="center"></el-table-column>
 				<el-table-column prop="account" :label="$t('mailboxConfig.account')" min-width="160"></el-table-column>
 				<el-table-column prop="smtp_from_name" :label="$t('mailboxConfig.smtpFromName')" min-width="120"></el-table-column>
 				<!-- <el-table-column prop="smtp_host" :label="$t('mailboxConfig.smtpHost')" min-width="120"></el-table-column> -->
@@ -45,15 +57,21 @@
 		<el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="580px" :close-on-click-modal="false">
 			<el-form ref="formRef" :model="form" :rules="rules" label-width="140px">
 				<el-form-item :label="$t('mailboxConfig.journal')" prop="journal_id">
-					<el-select v-model="form.journal_id" :placeholder="$t('mailboxConfig.selectJournal')" style="width: 100%;">
+					<el-select :disabled="form.id" v-model="form.journal_id" :placeholder="$t('mailboxConfig.selectJournal')" style="width: 100%;">
 						<el-option v-for="item in journalList" :key="item.journal_id" :label="item.title" :value="item.journal_id"></el-option>
 					</el-select>
 				</el-form-item>
 				<el-form-item :label="$t('mailboxConfig.account')" prop="account">
-					<el-input v-model="form.account" ></el-input>
+					<el-input v-model="form.account" placeholder="eg: test@tmrjournals.co.nz"></el-input>
 				</el-form-item>
 				<el-form-item :label="$t('mailboxConfig.password')" prop="password">
-					<el-input v-model="form.password" type="password"  show-password autocomplete="new-password"></el-input>
+					<el-input
+						v-model="form.password"
+						type="password"
+						show-password
+						clearable
+						autocomplete="new-password"
+					></el-input>
 					<!-- <span class="form-tip">{{ $t('mailboxConfig.passwordTip') }}</span> -->
 				</el-form-item>
 				<el-form-item :label="$t('mailboxConfig.smtpFromName')" prop="smtp_from_name">
@@ -77,7 +95,15 @@
 			</el-form>
 			<span slot="footer" class="dialog-footer">
 				<el-button @click="dialogVisible = false">{{ $t('mailboxConfig.cancel') }}</el-button>
-				<el-button type="primary" @click="submitForm">{{ $t('mailboxConfig.save') }}</el-button>
+				<el-button
+					type="primary"
+					@click="submitForm"
+					:loading="saveLoading"
+					:disabled="saveLoading"
+					:loading-text="$t('mailboxConfig.loading')"
+				>
+					{{ $t('mailboxConfig.save') }}
+				</el-button>
 			</span>
 		</el-dialog>
 	</div>
@@ -86,7 +112,7 @@
 <script>
 	// 期刊邮箱列表：POST api/email_client/getAccounts 参数 journal_id，返回 data[]: j_email_id, journal_id, smtp_host, smtp_port, smtp_user, imap_host, imap_port, daily_limit, today_sent, state, remaining_today 等
 	const API = {
-		getAllJournal: 'api/Journal/getAllJournal',
+		getAllJournal: 'api/Article/getJournal',
 		getAccounts: 'api/email_client/getAccounts',
 		addAccount: 'api/email_client/addAccount',
 		updateAccount: 'api/email_client/updateAccount',
@@ -105,6 +131,9 @@
 				tableData: [],
 				total: 0,
 				journalList: [],
+				loading: false,
+				saveLoading: false,
+				saveDebounceTimer: null,
 				dialogVisible: false,
 				dialogTitle: '',
 				form: {
@@ -145,11 +174,17 @@
 		created() {
 			this.loadJournals();
 		},
+		beforeDestroy() {
+			if (this.saveDebounceTimer) {
+				clearTimeout(this.saveDebounceTimer);
+				this.saveDebounceTimer = null;
+			}
+		},
 		methods: {
-			// 期刊下拉框：调用 api/Journal/getAllJournal 获取列表
+			// 期刊下拉框：调用 api/Article/getJournal 获取列表
 			loadJournals() {
 				var self = this;
-				this.$api.post(API.getAllJournal, {}).then(function(res) {
+				this.$api.post(API.getAllJournal, {username: localStorage.getItem('U_name')}).then(function(res) {
 					var list = [];
 					if (res && res.code === 0 && res.data) {
 						if (Array.isArray(res.data.journals)) {
@@ -194,6 +229,7 @@
 				return j ? j.title : '';
 			},
 			getList() {
+				this.loading = true;
 				var journalId = this.query.journal_id;
 				var params = {};
 				if (journalId !== 0 && journalId !== '' && journalId != null) {
@@ -231,21 +267,23 @@
 				}).catch(function() {
 					this.tableData = [];
 					this.total = 0;
-				}.bind(this));
+				}.bind(this)).finally(() => {
+					this.loading = false;
+				});
 			},
 			handleAdd() {
 				this.dialogTitle = this.$t('mailboxConfig.dialogAdd');
 				this.form = {
 					id: null,
-					journal_id: this.journalList[0] ? this.journalList[0].journal_id : null,
+					journal_id: this.query.journal_id || (this.journalList[0] ? this.journalList[0].journal_id : null),
 					account: '',
 					password: '',
 					smtp_from_name: '',
-					smtp_host: '',
-					smtp_port: '',
-					smtp_encryption: '',
-					imap_host: '',
-					imap_port: '',
+					smtp_host: 'mail.tmrjournals.co.nz',
+					smtp_port: '465',
+					smtp_encryption: 'ssl',
+					imap_host: 'mail.tmrjournals.co.nz',
+					imap_port: '993',
 				};
 				this.dialogVisible = true;
 				this.$nextTick(function() { if (this.$refs.formRef) this.$refs.formRef.clearValidate(); }.bind(this));
@@ -268,6 +306,15 @@
 				this.$nextTick(function() { if (this.$refs.formRef) this.$refs.formRef.clearValidate(); }.bind(this));
 			},
 			submitForm() {
+				// 保存防抖：连续点击只触发一次
+				if (this.saveLoading) return;
+				if (this.saveDebounceTimer) clearTimeout(this.saveDebounceTimer);
+				this.saveDebounceTimer = setTimeout(() => {
+					this.saveDebounceTimer = null;
+					this._doSubmitForm();
+				}, 600);
+			},
+			_doSubmitForm() {
 				var self = this;
 				this.$refs.formRef.validate(function(valid) {
 					if (!valid) return;
@@ -290,19 +337,27 @@
 						payload.smtp_password = String(self.form.password || '');
 					}
 
-					self.$api.post(url, payload).then(function(res) {
-						if (res && res.code === 0) {
-							self.$message.success(isEdit ? self.$t('mailboxConfig.editSuccess') : self.$t('mailboxConfig.addSuccess'));
+					self.saveLoading = true;
+					self.$api
+						.post(url, payload)
+						.then(function(res) {
+							if (res && res.code === 0) {
+								self.$message.success(isEdit ? self.$t('mailboxConfig.editSuccess') : self.$t('mailboxConfig.addSuccess'));
+								self.dialogVisible = false;
+								self.getList();
+							} else {
+								self.$message.error((res && res.msg) || (isEdit ? self.$t('mailboxConfig.editFail') : self.$t('mailboxConfig.addFail')));
+							}
+						})
+						.catch(function() {
+							// Mock fallback（保留原逻辑）
+							self.$message.success(isEdit ? self.$t('mailboxConfig.editSuccessMock') : self.$t('mailboxConfig.addSuccessMock'));
 							self.dialogVisible = false;
 							self.getList();
-						} else {
-							self.$message.error((res && res.msg) || (isEdit ? self.$t('mailboxConfig.editFail') : self.$t('mailboxConfig.addFail')));
-						}
-					}).catch(function() {
-						self.$message.success(isEdit ? self.$t('mailboxConfig.editSuccessMock') : self.$t('mailboxConfig.addSuccessMock'));
-						self.dialogVisible = false;
-						self.getList();
-					});
+						})
+						.finally(function() {
+							self.saveLoading = false;
+						});
 				});
 			},
 			handleMailManage(row) {
@@ -321,7 +376,7 @@
 			// 删除邮箱配置：接口 api/email_client/deleteAccount，传参 j_email_id
 			handleDelete(row) {
 				const self = this;
-				this.$confirm(self.$t('mailboxConfig.deleteConfirm'), self.$t('mailboxConfig.title'), {
+				this.$confirm(self.$t('mailboxConfig.deleteConfirm'), self.$t('mailboxConfig.deleteTitle'), {
 					confirmButtonText: self.$t('mailboxConfig.confirm'),
 					cancelButtonText: self.$t('mailboxConfig.cancel'),
 					type: 'warning'
@@ -345,5 +400,6 @@
 <style scoped>
 	.handle-box { margin-bottom: 16px; }
 	.filter-form { margin: 0; }
+	.add-account-btn { margin-left: 10px; }
 	.form-tip { font-size: 12px; color: #909399; margin-top: 4px; }
 </style>
diff --git a/src/components/page/mailboxMould.vue b/src/components/page/mailboxMould.vue
index 3f783f7..737528e 100644
--- a/src/components/page/mailboxMould.vue
+++ b/src/components/page/mailboxMould.vue
@@ -55,6 +55,7 @@
         </div>
 
         <el-table :data="tplTableData" border style="width: 100%; margin-top: 20px;" v-loading="tplLoading">
+          <el-table-column type="index" :label="$t('mailboxMould.no')" width="70" align="center"></el-table-column>
           <el-table-column prop="title" :label="$t('mailboxMould.colTitle')" min-width="220">
             <template slot-scope="scope">
               <div class="title-cell"><strong>{{ scope.row.title }}</strong></div>
@@ -65,7 +66,7 @@
               <span>{{ scope.row.subject || '-' }}</span>
             </template>
           </el-table-column>
-          <el-table-column prop="scene" :label="$t('mailboxMould.colScene')">
+          <el-table-column prop="scene" :label="$t('mailboxMould.colScene')"  width="160">
             <template slot-scope="scope">
               <el-tag size="small" type="info">{{ scope.row.scene }}</el-tag>
             </template>
@@ -78,8 +79,8 @@
           <el-table-column prop="version" :label="$t('mailboxMould.colVersion')" width="100"></el-table-column>
           <el-table-column :label="$t('mailboxMould.colStatus')" width="120">
             <template slot-scope="scope">
-              <span :class="['status-dot', scope.row.status]"></span>
-              {{ scope.row.status === 'active' ? $t('mailboxMould.active') : $t('mailboxMould.inactive') }}
+              <span :class="['status-dot', scope.row.is_active==1?'active':'inactive']"></span>
+              {{ scope.row.is_active == 1 ? $t('mailboxMould.active') : $t('mailboxMould.inactive') }}
             </template>
           </el-table-column>
           <el-table-column width="160">
@@ -102,6 +103,7 @@
         </div>
 
         <el-table :data="styleTableData" border style="width: 100%; margin-top: 20px;" v-loading="styleLoading">
+          <el-table-column type="index" :label="$t('mailboxStyle.no')" width="70" align="center"></el-table-column>
           <el-table-column prop="name" :label="$t('mailboxStyle.colName')" min-width="220">
             <template slot-scope="scope">
               <div class="title-cell"><strong>{{ scope.row.title }}</strong></div>
@@ -141,7 +143,7 @@
 const API = {
   listTemplates: 'api/mail_template/listTemplates',
   listStyles: 'api/mail_template/listStyles',
-  getAllJournal: 'api/Journal/getAllJournal',
+  getAllJournal: 'api/Article/getJournal',
   deleteTemplate: 'api/mail_template/deleteTemplate',
   deleteStyle: 'api/mail_template/deleteStyle'
 };
@@ -151,6 +153,8 @@ export default {
     return {
       activeTab: 'templates',
       journalList: [],
+      // 用于避免 ElementUI 初始化时触发的 tab 事件把 localStorage 写回 templates
+      tabChangeLocked: true,
 
       // --- Templates ---
       tplLoading: false,
@@ -171,15 +175,28 @@ export default {
     };
   },
   created() {
+    const q = (this.$route && this.$route.query) || {};
+    const routeTab = q && (q.activeTab || q.tab || q.mouldTab) ? String(q.activeTab || q.tab || q.mouldTab) : '';
+    let savedTab = localStorage.getItem('mailboxMouldActiveTab') || '';
+    savedTab = String(savedTab).trim();
+
+    const normalized = (routeTab && (routeTab === 'styles' || routeTab === 'templates')) ? routeTab : savedTab;
+    if (normalized === 'styles' || normalized === 'templates') this.activeTab = normalized;
+
+    // 初始化期间不要响应 tab-click，避免覆盖 localStorage
+    this.tabChangeLocked = true;
     this.loadJournals();
+    this.$nextTick(() => {
+      this.tabChangeLocked = false;
+    });
   },
   methods: {
     // ========== 公共 ==========
     loadJournals() {
       this.$api
-        .post(API.getAllJournal, {})
+        .post(API.getAllJournal, {username: localStorage.getItem('U_name')})
         .then(res => {
-          const list = (res && res.data && res.data.journals) || res.data || [];
+          const list = res || [];
           const mapped = (Array.isArray(list) ? list : []).map(j => ({
             journal_id: j.journal_id || j.id,
             title: j.title || j.name || ''
@@ -188,13 +205,19 @@ export default {
           if (mapped.length > 0) {
             this.tplFilters.journalId = String(mapped[0].journal_id);
           }
-          this.fetchTemplates();
+          if (this.activeTab === 'styles') {
+            this.fetchStyles();
+          } else {
+            this.fetchTemplates();
+          }
         })
         .catch(() => {
           this.journalList = [];
         });
     },
     handleTabChange(tab) {
+      if (this.tabChangeLocked) return;
+      localStorage.setItem('mailboxMouldActiveTab', tab.name);
       if (tab.name === 'templates' && this.tplTableData.length === 0) {
         this.fetchTemplates();
       } else if (tab.name === 'styles' && this.styleTableData.length === 0) {
@@ -225,7 +248,7 @@ export default {
             scene: item.scene,
             language: item.language,
             version: item.version,
-            status: item.status || 'active'
+            is_active: item.is_active || 0
           }));
         })
         .catch(() => {
@@ -234,11 +257,17 @@ export default {
         });
     },
     handleCreateTemplate() {
-      this.$router.push({ path: '/mailboxMouldDetail' });
+      // 传入当前模板列表选中的期刊，详情页用于默认回填
+      const journalId = this.tplFilters && this.tplFilters.journalId ? String(this.tplFilters.journalId) : '';
+      this.$router.push({ path: '/mailboxMouldDetail', query: journalId ? { journal_id: journalId } : {} });
     },
     handleEditTemplate(row) {
       const templateId = row && (row.template_id || row.id);
-      this.$router.push({ path: '/mailboxMouldDetail', query: templateId ? { template_id: String(templateId) } : {} });
+      const journalId = this.tplFilters && this.tplFilters.journalId ? String(this.tplFilters.journalId) : '';
+      const query = templateId ? { template_id: String(templateId) } : {};
+      // 编辑时一般会由模板详情回填期刊，但带上也能避免个别场景先展示错误默认值
+      if (journalId && !query.journal_id) query.journal_id = journalId;
+      this.$router.push({ path: '/mailboxMouldDetail', query });
     },
     handlePreviewTemplate(row) {
       this.previewContent = row && row.body_html ? row.body_html : '';
@@ -354,6 +383,9 @@ export default {
 .status-dot.active {
   background-color: #52c41a;
 }
+.status-dot.inactive {
+  background-color: #f5222d;
+}
 .delete-btn {
   color: #f5222d !important;
 }
diff --git a/src/components/page/mailboxMouldDetail.vue b/src/components/page/mailboxMouldDetail.vue
index 8159d19..5110040 100644
--- a/src/components/page/mailboxMouldDetail.vue
+++ b/src/components/page/mailboxMouldDetail.vue
@@ -9,7 +9,17 @@
       </div>
       <div class="right">
         <el-button size="mini" @click="goBack">{{ $t('mailboxMouldDetail.cancel') }}</el-button>
-        <el-button type="primary" size="mini" icon="el-icon-document-checked" @click="handleSave">{{ $t('mailboxMouldDetail.save') }}</el-button>
+        <el-button
+          type="primary"
+          size="mini"
+          icon="el-icon-document-checked"
+          @click="handleSave"
+          :loading="saveLoading"
+          :disabled="saveLoading || journalLoading"
+          :loading-text="$t('mailboxMouldDetail.loading')"
+        >
+          {{ $t('mailboxMouldDetail.save') }}
+        </el-button>
       </div>
     </header>
 
@@ -98,7 +108,7 @@
 import CkeditorMail from '@/components/page/components/email/CkeditorMail.vue';
 
 const API = {
-  getAllJournal: 'api/Journal/getAllJournal',
+  getAllJournal: 'api/Article/getJournal',
   getTemplate: 'api/mail_template/getTemplate',
   saveTemplate: 'api/mail_template/saveTemplate'
 };
@@ -110,6 +120,9 @@ export default {
     return {
       journalLoading: true,
       journalList: [],
+      saveLoading: false,
+      // 防抖：避免重复点击“保存”导致多次请求
+      saveDebounceTimer: null,
       rules: {
         journalId: [{ required: true, message: this.$t('mailboxMouldDetail.rulesJournal'), trigger: 'change' }],
         scene: [{ required: true, message: this.$t('mailboxMouldDetail.rulesScene'), trigger: 'change' }],
@@ -139,21 +152,31 @@ export default {
   created() {
     this.loadJournals();
   },
+  beforeDestroy() {
+    if (this.saveDebounceTimer) {
+      clearTimeout(this.saveDebounceTimer);
+      this.saveDebounceTimer = null;
+    }
+  },
   methods: {
     loadJournals() {
       this.journalLoading = true;
+      const q = this.$route && this.$route.query ? this.$route.query : {};
+      const fromRouteJournalId = q.journal_id || q.journalId || '';
       this.$api
-        .post(API.getAllJournal, {})
+        .post(API.getAllJournal, { username: localStorage.getItem('U_name') })
         .then(res => {
-          const list = (res && res.data && res.data.journals) || res.data || [];
+          const list = res || [];
           const mapped = (Array.isArray(list) ? list : []).map(j => ({
             journal_id: j.journal_id || j.id,
             title: j.title || j.name || ''
           }));
           this.journalList = mapped;
-          if (!this.form.journalId && mapped.length > 0) {
-            this.form.journalId = String(mapped[0].journal_id);
+          if (fromRouteJournalId) {
+            const has = mapped.some(j => String(j.journal_id) === String(fromRouteJournalId));
+            if (has) this.form.journalId = String(fromRouteJournalId);
           }
+          if (!this.form.journalId && mapped.length > 0) this.form.journalId = String(mapped[0].journal_id);
         })
         .catch(() => {
           this.journalList = [];
@@ -188,51 +211,81 @@ export default {
       });
     },
     goBack() {
+      const q = (this.$route && this.$route.query) || {};
+      if (q.from_auto_promotion === '1') {
+        this.$router.push({ path: '/autoPromotion' });
+        return;
+      }
       this.$router.push({ path: '/mailboxMould' });
     },
     handleSave() {
-      const formRef = this.$refs.detailForm;
-      const validatePromise = formRef && formRef.validate ? new Promise(resolve => formRef.validate(ok => resolve(ok))) : Promise.resolve(true);
-      validatePromise.then(ok => {
-        if (!ok) return;
-        if (!this.form.subject) {
-          this.$message.warning(this.$t('mailboxMouldDetail.rulesSubject'));
-          return;
-        }
-        if (!this.form.body) {
-          this.$message.warning(this.$t('mailboxMouldDetail.rulesBody'));
-          return;
-        }
+      // 若已在保存中，直接忽略重复点击
+      if (this.saveLoading) return;
 
-      const q = this.$route.query;
-      const templateId = q.template_id || q.id || '';
-      const bodyHtml = this.form.body || '';
-      const bodyText = bodyHtml.replace(/<[^>]+>/g, ' ').replace(/\s+/g, ' ').trim();
-      const params = {
-        journal_id: String(this.form.journalId || ''),
-        scene: String(this.form.scene || 'invite_submission'),
-        language: String(this.form.lang || 'en'),
-        title: String(this.form.title || ''),
-        subject: String(this.form.subject || ''),
-        body_html: bodyHtml,
-        body_text: bodyText || '',
-        variables_json: String(this.form.variables || ''),
-        version: String(this.form.version || '1.0.0'),
-        is_active: this.form.is_active === 1 ? '1' : '0'
-      };
-      if (templateId) params.template_id = String(templateId);
-      this.$api.post(API.saveTemplate, params).then(res => {
+      // 防抖：连续点击只触发最后一次
+      if (this.saveDebounceTimer) {
+        clearTimeout(this.saveDebounceTimer);
+      }
+
+      this.saveDebounceTimer = setTimeout(() => {
+        this.saveDebounceTimer = null;
+        this._doSave();
+      }, 600);
+    }
+    ,
+    async _doSave() {
+      const formRef = this.$refs.detailForm;
+      const validatePromise =
+        formRef && formRef.validate
+          ? new Promise(resolve => formRef.validate(ok => resolve(ok)))
+          : Promise.resolve(true);
+
+      const ok = await validatePromise;
+      if (!ok) return;
+
+      if (!this.form.subject) {
+        this.$message.warning(this.$t('mailboxMouldDetail.rulesSubject'));
+        return;
+      }
+      if (!this.form.body) {
+        this.$message.warning(this.$t('mailboxMouldDetail.rulesBody'));
+        return;
+      }
+
+      this.saveLoading = true;
+      try {
+        const q = this.$route.query;
+        const templateId = q.template_id || q.id || '';
+        const bodyHtml = this.form.body || '';
+        const bodyText = bodyHtml.replace(/<[^>]+>/g, ' ').replace(/\s+/g, ' ').trim();
+
+        const params = {
+          journal_id: String(this.form.journalId || ''),
+          scene: String(this.form.scene || 'invite_submission'),
+          language: String(this.form.lang || 'en'),
+          title: String(this.form.title || ''),
+          subject: String(this.form.subject || ''),
+          body_html: bodyHtml,
+          body_text: bodyText || '',
+          variables_json: String(this.form.variables || ''),
+          version: String(this.form.version || '1.0.0'),
+          is_active: this.form.is_active === 1 ? '1' : '0'
+        };
+
+        if (templateId) params.template_id = String(templateId);
+
+        const res = await this.$api.post(API.saveTemplate, params);
         if (res && res.code === 0) {
           this.$message.success(this.$t('mailboxMouldDetail.saveSuccess'));
           this.goBack();
         } else {
           this.$message.error((res && res.msg) || this.$t('mailboxMouldDetail.saveFail'));
         }
-      }).catch(() => {
+      } catch (e) {
         this.$message.error(this.$t('mailboxMouldDetail.saveFail'));
-      });
-
-      });
+      } finally {
+        this.saveLoading = false;
+      }
     }
   }
 };
diff --git a/src/components/page/mailboxSend.vue b/src/components/page/mailboxSend.vue
index 03e905c..fcf513d 100644
--- a/src/components/page/mailboxSend.vue
+++ b/src/components/page/mailboxSend.vue
@@ -11,7 +11,7 @@
 			</el-breadcrumb>
 		</div>
 		
-		<div class="container" style="padding-top: 0px;">
+		<div class="container" style="padding-top: 0px;" v-if="showSendEmail">
 			<div class="mail_shuru" style="position: relative; display: flex; align-items: center;">
     <span class="mail_tit">{{ $t('mailboxSend.to') }}</span>
     
@@ -31,6 +31,7 @@
         </div>
 
         <el-autocomplete
+            v-if="!isToRecipientLimitReached()"
             ref="autocompleteTo"
             class="mail_inp"
             v-model="toInput"
@@ -119,7 +120,14 @@
     </div>
     
     <div class="action-buttons">
-        <el-button type="primary" icon="el-icon-s-promotion" :loading="sendLoading" :disabled="sendLoading" @click="handleSend">
+        <el-button
+          type="primary"
+          icon="el-icon-s-promotion"
+          :loading="sendLoading"
+          :disabled="sendLoading"
+          :loading-text="$t('mailboxSend.sending')"
+          @click="handleSend"
+        >
             {{ $t('mailboxSend.send') }}
         </el-button>
         <!-- <el-button size="medium" :loading="saveDraftLoading" :disabled="saveDraftLoading" @click="handleSaveDraft">{{ $t('mailboxSend.saveDraft') }}</el-button> -->
@@ -155,9 +163,11 @@
 			</div>
 		</el-dialog>
 
-		<template-selector-dialog v-if="showTemplateDialog"
+		<template-selector-dialog
+  v-if="showTemplateDialog"
   :visible.sync="showTemplateDialog"
   @confirm="handleTemplateApply"
+  @close-all-dialogs="closeAllDialogs"
 />
 	</div>
 </template>
@@ -180,7 +190,8 @@ import TemplateSelectorDialog from '@/components/page/components/email/TemplateS
 					sendnamelist: [],
 					sendtitle: '',
 					sendcc: '',
-					content: ''
+					content: '',
+					expert_id: ''
 				},
 				mail_List: [],
 				fileL_atta: [],
@@ -206,6 +217,8 @@ import TemplateSelectorDialog from '@/components/page/components/email/TemplateS
 				sourceContent: '',
 			
 				toInput: '',
+				// 默认只允许 1 个收件人，后续可按需动态修改
+				maxToRecipients: 1,
 				toSelecting: false,
 				nextToUid: 1,
 				ccList: [],
@@ -214,7 +227,21 @@ import TemplateSelectorDialog from '@/components/page/components/email/TemplateS
 				nextCcUid: 1,
 				collapseValue: localStorage.getItem('collapse'),
 				sendLoading: false,
+				sendDebounceTimer: null,
 				saveDraftLoading: false,
+				selectedTemplateId: '',
+				selectedStyleId: '',
+				recipientSuggest: {
+					keyword: '',
+					pageIndex: 1,
+					pageSize: 10,
+					totalPages: 1,
+					loading: false,
+					options: [],
+					cb: null
+				},
+				recipientSuggestScrollHandler: null,
+				showSendEmail:true
 			};
 		},
 		components: {
@@ -225,7 +252,7 @@ import TemplateSelectorDialog from '@/components/page/components/email/TemplateS
 			footerBarLeft() {
 				const collapsed = this.collapseValue === true || this.collapseValue === 'true';
 				return (collapsed ? 64: 260) + 'px';
-			},
+			}
 		},
 		watch: {
 			collapseValue: {
@@ -236,27 +263,164 @@ import TemplateSelectorDialog from '@/components/page/components/email/TemplateS
 			},
 		},
 		created() {
+			this.showSendEmail=true
 			this.getDate();
 		},
+		activated(){
+			this.showSendEmail=true
+		},
 		mounted() {
 			bus.$on('collapse-content', (msg) => {
 				this.collapseValue = msg;
 			});
+			document.addEventListener('click', this.handleOutsideAutocompleteClick, true);
 		},
 		beforeDestroy() {
 			bus.$off('collapse-content');
+			this.detachRecipientSuggestScroll();
+			if (this.sendDebounceTimer) {
+				clearTimeout(this.sendDebounceTimer);
+				this.sendDebounceTimer = null;
+			}
+			document.removeEventListener('click', this.handleOutsideAutocompleteClick, true);
 		},
 		methods: {
-			handleTemplateApply(htmlContent) {
-    // 假设你使用的是 TinyMCE
-    if (window.tinymce && window.tinymce.activeEditor) {
-      // 建议：如果你想保留已有内容，用 insertContent；
-      // 如果想彻底更换模板，用 setContent。
-      window.tinymce.activeEditor.setContent(htmlContent);
-      
-      this.$message.success('Template applied successfully!');
-    }
-  },
+		closeAllDialogs() {
+			// 点击“去新增模板”后：关闭模板选择弹窗以及可能打开的其它弹窗
+			this.Librarybox = false;
+			this.showTemplateDialog = false;
+		},
+			handleOutsideAutocompleteClick(e) {
+				const target = e && e.target;
+				if (!target) return;
+				const inputRef = this.$refs.autocompleteTo;
+				const inputEl = inputRef && inputRef.$el ? inputRef.$el : null;
+				const inInput = inputEl && inputEl.contains(target);
+				const inSuggestion = typeof target.closest === 'function' && !!target.closest('.el-autocomplete-suggestion');
+				if (inInput || inSuggestion) return;
+
+				if (inputRef && typeof inputRef.close === 'function') {
+					inputRef.close();
+				}
+				if (inputRef && inputRef.$refs && inputRef.$refs.input && typeof inputRef.$refs.input.blur === 'function') {
+					inputRef.$refs.input.blur();
+				}
+			},
+			isToRecipientLimitReached() {
+				const max = Number(this.maxToRecipients || 0);
+				if (!max) return false;
+				return (this.queryMail.sendnamelist || []).length >= max;
+			},
+			showToRecipientLimitWarning() {
+				const max = Number(this.maxToRecipients || 1);
+				this.$message.warning(this.$t('mailboxSend.recipientLimit', { count: max }));
+			},
+			attachRecipientSuggestScroll() {
+				this.detachRecipientSuggestScroll();
+				this.$nextTick(() => {
+					const wraps = document.querySelectorAll('.el-autocomplete-suggestion__wrap');
+					if (!wraps || !wraps.length) return;
+					const wrap = wraps[wraps.length - 1];
+					const handler = () => {
+						if (this.recipientSuggest.loading) return;
+						if (this.recipientSuggest.pageIndex >= this.recipientSuggest.totalPages) return;
+						const threshold = 24;
+						const reachBottom = wrap.scrollTop + wrap.clientHeight >= wrap.scrollHeight - threshold;
+						if (reachBottom) {
+							this.loadMoreRecipientSuggestions();
+						}
+					};
+					wrap.addEventListener('scroll', handler);
+					this.recipientSuggestScrollHandler = { el: wrap, fn: handler };
+				});
+			},
+			detachRecipientSuggestScroll() {
+				const h = this.recipientSuggestScrollHandler;
+				if (h && h.el && h.fn) {
+					h.el.removeEventListener('scroll', h.fn);
+				}
+				this.recipientSuggestScrollHandler = null;
+			},
+			normalizeExpertList(list) {
+				if (!Array.isArray(list)) return [];
+				return list.map((u) => ({
+					...u,
+					value: u.email || '',
+					realname: u.name || u.realname || u.username || '',
+					expert_id: u.expert_id || u.id || ''
+				}));
+			},
+			async queryRecipientSuggestions(reset) {
+				if (this.recipientSuggest.loading) return;
+				const st = this.recipientSuggest;
+				if (!st.keyword) {
+					st.options = [];
+					if (st.cb) st.cb([]);
+					return;
+				}
+				if (reset) {
+					st.pageIndex = 1;
+					st.totalPages = 1;
+					st.options = [];
+				} else if (st.pageIndex >= st.totalPages) {
+					if (st.cb) st.cb(st.options);
+					return;
+				} else {
+					st.pageIndex += 1;
+				}
+				st.loading = true;
+				try {
+					const res = await this.$api.post('api/expert_manage/getList', {
+						major_id: '',
+						keyword: st.keyword,
+						pageIndex: st.pageIndex,
+						pageSize: st.pageSize
+					});
+					const data = (res && res.data) || {};
+					const list = this.normalizeExpertList(data.list || []);
+					st.totalPages = Number(data.totalPages || data.total_pages || 1) || 1;
+					st.options = reset ? list : st.options.concat(list);
+					if (st.cb) st.cb(st.options);
+					this.attachRecipientSuggestScroll();
+				} catch (e) {
+					if (st.cb) st.cb(st.options || []);
+				} finally {
+					st.loading = false;
+				}
+			},
+			loadMoreRecipientSuggestions() {
+				this.queryRecipientSuggestions(false);
+			},
+			handleTemplateApply(payload) {
+				// TemplateSelectorDialog 现在返回对象：{ html, journal_id, style_id, template_id, ... }
+				const html = payload && typeof payload === 'object' ? (payload.html || '') : String(payload || '');
+				const templateId = payload && typeof payload === 'object' ? (payload.template_id || '') : '';
+				const styleId = payload && typeof payload === 'object' ? (payload.style_id || '') : '';
+				const templateSubject = payload && typeof payload === 'object'
+					? ((payload.template && payload.template.subject) || payload.subject || '')
+					: '';
+				if (!html) {
+					this.$message.warning(this.$t('mailTemplate.noTemplateTip') || '未获取到模板内容');
+					return;
+				}
+
+				// 始终维护一份内容状态，确保源码模式/富文本模式都能回填
+				this.queryMail.content = html;
+				this.sourceContent = html;
+
+				// 优先回填 TinyMCE 实例
+				if (window.tinymce && window.tinymce.activeEditor && window.tinymce.activeEditor.setContent) {
+					window.tinymce.activeEditor.setContent(html);
+				}
+				this.selectedTemplateId = templateId ? String(templateId) : '';
+				this.selectedStyleId = styleId ? String(styleId) : '';
+				// 模板自带 subject：仅当当前主题为空时自动回填
+				if (!this.queryMail.sendtitle && templateSubject) {
+					this.queryMail.sendtitle = String(templateSubject);
+				}
+
+				// this.$message.success(this.$t('mailboxSend.templateApplied') || 'Template applied successfully!');
+			},
 			// 切换富文本 / 源代码编辑模式（源码用 sourceContent 保留完整 HTML，可自由来回切换）
 			toggleSourceMode() {
 				if (this.isSourceMode) {
@@ -276,41 +440,34 @@ import TemplateSelectorDialog from '@/components/page/components/email/TemplateS
 				}
 				this.isSourceMode = !this.isSourceMode;
 			},
-			// 返回收件箱（邮箱列表），带上 journal_id 和 j_email_id
+			// 返回收件箱（邮箱列表），账号信息从本地缓存读取
 			goBackInbox() {
-				const q = this.$route.query;
-				const query = {};
-				if (q.journal_id) query.journal_id = q.journal_id;
-				if (q.j_email_id) query.j_email_id = q.j_email_id;
-				this.$router.push({
-					path: '/mailboxCollect',
-					query,
+				this.showSendEmail=false
+				const currentPath = this.$route.fullPath;
+				// 先静默关闭当前标签，强制销毁 keep-alive 缓存，再执行跳转
+				bus.$emit('close_tag_by_path', {
+					path: currentPath,
+					silent: true
+				});
+				this.$nextTick(() => {
+					this.$router.push({ path: '/mailboxCollect' });
 				});
 			},
 			// 收件人自动补全 - 搜索用户
 			fetchUserSuggestions(queryString, cb) {
-				if (!queryString) {
+				if (this.isToRecipientLimitReached()) {
 					cb([]);
 					return;
 				}
-				this.$api
-					.post('api/Reviewer/researchUser', {
-						
-					keywords: queryString
-					})
-					.then(res => {
-						if (res && res.code === 0 && res.data && res.data.list) {
-							const list = res.data.list.map(u => ({
-								...u,
-								value: u.email,
-								realname: u.realname || u.username || ''
-							}));
-							cb(list);
-						} else {
-							cb([]);
-						}
-					})
-					.catch(() => cb([]));
+				const keyword = (queryString || '').trim();
+				this.recipientSuggest.keyword = keyword;
+				this.recipientSuggest.cb = cb;
+				if (!keyword) {
+					this.detachRecipientSuggestScroll();
+					cb([]);
+					return;
+				}
+				this.queryRecipientSuggestions(true);
 			},
 			// 收件人输入框失焦：输入内容失去焦点则自动成为一条收件人数据（排除点击下拉项时）
 			handleToBlur(e) {
@@ -332,11 +489,17 @@ import TemplateSelectorDialog from '@/components/page/components/email/TemplateS
 					}
 					const exists = (this.queryMail.sendnamelist || []).some(item => item.name === value);
 					if (!exists) {
+						if (this.isToRecipientLimitReached()) {
+							this.showToRecipientLimitWarning();
+							this.toInput = '';
+							return;
+						}
 						this.queryMail.sendnamelist.push({
 							id: null,
 							name: value,
 							_uid: this.nextToUid++,
 						});
+						this.queryMail.expert_id = '';
 						this.queryMail.sendname = (this.queryMail.sendnamelist || []).map(i => i.name);
 					}
 					this.toInput = '';
@@ -350,11 +513,17 @@ import TemplateSelectorDialog from '@/components/page/components/email/TemplateS
 				// 去重
 				const exists = (this.queryMail.sendnamelist || []).some(item => item.name === email);
 				if (!exists) {
+					if (this.isToRecipientLimitReached()) {
+						this.showToRecipientLimitWarning();
+						this.toInput = '';
+						return;
+					}
 					this.queryMail.sendnamelist.push({
-						id: user.user_id || user.id || null,
+						id: user.expert_id || user.user_id || user.id || null,
 						name: email,
 						_uid: this.nextToUid++,
 					});
+					this.queryMail.expert_id = user.expert_id || user.user_id || user.id || '';
 					// 同步简单数组
 					this.queryMail.sendname = (this.queryMail.sendnamelist || []).map(i => i.name);
 				}
@@ -366,6 +535,9 @@ import TemplateSelectorDialog from '@/components/page/components/email/TemplateS
 				if (index < 0) return;
 				this.queryMail.sendnamelist.splice(index, 1);
 				this.queryMail.sendname = (this.queryMail.sendnamelist || []).map(i => i.name);
+				if (!this.queryMail.sendnamelist.length) {
+					this.queryMail.expert_id = '';
+				}
 			},
 			// CC 输入框失焦：与 To 相同逻辑，输入失去焦点则自动成为一条数据（排除点击下拉项时）
 			handleCcBlur(e) {
@@ -415,9 +587,11 @@ import TemplateSelectorDialog from '@/components/page/components/email/TemplateS
 				if (index < 0) return;
 				this.ccList.splice(index, 1);
 			},
-			// 根据路由 j_email_id 获取发件邮箱信息，用于展示发件人
+			// 根据本地缓存（优先）或路由参数获取发件邮箱信息，用于展示发件人
 			getDate() {
-				const jEmailId = this.$route.query.j_email_id;
+				// 1. 优先从本地缓存读取
+				const storedEmailId = localStorage.getItem('mailboxCollect_j_email_id');
+				const jEmailId = storedEmailId || this.$route.query.j_email_id;
 				if (!jEmailId) {
 					this.userMes = {};
 					return;
@@ -464,52 +638,82 @@ import TemplateSelectorDialog from '@/components/page/components/email/TemplateS
 					});
 			},
 
-			// 发送邮件：api/email_client/sendOne，to_email 为多邮箱字符串拼接（逗号分隔），发送成功后关闭当前页并跳转收件箱
+			// 发送邮件：api/email_client/sendTemplateStyleText
 			handleSend() {
+				// 防抖：快速连点只触发最后一次
 				if (this.sendLoading) return;
-				const toList = (this.queryMail.sendnamelist || []).map((item) => item.name).filter(Boolean);
-				if (!toList.length) {
-					this.$message.warning(this.$t('mailboxSend.validateTo'));
-					return;
-				}
-				if (!this.queryMail.sendtitle) {
-					this.$message.warning(this.$t('mailboxSend.validateSubject'));
-					return;
-				}
-				const journalId = this.$route.query.journal_id;
-				if (!journalId) {
-					this.$message.warning(this.$t('mailboxSend.needAccount'));
-					return;
-				}
-				this.sendLoading = true;
-				// 优先发送完整 HTML（sourceContent），这样富文本编辑后也能保持 head/style/table 等结构（像阿里邮箱）
-				const bodyContent = this.sourceContent || (this.queryMail.content || '');
-				const params = {
-					journal_id: journalId,
-					to_email: toList.join(','),
-					subject: this.queryMail.sendtitle,
-					content: bodyContent,
-				};
-				const self = this;
-				this.$api.post('api/email_client/sendOne', params).then((res) => {
-					if (res && res.code === 0) {
-						self.$message.success(self.$t('mailboxSend.sendSuccess'));
-						self.queryMail.sendnamelist = [];
-						self.queryMail.sendtitle = '';
-						self.queryMail.sendcc = '';
-						self.ccList = [];
-						self.queryMail.content = '';
-						self.sourceContent = '';
-						self.fileL_atta = [];
-						self.goBackInbox();
-					} else {
-						self.$message.error((res && res.msg) || self.$t('mailboxSend.sendFail'));
+				if (this.sendDebounceTimer) clearTimeout(this.sendDebounceTimer);
+				this.sendDebounceTimer = setTimeout(() => {
+					this.sendDebounceTimer = null;
+					if (this.sendLoading) return;
+
+					const toList = (this.queryMail.sendnamelist || []).map((item) => item.name).filter(Boolean);
+					const expert_id_list = (this.queryMail.sendnamelist || []).map((item) => item.expert_id).filter(Boolean);
+					if (!toList.length) {
+						this.$message.warning(this.$t('mailboxSend.validateTo'));
+						return;
 					}
-				}).catch(() => {
-					self.$message.error(self.$t('mailboxSend.sendFail'));
-				}).finally(() => {
-					self.sendLoading = false;
-				});
+					if (!this.queryMail.sendtitle) {
+						this.$message.warning(this.$t('mailboxSend.validateSubject'));
+						return;
+					}
+
+					// journal_id 优先从本地缓存获取，兼容旧的路由参数
+					const storedJournalId = localStorage.getItem('mailboxCollect_journal_id');
+					const journalId = storedJournalId || this.$route.query.journal_id;
+					const storedEmailId = localStorage.getItem('mailboxCollect_j_email_id');
+					const jEmailId = storedEmailId || this.$route.query.j_email_id;
+
+					if (!journalId) {
+						this.$message.warning(this.$t('mailboxSend.needAccount'));
+						return;
+					}
+					if (!jEmailId) {
+						this.$message.warning(this.$t('mailboxSend.needAccount'));
+						return;
+					}
+					if (!this.selectedTemplateId || !this.selectedStyleId) {
+						this.$message.warning(this.$t('mailboxSend.selectTemplateStyleFirst'));
+						return;
+					}
+
+					this.sendLoading = true;
+					const params = {
+						journal_id: String(journalId),
+						template_id: String(this.selectedTemplateId),
+						to_email: toList.join(','),
+						style_id: String(this.selectedStyleId),
+						expert_id: expert_id_list.join(',') || '1',
+						j_email_id: String(jEmailId),
+					};
+
+					const self = this;
+					this.$api
+						.post('api/email_client/sendTemplateStyleTest', params)
+						.then((res) => {
+							if (res && res.code === 0) {
+								self.$message.success(self.$t('mailboxSend.sendSuccess'));
+								self.queryMail.sendnamelist = [];
+								self.queryMail.sendtitle = '';
+								self.queryMail.sendcc = '';
+								self.ccList = [];
+								self.queryMail.content = '';
+								self.sourceContent = '';
+								self.selectedTemplateId = '';
+								self.selectedStyleId = '';
+								self.fileL_atta = [];
+								self.goBackInbox();
+							} else {
+								self.$message.error((res && res.msg) || self.$t('mailboxSend.sendFail'));
+							}
+						})
+						.catch(() => {
+							self.$message.error(self.$t('mailboxSend.sendFail'));
+						})
+						.finally(() => {
+							self.sendLoading = false;
+						});
+				}, 600);
 			},
 			// 保存草稿（防抖：请求中禁用按钮）
 			handleSaveDraft() {
@@ -549,6 +753,10 @@ import TemplateSelectorDialog from '@/components/page/components/email/TemplateS
 			},
 			// 保存通讯录
 			mailLibAdd(e) {
+				if (this.isToRecipientLimitReached()) {
+					this.showToRecipientLimitWarning();
+					return;
+				}
 				this.queryMail.sendname.push(e.email)
 				this.queryMail.sendnamelist.push({
 					id: null,
@@ -560,7 +768,15 @@ import TemplateSelectorDialog from '@/components/page/components/email/TemplateS
 			// 批量保存通讯录
 			mailLiyAll() {
 				console.log(this.LibrarySelection)
+				const max = Number(this.maxToRecipients || 0);
+				const current = (this.queryMail.sendnamelist || []).length;
+				const remain = max > 0 ? Math.max(0, max - current) : this.LibrarySelection.length;
+				if (remain <= 0) {
+					this.showToRecipientLimitWarning();
+					return;
+				}
 				for (let i = 0; i < this.LibrarySelection.length; i++) {
+					if (i >= remain) break;
 					this.queryMail.sendname.push(this.LibrarySelection[i].email)
 					this.queryMail.sendnamelist.push({
 						id: null,
diff --git a/src/components/page/mailboxStyle.vue b/src/components/page/mailboxStyle.vue
index 02f6571..ea43bfd 100644
--- a/src/components/page/mailboxStyle.vue
+++ b/src/components/page/mailboxStyle.vue
@@ -12,6 +12,7 @@
     </div>
 
     <el-table :data="tableData" border style="width: 100%; margin-top: 20px;" v-loading="loading">
+      <el-table-column type="index" :label="$t('mailboxStyle.no')" width="70" align="center"></el-table-column>
       <el-table-column prop="name" :label="$t('mailboxStyle.colName')" min-width="220">
         <template slot-scope="scope">
           <div class="title-cell">
diff --git a/src/components/page/mailboxStyleDetail.vue b/src/components/page/mailboxStyleDetail.vue
index a5f73c3..201a7ce 100644
--- a/src/components/page/mailboxStyleDetail.vue
+++ b/src/components/page/mailboxStyleDetail.vue
@@ -8,7 +8,17 @@
       </div>
       <div class="right">
         <el-button size="mini" @click="goBack">{{ $t('mailboxStyleDetail.cancel') }}</el-button>
-        <el-button type="primary" size="mini" icon="el-icon-document-checked" @click="handleSave">{{ $t('mailboxStyleDetail.save') }}</el-button>
+        <el-button
+          type="primary"
+          size="mini"
+          icon="el-icon-document-checked"
+          @click="handleSave"
+          :loading="loading"
+          :disabled="loading"
+          :loading-text="$t('mailboxStyleDetail.loading')"
+        >
+          {{ $t('mailboxStyleDetail.save') }}
+        </el-button>
       </div>
     </header>
 
@@ -57,6 +67,7 @@ export default {
   data() {
     return {
       loading: false,
+      saveDebounceTimer: null,
       form: {
         style_id: '',
         name: '',
@@ -85,6 +96,12 @@ export default {
       this.loadDetail(String(styleId));
     }
   },
+  beforeDestroy() {
+    if (this.saveDebounceTimer) {
+      clearTimeout(this.saveDebounceTimer);
+      this.saveDebounceTimer = null;
+    }
+  },
   methods: {
     loadDetail(styleId) {
       this.loading = true;
@@ -104,15 +121,30 @@ export default {
         });
     },
     goBack() {
-      this.$router.push({ path: '/mailboxStyle' });
+      localStorage.setItem('mailboxMouldActiveTab', 'styles');
+      this.$router.push({ path: '/mailboxMould' });
     },
     handleSave() {
+      if (this.loading) return;
+      // 防抖：连续点击只触发最后一次
+      if (this.saveDebounceTimer) clearTimeout(this.saveDebounceTimer);
+      this.saveDebounceTimer = setTimeout(() => {
+        this.saveDebounceTimer = null;
+        this._doSave();
+      }, 600);
+    },
+    async _doSave() {
       const formRef = this.$refs.styleForm;
       const validatePromise =
-        formRef && formRef.validate ? new Promise(resolve => formRef.validate(ok => resolve(ok))) : Promise.resolve(true);
-      validatePromise.then(ok => {
-        if (!ok) return;
-        this.loading = true;
+        formRef && formRef.validate
+          ? new Promise(resolve => formRef.validate(ok => resolve(ok)))
+          : Promise.resolve(true);
+
+      const ok = await validatePromise;
+      if (!ok) return;
+
+      this.loading = true;
+      try {
         const q = this.$route && this.$route.query ? this.$route.query : {};
         const styleId = q.style_id || q.id || '';
         const params = {
@@ -122,23 +154,19 @@ export default {
           header_html: this.form.header_html || '',
           footer_html: this.form.footer_html || ''
         };
-        this.$api
-          .post(API.saveStyle, params)
-          .then(res => {
-            if (res && res.code === 0) {
-              this.$message.success(this.$t('mailboxStyleDetail.saveSuccess'));
-              this.goBack();
-            } else {
-              this.$message.error((res && res.msg) || this.$t('mailboxStyleDetail.saveFail'));
-            }
-          })
-          .catch(() => {
-            this.$message.error(this.$t('mailboxStyleDetail.saveFail'));
-          })
-          .finally(() => {
-            this.loading = false;
-          });
-      });
+
+        const res = await this.$api.post(API.saveStyle, params);
+        if (res && res.code === 0) {
+          this.$message.success(this.$t('mailboxStyleDetail.saveSuccess'));
+          this.goBack();
+        } else {
+          this.$message.error((res && res.msg) || this.$t('mailboxStyleDetail.saveFail'));
+        }
+      } catch (e) {
+        this.$message.error(this.$t('mailboxStyleDetail.saveFail'));
+      } finally {
+        this.loading = false;
+      }
     }
   }
 };
diff --git a/src/router/index.js b/src/router/index.js
index 2f9acaf..b7dd17d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1104,6 +1104,20 @@ export default new Router({
 				title: 'Expert Database'
 			}
 		},
+		{
+			path: '/autoPromotion', // 自动推广
+			component: () => import('../components/page/autoPromotion'),
+			meta: {
+				title: 'Auto Promotion'
+			}
+		},
+		{
+			path: '/autoPromotionLogs', // 历史推广记录
+			component: () => import('../components/page/autoPromotionLogs'),
+			meta: {
+				title: 'Promotion History'
+			}
+		},
 		{
 			path: '/PreIngested', //预收录-完善资料页面
 			component: () => import('../components/page/Complete_profile'),