From 0f8f084787f167e9873164fefd2e3c6f96e2c220 Mon Sep 17 00:00:00 2001
From: zyronon <zyronon@163.com>
Date: Fri, 17 Feb 2023 09:36:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/less/custom.less     |   2 +
 src/components/slide/BVideo.vue |  15 +--
 src/pages/slideHooks/index.vue  | 179 +++++++++++++++-----------------
 3 files changed, 93 insertions(+), 103 deletions(-)

diff --git a/src/assets/less/custom.less b/src/assets/less/custom.less
index 2fde2b9..eb054ce 100644
--- a/src/assets/less/custom.less
+++ b/src/assets/less/custom.less
@@ -125,6 +125,8 @@ p {
   height: 100%;
   width: 100%;
   transition: height .3s;
+  position: relative;
+  overflow: hidden;
 
   .slide-list {
     height: 100%;
diff --git a/src/components/slide/BVideo.vue b/src/components/slide/BVideo.vue
index 71badd9..6b4699f 100644
--- a/src/components/slide/BVideo.vue
+++ b/src/components/slide/BVideo.vue
@@ -13,7 +13,7 @@
     <img src="../../assets/img/icon/play-white.png" class="pause" v-if="!isPlaying">
     <div class="float" :style="{opacity: isUp?0:1}">
       <div :style="{opacity:isMove ? 0:1}" class="normal">
-        <template v-if="!commentVisible && !isMarginTop">
+        <template v-if="!commentVisible">
           <ItemToolbar v-model:item="localItem"
                        :position="position"
                        v-bind="$attrs"
@@ -165,7 +165,6 @@ export default {
       videoScreenHeight: 0,
       videoPoster: `?vframe/jpg/offset/0/w/${document.body.clientWidth}`,
       commentVisible: false,
-      isMarginTop: false,
       LUtils: Utils
     }
   },
@@ -245,15 +244,11 @@ export default {
     bus.off(EVENT_KEY.CLOSE_SUB_TYPE, this.onCloseSubType)
   },
   methods: {
-    onOpenSubType({id, height}) {
-      if (id !== this.item.id) return
-      this.isMarginTop = true
-      Utils.$setCss(this.$refs.video, 'margin-top', `${height}px`)
+    onOpenSubType() {
+      this.commentVisible = true
     },
-    onCloseSubType({id}) {
-      if (id !== this.item.id) return
-      this.isMarginTop = false
-      Utils.$setCss(this.$refs.video, 'margin-top', `0px`)
+    onCloseSubType() {
+      this.commentVisible = false
     },
     onDialogMove({tag, e}) {
       if (this.commentVisible && tag === 'comment') {
diff --git a/src/pages/slideHooks/index.vue b/src/pages/slideHooks/index.vue
index 32f7738..8f16a92 100644
--- a/src/pages/slideHooks/index.vue
+++ b/src/pages/slideHooks/index.vue
@@ -11,13 +11,12 @@
         />
 
         <div class="slide-content"
-             @touchstart="pageClick">
+        >
           <H class="first-horizontal-item"
              name="main"
              id="slideHook"
-             v-love="'slideHook'"
              v-model:index="state.navIndex">
-            <SlideItem>
+            <SlideItem id="slide1">
               <div class="sub-type"
                    :class="state.subTypeIsTop?'top':''"
                    ref="subTypeRef">
@@ -59,12 +58,15 @@
                 </div>
               </div>
               <div class="sub-type-notice"
-                   v-if="state.subType===-1 && state.navIndex === 0"
+                   v-if="state.subType===-1 && !state.subTypeVisible"
                    @click="showSubType">附近吃喝玩乐
               </div>
               <VInfinite
-                  :style="{background: 'black'}"
+                  @touchstart="pageClick"
+                  v-love="'slideHook'"
+                  :style="{background: 'black',marginTop:state.subTypeVisible?state.subTypeHeight:0}"
                   name="main"
+                  id="slide1-infinite"
                   v-model:index="state.itemIndex"
                   :render="render"
                   :list="state.recommendVideos"
@@ -224,7 +226,7 @@ const bodyWidth = computed(() => store.state.bodyWidth)
 const subTypeRef = ref(null)
 const state = reactive({
   baseIndex: 0,
-  navIndex: 4,
+  navIndex: 0,
   itemIndex: 0,
   test: '',
   recommendVideos: [
@@ -263,6 +265,8 @@ const state = reactive({
   commentVisible: false,
   fullScreen: false,
   subType: -1,
+  subTypeVisible: false,
+  subTypeHeight: '0',
   //用于改变zindex的层级到上层，反正比slide高就行。不然摸不到subType.
   subTypeIsTop: false,
   totalSize: 0,
@@ -301,24 +305,17 @@ function loadMore() {
 function showSubType(e) {
   Utils.$stopPropagation(e)
   console.log('subTypeRef',)
-  state.subType = 0
-  setTimeout(() => {
-    state.subTypeIsTop = true
-  }, 300)
-  let id = state.recommendVideos[state.itemIndex].id
-  bus.emit(EVENT_KEY.OPEN_SUB_TYPE, {
-    id,
-    height: subTypeRef.value.getBoundingClientRect().height
-  })
+  state.subTypeHeight = subTypeRef.value.getBoundingClientRect().height + 'px'
+  state.subTypeVisible = true
+  setTimeout(() => state.subTypeIsTop = true, 300)
+  bus.emit(EVENT_KEY.OPEN_SUB_TYPE,)
 }
 
 function pageClick(e) {
   // console.log('pageClick')
-  if (state.subType !== -1) {
-    state.subType = -1
-    state.subTypeIsTop = false
-    let id = state.recommendVideos[state.itemIndex].id
-    bus.emit(EVENT_KEY.CLOSE_SUB_TYPE, {id})
+  if (state.subTypeVisible) {
+    state.subTypeIsTop = state.subTypeVisible = false
+    bus.emit(EVENT_KEY.CLOSE_SUB_TYPE,)
     Utils.$stopPropagation(e)
   }
 }
@@ -408,68 +405,6 @@ function render(item, itemIndex, play, position) {
 <style scoped lang="less">
 @import "@/assets/less/index";
 
-.sub-type {
-  width: 100%;
-  position: fixed;
-  top: 0;
-
-  &.top {
-    z-index: 1;
-  }
-
-  .local {
-    transition: all .3s;
-    font-size: 14rem;
-    color: gray;
-    background: linear-gradient(to right, rgb(36, 34, 84), rgb(7, 5, 16));
-    display: flex;
-    justify-content: center;
-    align-items: center;
-
-    .card {
-      margin: 20rem;
-      margin-top: @header-height;
-      padding: 20rem;
-      border-radius: 8rem;
-      width: 100%;
-      background: red;
-      background: linear-gradient(to right, rgb(53, 51, 110), rgb(29, 21, 66));
-      box-sizing: border-box;
-      display: flex;
-      align-items: flex-end;
-      justify-content: space-between;
-      overflow: auto;
-    }
-
-    .nav-item {
-      @width: 35rem;
-      display: flex;
-      align-items: center;
-      flex-direction: column;
-      flex-shrink: 0;
-      width: 17vw;
-
-      img {
-        width: @width;
-        height: @width;
-        margin-bottom: 5rem;
-      }
-    }
-  }
-}
-
-.sub-type-notice {
-  position: fixed;
-  background: rgba(black, .4);
-  top: 100rem;
-  left: 50%;
-  transform: translateX(-50%);
-  padding: 3rem 12rem;
-  border-radius: 10rem;
-  z-index: 3;
-  font-size: 12rem;
-  color: white;
-}
 
 .test-slide-wrapper {
   font-size: 14rem;
@@ -495,21 +430,79 @@ function render(item, itemIndex, play, position) {
   height: calc(100vh - @footer-height);
   overflow: hidden;
 
-  .red {
-    background-color: red;
-  }
+  #slide1 {
+    position: relative;
 
-  .yellow {
-    background-color: yellow;
-  }
+    .sub-type {
+      width: 100%;
+      position: fixed;
+      top: 0;
 
-  .blue {
-    background-color: blue;
-  }
+      &.top {
+        z-index: 2;
+      }
 
-  .gray {
-    background-color: gray;
+      .local {
+        transition: all .3s;
+        font-size: 14rem;
+        color: gray;
+        background: linear-gradient(to right, rgb(36, 34, 84), rgb(7, 5, 16));
+        display: flex;
+        justify-content: center;
+        align-items: center;
+
+        .card {
+          margin: 20rem;
+          margin-top: @header-height;
+          padding: 20rem;
+          border-radius: 8rem;
+          width: 100%;
+          background: red;
+          background: linear-gradient(to right, rgb(53, 51, 110), rgb(29, 21, 66));
+          box-sizing: border-box;
+          display: flex;
+          align-items: flex-end;
+          justify-content: space-between;
+          overflow: auto;
+        }
+
+        .nav-item {
+          @width: 35rem;
+          display: flex;
+          align-items: center;
+          flex-direction: column;
+          flex-shrink: 0;
+          width: 17vw;
+
+          img {
+            width: @width;
+            height: @width;
+            margin-bottom: 5rem;
+          }
+        }
+      }
+    }
+
+    .sub-type-notice {
+      position: fixed;
+      background: rgba(black, .4);
+      top: 100rem;
+      left: 50%;
+      transform: translateX(-50%);
+      padding: 3rem 12rem;
+      border-radius: 10rem;
+      z-index: 3;
+      font-size: 12rem;
+      color: white;
+    }
+
+    #slide1-infinite {
+      z-index: 1;
+      margin-top: 0;
+      transition: height, margin-top .3s;
+    }
   }
+
 }
 
 </style>
\ No newline at end of file