From 62047e0573c1ea403a8724b4767f082f85be3fa2 Mon Sep 17 00:00:00 2001
From: luchenqun <luchenqun@qq.com>
Date: Wed, 22 Mar 2017 09:43:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E8=AE=BE=E7=BD=AE=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=E4=B8=8D=E6=98=BE=E7=A4=BA=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/scripts/controllers/settings-controller.js | 6 +++++-
 public/views/settings.html                        | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/public/scripts/controllers/settings-controller.js b/public/scripts/controllers/settings-controller.js
index a06087e..c9a4215 100644
--- a/public/scripts/controllers/settings-controller.js
+++ b/public/scripts/controllers/settings-controller.js
@@ -7,6 +7,7 @@ app.controller('settingsCtr', ['$scope', '$stateParams', '$filter', '$state', '$
     $scope.user = {};
     $scope.tagCnt = 0;
     $scope.bookmarkCnt = 0;
+    $scope.loadShowStyle = false;
     $scope.form[($stateParams && $stateParams.formIndex) || 0] = true;
 
     $scope.changeForm = function(index) {
@@ -15,15 +16,18 @@ app.controller('settingsCtr', ['$scope', '$stateParams', '$filter', '$state', '$
         $scope.form[index] = true;
 
         if (index <= 1) {
+            $scope.loadShowStyle = true;
             bookmarkService.userInfo({})
                 .then((data) => {
                     $scope.user = data;
                     if (index == 0) {
-                        updateShowStyle($scope.user && $scope.user.show_style);
+                        updateShowStyle(($scope.user && $scope.user.show_style) || 'navigate');
+                        $scope.loadShowStyle = false;
                     }
                 })
                 .catch((err) => {
                     toastr.error('获取信息失败。错误信息：' + JSON.stringify(err), "错误");
+                    $scope.loadShowStyle = false;
                 });
             if (index == 1) {
                 bookmarkService.getTags({})
diff --git a/public/views/settings.html b/public/views/settings.html
index ac790ed..3e1f258 100644
--- a/public/views/settings.html
+++ b/public/views/settings.html
@@ -33,7 +33,7 @@
                 <h4 class="ui horizontal divider header">
                     书签默认显示方式配置
                 </h4>
-                <div class="inline fields js-default-show-style">
+                <div class="inline fields js-default-show-style" ng-show="!loadShowStyle">
                     <div class="field" ng-click="updateDefaultShowStyle('navigate')">
                         <div class="ui radio checkbox js-radio-default-navigate">
                             <input type="radio" name="default-show-style" checked="checked">