From b2d284f666f7d5766f0076cc8dae7b7a6083287a Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Mon, 27 Jul 2020 14:35:32 +0800
Subject: [PATCH 1/3] =?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

---
 components/index/zhibo-item/index.vue | 7 ++++---
 pageB/search/out.vue                  | 4 ++--
 pages/index/index.vue                 | 6 ++++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/components/index/zhibo-item/index.vue b/components/index/zhibo-item/index.vue
index d26f10d..327b34e 100644
--- a/components/index/zhibo-item/index.vue
+++ b/components/index/zhibo-item/index.vue
@@ -1,10 +1,10 @@
 <template>
     <view class="zhibo">
-        <image class="head"></image>
+        <image class="head" :src="image"></image>
         <view class="user">
             <view class="name">
                 <image></image>
-                <text>这是名字</text>
+                <text class="u-line-1" style="width:130rpx">{{name}}</text>
             </view>
             <view class="pingbi">
                 <image></image>
@@ -70,6 +70,7 @@ export default {
         return {
 
         }
-    }
+    },
+    props:['name','image']
 }
 </script>
\ No newline at end of file
diff --git a/pageB/search/out.vue b/pageB/search/out.vue
index f16b84a..bd3b087 100644
--- a/pageB/search/out.vue
+++ b/pageB/search/out.vue
@@ -19,11 +19,11 @@
         </swiper>
         <view v-else style=" display: flex;flex-direction: column;height: calc(100vh - 88rpx);">
             <view class="select">
-                <view  @click="sx(0)" data-type="xl">销量</view>
+                <view  @click="sx(0)" class="xz" data-type="xl">销量</view>
                 <view class="xz" @click="sx(1)">
                     <text>价格</text>
                     <view class="jiage">
-                        <view class="top"></view>
+                        <view class="top topxz"></view>
                         <view class="bottom bottomxz"></view>
                     </view>
                 </view>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 68f4fd1..cefcdb7 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -39,10 +39,10 @@
 						<u-swiper mode="dot" :list="zhiboImageSwiper" name="adv_code"></u-swiper>
 						<view class="list">
 							<view>
-								<zhiboItem v-for="item in 10"></zhiboItem>
+								<zhiboItem v-for="item in tabLiveLists.filter((_, index) => !(index&1))" :key="item.live_id" :name="item.store_name" :image="item.cover_img"></zhiboItem>
 							</view>
 							<view style="margin-left:20rpx">
-								<zhiboItem v-for="item in 10"></zhiboItem>
+								<zhiboItem v-for="item in tabLiveLists.filter((_, index) => index&1)" :key="item.live_id"></zhiboItem>
 							</view>
 						</view>
 					</view>
@@ -203,6 +203,7 @@
 				recommendList: [], // 推荐达人
 				indexImageSwiper: [],
 				zhiboImageSwiper: [],
+				tabLiveLists:[]
 			}
 		},
 		components: {
@@ -222,6 +223,7 @@
 			tabLiveList(){
 				this.$u.api.tabLiveList().then((res)=>{
 					console.log(res)
+					this.tabLiveLists = res.data
 				})
 			},
 			getSwiper() {

From 2ea9b89acc4ed4eae8d0a32ac6cb7f6684161b96 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Mon, 27 Jul 2020 17:32:17 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=9B=B4=E6=92=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/index/zhibo-item/index.vue | 14 +++++-
 pageB/zhibo/index.vue                 | 38 +++++++++++++++
 pages.json                            | 69 ++++++---------------------
 pages/index/index.vue                 |  4 +-
 4 files changed, 66 insertions(+), 59 deletions(-)
 create mode 100644 pageB/zhibo/index.vue

diff --git a/components/index/zhibo-item/index.vue b/components/index/zhibo-item/index.vue
index 327b34e..37b8c0c 100644
--- a/components/index/zhibo-item/index.vue
+++ b/components/index/zhibo-item/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <view class="zhibo">
+    <view class="zhibo" @click="zhibo">
         <image class="head" :src="image"></image>
         <view class="user">
             <view class="name">
@@ -71,6 +71,16 @@ export default {
 
         }
     },
-    props:['name','image']
+    methods:{
+        zhibo(){
+            this.$u.route({
+                url:"/pageB/zhibo/index",
+               params:{
+                   url:this.url
+               } 
+            })
+        }
+    },
+    props:['name','image','url']
 }
 </script>
\ No newline at end of file
diff --git a/pageB/zhibo/index.vue b/pageB/zhibo/index.vue
new file mode 100644
index 0000000..84fd014
--- /dev/null
+++ b/pageB/zhibo/index.vue
@@ -0,0 +1,38 @@
+<template>
+    <view>
+        <video :src="url" class="vodio" autoplay="true">
+
+        </video>
+        <!-- <view class="user">
+            <view class="back"></view>
+            <image></image>
+            <view>
+                <text class="name">萨和登</text>
+                <text class="info">萨大赛大赛大赛大赛大</text>
+            </view>
+            <view class="guanzhu">
+                关注
+            </view >
+        </view> -->
+    </view>
+</template>
+<style lang="scss" scoped>
+.vodio{
+    width: 100vw;
+    height: 100vh;
+}
+</style>
+<script>
+export default {
+    name:"zhibo",
+    data(){
+        return {
+            url:""
+        }
+    },
+    onLoad(a){
+        this.url = a.url
+        console.log(this.url)
+    }
+}
+</script>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 44c90a6..cb22881 100644
--- a/pages.json
+++ b/pages.json
@@ -80,6 +80,13 @@
 		{
 			"root": "pageB",
 			"pages": [
+				{
+					"path": "zhibo/index",
+					"style": {
+						"navigationStyle": "custom"
+						
+					}
+				},
 				{
 					"path": "follow/index",
 					"style": {
@@ -113,69 +120,20 @@
 						}
 					}
 				},
-				{
-					"path": "comment/index",
-					"style": {
-						"navigationBarTitleText": "商品评价",
-						"app-plus":{
-							"titleNView":{
-								"backgroundColor":"#ffffff"
-							}
-						}
-					}
-				},
 				{
 					"path": "search/index",
 					"style": {
-						"app-plus": {
-							"titleNView": {
-								"titleColor": "#333333",
-								"backgroundColor": "#FFFFFF",
-								"buttons": [
-									{  
-										"type":"none",
-										"text":"搜索",
-										"float":"right",
-										"fontSize":"16",
-										"color": "#FF780F"
-									}
-								],
-								"searchInput": {
-									"align": "left",
-									"borderRadius": "15px",
-									"placeholder": "搜索您需要的商品",
-									"backgroundColor": "rgb(236,236,236)",
-									"disabled": false
-								}
-							}
-						}
+						"navigationBarTitleText": "",
+						"navigationStyle": "custom"
+						
 					}
 				},
 				{
 					"path": "search/out",
 					"style": {
-						"app-plus": {
-							"titleNView": {
-								"titleColor": "#333333",
-								"backgroundColor": "#FFFFFF",
-								"buttons": [
-									{  
-										"type":"none",
-										"text":"搜索",
-										"float":"right",
-										"fontSize":"16",
-										"color": "#FF780F"
-									}
-								],
-								"searchInput": {
-									"align": "left",
-									"borderRadius": "15px",
-									"placeholder": "搜索您需要的商品",
-									"backgroundColor": "rgb(236,236,236)",
-									"disabled": false
-								}
-							}
-						}
+						"navigationBarTitleText": "",
+						"navigationStyle": "custom"
+						
 					}
 				},
 				{
@@ -216,6 +174,7 @@
 							}
 						}
 					}
+				
 				},
 				{
 					"path": "cart/index",
diff --git a/pages/index/index.vue b/pages/index/index.vue
index cefcdb7..71cf5b6 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -39,10 +39,10 @@
 						<u-swiper mode="dot" :list="zhiboImageSwiper" name="adv_code"></u-swiper>
 						<view class="list">
 							<view>
-								<zhiboItem v-for="item in tabLiveLists.filter((_, index) => !(index&1))" :key="item.live_id" :name="item.store_name" :image="item.cover_img"></zhiboItem>
+								<zhiboItem v-for="item in tabLiveLists.filter((_, index) => !(index&1))" :key="item.live_id" :name="item.store_name" :image="item.cover_img" :url="item.url"></zhiboItem>
 							</view>
 							<view style="margin-left:20rpx">
-								<zhiboItem v-for="item in tabLiveLists.filter((_, index) => index&1)" :key="item.live_id"></zhiboItem>
+								<zhiboItem v-for="item in tabLiveLists.filter((_, index) => index&1)" :key="item.live_id" :name="item.store_name" :image="item.cover_img" :url="item.url"></zhiboItem>
 							</view>
 						</view>
 					</view>

From 41f4050768485a03249cb7cfbece3e1ce35c4579 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Tue, 28 Jul 2020 20:47:52 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E7=9B=B4=E6=92=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/index/zhibo-item/index.vue |   2 +-
 pageB/zhibo/index.nvue                | 126 ++++++++++++++++++++++++++
 pageB/zhibo/index.vue                 |  38 --------
 3 files changed, 127 insertions(+), 39 deletions(-)
 create mode 100644 pageB/zhibo/index.nvue
 delete mode 100644 pageB/zhibo/index.vue

diff --git a/components/index/zhibo-item/index.vue b/components/index/zhibo-item/index.vue
index 37b8c0c..d18f3de 100644
--- a/components/index/zhibo-item/index.vue
+++ b/components/index/zhibo-item/index.vue
@@ -8,7 +8,7 @@
             </view>
             <view class="pingbi">
                 <image></image>
-                <text>屏蔽用户</text>
+                <text>1屏蔽用户</text>
             </view>
         </view>
     </view>    
diff --git a/pageB/zhibo/index.nvue b/pageB/zhibo/index.nvue
new file mode 100644
index 0000000..b34b867
--- /dev/null
+++ b/pageB/zhibo/index.nvue
@@ -0,0 +1,126 @@
+<template>
+  <view>
+    <video :src="url" class="vodio" autoplay="true" :show-fullscreen-btn="false" :show-play-btn="false" :enable-progress-gesture="false" :show-center-play-btn="false" :show-progress="false" :controls="false" :style="{'height':height}">
+
+    </video>
+    <view class="user" :style="{'top': top}">
+      <view class="back"></view>
+      <image class="head"></image>
+      <view class="userinfo">
+        <text class="name">萨和登</text>
+        <text class="info">萨大赛大赛大赛大赛大</text>
+      </view>
+      <view class="guanzhu"><text style="color:#fff;font-size:24rpx">关注</text></view>
+    </view>
+    <view class="userlist" :style="{'top': top + 10 * rpx}">
+        <image class="userlistitem" v-for="(i,j) in [0,2]" :style="{'right': (-j * 15 * rpx) + 'px'}"></image>
+    </view>
+    
+  </view>
+</template>
+<style lang="scss" scoped>
+.userlistitem{
+    width: 60rpx;
+    height: 60rpx;
+    position: relative;
+    background-color: #0f0;
+    border-radius: 30rpx;
+
+}
+.userlist{
+    display: flex;
+    flex-direction: row-reverse;
+    width: 150rpx; 
+    height: 60rpx;
+    position: fixed;
+    right: 156rpx;
+
+}
+.name {
+  font-size: 24rpx;
+  color: #fff;
+  lines: 1;
+  text-overflow: ellipsis;
+}
+.info {
+  font-size: 20rpx;
+  color: #fff;
+  margin-top: 6rpx;
+  lines: 1;
+  text-overflow: ellipsis;
+}
+.userinfo {
+  display: flex;
+  flex-direction: column;
+  width: 100rpx;
+  margin-left: 20rpx;
+
+}
+.guanzhu {
+  width: 100rpx;
+  height: 50rpx;
+  background-color: #ff780f;
+  border-radius: 25rpx;
+  margin-left: 10rpx;
+  align-items: center;
+  justify-content: center;
+}
+.head {
+  width: 70rpx;
+  height: 70rpx;
+  border-radius: 35rpx;
+  background-color: #0f0;
+}
+.back {
+  position: absolute;
+  top: 0;
+  left: 0;
+  background-color: #000;
+  opacity: 0.2;
+  width: 308rpx;
+  height: 70rpx;
+  border-radius: 35rpx;
+}
+.user {
+  position: fixed;
+  left: 30rpx;
+  width: 308rpx;
+  height: 70rpx;
+  display: flex;
+  align-items: center;
+  border-radius: 35rpx;
+  overflow: hidden;
+  flex-direction: row;
+}
+.video {
+  width: 750rpx;
+}
+</style>
+<script>
+export default {
+  name: "zhibo",
+  data() {
+    return {
+      url: "",
+      top: 0,
+      height: 0,
+      rpx:0
+    };
+  },
+  onLoad(a) {
+    this.url = a.url;
+    console.log(this.url);
+    let that = this;
+    uni.getSystemInfo({
+      success(a) {
+        console.log(a.windowHeight);
+        that.height = a.windowHeight;
+        // that.start()
+        that.top = a.statusBarHeight + 5;
+        that.rpx = (a.windowWidth / 750)
+        console.log(that.rpx)
+      },
+    });
+  },
+};
+</script>
\ No newline at end of file
diff --git a/pageB/zhibo/index.vue b/pageB/zhibo/index.vue
deleted file mode 100644
index 84fd014..0000000
--- a/pageB/zhibo/index.vue
+++ /dev/null
@@ -1,38 +0,0 @@
-<template>
-    <view>
-        <video :src="url" class="vodio" autoplay="true">
-
-        </video>
-        <!-- <view class="user">
-            <view class="back"></view>
-            <image></image>
-            <view>
-                <text class="name">萨和登</text>
-                <text class="info">萨大赛大赛大赛大赛大</text>
-            </view>
-            <view class="guanzhu">
-                关注
-            </view >
-        </view> -->
-    </view>
-</template>
-<style lang="scss" scoped>
-.vodio{
-    width: 100vw;
-    height: 100vh;
-}
-</style>
-<script>
-export default {
-    name:"zhibo",
-    data(){
-        return {
-            url:""
-        }
-    },
-    onLoad(a){
-        this.url = a.url
-        console.log(this.url)
-    }
-}
-</script>
\ No newline at end of file