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 @@ + + 已到底了 + 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/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`, + }) + } + }, /** * 生命周期函数--监听页面加载 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/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 ff94bfe..48f4042 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; 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 @@