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

app.json

@@ -1,9 +1,9 @@
 {
   "pages": [
     "pages/index/index",
+    "pages/broadcast/broadcast",
     "pages/activityDialog/activityDialog",
     "pages/teamDetail/teamDetail",
-    "pages/broadcast/broadcast",
     "pages/center/center",
     "pages/volunteerRegister/volunteerRegister",
     "pages/volunteer/volunteer",

pages/book/book.js

@@ -5,9 +5,18 @@ Page({
    * 页面的初始数据
    */
   data: {
-
+    checkOrder: false
+  },
+  doCheckOrder: function () {
+    this.setData({
+      checkOrder: true
+    })
+  },
+  closeCheckOrder: function () {
+    this.setData({
+      checkOrder: false
+    })
   },
-
   /**
    * 生命周期函数--监听页面加载
    */

pages/book/book.wxml

@@ -88,7 +88,7 @@
     </view>
   </view>
   <view class="pay-book">
-    <view class="pay">
+    <view class="pay" bindtap="doCheckOrder">
       订单金额：10元
     </view>
     <view class="book">
@@ -96,7 +96,7 @@
     </view>
   </view>
 </view>
-<view class="order-info">
+<view class="order-info" bindtap="closeCheckOrder" wx:if="{{checkOrder}}">
   <view class="order-container">
     <view class="order-title">订单信息</view>
     <view class="order">
@@ -105,7 +105,27 @@
           <view>2020-01-01</view>
           <view>12:00-13:00</view>
         </view>
-        <view class="bottom">
+        <view class="bottom-info">
+          <view>场地1</view>
+          <view>15元</view>
+        </view>
+      </view>
+      <view class="order-box">
+        <view class="top">
+          <view>2020-01-01</view>
+          <view>12:00-13:00</view>
+        </view>
+        <view class="bottom-info">
+          <view>场地1</view>
+          <view>15元</view>
+        </view>
+      </view>
+      <view class="order-box">
+        <view class="top">
+          <view>2020-01-01</view>
+          <view>12:00-13:00</view>
+        </view>
+        <view class="bottom-info">
           <view>场地1</view>
           <view>15元</view>
         </view>

pages/book/book.wxss

@@ -189,9 +189,33 @@
 }
 .order-container{
   position: absolute;
-  bottom: 80rpx;
+  bottom: 90rpx;
   left: 30rpx;
   right: 30rpx;
   background: #fff;
   border-radius: 10rpx;
+  padding: 20rpx;
+}
+.order-title{
+  font-size: 30rpx;
+  text-align: center;
+  color: #9F1512;
+}
+.order{
+  margin-top: 20rpx;
+  overflow-x: auto;
+  white-space: nowrap;
+}
+.order-box{
+  border: 1px solid #9F1512;
+  border-radius: 10rpx;
+  text-align: center;
+  display: inline-block;
+  margin-right: 20rpx;
+  font-size: 28rpx;
+  width: 32%;
+}
+.top{
+  background: #9F1512;
+  color: #fff;
 }

pages/broadcast/broadcast.wxml

@@ -2,6 +2,7 @@
   <view class="broadcast-box" bindtap="goDetail" data-live-plan-id="{{item.livePlanId}}" wx:for="{{live.liveList}}" wx:for-index="idx" wx:for-item="item" wx:key="liveList">
     <view class="broadcast-img">
       <image src="{{live.liveUrl}}/route/file/downloadfile/true/{{item.livePlanPhoto}}"></image>
+      <view class="broadcast-status">直播中</view>
     </view>
     <view class="broadcast-info">
       <view class="name">{{item.livePlanName}}</view>

pages/broadcast/broadcast.wxss

@@ -11,6 +11,9 @@
   width: 100%;
   height: 310rpx;
 }
+.broadcast-img{
+  position: relative;
+}
 .broadcast-info{
   padding: 20rpx;
 }
@@ -25,4 +28,14 @@
   color: #242424;
   font-size: 26rpx;
   margin-top: 10rpx;
+}
+.broadcast-status{
+  position: absolute;
+  top: 15rpx;
+  right: 15rpx;
+  padding: 5rpx 10rpx;
+  background: #9F1512;
+  color: #fff;
+  font-size: 28rpx;
+  border-radius: 10rpx;
 }

pages/index/index.wxml

@@ -117,6 +117,7 @@
   <view class="broadcast-container">
     <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>
   </view>
 </view>

pages/index/index.wxss

@@ -128,8 +128,22 @@
   overflow: hidden;
   height: 185rpx;
   margin-bottom: 15rpx;
+  position: relative;
 }
 .broadcast-box image{
   width: 100%;
   height: 100%;
+}
+.broadcast-text{
+  position: absolute;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  padding: 5rpx 10rpx;
+  font-size: 26rpx;
+  background: rgba(0,0,0,0.6);
+  color: #fff;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }