diff --git a/src/utils/language.js b/src/utils/language.js
index 3028c78..82f5456 100644
--- a/src/utils/language.js
+++ b/src/utils/language.js
@@ -59,6 +59,12 @@ export function lang() {
 					reset_settings: '恭喜! 个性化设置成功',
 					reset_pwd_failed: '密码不能为空',
 					reset_pwd_successful: '恭喜! 新的密码已经应用'
+				},
+				reset_dialog: {
+					title: '警告',
+					content: '该操作不可复原，是否继续',
+					confirm: '继续',
+					cancel: '取消'
 				}
 			},
 			EN: {
@@ -79,6 +85,12 @@ export function lang() {
 					reset_settings: 'Congratulations! Reset settings completed',
 					reset_pwd_failed: 'Password can not be none',
 					reset_pwd_successful: 'Congratulations! New password set up successfully'
+				},
+				reset_dialog: {
+					title: 'Warning',
+					content: 'This operation cannot be undone, whether to continue',
+					confirm: 'Continue',
+					cancel: 'Cancel'
 				}
 			}
 		},
@@ -282,6 +294,14 @@ export function lang() {
 			CHS:{
 				title: '更新日志',
 				timeline: [
+					{
+						label: '设置中的重置功能优化',
+						tag:'功能更新',
+						content: [
+							'所有重置操作之前会进行弹窗提醒，防止误操作',
+							'2020-03-08'
+						]
+					},
 					{
 						label: '设置中的重置主密码功能启用',
 						tag:'功能更新',
@@ -383,6 +403,14 @@ export function lang() {
 			EN:{
 				title: 'Update Log',
 				timeline: [
+					{
+						label: 'Optimization of reset function in settings',
+						tag:'Feature update',
+						content: [
+							'Pop-up window reminder before all reset operations to prevent misoperation',
+							'2020-03-08'
+						]
+					},
 					{
 						label: 'The reset master password function is enabled in the settings',
 						tag:'Feature update',
diff --git a/src/views/Settings/Settings.vue b/src/views/Settings/Settings.vue
index 779e609..59752d2 100644
--- a/src/views/Settings/Settings.vue
+++ b/src/views/Settings/Settings.vue
@@ -13,19 +13,19 @@
 					<div ref="list_placeholder" style="height: 54px;"></div>
 					<md-list>
 						<md-subheader class="md-primary">{{ lang.subheader[0] }}</md-subheader>
-						<md-list-item @click="resetAccount()">
+						<md-list-item @click="openResetDialog('account')">
 							<md-icon>person</md-icon>
 							<span class="md-list-item-text">{{ lang.reset_list[0] }}</span>
 							<md-progress-spinner v-if="account_loading" :md-diameter="22" :md-stroke="3" md-mode="indeterminate"></md-progress-spinner>
 						</md-list-item>
 
-						<md-list-item @click="resetCodebook()">
+						<md-list-item @click="openResetDialog('codebook')">
 							<md-icon>format_align_left</md-icon>
 							<span class="md-list-item-text">{{ lang.reset_list[1] }}</span>
 							<md-progress-spinner v-if="codebook_loading" :md-diameter="22" :md-stroke="3" md-mode="indeterminate"></md-progress-spinner>
 						</md-list-item>
 
-						<md-list-item @click="resetApplication()">
+						<md-list-item @click="openResetDialog('application')">
 							<md-icon>layers</md-icon>
 							<span class="md-list-item-text">{{ lang.reset_list[2] }}</span>
 							<md-progress-spinner v-if="application_loading" :md-diameter="22" :md-stroke="3" md-mode="indeterminate"></md-progress-spinner>
@@ -74,6 +74,16 @@
 						:md-cancel-text="lang.dialog.cancel"
 						@md-confirm="resetPwd"
 					/>
+					
+					<md-dialog-confirm
+						:md-active.sync="reset_confirm"
+						:md-title="lang.reset_dialog.title"
+						:md-content="lang.reset_dialog.content"
+						:md-confirm-text="lang.reset_dialog.confirm"
+						:md-cancel-text="lang.reset_dialog.cancel"
+						@md-cancel="reset_confirm = false"
+						@md-confirm="resetStart" 
+					/>
 
 					<md-snackbar md-position="center" :md-active.sync="show_snackbar" md-persistent>
 						<span>{{ snakebar_msg }}</span>
@@ -114,7 +124,10 @@ export default {
 			// 初始化完成状态
 			has_init: false,
 			lang: '',
-			clientHeight: ''
+			clientHeight: '',
+			// 重置确认
+			reset_confirm: false,
+			reset_type: ''
 		};
 	},
 	computed: {
@@ -313,6 +326,31 @@ export default {
 			this.setRowPwd([row_pwd, this]);
 			this.snakebar_msg = this.lang.snakebar_msg.reset_pwd_successful;
 			this.show_snackbar = true;
+		},
+
+		// 打开重置的警告提醒
+		openResetDialog(type) {
+			this.reset_confirm = true;
+			this.reset_type = type
+		},
+
+		// 提醒完成点击确定
+		resetStart() {
+			console.log('用户点击继续，重置开始')
+			switch(this.reset_type) {
+				case 'account':
+					this.resetAccount();
+					break
+				case 'codebook':
+					this.resetCodebook();
+					break
+				case 'application':
+					this.resetApplication();
+					break
+				default:
+					return
+			}
+			this.reset_type = ''
 		}
 	},
 	created() {