From 4211e2181a9a34f8a2be00624dbf5d71e7ef5918 Mon Sep 17 00:00:00 2001
From: luchenqun <luchenqun@qq.com>
Date: Thu, 8 Aug 2019 17:24:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=96=87=E7=AB=A0=E7=BB=99?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AAloading=E7=9A=84=E5=81=87=E8=B1=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controllers/weixin-article-controller.js       |  7 +++++--
 public/views/weixin-article.html                   | 14 +++++++-------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/public/scripts/controllers/weixin-article-controller.js b/public/scripts/controllers/weixin-article-controller.js
index 4a714a6..30c0b6a 100644
--- a/public/scripts/controllers/weixin-article-controller.js
+++ b/public/scripts/controllers/weixin-article-controller.js
@@ -98,10 +98,13 @@ app.controller('weixinArticleCtr', ['$scope', '$state', '$sce', '$stateParams',
             $scope.jumpToUrl(b.url);
             return;
         }
+        // 假装等待一下。。。。。。
+        $scope.loadBusy = true;
         $scope.bookmark = b;
-        setTimeout(function() {
+        $timeout(function() {
             $('body,html').animate({scrollTop:0},100);
-        }, 100);
+            $scope.loadBusy = false;
+        }, 200)
     }
 
     // 快捷键r随机推荐
diff --git a/public/views/weixin-article.html b/public/views/weixin-article.html
index a13ec10..41f8405 100644
--- a/public/views/weixin-article.html
+++ b/public/views/weixin-article.html
@@ -12,7 +12,7 @@
         正在加载中...</div>
 
     <div class="ui divider" style="margin: 3px 0px 8px 0px;"></div>
-    <div class="ui five stackable cards" ng-if="!bookmark.content">
+    <div class="ui five stackable cards" ng-if="!bookmark.content && !loadBusy">
         <div class="card" ng-repeat="bookmark in bookmarks" ng-mouseover="setHoverBookmark(bookmark)" ng-mouseleave="setHoverBookmark(null)">
             <div class="content" style="max-height:70px;cursor:pointer" ng-click="detailBookmark(bookmark)">
                 <div class="description bookmarkTitle" title="{{bookmark.title}}">
@@ -39,7 +39,7 @@
             </div>
         </div>
     </div>
-    <div class="ui container" ng-if="bookmark.content">
+    <div class="ui container" ng-if="bookmark.content && !loadBusy">
         <div class="ui center aligned container" style="font-size:30px;">
             {{bookmark.title}}
         </div>
@@ -64,8 +64,8 @@
             </span>
         </div>
     </div>
-    <div class="ui divider"></div>
-    <div class="ui grid" ng-if="bookmark.content">
+    <div class="ui divider" ng-if="!loadBusy"></div>
+    <div class="ui grid" ng-if="bookmark.content && !loadBusy">
         <div class="eight wide column">
             <div style="float: left;cursor: pointer" ng-click="detailBookmark(bookmarks[bookmark.index-1])" ng-if="bookmarks[bookmark.index-1]"><i class="chevron left icon"></i>
                 {{ bookmarks[bookmark.index-1].title }}</div>
@@ -75,12 +75,12 @@
                 {{ bookmarks[bookmark.index+1].title }} <i class="chevron right icon"></i></div>
         </div>
     </div>
-    <div class="ui divider" ng-if="bookmark.content"></div>
+    <div class="ui divider" ng-if="bookmark.content && !loadBusy"></div>
     <div class="ui grid">
-        <div class="one wide column">
+        <div class="four wide column">
             <i title="返回文章列表。按 ESC 键亦可返回" class="reply icon black big" style="padding-top:10px;" ng-click="bookmark.content=''" ng-show="bookmark.content"></i>
         </div>
-        <div class="fifteen wide column">
+        <div class="twelve wide column">
             <pagination></pagination>
         </div>
     </div>