diff --git a/public/scripts/controllers/home-controller.js b/public/scripts/controllers/home-controller.js index 5a5ee99..99bc4ef 100644 --- a/public/scripts/controllers/home-controller.js +++ b/public/scripts/controllers/home-controller.js @@ -6,23 +6,16 @@ app.controller('homeCtr', ['$scope', '$stateParams', '$filter', '$state', '$wind } bookmarkService.autoLogin() .then((data) => { - if (data.logined) { - pubSubService.publish('loginCtr.login', { - 'login': data.logined, - }); - $state.go('tags'); - toastr.success('自动登陆成功,系统将自动跳转到书签分类页面', "提示"); - } else { - console.log('autoLogin failed......................') - pubSubService.publish('Common.menuActive', { - login: false, - index: dataService.NotLoginIndexHome - }); - transition(); - } + pubSubService.publish('loginCtr.login', { + 'login': data.logined, + }); + $state.go('tags'); }) .catch((err) => { - console.log('autoLogin err', err) + pubSubService.publish('loginCtr.login', { + 'login': data.logined, + }); + $state.go('tags'); }); $('.js-segment-home').transition('hide'); diff --git a/public/scripts/services/data-service.js b/public/scripts/services/data-service.js index c33be74..22b6c27 100644 --- a/public/scripts/services/data-service.js +++ b/public/scripts/services/data-service.js @@ -155,8 +155,8 @@ app.factory('dataService', [function() { }, netErrorHandle(err, $state) { if(err == "Unauthorized") { - $state.go("login"); - toastr.error('您好像没有登陆,或者登陆session过期了,请重新登陆!', "提示"); + // $state.go("login"); + // toastr.error('您好像没有登陆,或者登陆session过期了,请重新登陆!', "提示"); } } }; diff --git a/public/views/tags.html b/public/views/tags.html index bb6b20d..6376d91 100644 --- a/public/views/tags.html +++ b/public/views/tags.html @@ -6,9 +6,6 @@