From b5ef32361271aed20c4dab40a605559c306c2a12 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Wed, 3 Jun 2020 10:53:38 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=BE=BE=E4=BA=BA=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pageB/components/details/userinfo.vue |  84 ++++++++++++++++++++++
 pageB/details/index.vue               | 100 ++++++++++++++++++++++++++
 pages.json                            |  11 +++
 3 files changed, 195 insertions(+)
 create mode 100644 pageB/components/details/userinfo.vue
 create mode 100644 pageB/details/index.vue

diff --git a/pageB/components/details/userinfo.vue b/pageB/components/details/userinfo.vue
new file mode 100644
index 0000000..9f7e9c6
--- /dev/null
+++ b/pageB/components/details/userinfo.vue
@@ -0,0 +1,84 @@
+<template>
+    <view class="userinfo">
+
+        <view class="user">
+            <view class="info">
+                <image></image>
+                <view>
+                    <text>达人昵称</text>
+                    <text>关注数量</text>
+                </view>
+               
+            </view>
+            <view class="guanzhu">关注</view>
+        </view>
+        <view class="profile">个性签名</view>
+    </view>
+</template>
+<style lang="scss" scoped>
+image{
+    background-color: #0f0;
+}
+.userinfo{
+    height: 261rpx;
+    width: 100%;
+    padding: 30rpx;
+    .user{
+        display: flex;
+        margin-top: 10rpx;
+        align-items: center;
+        justify-content: space-between;
+        .info{
+            display: flex;
+            align-items: center;
+            >image{
+                width: 140rpx;
+                height: 140rpx;
+                border-radius: 50%;
+
+            }
+            >view{
+                margin-left: 40rpx;
+                display: flex;
+                height: 79rpx;
+                justify-content: space-between;
+                flex-direction: column;
+                >text:first-child{
+                    font-size: 28rpx;
+                    color:#333;
+                }
+                >text:last-child{
+                    font-size: 24rpx;
+                    color: #333;
+                }
+            }
+        }
+        .guanzhu{
+            width: 140rpx;
+            height: 60rpx;
+            font-size: 26rpx;
+            color:#fff;
+            line-height: 60rpx;
+            border-radius: 30rpx;
+            background-color: #FF780F;
+            text-align: center;
+        }
+    }
+    .profile{
+        margin-top: 19rpx;
+        font-size: 24rpx;
+        color: #333;
+        margin-left: 14rpx;
+    }
+}
+</style>
+<script>
+export default {
+    name:"userinfo",
+    data(){
+        return {
+
+        }
+    }
+}
+</script>
\ No newline at end of file
diff --git a/pageB/details/index.vue b/pageB/details/index.vue
new file mode 100644
index 0000000..f31ffd0
--- /dev/null
+++ b/pageB/details/index.vue
@@ -0,0 +1,100 @@
+<template>
+    <view class="details">
+        <view style="border-top: 1rpx solid #ececec;"></view>
+        <userinfo></userinfo>
+        <view style="border-top: 20rpx solid #ececec;"></view>
+        <u-tabs :is-scroll="false" bar-width="70" ref="tabs" :list="list" :current="num" :bar-style="{
+                'background-color':'#FF780F',
+                'bottom':'10rpx'
+            }"
+            inactive-color="#333"
+            :active-item-style="{
+                'color':'#FF780F'
+            }"
+            :bold="false"
+            @change="dianji"
+            :show-bar="false"></u-tabs>
+        <swiper class="card" @change="dianji" :current="num">
+            <swiper-item>
+                <scroll-view style="width:100%;height:100%" scroll-y="true">
+                    <view class="box">
+                        <view class="list">
+                            <view >
+                                <videoItem v-for="item in 10"></videoItem>
+                            </view>
+                            <view style="margin-left:20rpx">
+                                <videoItem v-for="item in 10"></videoItem>
+                            </view>
+                        </view>
+                    </view>
+                    
+                </scroll-view>
+            </swiper-item>
+            <swiper-item>
+                <scroll-view style="width:100%;height:100%" scroll-y="true">
+                    <view class="box">
+                        <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>
+                    </view>
+                    
+                </scroll-view>
+            </swiper-item>
+        </swiper>
+    </view>
+</template>
+<style lang="scss" scoped>
+.details{
+      .card{
+        height: 100vh;
+        width: 100%;
+        .box{
+            width: 100%;
+            padding: 0 30rpx;
+        }
+        .list{
+            display: flex;
+        }
+    }
+}
+</style>
+<script>
+import videoItem from "@/components/index/video-item/index" 
+import zhiboItem from "@/components/index/zhibo-item/index" 
+import userinfo from "../components/details/userinfo"
+export default {
+    name:"details",
+    components:{
+       userinfo,
+       videoItem,
+       zhiboItem
+    },
+    data(){
+        return {
+            list:[
+                {
+					name: '短视频'
+				}, {
+					name: '图文'
+				}
+            ],
+            num:0
+        }
+    },
+    methods:{
+        dianji(a){
+            console.log(a)
+            if(typeof a == "object"){
+                this.num = a.detail.current
+            }else{
+                this.num = a
+            }
+        }
+    }
+}
+</script>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index d4c2aa3..528fdcc 100644
--- a/pages.json
+++ b/pages.json
@@ -44,6 +44,17 @@
 							}
 						}
 					}
+				},
+				{
+					"path": "details/index",
+					"style": {
+						"navigationBarTitleText": "",
+						"app-plus":{
+							"titleNView":{
+								"backgroundColor":"#ffffff"
+							}
+						}
+					}
 				}
 			]
 		},
-- 
2.47.2


From d71c7fcc2411803912f81320ac85e615a9ad3c16 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Wed, 3 Jun 2020 17:17:05 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pageB/components/search/shop.vue |  53 ++++++++++++++++
 pageB/search/index.vue           |  69 +++++++++++++++++++++
 pageB/search/out.vue             | 102 +++++++++++++++++++++++++++++++
 pages.json                       |  16 +++++
 pages/index/index.vue            |  10 ---
 5 files changed, 240 insertions(+), 10 deletions(-)
 create mode 100644 pageB/components/search/shop.vue
 create mode 100644 pageB/search/index.vue
 create mode 100644 pageB/search/out.vue

diff --git a/pageB/components/search/shop.vue b/pageB/components/search/shop.vue
new file mode 100644
index 0000000..649bba8
--- /dev/null
+++ b/pageB/components/search/shop.vue
@@ -0,0 +1,53 @@
+<template>
+    <view class="shop">
+        <image></image>
+        <view class="info">
+            <text class="title">这是标题</text>
+            <text class="profile u-line-2">这是简介</text>
+        </view>
+    </view>
+</template>
+<script>
+export default {
+    name:"shop",
+    data(){
+        return {
+
+        }
+    }    
+}
+</script>
+<style lang="scss" scoped>
+.shop{
+    display: flex;
+    width: 690rpx;
+    height: 170rpx;
+    margin: 0 auto;
+    margin-bottom: 30rpx;
+    border-radius: 5rpx;
+    overflow: hidden;
+    >image{
+        width: 220rpx;
+        height: 170rpx;
+        flex-shrink: 0;
+    }
+    .info{
+        display: flex;
+        flex-direction: column;
+        width: 100%;
+        height: 100%;
+        background-color: #f5f5f5;
+        padding: 30rpx;
+        >text:first-child{
+            font-size: 30rpx;
+            color:#333;
+             
+        }
+        >text:last-child{
+            font-size: 28rpx;
+            color: #666;
+            margin-top: 20rpx;
+        }
+    }
+}
+</style>
\ No newline at end of file
diff --git a/pageB/search/index.vue b/pageB/search/index.vue
new file mode 100644
index 0000000..c781c58
--- /dev/null
+++ b/pageB/search/index.vue
@@ -0,0 +1,69 @@
+<template>
+    <view class="search">
+        <view class="sosuo">
+            <image></image>
+            <u-search placeholder="搜索您需要的商品" v-model="keyword" height="60" :action-style="{
+                'font-size':'32rpx',
+                'color':'#FF780F',
+                'overflow':'unset'
+            }"></u-search>
+        </view>
+        <view class="list">
+            <view class="title">搜索发现</view>
+            <view class="label">
+                <text>这是标签</text>
+            </view>
+        </view>
+    </view>
+</template>
+<script>
+export default {
+    name:"search",
+    data(){
+        return{
+            keyword:""
+        }
+    }
+}
+</script>
+<style lang="scss" scoped>
+.search{
+    .sosuo{
+        width: 100%;
+        height: 88rpx;
+        border-bottom: 1rpx solid #ececec;
+        display: flex;
+        align-items: center;
+        padding: 0 30rpx;
+
+        >image{
+            width: 18rpx;
+            height: 32rpx;
+            margin-right: 24rpx;
+            flex-shrink: 0;
+        }
+        align-items: center;
+    }
+    .list{
+        padding: 30rpx;
+        .title{
+            font-size: 26rpx;
+            color: #999;
+
+        }
+        .label{
+            display: flex;
+            >text{
+                margin-top: 20rpx;
+                margin-right: 30rpx;
+                font-size: 26rpx;
+                color: #666;
+                text-align: center;
+                padding: 17rpx 12rpx;
+                background-color: #ececec;
+                border-radius: 10rpx;
+            }
+        }
+    }
+}
+</style>
\ No newline at end of file
diff --git a/pageB/search/out.vue b/pageB/search/out.vue
new file mode 100644
index 0000000..a161faf
--- /dev/null
+++ b/pageB/search/out.vue
@@ -0,0 +1,102 @@
+<template>
+    <view class="out">
+        <view class="sosuo">
+            <image></image>
+            <u-search placeholder="搜索您需要的商品" v-model="keyword" height="60" :show-action="false"></u-search>
+        </view>
+        <u-tabs-swiper @change="tabsChange" :show-bar="false" :bold="false" :font-size="32" active-color="#FF780F" ref="uTabs" :list="list" :is-scroll="false" style="border-bottom: 1px solid #ececec;flex-shrink:0" height="88"></u-tabs-swiper>
+        <swiper class="swiper"  :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish">
+            <swiper-item>
+                <scroll-view :scroll-y="true" style="height:100%">
+                    <view style="padding-top:30rpx">
+                        <shop></shop>
+                        <shop></shop>
+                        <shop></shop>
+                        <shop></shop>
+                        <shop></shop>
+                    </view>
+                </scroll-view>
+            </swiper-item> 
+            <swiper-item> 
+                <scroll-view :scroll-y="true" style="height:100%">
+                    <view class="list">
+                        <darenItem style="margin-top:20rpx;margin-right:23rpx;box-shadow:0rpx 3rpx 7rpx 0rpx rgba(153, 153, 153, 0.35);" v-for="item in 50"></darenItem>
+                    </view>
+                </scroll-view>
+            </swiper-item>
+        </swiper>
+    </view>
+</template>
+<style lang="scss" scoped>
+.out{
+    display: flex;
+    flex-direction: column;
+    height: 100vh;
+    .sosuo{
+        width: 100%;
+        height: 88rpx;
+        border-bottom: 1rpx solid #ececec;
+        display: flex;
+        align-items: center;
+        padding: 0 30rpx;
+        flex-shrink: 0;
+
+        >image{
+            width: 18rpx;
+            height: 32rpx;
+            margin-right: 24rpx;
+            flex-shrink: 0;
+        }
+        align-items: center;
+    }
+    .swiper{
+        width: 100%;
+        height: 100%; 
+        .list{
+            display: flex;
+            flex-wrap: wrap;
+            width: 100%;
+            padding-left: 30rpx;
+        }
+    }
+}
+</style>
+<script>
+import shop from "../components/search/shop"
+import darenItem from "@/components/index/daren-item/index" 
+export default {
+    name:"out",
+    components:{
+        shop,
+        darenItem
+    },
+    data(){
+        return {
+            list:[
+                {
+                    name:"店铺"
+                },{
+                    name:"达人"
+                }
+            ],
+            current: 0, 
+            swiperCurrent: 0,
+            keyword:""
+        }
+    }, methods: { 
+        tabsChange(index) {
+            this.swiperCurrent = index; 
+        }, 
+        transition(e) { 
+            let dx = e.detail.dx; 
+            this.$refs.uTabs.setDx(dx); 
+        },
+        animationfinish(e) { 
+            let current = e.detail.current; 
+            this.$refs.uTabs.setFinishCurrent(current); 
+            this.swiperCurrent = current; 
+            this.current = current; 
+        }
+    }
+}
+</script>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 528fdcc..0e97fbd 100644
--- a/pages.json
+++ b/pages.json
@@ -55,6 +55,22 @@
 							}
 						}
 					}
+				},
+				{
+					"path": "search/index",
+					"style": {
+						"navigationBarTitleText": "",
+						"navigationStyle": "custom"
+						
+					}
+				},
+				{
+					"path": "search/out",
+					"style": {
+						"navigationBarTitleText": "",
+						"navigationStyle": "custom"
+						
+					}
 				}
 			]
 		},
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 764365a..3bf37b3 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -186,16 +186,6 @@ export default {
         zhiboItem,
         indexad,
         darenItem
-    },
-    methods:{
-        dianji(a){
-            console.log(a)
-            if(typeof a == "object"){
-                this.num = a.detail.current
-            }else{
-                this.num = a
-            }
-        }
     }
 }
 </script>
\ No newline at end of file
-- 
2.47.2