liweichun
/
my-bookmark
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

处理未登陆跳转到登陆界面问题

This commit is contained in:
luchenqun 2018-07-27 13:57:31 +08:00
parent 7430de3ad0
commit 7b29cb9a7d
9 changed files with 57 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/scripts/app-angular.js
View File

@ -107,4 +107,4 @@ console.log([
" 不见满街漂亮妹，哪个归得程序员？", " 不见满街漂亮妹，哪个归得程序员？",
].join('\n')); ].join('\n'));
console.log = function(){} // console.log = function(){}

2
public/scripts/controllers/advice-controller.js
View File

@ -51,7 +51,7 @@ app.controller('adviceCtr', ['$scope', '$state', '$timeout', 'bookmarkService',
index: dataService.LoginIndexAdvice index: dataService.LoginIndexAdvice
}); });
}) })
.catch((err) => console.log('getAdvices err', err)); .catch((err) => dataService.netErrorHandle(err, $state));
} }
setTimeout(function() { setTimeout(function() {

6
public/scripts/controllers/bookmarks-controller.js
View File

@ -285,9 +285,7 @@ app.controller('bookmarksCtr', ['$scope', '$state', '$stateParams', '$filter', '
updateShowStyle(); updateShowStyle();
getBookmarks(); // 拿到默认显示风格了，继续取获取书签 getBookmarks(); // 拿到默认显示风格了，继续取获取书签
}) })
.catch((err) => { .catch((err) => dataService.netErrorHandle(err, $state));
console.log('获取信息失败。错误信息：' + JSON.stringify(err), "错误");
});
} else { } else {
$scope.loadBusy = true; $scope.loadBusy = true;
if (params.showStyle == 'table' && (!$scope.forbidTransition)) { if (params.showStyle == 'table' && (!$scope.forbidTransition)) {
@ -343,7 +341,7 @@ app.controller('bookmarksCtr', ['$scope', '$state', '$stateParams', '$filter', '
$scope.loadBusy = false; $scope.loadBusy = false;
}) })
.catch((err) => { .catch((err) => {
console.log('getBookmarks err', err); dataService.netErrorHandle(err, $state);
$scope.loadBusy = false; $scope.loadBusy = false;
}); });
} }

2
public/scripts/controllers/note-controller.js
View File

@ -38,7 +38,7 @@ app.controller('noteCtr', ['$scope', '$state', '$stateParams', '$filter', '$wind
getNotes(); getNotes();
}) })
.catch((err) => { .catch((err) => {
console.log('autoLogin err', err) dataService.netErrorHandle(err, $state)
}); });
$scope.changeCurrentPage = function (currentPage) { $scope.changeCurrentPage = function (currentPage) {

5
public/scripts/controllers/settings-controller.js
View File

@ -73,8 +73,7 @@ app.controller('settingsCtr', ['$scope', '$stateParams', '$filter', '$state', '$
} }
}) })
.catch((err) => { .catch((err) => {
console.log(err); dataService.netErrorHandle(err, $state)
toastr.error('获取信息失败。错误信息：' + JSON.stringify(err), "错误");
$scope.loadShowStyle = false; $scope.loadShowStyle = false;
}); });
} }
@ -89,7 +88,7 @@ app.controller('settingsCtr', ['$scope', '$stateParams', '$filter', '$state', '$
}) })
}) })
.catch((err) => { .catch((err) => {
console.log('getTags err', err); dataService.netErrorHandle(err, $state)
}); });
} }

13
public/scripts/controllers/tags-controller.js
View File

@ -1,4 +1,4 @@
app.controller('tagsCtr', ['$scope', '$filter', '$window', '$stateParams', '$timeout', '$document', 'ngDialog', 'bookmarkService', 'pubSubService', 'dataService', function ($scope, $filter, $window, $stateParams, $timeout, $document, ngDialog, bookmarkService, pubSubService, dataService) { app.controller('tagsCtr', ['$scope', '$filter', '$state', '$window', '$stateParams', '$timeout', '$document', 'ngDialog', 'bookmarkService', 'pubSubService', 'dataService', function ($scope, $filter, $state, $window, $stateParams, $timeout, $document, ngDialog, bookmarkService, pubSubService, dataService) {
console.log("Hello tagsCtr...", $stateParams); console.log("Hello tagsCtr...", $stateParams);
if(dataService.smallDevice()){ if(dataService.smallDevice()){
$window.location = "http://m.mybookmark.cn/#/tags"; $window.location = "http://m.mybookmark.cn/#/tags";
@ -493,16 +493,15 @@ app.controller('tagsCtr', ['$scope', '$filter', '$window', '$stateParams', '$tim
toastr.info('您还没有书签分类，请点击菜单栏的添加按钮进行添加', "提示"); toastr.info('您还没有书签分类，请点击菜单栏的添加按钮进行添加', "提示");
} }
$scope.loadTags = false; $scope.loadTags = false;
pubSubService.publish('Common.menuActive', {
login: true,
index: dataService.LoginIndexTags
});
}) })
.catch((err) => { .catch((err) => {
console.log('getTags err', err); dataService.netErrorHandle(err, $state);
$scope.loadTags = false; $scope.loadTags = false;
}); });
pubSubService.publish('Common.menuActive', {
login: true,
index: dataService.LoginIndexTags
});
} }
pubSubService.subscribe('EditCtr.inserBookmarsSuccess', $scope, function (event, data) { pubSubService.subscribe('EditCtr.inserBookmarsSuccess', $scope, function (event, data) {

70
public/scripts/services/bookmark-service.js
View File

@ -10,7 +10,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
def.resolve(data); def.resolve(data);
}) })
.error(function(data) { .error(function(data) {
def.reject('getArticle error'); def.reject(data);
}); });
return def.promise; return def.promise;
}, },
@ -23,7 +23,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
def.resolve(data); def.resolve(data);
}) })
.error(function(data) { .error(function(data) {
def.reject('getUpdateLog error'); def.reject(data);
}); });
return def.promise; return def.promise;
}, },
@ -36,7 +36,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
def.resolve(data); def.resolve(data);
}) })
.error(function(data) { .error(function(data) {
def.reject('login error'); def.reject(data);
}); });
return def.promise; return def.promise;
}, },
@ -49,7 +49,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
def.resolve(data); def.resolve(data);
}) })
.error(function(data) { .error(function(data) {
def.reject('register error'); def.reject(data);
}); });
return def.promise; return def.promise;
}, },
@ -62,7 +62,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
def.resolve(data); def.resolve(data);
}) })
.error(function(data) { .error(function(data) {
def.reject('register error'); def.reject(data);
}); });
return def.promise; return def.promise;
}, },
@ -75,7 +75,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
def.resolve(data); def.resolve(data);
}) })
.error(function(data) { .error(function(data) {
def.reject('clickBookmark error'); def.reject(data);
}); });
return def.promise; return def.promise;
}, },
@ -88,7 +88,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
def.resolve(data); def.resolve(data);
}) })
.error(function(data) { .error(function(data) {
def.reject('jumpQuickUrl error'); def.reject(data);
}); });
return def.promise; return def.promise;
}, },
@ -101,7 +101,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
def.resolve(data); def.resolve(data);
}) })
.error(function(data) { .error(function(data) {
def.reject('logout error'); def.reject(data);
}); });
return def.promise; return def.promise;
}, },
@ -112,7 +112,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
def.resolve(data); def.resolve(data);
}) })
.error(function(data) { .error(function(data) {
def.reject('autoLogin error'); def.reject(data);
}); });
return def.promise; return def.promise;
}, },
@ -125,7 +125,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
def.resolve(data); def.resolve(data);
}) })
.error(function(data) { .error(function(data) {
def.reject('userInfo error'); def.reject(data);
}); });
return def.promise; return def.promise;
}, },
@ -144,7 +144,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
def.resolve(data); def.resolve(data);
}) })
.error(function(data, status) { .error(function(data, status) {
def.reject('getBookmarks error'); def.reject(data);
}); });
return def.promise; return def.promise;
}, },
@ -158,7 +158,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
def.resolve(data); def.resolve(data);
}) })
.error(function(data, status) { .error(function(data, status) {
def.reject('bookmarksByTag error'); def.reject(data);
}); });
return def.promise; return def.promise;
}, },
@ -172,7 +172,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
def.resolve(data); def.resolve(data);
}) })
.error(function(data, status) { .error(function(data, status) {
def.reject('searchBookmarks error'); def.reject(data);
}); });
return def.promise; return def.promise;
}, },
@ -186,7 +186,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
def.resolve(data); def.resolve(data);
}) })
.error(function(data, status) { .error(function(data, status) {
def.reject('searchHotBookmarks error'); def.reject(data);
}); });
return def.promise; return def.promise;
}, },
@ -200,7 +200,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
def.resolve(data); def.resolve(data);
}) })
.error(function(data, status) { .error(function(data, status) {
def.reject('getBookmark error'); def.reject(data);
}); });
return def.promise; return def.promise;
}, },
@ -213,7 +213,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
def.resolve(data); def.resolve(data);
}) })
.error(function(data) { .error(function(data) {
def.reject('addBookmark error'); def.reject(data);
}); });
return def.promise; return def.promise;
}, },
@ -226,7 +226,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
def.resolve(data); def.resolve(data);
}) })
.error(function(data) { .error(function(data) {
def.reject('favorite error'); def.reject(data);
}); });
return def.promise; return def.promise;
}, },
@ -239,7 +239,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
def.resolve(data); def.resolve(data);
}) })
.error(function(data) { .error(function(data) {
def.reject('updateBookmark error'); def.reject(data);
}); });
return def.promise; return def.promise;
}, },
@ -252,7 +252,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
def.resolve(data); def.resolve(data);
}) })
.error(function(data) { .error(function(data) {
def.reject('delBookmark error'); def.reject(data);
}); });
return def.promise; return def.promise;
}, },
@ -270,7 +270,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
def.resolve(data); def.resolve(data);
}) })
.error(function(data) { .error(function(data) {
def.reject('getTags error'); def.reject(data);
}); });
return def.promise; return def.promise;
}, },
@ -283,7 +283,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
def.resolve(data); def.resolve(data);
}) })
.error(function(data) { .error(function(data) {
def.reject('addTags error'); def.reject(data);
}); });
return def.promise; return def.promise;
}, },
@ -296,7 +296,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
def.resolve(data); def.resolve(data);
}) })
.error(function(data) { .error(function(data) {
def.reject('updateTagName error'); def.reject(data);
}); });
return def.promise; return def.promise;
}, },
@ -309,7 +309,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
def.resolve(data); def.resolve(data);
}) })
.error(function(data) { .error(function(data) {
def.reject('updateTagsIndex error'); def.reject(data);
}); });
return def.promise; return def.promise;
}, },
@ -322,7 +322,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
def.resolve(data); def.resolve(data);
}) })
.error(function(data) { .error(function(data) {
def.reject('delTag error'); def.reject(data);
}); });
return def.promise; return def.promise;
}, },
@ -335,7 +335,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
def.resolve(data); def.resolve(data);
}) })
.error(function(data) { .error(function(data) {
def.reject('updateShowStyle error'); def.reject(data);
}); });
return def.promise; return def.promise;
}, },
@ -348,7 +348,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
def.resolve(data); def.resolve(data);
}) })
.error(function(data) { .error(function(data) {
def.reject('updateSearchHistory error'); def.reject(data);
}); });
return def.promise; return def.promise;
}, },
@ -361,7 +361,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
def.resolve(data); def.resolve(data);
}) })
.error(function(data) { .error(function(data) {
def.reject('updateQuickUrl error'); def.reject(data);
}); });
return def.promise; return def.promise;
}, },
@ -374,7 +374,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
def.resolve(data); def.resolve(data);
}) })
.error(function(data) { .error(function(data) {
def.reject('getAdvices error'); def.reject(data);
}); });
return def.promise; return def.promise;
}, },
@ -387,7 +387,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
def.resolve(data); def.resolve(data);
}) })
.error(function(data) { .error(function(data) {
def.reject('addAdvice error'); def.reject(data);
}); });
return def.promise; return def.promise;
}, },
@ -401,7 +401,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
def.resolve(data); def.resolve(data);
}) })
.error(function(data, status) { .error(function(data, status) {
def.reject('getHotBookmarks error'); def.reject(data);
}); });
return def.promise; return def.promise;
}, },
@ -414,7 +414,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
def.resolve(data); def.resolve(data);
}) })
.error(function(data, status) { .error(function(data, status) {
def.reject('addNote error'); def.reject(data);
}); });
return def.promise; return def.promise;
}, },
@ -427,7 +427,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
def.resolve(data); def.resolve(data);
}) })
.error(function(data) { .error(function(data) {
def.reject('getNotes error'); def.reject(data);
}); });
return def.promise; return def.promise;
}, },
@ -440,7 +440,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
def.resolve(data); def.resolve(data);
}) })
.error(function(data) { .error(function(data) {
def.reject('delNote error'); def.reject(data);
}); });
return def.promise; return def.promise;
}, },
@ -453,7 +453,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
def.resolve(data); def.resolve(data);
}) })
.error(function(data) { .error(function(data) {
def.reject('updateNote error'); def.reject(data);
}); });
return def.promise; return def.promise;
}, },
@ -466,7 +466,7 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) {
def.resolve(data); def.resolve(data);
}) })
.error(function(data) { .error(function(data) {
def.reject('download error'); def.reject(data);
}); });
return def.promise; return def.promise;
}, },

6
public/scripts/services/data-service.js
View File

@ -151,6 +151,12 @@ app.factory('dataService', [function() {
} }
return false; return false;
},
netErrorHandle(err, $state) {
if(err == "Unauthorized") {
$state.go("login");
toastr.error('您好像没有登陆，或者登陆session过期了，请重新登陆！', "提示");
}
} }
}; };

4
public/views/settings.html
View File

@ -52,12 +52,12 @@
<label>表格</label> <label>表格</label>
</div> </div>
</div> </div>
<div class="field" ng-click="updateDefaultShowStyle('card')"> <!-- <div class="field" ng-click="updateDefaultShowStyle('card')">
<div class="ui radio checkbox js-radio-default-card"> <div class="ui radio checkbox js-radio-default-card">
<input type="radio" name="default-show-style"> <input type="radio" name="default-show-style">
<label>卡片</label> <label>卡片</label>
</div> </div>
</div> </div> -->
</div> </div>
</form> </form>
<div class="ui four statistics" style="margin-top:30px;" ng-show="form[1]"> <div class="ui four statistics" style="margin-top:30px;" ng-show="form[1]">