Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev

src/views/management/userControl/index.vue

@@ -59,7 +59,7 @@ export default {
 						prop: 'mobile'
 					},
 					{
-						title: this.$t('system.global.email'),
+						title: this.$t('global.email'),
 						prop: 'email'
 					},
 					{

src/views/publish/examRule/draft/rule.vue

@@ -184,8 +184,8 @@ export default {
 				} else {
 					this.$router.push({ path: `${path}` });
 				}
-			}).catch(res => {
-				this.$messageBox('保存规则失败');
+			}).catch(error => {
+				this.$messageBox(`保存规则失败: ${error.message}`);
 			});
 		},
 		addRuleList(data) {