Merge remote-tracking branch 'origin/master'

h_news/news_list.html

@@ -86,7 +86,7 @@
     <ul>
       <li>分享到</li>
       <li><img src="../imgs/qq.png" alt="qq">QQ</li>
-      <!-- <li><img src="./imgs/weixin.png" alt="qq">微信</li> -->
+      <li><img src="../imgs/weixin.png" alt="qq">微信</li>
       <li><img src="../imgs/weibo.png" alt="qq">微博</li>
     </ul>
   </div>

js/new_list.js

@@ -16,7 +16,7 @@ $(function () {
     if (c == 0 && currentPage <= totalPage) {
       lock = true;
       $(".my-loading").show();
-      data({ currentPage }).then(res => { console.log(res.totalPage); totalPage = res.totalPage; currentPage++; lock = res.lock; $(".my-loading").hide(); })
+      data({ currentPage }).then(res => { totalPage = res.totalPage; currentPage++; lock = res.lock; $(".my-loading").hide(); })
     }
   })
   // 加载数据
@@ -29,7 +29,7 @@ $(function () {
           pageSize: 10
         },
         type: "get",
-        error: function () {
+        error: function (error) {
           $(".my-loading").html("已经没有可以加载的数据了")
         },
         success: function (res) {