From 0f5e209d64784dfbd20d7f44955535dfd439e6a1 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Tue, 2 Jun 2020 09:34:37 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=B4=E6=92=AD=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/index/ad/index.vue         | 25 +++++++++
 components/index/video-item/index.vue |  3 --
 components/index/zhibo-item/index.vue | 75 +++++++++++++++++++++++++++
 pages/index/index.vue                 | 37 +++++++------
 4 files changed, 120 insertions(+), 20 deletions(-)
 create mode 100644 components/index/ad/index.vue
 create mode 100644 components/index/zhibo-item/index.vue

diff --git a/components/index/ad/index.vue b/components/index/ad/index.vue
new file mode 100644
index 0000000..0c6bddf
--- /dev/null
+++ b/components/index/ad/index.vue
@@ -0,0 +1,25 @@
+<template>
+    <swiper class="ad" indicator-dots="true" indicator-color="#fff" indicator-active-color="#634838">
+        <swiper-item></swiper-item>
+        <swiper-item></swiper-item>
+        <swiper-item></swiper-item>
+    </swiper>
+</template>
+<style lang="scss" scoped>
+.ad{
+    width: 100%;
+    height: 294rpx;
+    border-radius: 20rpx;
+    background-color: #0f0;
+}
+</style>
+<script>
+export default {
+    name:"ad",
+    data(){
+        return {
+
+        }
+    }
+}
+</script>
\ No newline at end of file
diff --git a/components/index/video-item/index.vue b/components/index/video-item/index.vue
index 2137097..1f48a97 100644
--- a/components/index/video-item/index.vue
+++ b/components/index/video-item/index.vue
@@ -16,9 +16,6 @@
 </template>
 <style lang="scss" scoped>
 .video-item{
-    image{
-        background-color: #0f0;
-    }
     margin-top: 20rpx;
     width: 335rpx;
     box-shadow:0 3rpx 7rpx 0 rgba(153, 153, 153, 0.35);
diff --git a/components/index/zhibo-item/index.vue b/components/index/zhibo-item/index.vue
new file mode 100644
index 0000000..d26f10d
--- /dev/null
+++ b/components/index/zhibo-item/index.vue
@@ -0,0 +1,75 @@
+<template>
+    <view class="zhibo">
+        <image class="head"></image>
+        <view class="user">
+            <view class="name">
+                <image></image>
+                <text>这是名字</text>
+            </view>
+            <view class="pingbi">
+                <image></image>
+                <text>屏蔽用户</text>
+            </view>
+        </view>
+    </view>    
+</template>
+<style lang="scss" scoped>
+.zhibo{
+    width: 335rpx;
+    margin-top: 20rpx;
+    box-shadow:0 3rpx 7rpx 0 rgba(153, 153, 153, 0.35);
+    padding-bottom: 20rpx;
+    border-radius: 20rpx;
+    overflow: hidden;
+    .head{
+        width: 100%;
+        height: 425rpx;
+    }
+    .user{
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        margin:0 auto;
+        margin-top: 20rpx;
+        width: 307rpx;
+        .name{
+            display: flex;
+            align-items: center;
+            >image{
+                width: 38rpx;
+                height: 38rpx;
+                border-radius: 50%;
+
+            }
+            >text{
+                font-size: 20rpx;
+                color:#333;
+                margin-left: 9rpx;
+            }
+        }
+        .pingbi{
+            display: flex;
+            align-items: center;
+            >text{
+                font-size: 20rpx;
+                color: #333;
+                margin-left: 9rpx;
+            }
+            >image{
+                width: 24rpx;
+                height: 24rpx;
+            }
+        }
+    }
+}
+</style>
+<script>
+export default {
+    name:"zhibo-item",
+    data(){
+        return {
+
+        }
+    }
+}
+</script>
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index ec5dd11..034ee12 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -12,11 +12,7 @@
         <swiper class="card">
             <swiper-item>
                 <scroll-view style="width:100%;height:100%" scroll-y="true">
-                    <swiper class="ad" indicator-dots="true" indicator-color="#fff" indicator-active-color="#634838">
-                        <swiper-item></swiper-item>
-                        <swiper-item></swiper-item>
-                        <swiper-item></swiper-item>
-                    </swiper>
+                    <indexad style="width:690rpx"></indexad>
                     <view class="list">
                         <view >
                             <videoItem v-for="item in 10"></videoItem>
@@ -29,9 +25,15 @@
             </swiper-item>
             <swiper-item>
                 <scroll-view style="width:100%;height:100%" scroll-y="true">
-                    <view id="demo1" class="scroll-view-item uni-bg-red">A</view>
-                    <view id="demo2" class="scroll-view-item uni-bg-green">B</view>
-                    <view id="demo3" class="scroll-view-item uni-bg-blue">C</view>
+                    <indexad style="width:690rpx"></indexad>
+                    <view class="list">
+                        <view >
+                            <zhiboItem v-for="item in 10"></zhiboItem>
+                        </view>
+                        <view style="margin-left:20rpx">
+                            <zhiboItem v-for="item in 10"></zhiboItem>
+                        </view>
+                    </view>
                 </scroll-view>
             </swiper-item>
             <swiper-item>
@@ -48,11 +50,11 @@
 <style lang="scss" scoped>
 .index{
     width: 750rpx;
-    padding: 0 30rpx;
     display: flex;
     flex-direction: column;
     height: 100vh;
     .top{
+        padding: 0 30rpx;
         display: flex;
         justify-content: space-between;
         width: 100%;
@@ -62,7 +64,6 @@
         .sosuo{
             width: 32rpx;
             height: 32rpx;
-            background-color: #0f0;
         }
         .tabs{
             display: flex;
@@ -90,13 +91,10 @@
         }
     }
     .card{
-        width: 100%;
         height: 100%;
-        .ad{
-            width: 100%;
-            height: 294rpx;
-            border-radius: 20rpx;
-            background-color: #0f0;
+        width: 100%;
+        scroll-view{
+            padding: 0 30rpx;
         }
         .list{
             display: flex;
@@ -106,6 +104,9 @@
 </style>
 <script>
 import videoItem from "@/components/index/video-item/index" 
+import zhiboItem from "@/components/index/zhibo-item/index" 
+import indexad from "@/components/index/ad/index" 
+
 export default {
     name:"index",
     data(){
@@ -114,7 +115,9 @@ export default {
         }
     },
     components:{
-        videoItem
+        videoItem,
+        zhiboItem,
+        indexad
     }
 }
 </script>
\ No newline at end of file