diff --git a/web/app/services/ajax.js b/web/app/services/ajax.js index 80c3ab1..8e34e2b 100644 --- a/web/app/services/ajax.js +++ b/web/app/services/ajax.js @@ -73,22 +73,22 @@ export default Ember.Service.extend({ me.message.alert(r.data || 'Ajax Request Successfully'); } } - else if (r.errcode === 4011) { + else if (r.code === 4011) { // $.trigger('NOT_LOGIN', true); getOwner(me).lookup('route:application').transitionTo('login'); } // ignore fail callback else if (p.fnFail !== false) { me._isFunc(p.fnFail) ? p.fnFail(r.message, r) : - me.dialog.error(r.message || 'Ajax Request Error Caused'); + me.dialog.error(r.message || 'Request server error caused'); } else { - me.dialog.error(r.message || 'Ajax Request Error Caused'); + me.dialog.error(r.message || 'Request server error caused'); } p.loadmask && me.set('loading', false); }, error(jqXHR, textStatus) { - Ember.Logger.error('Ajax Request Error Caused', arguments); + console.error('Ajax request error caused', arguments); if (jqXHR.status === 401) { if (window.localStorage) { window.localStorage.setItem('prevURL', window.location.href); @@ -97,13 +97,14 @@ export default Ember.Service.extend({ getOwner(me).lookup('route:application').transitionTo('login'); } else if (textStatus === 'timeout') { - me.dialog.error('Ajax Request Timeout Error Caused.'); + me.dialog.error('Request server timeout error caused.'); } else if (textStatus === 'abort') { - me.dialog.error('Ajax Request Client Abort Error Caused.'); + me.dialog.error('Request client abort error caused.'); } else { - me.dialog.error('Ajax Request Error Caused.'); + const r = jqXHR.responseJSON; + me.dialog.error(r && r.message ? r.message : 'Request server error caused.'); } p.loadmask && me.set('loading', false); }