diff --git a/public/index.html b/public/index.html index 17f1890..2640db3 100644 --- a/public/index.html +++ b/public/index.html @@ -5,7 +5,7 @@ - 我的书签-随时随地查看你的网络书签 + 在线书签管理工具-我的书签 diff --git a/public/scripts/app-angular.js b/public/scripts/app-angular.js index 203c3e5..3e8601f 100644 --- a/public/scripts/app-angular.js +++ b/public/scripts/app-angular.js @@ -38,6 +38,9 @@ app.config(function($stateProvider, $urlRouterProvider, $httpProvider) { .state('settings', { url: '/settings', templateUrl: '/views/settings.html', + params: { + formIndex: null, + }, controller: 'settingsCtr' }) .state('login', { diff --git a/public/scripts/controllers/bookmarks-controller.js b/public/scripts/controllers/bookmarks-controller.js index 776717a..6d098b0 100644 --- a/public/scripts/controllers/bookmarks-controller.js +++ b/public/scripts/controllers/bookmarks-controller.js @@ -80,13 +80,13 @@ app.controller('bookmarksCtr', ['$scope', '$state', '$stateParams', '$filter', ' $scope.addBookmarkbyFile = function() { console.log("addBookmarkbyFile"); + $state.go('settings', { + formIndex: 2, + }); pubSubService.publish('Common.menuActive', { login: true, index: 3 }); - $state.go('settings', { - - }) } $scope.closeMsg = function() { @@ -114,6 +114,9 @@ app.controller('bookmarksCtr', ['$scope', '$state', '$stateParams', '$filter', ' } } else { $scope.bookmarks = data; + if ($scope.bookmarks.length <= 2) { + $(".js-msg").removeClass("hidden"); + } if ($scope.bookmarks.length == 0) { toastr.info('您还没有书签，请点击菜单栏的添加按钮进行添加', "提示"); } diff --git a/public/scripts/controllers/menus-controller.js b/public/scripts/controllers/menus-controller.js index 7a3bb00..498c17f 100644 --- a/public/scripts/controllers/menus-controller.js +++ b/public/scripts/controllers/menus-controller.js @@ -75,16 +75,12 @@ app.controller('menuCtr', ['$scope', '$stateParams', '$state', 'pubSubService', .then((data) => { console.log('logout..........', data) $scope.login = false; - $state.go('login', { - foo: 'i love you', - bar: 'hello world' - }) + $state.go('login', {}) }) .catch((err) => console.log('logout err', err)); } function updateMenuActive(index) { - console.log('index = ' + index) $('.ui.menu a.item').removeClass('selected'); $('.ui.menu a.item:eq(' + index + ')').addClass('selected'); } diff --git a/public/scripts/controllers/settings-controller.js b/public/scripts/controllers/settings-controller.js index bd785a3..0c9130c 100644 --- a/public/scripts/controllers/settings-controller.js +++ b/public/scripts/controllers/settings-controller.js @@ -1,10 +1,12 @@ app.controller('settingsCtr', ['$scope', '$stateParams', '$filter', '$state', '$window', 'bookmarkService', 'pubSubService', function($scope, $stateParams, $filter, $state, $window, bookmarkService, pubSubService) { - console.log('Hello settingsCtr......'); - $scope.form = [true, false, false]; + console.log('Hello settingsCtr......', $stateParams); + $scope.form = [false, false, false]; $scope.passwordOrgin = ""; $scope.passwordNew1 = ""; $scope.passwordNew2 = ""; + $scope.form[($stateParams && $stateParams.formIndex) || 0] = true; + $scope.changeForm = function(index) { $scope.form = $scope.form.map(() => false); $scope.form[index] = true; diff --git a/public/views/bookmarks.html b/public/views/bookmarks.html index 0cd62cc..7bd5a1a 100644 --- a/public/views/bookmarks.html +++ b/public/views/bookmarks.html @@ -1,10 +1,10 @@ -
+