From 1144853a64240b4212d9bf506db37c27a0f9e29c Mon Sep 17 00:00:00 2001
From: luchenqun <luchenqun@juzix.io>
Date: Mon, 21 May 2018 09:31:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=B1=BB=E9=BB=98=E8=AE=A4=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=B8=AA=E4=BA=BA=E5=AE=9A=E5=88=B6=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E6=8C=89=E6=9C=80=E8=BF=91=E6=B7=BB=E5=8A=A0=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/scripts/controllers/tags-controller.js | 11 +++++------
 public/views/tags.html                        | 18 +++++++++---------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/public/scripts/controllers/tags-controller.js b/public/scripts/controllers/tags-controller.js
index 61145b0..dced572 100644
--- a/public/scripts/controllers/tags-controller.js
+++ b/public/scripts/controllers/tags-controller.js
@@ -14,7 +14,7 @@ app.controller('tagsCtr', ['$scope', '$filter', '$window', '$stateParams', '$tim
     var addBookmarkId = -1;
     $scope.hoverBookmark = null;
     $scope.order = [false, false, false];
-    $scope.order[($stateParams && $stateParams.orderIndex) || 0] = true;
+    $scope.order[($stateParams && $stateParams.orderIndex) || 1] = true;
     $scope.loadBookmarks = false;
     $scope.loadTags = false;
     $scope.tags = []; // 书签数据
@@ -481,12 +481,11 @@ app.controller('tagsCtr', ['$scope', '$filter', '$window', '$stateParams', '$tim
                         find = true; // 如果是删了分类返回来，那么要重新默认选中第一个分类
                     }
                 })
-                if (!find && $scope.currentTagId !== -1) $scope.currentTagId = null;
-                if (!$scope.currentTagId && $scope.tags.length > 0) {
-                    $scope.currentTagId = $scope.tags[0].id;
-                    $scope.tags[0].bookmarkClicked = true;
+                if (!find && $scope.currentTagId !== -1 && $scope.currentTagId !== -2) {
+                    $scope.currentTagId = -1;
+                    $scope.costomTag.bookmarkClicked = true;
                 }
-
+                
                 if ($scope.currentTagId) {
                     if (!$scope.editMode) {
                         $scope.getBookmarks($scope.currentTagId, $scope.currentPage);
diff --git a/public/views/tags.html b/public/views/tags.html
index 3d7658a..3fba6f7 100644
--- a/public/views/tags.html
+++ b/public/views/tags.html
@@ -1,16 +1,16 @@
 <div class="ui segment js-tags">
     <div class="ui container" ng-show="!editMode" style="cursor:default;">
         <div class="ui grid">
-            <div class="two wide column  js-tag-label" ng-if="tag.cnt" ng-repeat="tag in tags">
-                <div class="ui small label" ng-class="{green:tag.bookmarkClicked}" ng-click="getBookmarks(tag.id, 1)">
-                    {{ tag.name }} ({{ tag.cnt || 0 }})
-                </div>
-            </div>
             <div class="two wide column  js-tag-label">
                 <div class="ui small label" ng-class="{green:costomTag.bookmarkClicked}" ng-click="getBookmarks(-1, 1)">
                     {{ costomTag.name }} ({{ costomTag.cnt || 0 }})
                 </div>
             </div>
+            <div class="two wide column  js-tag-label" ng-if="tag.cnt" ng-repeat="tag in tags">
+                <div class="ui small label" ng-class="{green:tag.bookmarkClicked}" ng-click="getBookmarks(tag.id, 1)">
+                    {{ tag.name }} ({{ tag.cnt || 0 }})
+                </div>
+            </div>
             <div class="two wide column  js-tag-label">
                 <div class="ui small label" ng-class="{green:costomAllUsersTag.bookmarkClicked}" ng-click="getBookmarks(-2, 1)">
                     {{ costomAllUsersTag.name }} ({{ costomAllUsersTag.cnt || 0 }})
@@ -138,14 +138,14 @@
     <div class="ui grid">
         <div class="five wide column" style="margin-top:10px;">
             <div class="ui three column grid" style="cursor: default;">
-                <div class="column" ng-click="changeOrder(0)">
-                    <i class="sort numeric descending large icon" ng-class="{green: order[0]}" style="margin-bottom:4px;"></i>
-                    <span ng-class="{fontgreen: order[0]}" style="margin-left:-5px;">点击次数</span>
-                </div>
                 <div class="column" ng-click="changeOrder(1)">
                     <i class="add to calendar large icon" ng-class="{green: order[1]}" style="margin-bottom:4px;"></i>
                     <span ng-class="{fontgreen: order[1]}" style="margin-left:-5px;">添加日期</span>
                 </div>
+                <div class="column" ng-click="changeOrder(0)">
+                    <i class="sort numeric descending large icon" ng-class="{green: order[0]}" style="margin-bottom:4px;"></i>
+                    <span ng-class="{fontgreen: order[0]}" style="margin-left:-5px;">点击次数</span>
+                </div>
                 <div class="column" ng-click="changeOrder(2)">
                     <i class="sort alphabet descending large icon" ng-class="{green: order[2]}" style="margin-bottom:4px;"></i>
                     <span ng-class="{fontgreen: order[2]}" style="margin-left:-5px;">最后点击</span>