This commit is contained in:
zyronon 2023-02-18 00:53:47 +08:00
parent ec18f5b540
commit 7fc3b9d244
6 changed files with 37 additions and 40 deletions

View File

@ -10,9 +10,7 @@
</div> </div>
<div class="l-button" @click="tab(3)"> <div class="l-button" @click="tab(3)">
<div class="add-ctn"> <div class="add-ctn">
<div class="add-one"> <img src="../assets/img/icon/add-light.png" alt="" class="add">
<img src="../assets/img/icon/add-light.png" alt="" class="add">
</div>
</div> </div>
</div> </div>
<div class="l-button" @click="tab(4)"> <div class="l-button" @click="tab(4)">
@ -125,24 +123,17 @@ export default {
.add-ctn { .add-ctn {
@height: 27rem; @height: 27rem;
@width: 40rem; @width: 36rem;
height: @height; height: @height;
width: @width; width: @width;
background: linear-gradient(to right, #59dcdf, #ff5f75); border-radius: 6rem;
border-radius: 5rem;
box-sizing: border-box; box-sizing: border-box;
padding: 0 2rem; padding: 0 2rem;
border: 3rem solid white;
.add-one { background: black;
box-sizing: border-box; display: flex;
height: 100%; align-items: center;
border-radius: 5rem; justify-content: center;
border: 2px solid white;
background: black;
display: flex;
align-items: center;
justify-content: center;
}
img { img {
width: 20rem; width: 20rem;

View File

@ -340,10 +340,10 @@ export default {
margin-bottom: @space-width; margin-bottom: @space-width;
img { img {
width: @icon-width - 2.6; width: 20rem;
height: @icon-width - 2.6;
padding: 13rem; padding: 13rem;
border-radius: 50%; border-radius: 50%;
margin-bottom: 3rem;
background: @second-btn-color-tran; background: @second-btn-color-tran;
//background: rgb(56, 58, 57); //background: rgb(56, 58, 57);
} }

View File

@ -324,7 +324,7 @@ function progressBarTouchMEnd(e) {
} }
function touchStart(e) { function touchStart(e) {
console.log('start', e.touches.length) // console.log('start', e.touches.length)
if (e.touches.length === 1) { if (e.touches.length === 1) {
slideTouchStart(e, wrapperEl.value, state) slideTouchStart(e, wrapperEl.value, state)
} else { } else {
@ -338,10 +338,10 @@ function touchStart(e) {
} }
function touchMove(e) { function touchMove(e) {
console.log('move', e.touches.length,) // console.log('move', e.touches.length,)
let current1 = {x: e.touches[0].pageX, y: e.touches[0].pageY} let current1 = {x: e.touches[0].pageX, y: e.touches[0].pageY}
if (isZooming.value && e.touches.length === 1) { if (isZooming.value && e.touches.length === 1) {
console.log('m1') // console.log('m1')
state.status = 'pause' state.status = 'pause'
Utils.$stopPropagation(e) Utils.$stopPropagation(e)
@ -355,7 +355,7 @@ function touchMove(e) {
state.last.point1 = current1 state.last.point1 = current1
} else { } else {
if (e.touches.length === 1) { if (e.touches.length === 1) {
console.log('m2') // console.log('m2')
slideTouchMove(e, wrapperEl.value, state, judgeValue, canNext, slideTouchMove(e, wrapperEl.value, state, judgeValue, canNext,
() => { () => {
state.status = 'pause' state.status = 'pause'
@ -366,7 +366,7 @@ function touchMove(e) {
} }
}) })
} else { } else {
console.log('m3') // console.log('m3')
state.operationStatus = SlideAlbumOperationStatus.Zooming state.operationStatus = SlideAlbumOperationStatus.Zooming
Utils.$stopPropagation(e) Utils.$stopPropagation(e)
state.status = 'pause' state.status = 'pause'

View File

@ -246,6 +246,7 @@ export default {
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
@p: 15rem;
#SlideUser { #SlideUser {
width: 100%; width: 100%;
height: 100%; height: 100%;
@ -255,9 +256,11 @@ export default {
align-items: center; align-items: center;
justify-content: center; justify-content: center;
position: relative; position: relative;
padding: 0 @p;
box-sizing: border-box;
.content { .content {
width: 85%; width: 100%;
background: linear-gradient(to bottom, rgb(71, 90, 110), rgb(97, 84, 75)); background: linear-gradient(to bottom, rgb(71, 90, 110), rgb(97, 84, 75));
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@ -362,11 +365,11 @@ export default {
bottom: 20rem; bottom: 20rem;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
left: 15rem; left: @p;
right: 15rem; right: @p;
.button { .button {
width: 49%; width: 48%;
} }

View File

@ -1,5 +1,5 @@
<template> <template>
<div class="indicator-home" :class="isLight"> <div class="indicator-home" :class="{isLight}">
<transition name="fade"> <transition name="fade">
<div class="mask" v-if="open" @click="open = false"></div> <div class="mask" v-if="open" @click="open = false"></div>
</transition> </transition>
@ -205,7 +205,11 @@ export default {
font-weight: bold; font-weight: bold;
&.isLight { &.isLight {
color: black; .tab{
&.active {
color: black!important;
}
}
} }
.notice { .notice {

View File

@ -226,7 +226,7 @@ const bodyWidth = computed(() => store.state.bodyWidth)
const subTypeRef = ref(null) const subTypeRef = ref(null)
const state = reactive({ const state = reactive({
baseIndex: 0, baseIndex: 0,
navIndex: 0, navIndex: 4,
itemIndex: 0, itemIndex: 0,
test: '', test: '',
recommendVideos: [ recommendVideos: [
@ -234,14 +234,14 @@ const state = reactive({
// type: 'img', // type: 'img',
// src: `http://douyin.ttentau.top/0.mp4?vframe/jpg/offset/0/w/${document.body.clientWidth}` // src: `http://douyin.ttentau.top/0.mp4?vframe/jpg/offset/0/w/${document.body.clientWidth}`
// }, // },
{ // {
type: 'imgs', // type: 'imgs',
src: `http://douyin.ttentau.top/0.mp4?vframe/jpg/offset/0/w/${document.body.clientWidth}` // src: `http://douyin.ttentau.top/0.mp4?vframe/jpg/offset/0/w/${document.body.clientWidth}`
}, // },
{ // {
type: 'user', // type: 'user',
src: `http://douyin.ttentau.top/0.mp4?vframe/jpg/offset/0/w/${document.body.clientWidth}` // src: `http://douyin.ttentau.top/0.mp4?vframe/jpg/offset/0/w/${document.body.clientWidth}`
}, // },
], ],
isSharing: false, isSharing: false,
@ -404,7 +404,6 @@ function render(item, itemIndex, play, position) {
<style scoped lang="less"> <style scoped lang="less">
@import "@/assets/less/index"; @import "@/assets/less/index";
.test-slide-wrapper { .test-slide-wrapper {
font-size: 14rem; font-size: 14rem;
width: 100%; width: 100%;