Merge branch 'master' of http://121.42.41.42:7070/r/shibeirencai_wechat

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>

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;

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`,
+      })
+    }
+
   },
   /**
    * 生命周期函数--监听页面加载

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;

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)

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;

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>