From 299dc5e762093ebbebb8b19472cd73e64f733a6d Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 22 Sep 2020 15:02:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E6=96=87=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/wechat/view/news/index.html | 5 ++++-
 public/static/admin.js          | 6 ++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/wechat/view/news/index.html b/app/wechat/view/news/index.html
index d3aa9d950..a819520be 100644
--- a/app/wechat/view/news/index.html
+++ b/app/wechat/view/news/index.html
@@ -10,7 +10,7 @@
 
 {block name='content'}
 <div class="think-box-shadow">
-    <div id="news-box" class="layui-clear">
+    <div id="news-box" class="layui-clear layui-hide">
         {foreach $list as $vo}
         <div class="news-item">
             <div class='news-tools layui-hide'>
@@ -45,7 +45,10 @@
     }).off('mouseleave', '.news-item').on('mouseleave', '.news-item', function () {
         $(this).find('.news-tools').addClass('layui-hide');
     });
+    $.msg.loading();
     require(['jquery.masonry'], function (Masonry) {
+        layui.layer.closeAll();
+        $('#news-box').removeClass('layui-hide');
         var newsbox = document.querySelector('#news-box');
         var msnry = new Masonry(newsbox, {itemSelector: '.news-item', columnWidth: 0});
         msnry.layout(), $('body').on('click', '[data-news-del]', function (event) {
diff --git a/public/static/admin.js b/public/static/admin.js
index 282e70beb..2c5541e27 100644
--- a/public/static/admin.js
+++ b/public/static/admin.js
@@ -131,7 +131,7 @@ $(function () {
         };
         // 内容区域动态加载后初始化
         this.reInit = function ($dom) {
-            $.vali.listen(this), $dom = $dom || $(this.selecter);
+            $(window).trigger('scroll'), $.vali.listen(this), $dom = $dom || $(this.selecter);
             $dom.find('[required]').map(function ($parent) {
                 if (($parent = $(this).parent()) && $parent.is('label')) {
                     $parent.addClass('label-required-prev');
@@ -160,9 +160,7 @@ $(function () {
                 $this.uploadFile(function (url, file) {
                     $($this.data('input')).data('file', file).val(url).trigger('change');
                 });
-            }), setTimeout(function () {
-                $(window).trigger('scroll');
-            }, 500);
+            });
         };
         // 在内容区显示视图
         this.show = function (html) {