From f751e35fbab64ae3a8abf346f872448898eb1aba Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Fri, 13 Mar 2020 19:18:50 +0800
Subject: [PATCH] 好物推荐

---
 pages/video/index.js   | 19 +++++++++++++++++++
 pages/video/index.json |  5 ++++-
 pages/video/index.wxml | 37 +++++++++++++++++++++++++++++++++++--
 pages/video/index.wxss | 42 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 100 insertions(+), 3 deletions(-)

diff --git a/pages/video/index.js b/pages/video/index.js
index aaab839..89f2357 100644
--- a/pages/video/index.js
+++ b/pages/video/index.js
@@ -48,5 +48,24 @@ Page({
       text: this.inputValue,
       color: getRandomColor()
     })
+  },
+  onShow:function(){
+	  var goods_list = this.selectComponent("#goods_list"); //组件的id
+	  goods_list.init();
+	  setTimeout(function() {
+	    goods_list.get_list();
+	  }, 300)
+  },
+  
+  //调用视频接口
+  onLoad:function(e){
+	  var r_id=e.roomid,th=this;
+	  getApp().request.get("",{
+		  data:{},
+		  success:function(res){
+			  
+		  }
+	  })
+	  
   }
 })
\ No newline at end of file
diff --git a/pages/video/index.json b/pages/video/index.json
index 78ba31c..2d53251 100644
--- a/pages/video/index.json
+++ b/pages/video/index.json
@@ -1,4 +1,7 @@
 {
     "navigationBarTitleText": "视频",
-    "enablePullDownRefresh": false
+    "enablePullDownRefresh": false,
+	"usingComponents": {
+		 "goods_recommend":"/components/goods_list/goods_list" 
+	}
 }
\ No newline at end of file
diff --git a/pages/video/index.wxml b/pages/video/index.wxml
index 429dced..0ac2599 100644
--- a/pages/video/index.wxml
+++ b/pages/video/index.wxml
@@ -1,7 +1,7 @@
 
 <view class="video">
   <video
-   src="http://1258344707.vod2.myqcloud.com/1b87576bvodcq1258344707/54fc82435285890799847056279/playlist_eof.m3u8"
+   src="{{url}}"
    controls
    show-fullscreen-btn
    show-mute-btn
@@ -10,5 +10,38 @@
    binderror="error"
    bindpause="pause"
    bindtimeupdate="timeupdate"></video>
+</view>
 
-</view>
\ No newline at end of file
+
+ <!-- 标题 -->
+    <view  class="title">
+      <!-- 中文名标题 -->
+      <view class="China flex-level">
+        <view class="line flex-vertical">
+          <view class="one"></view>
+          <view class="two"></view>
+          <view class="three"></view>
+        </view>
+
+        <view class="Recommend flex-level" bindtap="requestList">好物推荐</view>
+
+        <view class="line flex-vertical">
+          <view class="three"></view>
+          <view class="two"></view>
+          <view class="one"></view>
+        </view>
+      </view>
+
+      <!-- 英文标题 -->
+      <view class="english flex-center">
+        <view class="silk"></view>
+        <view class="esh five-level-word">GOOD HOT THING</view>
+        <view class="silk"></view>
+      </view>
+
+    </view>
+
+
+
+<!-- 商品列表组件 -->
+<goods_recommend id="goods_list"></goods_recommend>
\ No newline at end of file
diff --git a/pages/video/index.wxss b/pages/video/index.wxss
index 21ca0bb..04a0b0d 100644
--- a/pages/video/index.wxss
+++ b/pages/video/index.wxss
@@ -4,4 +4,46 @@
 
 video {
   width: 100%;
+}
+
+/* 热门好物 */
+
+.title .China {
+  width: 100%;
+  margin-top: 10rpx;
+  margin-bottom: 10rpx;
+  line-height: 0rpx;
+}
+
+.title .China .line view {
+  width: 2rpx;
+}
+
+.title .China .line {
+  height: 40rpx;
+  color: rgb(51, 51, 51);
+}
+
+.title .China .line view {
+  border-left: 3rpx solid #000;
+  margin-left: 5rpx;
+}
+
+.title .China .line .one {
+  height: 23rpx;
+}
+
+.title .China .line .two {
+  height: 15rpx;
+}
+
+.title .China .line .three {
+  height: 18rpx;
+}
+
+.title .China .Recommend {
+  margin: 0rpx 20rpx;
+  font-size: 28rpx;
+  line-height: 39rpx;
+  font-weight: bold;
 }
\ No newline at end of file
--
libgit2 0.21.4