Commit 1069887f authored by 石盼盼's avatar 石盼盼

Merge branch 'spp' into 'master'

Spp

See merge request !2
parents 112fc9b4 dc2b673f
......@@ -9,26 +9,6 @@ Page({
*/
data: {
endLoading: false,
// list: [
// {
// bigUrl: '/images/1.png',
// littleUrl: '/images/1.png',
// name: '金地物业秋季线上校园宣讲会',
// time: '10-12 09:00'
// },
// {
// bigUrl: '/images/2.png',
// littleUrl: '/images/2.png',
// name: '泡泡玛特秋季线上校园宣讲会',
// time: '10-13 09:00'
// },
// {
// bigUrl: '/images/3.png',
// littleUrl: '/images/3.png',
// name: '蔚来汽车秋季线上校园宣讲会',
// time: '10-14 09:00'
// },
// ],
list: [],
next_page: 1, // 下一页
has_more: true, // 是否还有更多
......
......@@ -4,18 +4,18 @@
catchtap="goLive">
<view class="fm">
<view class="time">{{item.starttime}}</view>
<image class="fm-img" src="{{item.feedImg}}"></image>
<image class="fm-img" src="{{item.feedImg}}" mode="aspectFill"></image>
</view>
<view class="company flex-h flex-vc flex-hb">
<view class="flex-h flex-vc">
<view class="img">
<image src="{{item.one.logo}}"></image>
<image src="{{item.one.logo}}" mode="aspectFill"></image>
</view>
<view class="company_name text-line-one">{{item.title}}</view>
</view>
<view wx:if="{{item.live.islive==101 ||item.live.islive==105}}" class="ing-btn flex-h flex-vc flex-hc">
<text>直播中</text>
<image src="/images/living.gif"></image>
<image src="/images/living.gif" mode="aspectFill"></image>
</view>
<view wx:if="{{item.live.islive==102}}" class="yy-btn" catchtap="impower"
data-roomId="{{item.live.room_id}}">预约直播</view>
......@@ -25,6 +25,7 @@
已结束</view>
</view>
</view>
<view class="blank"></view>
</view>
<view wx:else class="noneBox column">
<image src="/images/none.png"></image>
......
......@@ -45,14 +45,14 @@ page {
}
.item .company .img {
width: 37rpx;
height: 37rpx;
width: 60rpx;
height: 60rpx;
margin-right: 22rpx;
}
.item .company .img image {
width: 37rpx;
height: 37rpx;
width: 60rpx;
height: 60rpx;
}
.item .company .company_name {
......@@ -121,3 +121,7 @@ page {
width: 28rpx;
height: 28rpx;
}
.blank{
width: 100%;
height: 100rpx;
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment