-
@@ -159,6 +159,12 @@ export default {
default: () => {
return false
}
+ },
+ isUp: {
+ type: Boolean,
+ default: () => {
+ return false
+ }
}
},
computed: {
@@ -192,6 +198,7 @@ export default {
test: [1, 2],
lVideo: this.video,
+ videoScreenHeight: 0,
videoPoster: `?vframe/jpg/offset/0/w/${document.body.clientWidth}`
}
},
@@ -203,10 +210,12 @@ export default {
let video = this.$refs.video
video.currentTime = 0
let fun = e => {
+ this.loading = false
this.currentTime = Math.ceil(e.target.currentTime)
this.pageX = this.currentTime * this.step
}
video.addEventListener('loadedmetadata', e => {
+ this.videoScreenHeight = video.videoHeight / (video.videoWidth / this.width)
this.duration = video.duration
if (this.duration > 60) {
// if (this.duration > 6) {
diff --git a/src/components/Comment.vue b/src/components/Comment.vue
index e442729..1d7f6e4 100644
--- a/src/components/Comment.vue
+++ b/src/components/Comment.vue
@@ -5,7 +5,7 @@
@cancel="cancel"
:show-heng-gang="false"
maskMode="light"
- height="70vh"
+ :height="height"
mode="white">
-
@@ -135,6 +135,10 @@ export default {
type: String,
default: null
},
+ height: {
+ type: String,
+ default: '70vh'
+ },
},
computed: {
...mapState(['friends'])
@@ -348,7 +352,7 @@ export default {
.comment {
width: 100%;
- height: 70vh;
+ height: v-bind(height);
background: #fff;
z-index: 5;
border-radius: 1rem 1rem 0 0;
diff --git a/src/components/dialog/FromBottomDialog.vue b/src/components/dialog/FromBottomDialog.vue
index 49f9157..4bb55cc 100644
--- a/src/components/dialog/FromBottomDialog.vue
+++ b/src/components/dialog/FromBottomDialog.vue
@@ -87,7 +87,7 @@ export default {
let mask = new Dom('.Mask').replaceClass('fade-in', 'fade-out')
setTimeout(() => {
mask.remove()
- }, 300)
+ }, 250)
}
},
},
@@ -105,7 +105,7 @@ export default {
},
methods: {
beforeEnter(el) {
- this.$setCss(el, 'transition-duration', `200ms`)
+ this.$setCss(el, 'transition-duration', `250ms`)
this.$setCss(el, 'transform', `translate3d(0,${this.height},0)`)
},
enter(el, done) {
@@ -116,19 +116,19 @@ export default {
// this.$setCss(el, 'transition-duration', `0ms`)
this.$setCss(el, 'transform', `none`)
done()
- }, 200)
+ }, 250)
},
afterEnter() {
},
beforeLeave(el) {
- this.$setCss(el, 'transition-duration', `200ms`)
+ this.$setCss(el, 'transition-duration', `250ms`)
this.$setCss(el, 'transform', `translate3d(0,0,0)`)
},
leave(el, done) {
//ref获取不到
let maxHeight = new Dom('.FromBottomDialog').css('max-height')
this.$setCss(el, 'transform', `translate3d(0,${maxHeight},0)`)
- setTimeout(done, 200)
+ setTimeout(done, 250)
},
afterLeave() {
},
@@ -151,25 +151,23 @@ export default {
}
},
end(e) {
-
//点击
if (Date.now() - this.startTime < 150 && Math.abs(this.moveYDistance) < 30) {
return
}
-
//滑动
if (this.$refs.dialog.scrollTop !== 0) return
let clientHeight = this.$refs.dialog.clientHeight
- this.$setCss(this.$refs.dialog, 'transition-duration', `300ms`)
+ this.$setCss(this.$refs.dialog, 'transition-duration', `250ms`)
if (Math.abs(this.moveYDistance) > clientHeight / 2) {
this.$setCss(this.$refs.dialog, 'transform', `translate3d(0,${clientHeight}px,0)`)
- setTimeout(this.hide, 300)
+ setTimeout(this.hide, 250)
} else {
this.$setCss(this.$refs.dialog, 'transform', `translate3d(0,0,0)`)
setTimeout(() => {
this.$setCss(this.$refs.dialog, 'transform', 'none')
// this.$setCss(this.$refs.dialog, 'transition-duration', `0ms`)
- }, 300)
+ }, 250)
}
this.moveYDistance = 0
}
diff --git a/src/pages/slide/IndicatorHome.vue b/src/pages/slide/IndicatorHome.vue
index 8100210..8d64219 100644
--- a/src/pages/slide/IndicatorHome.vue
+++ b/src/pages/slide/IndicatorHome.vue
@@ -24,7 +24,7 @@
@@ -199,6 +199,7 @@ export default {
width: 100%;
color: white;
height: @height;
+ transition: all .3s;
.notice {
opacity: 0;
diff --git a/src/pages/slide/Slide.vue b/src/pages/slide/Slide.vue
index 0ebe8c0..f3536f1 100644
--- a/src/pages/slide/Slide.vue
+++ b/src/pages/slide/Slide.vue
@@ -1,8 +1,9 @@
-
+
-
+
+
@@ -34,56 +35,29 @@
住宿
-
-
-
-
-
@@ -34,56 +35,29 @@
住宿
-
- - r2222222222222222222222222222222222222222222222222222222 -
-r333333333333333333333333333333333333333333333333333333
-
-
-
-
-
-
-
- 正在直播
-
-
-
- 全部关注
-
-
-
- ![]()
- {{ item.name }}
-
- 直播中
- r1r1r1r1r1r1r1r1r1r1r1r1r1r1r1r1r1r1r1r1r1r1r1r1r1r1r1r1r1r1
- r2222222222222222222222222222222222222222222222222222222
- r333333333333333333333333333333333333333333333333333333
-
-
-
+
r1r1r1r1r1r1r1r1r1r1r1r1r1r1r1r1r1r1r1r1r1r1r1r1r1r1r1r1r1r1
- r2222222222222222222222222222222222222222222222222222222
- r333333333333333333333333333333333333333333333333333333
-
+
+
-