Merge branch 'master' of https://github.com/wanggeng888/xz_mini

pages/book/book.wxml

@@ -70,6 +70,26 @@
     <view>12:00-13:00</view>
     <view>15元</view>
   </view>
+  <view class="time-box">
+    <view>2020-01-01</view>
+    <view>12:00-13:00</view>
+    <view>15元</view>
+  </view>
+  <view class="time-box">
+    <view>2020-01-01</view>
+    <view>12:00-13:00</view>
+    <view>15元</view>
+  </view>
+  <view class="time-box">
+    <view>2020-01-01</view>
+    <view>12:00-13:00</view>
+    <view>15元</view>
+  </view>
+  <view class="time-box">
+    <view>2020-01-01</view>
+    <view>12:00-13:00</view>
+    <view>15元</view>
+  </view>
 </view>
 <view class="bottom">
   <view class="phone-code">

pages/book/book.wxss

@@ -97,6 +97,7 @@
 }
 .time{
   padding: 0 30rpx;
+  margin-bottom: 260rpx;
 }
 .time-box{
   display: inline-block;
@@ -123,6 +124,7 @@
   left: 0;
   right: 0;
   padding: 15rpx 30rpx;
+  background: #fff;
 }
 .phone-code{
   margin-bottom: 20rpx;

pages/index/index.wxml

@@ -118,6 +118,7 @@
     <view class="broadcast-box" bindtap="goBroadcastDetail" wx:for="{{live.liveList}}" wx:for-index="index" wx:for-item="item" wx:key="liveList">
       <image src="{{live.liveUrl}}/route/file/downloadfile/true/{{item.livePlanPhoto}}"></image>
       <view class="broadcast-text">文字</view>
+      <view class="broadcast-status">直播中</view>
     </view>
   </view>
 </view>

pages/index/index.wxss

@@ -146,4 +146,14 @@
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
+}
+.broadcast-status{
+  position: absolute;
+  top: 10rpx;
+  right: 10rpx;
+  padding: 5rpx;
+  background: #9F1512;
+  color: #fff;
+  font-size: 26rpx;
+  border-radius: 10rpx;
 }