From b01171bab8947c3caa7287399d7d4e2d6fe0b2ea Mon Sep 17 00:00:00 2001
From: dong_bo0602 <358256383@qq.com>
Date: Sat, 27 Jun 2020 19:21:38 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=9B=B4=E6=92=AD=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json                               |  7 +++
 pages/broadcastList/broadcastList.js   | 66 ++++++++++++++++++++++++++
 pages/broadcastList/broadcastList.json |  3 ++
 pages/broadcastList/broadcastList.wxml |  9 ++++
 pages/broadcastList/broadcastList.wxss | 22 +++++++++
 5 files changed, 107 insertions(+)
 create mode 100644 pages/broadcastList/broadcastList.js
 create mode 100644 pages/broadcastList/broadcastList.json
 create mode 100644 pages/broadcastList/broadcastList.wxml
 create mode 100644 pages/broadcastList/broadcastList.wxss

diff --git a/app.json b/app.json
index a071b04..9dfcf50 100644
--- a/app.json
+++ b/app.json
@@ -1,8 +1,15 @@
 {
   "pages": [
+<<<<<<< Updated upstream
     "pages/center/center",
     "pages/book/book",
+=======
+    "pages/broadcastList/broadcastList",
+>>>>>>> Stashed changes
     "pages/index/index",
+    "pages/orderDetail/orderDetail",
+    "pages/myVenueOrder/myVenueOrder",
+    "pages/book/book",
     "pages/broadcast/broadcast",
     "pages/activityDialog/activityDialog",
     "pages/teamDetail/teamDetail",
diff --git a/pages/broadcastList/broadcastList.js b/pages/broadcastList/broadcastList.js
new file mode 100644
index 0000000..fe01253
--- /dev/null
+++ b/pages/broadcastList/broadcastList.js
@@ -0,0 +1,66 @@
+// pages/broadcastList/broadcastList.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})
\ No newline at end of file
diff --git a/pages/broadcastList/broadcastList.json b/pages/broadcastList/broadcastList.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/pages/broadcastList/broadcastList.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/broadcastList/broadcastList.wxml b/pages/broadcastList/broadcastList.wxml
new file mode 100644
index 0000000..084e104
--- /dev/null
+++ b/pages/broadcastList/broadcastList.wxml
@@ -0,0 +1,9 @@
+<view class="broadcast">
+	<live-player id="liveVideo" src="{{liveDetail.liveDeviceRtmpUrl}}" mode="live" object-fit="contain" style="width: 100%; height: 400rpx;"/>
+</view>
+<view class="broadcast-list">
+  <view class="broadcast-title">标题</view>
+  <view class="broadcast-title">标题</view>
+  <view class="broadcast-title">标题</view>
+  <view class="broadcast-title">标题</view>
+</view>
\ No newline at end of file
diff --git a/pages/broadcastList/broadcastList.wxss b/pages/broadcastList/broadcastList.wxss
new file mode 100644
index 0000000..2830aae
--- /dev/null
+++ b/pages/broadcastList/broadcastList.wxss
@@ -0,0 +1,22 @@
+.broadcast{
+  width: 100%;
+  height: 400rpx;
+  background: #D8D8D8;
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+}
+video{
+  width: 100%;
+  height: 400rpx;
+}
+.broadcast-title{
+  padding: 30rpx;
+  font-size: 34rpx;
+  color: #242424;
+  border-bottom: 5px solid #FBFBFB;
+}
+.broadcast-list{
+  margin-top: 400rpx;
+}
\ No newline at end of file

From b390b9bc7103f2c7bd36c2ac0b45f0e457eb732e Mon Sep 17 00:00:00 2001
From: dong_bo0602 <358256383@qq.com>
Date: Sat, 27 Jun 2020 19:22:12 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=9B=B4=E6=92=AD=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/app.json b/app.json
index 9dfcf50..64d7f6e 100644
--- a/app.json
+++ b/app.json
@@ -1,12 +1,8 @@
 {
   "pages": [
-<<<<<<< Updated upstream
-    "pages/center/center",
-    "pages/book/book",
-=======
-    "pages/broadcastList/broadcastList",
->>>>>>> Stashed changes
     "pages/index/index",
+    "pages/center/center",
+    "pages/broadcastList/broadcastList",
     "pages/orderDetail/orderDetail",
     "pages/myVenueOrder/myVenueOrder",
     "pages/book/book",