diff --git a/core/language/zh-cn/lang.php b/core/language/zh-cn/lang.php index 928de0b..43f1cc2 100644 --- a/core/language/zh-cn/lang.php +++ b/core/language/zh-cn/lang.php @@ -1474,12 +1474,7 @@ $_G[siteurl]', 'community_edition'=>'社区版', 'title_admincp'=>'管理员登录入口', 'forbid_folder_to_sub_folder'=>'目标文件夹是源文件夹的子文件夹', - //系统出错通知 - 'Error'=>'{errormsg},详情请前往系统日志中查看。', - 'Error_wx'=>'你收到了{title}', - 'Error_redirecturl'=>'{url}', - 'Error_title'=>'{title}', - + 'system_error'=>'系统异常!', ); ?> \ No newline at end of file diff --git a/user/scripts/login.js b/user/scripts/login.js index 8511d9c..3ef7ad7 100644 --- a/user/scripts/login.js +++ b/user/scripts/login.js @@ -11,23 +11,19 @@ function loginsub(formid,rspaceid){ var type = 'json'; jQuery.post(url+'&returnType='+type,formData,function(json){ - if(json['success']){ + showmessage(json['success']['message'],"success",0,1); location.href=json['success']['url_forward']; - /* jQuery('#succeedmessage_href').href = json['success']['url_forward']; - jQuery('#main_message').hide(); - jQuery('#main_succeed').show(); - jQuery('#succeedlocation').html(json['success']['message']); - jQuery('#succeedmessage_href').attr('href',json['success']['url_forward']); - setTimeout("window.location.href ='"+json['success']['url_forward']+"';", 3000);*/ }else if(json['error']){ - jQuery('#'+rspaceid).html(json['error']); - }else{ jQuery('#'+rspaceid).html(__lang.system_busy); } - },'json'); + },'json') + .fail(function (jqXHR, textStatus, errorThrown) { + showmessage(__lang.system_error, 'error', '3000', 1); + jQuery('#'+rspaceid).html(__lang.system_error); + }); } function lostpass(contid,formid,rspaceid){ var url = jQuery('#'+formid).attr('action');