From d5181b7d00712171fff2274a322524e7a52e9b96 Mon Sep 17 00:00:00 2001
From: lqq <jesus_lqq@163.com>
Date: Wed, 23 Oct 2019 14:38:18 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96empty=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/empty/index.wxml              | 3 +++
 components/empty/index.wxss              | 2 +-
 pages/home/index.js                      | 8 ++++----
 pages/topics/interactive/cell/index.wxss | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/components/empty/index.wxml b/components/empty/index.wxml
index ffef962..954bc01 100644
--- a/components/empty/index.wxml
+++ b/components/empty/index.wxml
@@ -7,4 +7,7 @@
     <view class="empty-logo">{{message}}</view>
     <view class="empty-refresh"></view>
   </view>
+  <view class="empty_bottom" wx:if="{{bottom}}">
+    已到底了
+  </view>
 </view>
diff --git a/components/empty/index.wxss b/components/empty/index.wxss
index 8f3e25c..77a5299 100644
--- a/components/empty/index.wxss
+++ b/components/empty/index.wxss
@@ -12,7 +12,7 @@
   left: 0;
   bottom: 0;
 }
-.empty-bd {
+.empty-bd, .empty_bottom {
   padding: 10px 0;
   text-align: center;
   font-size: 17px;
diff --git a/pages/home/index.js b/pages/home/index.js
index aaed8ad..f53686d 100644
--- a/pages/home/index.js
+++ b/pages/home/index.js
@@ -82,10 +82,10 @@ Page({
           this.setData({
             currPage: page
           })
-          wx.showToast({
-            title: '已加载全部',
-            icon: 'none'
-          })
+          // wx.showToast({
+          //   title: '已加载全部',
+          //   icon: 'none'
+          // })
         }
       }
       console.log(res)
diff --git a/pages/topics/interactive/cell/index.wxss b/pages/topics/interactive/cell/index.wxss
index 6242966..799a98f 100644
--- a/pages/topics/interactive/cell/index.wxss
+++ b/pages/topics/interactive/cell/index.wxss
@@ -85,7 +85,7 @@ image{
   font-weight: 300;
   font-size: 17px;
   color: #000;
-    display: -webkit-box;
+  display: -webkit-box;
   -webkit-box-orient: vertical;
   -webkit-line-clamp: 2;
   overflow: hidden;

From 284b196647df2545a1211f6faad66da1f15027a6 Mon Sep 17 00:00:00 2001
From: lqq <jesus_lqq@163.com>
Date: Wed, 23 Oct 2019 15:31:28 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/article/index.wxss         | 2 +-
 pages/user/myFavorite/index.wxml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pages/article/index.wxss b/pages/article/index.wxss
index 3f56206..5bbe95a 100644
--- a/pages/article/index.wxss
+++ b/pages/article/index.wxss
@@ -3,7 +3,7 @@
   overflow: hidden;
 }
 .page_hd {
-  padding: 0 15px;
+  padding: 0 20rpx;
   display: flex;
   flex-direction: column;
   margin-bottom: 10px;
diff --git a/pages/user/myFavorite/index.wxml b/pages/user/myFavorite/index.wxml
index ebb8dc8..42b0395 100644
--- a/pages/user/myFavorite/index.wxml
+++ b/pages/user/myFavorite/index.wxml
@@ -5,6 +5,7 @@
       <artice-cell 
         cId="{{item.topicId}}"
         title="{{item.title}}" 
+        image="{{item.topicImg}}"
         time="{{item.time}}" 
         bind:clickListItem="clickListItem"/>
     </block>

From a2504309aa632d7e78bb348012998f198d42dafd Mon Sep 17 00:00:00 2001
From: lqq <jesus_lqq@163.com>
Date: Wed, 23 Oct 2019 16:44:20 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/article/index.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pages/article/index.js b/pages/article/index.js
index 56e2c00..4583d9a 100644
--- a/pages/article/index.js
+++ b/pages/article/index.js
@@ -1,6 +1,7 @@
 // pages/article/index.js
 import {ArticeModel} from '../../models/artice.js'
 import dayjs from '../../utils/dayjs/index.js'
+import { store } from '../../utils/store.js'
 let artice = new ArticeModel()
 
 Page({
@@ -27,7 +28,14 @@ Page({
   },
   onlineSubmit () {
     console.log('在线报名')
-    this.onlineSignApi() // 在线报名
+    if (store.hasPhone()) {
+      this.onlineSignApi() // 在线报名
+    } else {
+      wx.redirectTo({
+        url: `/pages/register/index`,
+      })
+    }
+
   },
   /**
    * 生命周期函数--监听页面加载