From e8ce732a02b0591295ebc9e87485b13efea1e164 Mon Sep 17 00:00:00 2001
From: luchenqun <luchenqun@juzix.io>
Date: Fri, 25 May 2018 10:46:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=AB=E9=80=9F=E8=B7=B3=E8=BD=AC=E6=8C=89?=
 =?UTF-8?q?=E5=AD=97=E5=B9=95=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/public/scripts/controllers/settings-controller.js b/public/scripts/controllers/settings-controller.js
index 2c8d9f3..da0b314 100644
--- a/public/scripts/controllers/settings-controller.js
+++ b/public/scripts/controllers/settings-controller.js
@@ -59,7 +59,17 @@ app.controller('settingsCtr', ['$scope', '$stateParams', '$filter', '$state', '$
                         $scope.loadShowStyle = false;
                     }
                     if (index == 4) {
-                        $scope.quickUrl = JSON.parse($scope.user.quick_url || '{}');
+                        function objKeySort(obj) {
+                            var newkey = Object.keys(obj).sort();
+                            var newObj = {};
+                            for (var i = 0; i < newkey.length; i++) {
+                                newObj[newkey[i]] = obj[newkey[i]];
+                            }
+                            return newObj;//返回排好序的新对象
+                        }
+
+                        $scope.quickUrl = objKeySort(JSON.parse($scope.user.quick_url || '{}'));
+
                     }
                 })
                 .catch((err) => {
diff --git a/public/views/settings.html b/public/views/settings.html
index 80b9955..b4ecd40 100644
--- a/public/views/settings.html
+++ b/public/views/settings.html
@@ -166,6 +166,7 @@
                 <p>以下几个系统默认使用的按键无法使用：<br/>
                     <span ng-repeat="(key, value) in forbidQuickKey">{{key}}：{{value}}<br/></span>
                 </p>
+                <p>如果你想更换快捷链接，你需要先删除再添加。</p>
                 <div class="ui divider"></div>
                 <div class="ui form">
                     <div class="inline fields">