diff --git a/package.json b/package.json index 53bba66..5d90000 100755 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "serve": "vue-cli-service serve", "build": "vue-cli-service build", "lint": "vue-cli-service lint", - "push": "git add ./ & git commit -m 'dubug' & git push origin master" + "push": "git add ./ && git commit -m 'dubug'" }, "dependencies": { "vue": "^2.5.17", diff --git a/src/components/home/Home.vue b/src/components/home/Home.vue index cf4ce9d..34cbfe6 100755 --- a/src/components/home/Home.vue +++ b/src/components/home/Home.vue @@ -142,6 +142,10 @@ // autoHeight: true, //高度随内容变化 on: { slideChange() { + self.isCommenting = false; + self.isSharing = false; + + let dateLength = self.data.length; let index = this.activeIndex; console.log(index); @@ -182,8 +186,8 @@ touchStart(event) { // console.log(); // event.stopPropagation(); - self.isCommenting = false; - self.isSharing = false; + // self.isCommenting = false; + // self.isSharing = false; } }, @@ -192,6 +196,10 @@ }, methods: { togglePlayVideo(e) { + console.log('1'); + console.log(this.isCommenting) + console.log(this.isSharing); + // return; if (this.isSharing) { this.isSharing = false; return; @@ -221,21 +229,21 @@ }, showComment() { this.isCommenting = !this.isCommenting; - setTimeout(()=>{ + setTimeout(() => { let comment = this.$refs.comment.$el; this.commentHeight = comment.offsetHeight; console.log(this.commentHeight); console.log(this.height); - },50); + }, 50); }, showShare() { this.isSharing = !this.isSharing; - setTimeout(()=>{ + setTimeout(() => { let share = this.$refs.share.$el; this.shareHeight = share.offsetHeight; console.log(this.shareHeight); console.log(this.height); - },50); + }, 50); }, loved(e, index) { let img = e.target.parentNode.childNodes[0]; @@ -255,7 +263,7 @@ window.scrollTo(0, 0); let other = this.$refs.other.$el; let footer = this.$refs.footer.$el; - let share = this.$refs.share.$el; + // let share = this.$refs.share.$el; this.otherUserHeight = other.offsetHeight; if (this.otherUserHeight < this.height) { this.otherUserHeight = this.height;