From 51aa8c10d37e1410f1328bf2166fe321046af826 Mon Sep 17 00:00:00 2001
From: luchenqun <luchenqun@qq.com>
Date: Fri, 10 Feb 2017 18:00:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=B9=A6=E7=AD=BE=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/scripts/controllers/settings-controller.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/public/scripts/controllers/settings-controller.js b/public/scripts/controllers/settings-controller.js
index 642d467..6a1e717 100644
--- a/public/scripts/controllers/settings-controller.js
+++ b/public/scripts/controllers/settings-controller.js
@@ -1,6 +1,6 @@
 app.controller('settingsCtr', ['$scope', '$stateParams', '$filter', '$state', '$window', 'bookmarkService', 'pubSubService', function($scope, $stateParams, $filter, $state, $window, bookmarkService, pubSubService) {
     console.log('Hello settingsCtr......');
-    $scope.form = [false, false, true];
+    $scope.form = [true, false, false];
     $scope.passwordOrgin = "";
     $scope.passwordNew1 = "";
     $scope.passwordNew2 = "";
@@ -52,16 +52,21 @@ app.controller('settingsCtr', ['$scope', '$stateParams', '$filter', '$state', '$
             acceptFiles: "text/html",
             maxFileSize: 10 * 1024 * 1024, // 最大10M
             onSuccess: function(files, response, xhr, pd) {
-                toastr.success('文件上传成功，3秒钟后自动跳转到书签页面', "错误");
+                toastr.success('文件上传成功，3秒钟自动跳转到书签页面', "提示");
                 setTimeout(function() {
                     pubSubService.publish('Common.menuActive', {
                         login: true,
                         index: 0
                     });
+                    $state.go('bookmarks', {
+                        showStyle: 'navigate',
+                    })
                 }, 3000);
+
             },
         });
-    }, 1000);
+        $(".ui.pointing.menu .item").removeClass("selected");
+    }, 500);
 
 
     pubSubService.publish('Common.menuActive', {