save

package.json

@@ -21,10 +21,10 @@
     "vuex": "4.0.2"
   },
   "devDependencies": {
-    "@vitejs/plugin-vue": "2.2.4",
+    "@vitejs/plugin-vue": "4.0.0",
-    "@vitejs/plugin-vue-jsx": "1.3.8",
+    "@vitejs/plugin-vue-jsx": "3.0.0",
-    "less": "^4.1.2",
+    "less": "^4.1.3",
     "mobile-select": "1.1.2",
-    "vite": "2.9.13"
+    "vite": "4.0.4"
   }
 }

src/assets/less/custom.less

@@ -180,3 +180,15 @@ p {
 .link {
   color: rgb(18, 100, 149);
 }
+
+.slide {
+  height: 100%;
+  width: 100%;
+
+  .slide-wrapper {
+    height: 100%;
+    width: 100%;
+    display: flex;
+    position: relative;
+  }
+}

src/assets/less/index.less

@@ -16,7 +16,7 @@ html, body {
   height: 100%;
   //background: #2e3244;
   background: @main-bg;
-  font-size: 62.5%;
+  font-size: 6.25%;
   //letter-spacing: .11rem;
   margin: 0;
   padding: 0;

src/assets/less/layout.less

@@ -1,8 +1,9 @@
 //布局常用类
 
-.d-none{
+.d-none {
-    display: none!important;
+  display: none !important;
 }
+
 //flex 布局常用类
 .d-flex {
   display: flex !important;
@@ -35,7 +36,8 @@
 .flex-wrap-wrap {
   flex-wrap: wrap;
 }
-.flex-direction-column{
+
+.flex-direction-column {
   flex-direction: column;
 }
 
@@ -60,6 +62,6 @@
   text-align: center;
 }
 
-.fb{
+.fb {
   font-weight: bold;
 }

src/assets/less/variables.less

@@ -1,5 +1,5 @@
-@footer-height: 5rem;
+@footer-height: 50rem;
-@header-height: 6rem;
+@header-height: 60rem;
-@indicator-height: 5rem;
+@indicator-height: 50rem;
 
-@padding-page: 1.5rem;
+@padding-page: 15rem;

src/components/BVideo.vue

@@ -115,7 +115,7 @@
 </template>
 
 <script>
-import globalMethods from '../utils/global-methods'
+import globalMethods from '../utils'
 import BaseMarquee from "./BaseMarquee";
 import Dom from "../utils/dom";
 import BaseMusic from "./BaseMusic";

src/components/Footer.vue

@@ -74,10 +74,10 @@ export default {
 @import "../assets/less/index";
 
 .footer {
-  font-size: 1.4rem;
+  font-size: 14rem;
   position: fixed;
   width: 100%;
-  height: 5rem;
+  height: 50rem;
   //border-top: 1px solid #7b7878;
   z-index: 2;
   //不用bottom：0是因为，在进行页面切换的时候，vue的transition
@@ -112,19 +112,19 @@ export default {
     }
 
     .add-ctn {
-      @height: 2.7rem;
+      @height: 27rem;
-      @width: 4rem;
+      @width: 40rem;
       height: @height;
       width: @width;
       background: linear-gradient(to right, #59dcdf, #ff5f75);
-      border-radius: .5rem;
+      border-radius: 5rem;
       box-sizing: border-box;
-      padding: 0 .2rem;
+      padding: 0 2rem;
 
       .add-one {
         box-sizing: border-box;
         height: 100%;
-        border-radius: .5rem;
+        border-radius: 5rem;
         border: 2px solid white;
         background: black;
         display: flex;
@@ -133,7 +133,7 @@ export default {
       }
 
       img {
-        width: 2rem;
+        width: 20rem;
       }
     }
 
@@ -146,14 +146,14 @@ export default {
     }
 
     .badge2 {
-      right: .7rem;
+      right: 7rem;
-      top: .7rem;
+      top: 7rem;
       position: absolute;
     }
 
     .badge {
-      right: .7rem;
+      right: 7rem;
-      top: .7rem;
+      top: 7rem;
       position: absolute;
     }
   }

src/components/Video.vue

@@ -116,7 +116,7 @@
 </template>
 
 <script>
-import globalMethods from '../utils/global-methods'
+import globalMethods from '../utils'
 import BaseMarquee from "./BaseMarquee";
 import Dom from "../utils/dom";
 import BaseMusic from "./BaseMusic";

src/components/slide/SlideImgs.vue

@@ -22,7 +22,7 @@
 
 <script>
 import enums from "../../utils/enums";
-import globalMethods from '../../utils/global-methods'
+import globalMethods from '../../utils'
 //TODO 放大功能待完善
 export default {
   name: "SlideImgs",

src/components/slide/SlideUser.vue

@@ -24,7 +24,7 @@
 </template>
 <script>
 import Posters from "../Posters";
-import globalMethods from "../../utils/global-methods";
+import globalMethods from "../../utils";
 import BaseButton from "../BaseButton";
 
 export default {

src/components/slide/SlideVideo.vue

@@ -115,7 +115,7 @@
 </template>
 
 <script>
-import globalMethods from '../../utils/global-methods'
+import globalMethods from '../../utils'
 import BaseMarquee from "../BaseMarquee";
 import Dom from "../../utils/dom";
 import BaseMusic from "../BaseMusic";

src/mock/index.js

@@ -1,5 +1,5 @@
 import Mock from 'mockjs'
-import globalMethods from '../utils/global-methods'
+import globalMethods from '../utils'
 import resource from "../assets/data/resource.js";
 
 function getParams(options) {

src/pages/me/components/SlideItemMusic.vue

@@ -68,7 +68,7 @@
 </template>
 <script>
 import {nextTick} from "vue";
-import globalMethods from "../../../utils/global-methods";
+import globalMethods from "../../../utils";
 import gaobaiqiqiu from "../../../assets/data/lyrics/gaobaiqiqiu.lrc?raw";
 
 export default {

src/pages/slideHooks/H.vue

@@ -0,0 +1,106 @@
+<script setup>
+import {ref, onMounted, reactive} from "vue";
+import GM from '../../utils'
+import bus from "../../utils/bus";
+import Common from "../../utils";
+import {slideReset, slideTouchStart} from "./common";
+
+const props = defineProps({
+  index: {
+    type: Number,
+    default: () => {
+      return 0
+    }
+  },
+})
+const emit = defineEmits(['update:index'])
+
+const judgeValue = 20
+const wrapperEl = ref(null)
+const wrapper = reactive({width: 0, height: 0, childrenLength: 0})
+const state = reactive({
+  name: 'SlideVertical',
+  localIndex: 0,
+  needCheck: true,
+  next: false,
+  start: {x: 0, y: 0, time: 0},
+  move: {x: 0, y: 0},
+})
+
+onMounted(() => {
+  wrapper.width = GM.$getCss(wrapperEl.value, 'width')
+  wrapper.height = GM.$getCss(wrapperEl.value, 'height')
+  wrapper.childrenLength = wrapperEl.value.children.length
+})
+
+function touchStart(e) {
+  slideTouchStart(e, wrapperEl.value, state)
+}
+
+function touchMove(e) {
+  state.move.x = e.touches[0].pageX - state.start.x
+  state.move.y = e.touches[0].pageY - state.start.y
+
+  let isNext = state.move.x < 0
+  if ((state.localIndex === 0 && !isNext) || (state.localIndex === wrapper.childrenLength - 1 && isNext)) return
+
+  checkDirection(e)
+
+  if (state.next) {
+    bus.emit(state.name + '-moveX', state.move.x)
+    GM.$stopPropagation(e)
+    GM.$setCss(wrapperEl.value, 'transform',
+        `translate3d(${getDistance()
+        + state.move.x
+        + (isNext ? judgeValue : -judgeValue)
+        }px, 0, 0)`)
+  }
+}
+
+function touchEnd(e) {
+  let isRight = state.move.x < 0
+  if ((state.localIndex === 0 && !isRight) || (state.localIndex === wrapper.childrenLength - 1 && isRight)) state.next = false
+
+  let endTime = Date.now()
+  let gapTime = endTime - state.start.time
+  if (Math.abs(state.move.x) < 20) gapTime = 1000
+  if (Math.abs(state.move.x) > (wrapper.width / 4)) gapTime = 100
+  if (gapTime < 150 && state.next) {
+    if (isRight) {
+      state.localIndex++
+    } else {
+      state.localIndex--
+    }
+  }
+  slideReset(wrapperEl.value, getDistance(), state, emit)
+}
+
+function checkDirection(e) {
+  if (!state.needCheck) return
+  if (Math.abs(state.move.x) > judgeValue || Math.abs(state.move.y) > judgeValue) {
+    let angle = (Math.abs(state.move.x) * 10) / (Math.abs(state.move.y) * 10)
+    state.next = angle > 1;
+    // console.log(angle)
+    return state.needCheck = false
+  }
+  return state.needCheck = true
+}
+
+function getDistance() {
+  return -state.localIndex * wrapper.width
+}
+
+</script>
+
+<template>
+  <div class="slide">
+    <div class="slide-wrapper"
+         ref="wrapperEl"
+         @touchstart="touchStart"
+         @touchmove="touchMove"
+         @touchend="touchEnd"
+    >
+      <slot></slot>
+    </div>
+  </div>
+</template>

src/pages/slideHooks/SlideItem.vue

@@ -0,0 +1,16 @@
+<template>
+  <div class="slide-item">
+    <slot></slot>
+  </div>
+</template>
+
+<script setup>
+</script>
+
+<style scoped lang="less">
+.slide-item {
+  height: 100%;
+  width: 100%;
+  flex-shrink: 0;
+}
+</style>

src/pages/slideHooks/V.vue

@@ -0,0 +1,123 @@
+<script setup>
+import {ref, onMounted, reactive} from "vue";
+import Common from '../../utils'
+import bus from "../../utils/bus";
+
+const props = defineProps({
+  list: {
+    type: Array,
+    default: () => {
+      return []
+    }
+  },
+})
+
+const judgeValue = 20
+const wrapperEl = ref(null)
+const wrapper = reactive({width: 0, height: 0, childrenLength: 0})
+const start = reactive({x: 0, y: 0, time: 0})
+const move = reactive({x: 0, y: 0})
+const state = reactive({
+  localIndex: 0,
+  needCheck: true,
+  next: false,
+})
+
+onMounted(() => {
+  checkChildren()
+})
+
+function checkChildren() {
+  wrapper.width = Common.$getCss(wrapperEl.value, 'width')
+  wrapper.height = Common.$getCss(wrapperEl.value, 'height')
+  wrapper.childrenLength = wrapperEl.value.children.length
+}
+
+function touchStart(e) {
+  Common.$setCss(wrapperEl.value, 'transition-duration', `0ms`)
+  start.x = e.touches[0].pageX
+  start.y = e.touches[0].pageY
+  start.time = Date.now()
+}
+
+function touchMove(e) {
+  move.x = e.touches[0].pageX - start.x
+  move.y = e.touches[0].pageY - start.y
+
+  let isNext = move.x < 0
+  checkDirection(e)
+
+  if (state.localIndex === 0 && !isNext && state.next) {
+    // bus.emit(this.name + '-moveY', this.moveY)
+  }
+  if ((state.localIndex === 0 && !isNext) || (state.localIndex === props.list.length- 1 && isNext)) return
+  if (state.next) {
+    Common.$stopPropagation(e)
+    Common.$setCss(wrapperEl.value, 'transform',
+        `translate3d(${getDistance()
+        + move.y
+        + (isNext ? judgeValue : -judgeValue)
+        }px, 0)`)
+  }
+}
+
+function touchEnd(e) {
+  let isRight = move.x < 0
+  if ((state.localIndex === 0 && !isRight) || (state.localIndex === wrapper.childrenLength - 1 && isRight)) state.next = false
+
+  let endTime = Date.now()
+  let gapTime = endTime - start.time
+  if (Math.abs(move.x) < 20) gapTime = 1000
+  if (Math.abs(move.x) > (wrapper.width / 4)) gapTime = 100
+  if (gapTime < 150 && state.next) {
+    if (isRight) {
+      state.localIndex++
+    } else {
+      state.localIndex--
+    }
+  }
+  reset()
+}
+
+function checkDirection(e) {
+  if (!state.needCheck) return
+  if (Math.abs(move.x) > judgeValue || Math.abs(move.y) > judgeValue) {
+    let angle = (Math.abs(move.x) * 10) / (Math.abs(move.y) * 10)
+    state.next = angle <= 1;
+    // console.log(angle)
+    return state.needCheck = false
+  }
+  return state.needCheck = true
+}
+
+function reset() {
+  Common.$setCss(wrapperEl.value, 'transition-duration', `300ms`)
+  Common.$setCss(wrapperEl.value, 'transform',
+      `translate3d(${getDistance()}px, 0, 0)`)
+
+  move.x = 0
+  state.next = false
+  state.needCheck = true
+  start.time = null
+  // this.$emit('update:index', state.localIndex)
+  // bus.emit(this.name + '-end', state.localIndex)
+}
+
+function getDistance() {
+  return -state.localIndex * wrapper.height
+}
+
+</script>
+
+<template>
+  <div class="slide">
+    <div class="slide-wrapper flex-direction-column"
+         ref="wrapperEl"
+         @touchstart="touchStart"
+         @touchmove="touchMove"
+         @touchend="touchEnd"
+    >
+      <slot></slot>
+    </div>
+  </div>
+</template>

src/pages/slideHooks/common.js

@@ -0,0 +1,20 @@
+import bus from "../../utils/bus";
+import Utils from '../../utils'
+import GM from "../../utils";
+
+export function slideReset(el, distance, state, emit) {
+  Utils.$setCss(el, 'transition-duration', `300ms`)
+  Utils.$setCss(el, 'transform', `translate3d(${distance}px, 0, 0)`)
+  state.start.x = state.start.y = state.start.time = state.move.x = state.move.y = 0
+  state.next = false
+  state.needCheck = true
+  emit('update:index', state.localIndex)
+  bus.emit(state.name + '-end', state.localIndex)
+}
+
+export function slideTouchStart(e, el, state) {
+  GM.$setCss(el, 'transition-duration', `0ms`)
+  state.start.x = e.touches[0].pageX
+  state.start.y = e.touches[0].pageY
+  state.start.time = Date.now()
+}

src/pages/slideHooks/index.vue

@@ -0,0 +1,56 @@
+<template>
+  <div class="slide2">
+    <H class="h" v-model:index="state.index">
+      <SlideItem class="slide-item">
+        <!--        <V>-->
+        <!--          <SlideItem class="slide-item"></SlideItem>-->
+        <!--          <SlideItem class="slide-item"></SlideItem>-->
+        <!--        </V>-->
+      </SlideItem>
+      <SlideItem class="slide-item">
+        <!--        <V></V>-->
+      </SlideItem>
+    </H>
+    <span>{{ state.index }}</span>
+    <Footer v-bind:init-tab="1"/>
+  </div>
+</template>
+
+<script setup>
+import H from './H'
+import V from './V'
+import SlideItem from './SlideItem'
+import {reactive} from "vue";
+
+const state = reactive({
+  index: 0
+})
+
+</script>
+
+<style scoped lang="less">
+.slide2 {
+  width: 100%;
+  height: 100%;
+
+  span {
+    color: white;
+    font-size: 24rem;
+  }
+}
+
+.h {
+  width: 90vw;
+  height: 80vh;
+  overflow: hidden;
+
+  .slide-item {
+    background-color: red;
+
+    &:last-child {
+      background-color: gray;
+    }
+  }
+}
+
+</style>

src/pages/test/Test.vue

@@ -1,8 +1,9 @@
 <template>
   <!--  <TestSlide></TestSlide>-->
-<!--  <SlideUser></SlideUser>-->
+  <!--  <SlideUser></SlideUser>-->
-<!--  <SlideImgs></SlideImgs>-->
+  <!--  <SlideImgs></SlideImgs>-->
-  <TestImg/>
+  <!--  <TestImg/>-->
+  <slideHooks></slideHooks>
 </template>
 <script>
 
@@ -11,10 +12,12 @@ import TestSlide from "./TestSlide";
 import SlideUser from "../../components/slide/SlideUser";
 import SlideImgs from "../../components/slide/SlideImgs";
 import TestImg from "./TestImg";
+import slideHooks from '../slideHooks'
 
 export default {
   name: "Test",
   components: {
+    slideHooks,
     TestSlide,
     SlideUser,
     SlideImgs,

src/pages/test/TestImg.vue

@@ -9,7 +9,7 @@
 </template>
 
 <script>
-import globalMethods from "../../utils/global-methods";
+import globalMethods from "../../utils";
 
 export default {
   name: "TestImg",

src/utils/dom.js

@@ -1,4 +1,4 @@
-import globalMethods from '../utils/global-methods'
+import globalMethods from './index'
 
 export default class Dom {
   els = []

src/utils/index.jsx

@@ -6,6 +6,7 @@ import Loading from "../components/Loading.vue";
 import Config from '../config'
 import NoticeDialog from "../components/dialog/NoticeDialog";
 import dayjs from 'dayjs'
+import bus from "./bus";
 
 export default {
   require2(url) {

src/utils/mixin.js

@@ -1,4 +1,4 @@
-import globalMethods from "./global-methods";
+import globalMethods from "./index";
 import BaseHeader from "../components/BaseHeader";
 import SlideList from "../components/slide/SlideList";
 import SlideRowList from "../components/slide/SlideRowList";

src/utils/request.js

@@ -1,7 +1,7 @@
 import axios from 'axios'
 import config from '@/config'
 import store from '../store'
-import globalMethods from './global-methods'
+import globalMethods from './index'
 //这里必须使用axios实例，因为已经有一个没有创建实例而直接使用的axio了，
 // 在request.js，这里如果直接使用axios的话，request.js里面的拦截器也会执行
 //创建一个实例再去使用这个实例请求，request.js里面的axios配置就不会生效