修复首页显示的问题

This commit is contained in:
HelloWorld 2020-02-25 21:03:56 +08:00
parent 85bed0e0f5
commit 8561131fbf
3 changed files with 3 additions and 43 deletions

View File

@ -4,34 +4,5 @@ app.controller('homeCtr', ['$scope', '$stateParams', '$filter', '$state', '$wind
$window.location = "http://m.mybookmark.cn/#/tags"; $window.location = "http://m.mybookmark.cn/#/tags";
return; return;
} }
bookmarkService.autoLogin() $state.go('bookmarks');
.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();
}
})
.catch((err) => {
console.log('autoLogin err', err)
});
$('.js-segment-home').transition('hide');
function transition() {
var className = 'js-segment-home';
$('.' + className).transition('hide');
$('.' + className).transition({
animation: dataService.animation(),
duration: 500,
});
}
}]); }]);

View File

@ -49,17 +49,6 @@ app.controller('menuCtr', ['$scope', '$stateParams', '$state', '$window', '$time
$scope.login = false; $scope.login = false;
}); });
bookmarkService.userInfo({})
.then((data) => {
$scope.user = data;
if (data.username === 'lcq') {
$scope.loginMenus[dataService.LoginIndexHot].show = false;
}
})
.catch((err) => {
});
$scope.userLogin = function (username, password) { $scope.userLogin = function (username, password) {
var params = { var params = {
username: username, username: username,

View File

@ -412,8 +412,8 @@ api.get('/bookmark', function (req, res) {
api.get('/bookmarks', function (req, res) { api.get('/bookmarks', function (req, res) {
console.log("bookmarks username = ", req.session.username); console.log("bookmarks username = ", req.session.username);
var userId = 226; //req.session.user.id; db.getUser('admin')
db.getTags(userId) .then((user) => db.getTags(user.id))
.then((tags) => db.getBookmarksNavigate(tags)) .then((tags) => db.getBookmarksNavigate(tags))
.then((result) => { .then((result) => {
var data = []; var data = [];