From e71537a41e7fcd85c8d871ba1c8231587f8249a4 Mon Sep 17 00:00:00 2001
From: dong_bo0602 <358256383@qq.com>
Date: Sat, 27 Jun 2020 13:19:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=9B=B4=E6=92=AD=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/broadcast/broadcast.wxml | 1 +
pages/broadcast/broadcast.wxss | 13 +++++++++++++
pages/index/index.wxml | 1 +
pages/index/index.wxss | 14 ++++++++++++++
4 files changed, 29 insertions(+)
diff --git a/pages/broadcast/broadcast.wxml b/pages/broadcast/broadcast.wxml
index 4e0a051..d10391c 100644
--- a/pages/broadcast/broadcast.wxml
+++ b/pages/broadcast/broadcast.wxml
@@ -2,6 +2,7 @@
+ 直播中
{{item.livePlanName}}
diff --git a/pages/broadcast/broadcast.wxss b/pages/broadcast/broadcast.wxss
index 73a739e..98d1160 100644
--- a/pages/broadcast/broadcast.wxss
+++ b/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;
}
\ No newline at end of file
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 2163cd7..21fceed 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -117,6 +117,7 @@
+ 文字
\ No newline at end of file
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 0260508..e60de93 100644
--- a/pages/index/index.wxss
+++ b/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;
}
\ No newline at end of file
From 51c90735c1cb1b94b3258579219bb8f046d815ac Mon Sep 17 00:00:00 2001
From: dong_bo0602 <358256383@qq.com>
Date: Sat, 27 Jun 2020 13:25:40 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=9B=B4=E6=92=AD=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app.json | 2 +-
pages/book/book.js | 13 +++++++++++--
pages/book/book.wxml | 26 +++++++++++++++++++++++---
pages/book/book.wxss | 26 +++++++++++++++++++++++++-
4 files changed, 60 insertions(+), 7 deletions(-)
diff --git a/app.json b/app.json
index af7d876..397f712 100644
--- a/app.json
+++ b/app.json
@@ -2,9 +2,9 @@
"pages": [
"pages/book/book",
"pages/index/index",
+ "pages/broadcast/broadcast",
"pages/activityDialog/activityDialog",
"pages/teamDetail/teamDetail",
- "pages/broadcast/broadcast",
"pages/center/center",
"pages/volunteerRegister/volunteerRegister",
"pages/volunteer/volunteer",
diff --git a/pages/book/book.js b/pages/book/book.js
index 764627f..c6b9688 100644
--- a/pages/book/book.js
+++ b/pages/book/book.js
@@ -5,9 +5,18 @@ Page({
* 页面的初始数据
*/
data: {
-
+ checkOrder: false
+ },
+ doCheckOrder: function () {
+ this.setData({
+ checkOrder: true
+ })
+ },
+ closeCheckOrder: function () {
+ this.setData({
+ checkOrder: false
+ })
},
-
/**
* 生命周期函数--监听页面加载
*/
diff --git a/pages/book/book.wxml b/pages/book/book.wxml
index 463d606..0cbad2e 100644
--- a/pages/book/book.wxml
+++ b/pages/book/book.wxml
@@ -88,7 +88,7 @@
-
+
订单金额：10元
@@ -96,7 +96,7 @@
-
+
订单信息
@@ -105,7 +105,27 @@
2020-01-01
12:00-13:00
-
+
+ 场地1
+ 15元
+
+
+
+
+ 2020-01-01
+ 12:00-13:00
+
+
+ 场地1
+ 15元
+
+
+
+
+ 2020-01-01
+ 12:00-13:00
+
+
场地1
15元
diff --git a/pages/book/book.wxss b/pages/book/book.wxss
index c6f08ab..2332f35 100644
--- a/pages/book/book.wxss
+++ b/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;
}
\ No newline at end of file