推广管理

src/components/common/langs/en.js

@@ -273,6 +273,7 @@ const en = {
 		tools: 'Assistant tools',
 		mailboxManagement: 'Mailbox Management',
 		scholarCrawlers: 'Scholar Crawlers',
+		expertDatabase: 'Expert Database',
 		ReArticles: 'Rejected Manuscripts',     // 被拒稿件
 		editorialBoard: 'Boss System',
 		editorialBoard1: 'Board Management',
@@ -283,6 +284,8 @@ const en = {
 		managingDirector: 'Managing Director',
 		GroupClassification: 'Group List',
 		JournalInstallment: 'Journal Installment',
+		mailboxCollect: 'Email List',
+		promotionManagement: 'Promotion Management',
 	},
 	mailboxConfig: {
 		mailSystem: 'Mailbox system',
@@ -492,6 +495,7 @@ const en = {
 		operation: 'Operation',
 		loadingMore: 'Loading more...',
 		noMore: 'No more',
+		selectAccountTip: 'Please select an email account first.'
 	},
 	mailboxSend: {
 		title: 'Write mail',

src/components/common/langs/zh.js

@@ -257,13 +257,11 @@ const zh = {
 		emailStyles: '邮件风格',
 		tools: '辅助工具',
 		mailboxManagement: '邮箱管理',
-<<<<<<< HEAD
 		mailboxConfig: '邮箱配置管理',
-		mailboxCollect: '邮箱列表',
-		scholarCrawlers: '学者抓取',
-=======
+	
+		
 		scholarCrawlers: '学者数据库',
->>>>>>> 577a30aeb65a03b5b8b229e5b6a974645e171a0c
+		expertDatabase: '专家库',
 		ReArticles: '被拒稿件',     // 被拒稿件
 		editorialBoard: '编委管理',
 		editorialBoard1: '编委列表',
@@ -274,6 +272,8 @@ const zh = {
 		managingDirector: '总经理',
 		GroupClassification: '集团列表',
 		JournalInstallment: '分期列表',
+		mailboxCollect: '邮件列表',
+		promotionManagement: '推广管理',
 
 	},
 	mailboxConfig: {
@@ -484,6 +484,7 @@ const zh = {
 		operation: '操作',
 		loadingMore: '加载更多...',
 		noMore: '没有更多了',
+		selectAccountTip: '请先选择一个邮箱账号.',
 	},
 	mailboxSend: {
 		title: '写邮件',