Commit 92979b63 authored by 786817560's avatar 786817560

'解决冲突'

parents 5bf94a75 2a0f5606
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Descrip: 产品明细 * @Descrip: 产品明细
* @Author: your name * @Author: your name
* @Date: 2019-10-15 14:30:00 * @Date: 2019-10-15 14:30:00
* @LastEditTime: 2019-11-06 10:36:40 * @LastEditTime: 2019-11-06 13:56:38
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
--> -->
<template> <template>
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<!-- <Tab v-if="slide" :tabNums="tabNum" @getTabNum="getTabNum"/> --> <!-- <Tab v-if="slide" :tabNums="tabNum" @getTabNum="getTabNum"/> -->
<!-- 基本信息 --> <!-- 基本信息 -->
<h-content v-swipeup="(e)=>vueTouch('上滑',e)" v-swipedown="(e)=>vueTouch('下滑',e)" class="hcontent"> <h-content v-swipeup="(e)=>vueTouch('上滑',e)" v-swipedown="(e)=>vueTouch('下滑',e)" class="hcontent">
<scroll class="scrolls"> <scroll class="scrolls" ref="scrolls">
<div id="baseInfo" class="base"> <div id="baseInfo" class="base">
...@@ -155,23 +155,33 @@ export default { ...@@ -155,23 +155,33 @@ export default {
} }
}, },
methods: methods:
{ {
// tab切换 // tab切换
tabCheck (num) { tabCheck (num) {
let scrollContent = document.getElementsByClassName('scrollContent')[0]
if(num === 0){ if(num === 0){
this.num = 0 this.num = 0
console.log('基本信息',document.getElementsByClassName('base')[0].getBoundingClientRect().top)
this.height = document.getElementsByClassName('base')[0].getBoundingClientRect().top - 83
// console.log(height)
scrollContent.style.transition = 'all .3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s'
scrollContent.style.transform = 'translate(0px, -' + this.height + 'px) scale(1) translateZ(0px)'
}else if(num === 1){ }else if(num === 1){
this.num = 1 this.num = 1
console.log('详情信息',document.getElementsByClassName('prodetail')[0].getBoundingClientRect().top)
this.height = document.getElementsByClassName('prodetail')[0].getBoundingClientRect().top - 83
console.log(this.height)
scrollContent.style.transition = 'all .3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s'
scrollContent.style.transform = 'translate(0px, -' + this.height + 'px) scale(1) translateZ(0px)'
}else{ }else{
this.num = 2 this.num = 2
console.log('配置信息',document.getElementsByClassName('procnf')[0].getBoundingClientRect().top) console.log('配置信息',document.getElementsByClassName('procnf')[0].getBoundingClientRect().top)
this.height = document.getElementsByClassName('procnf')[0].getBoundingClientRect().top - 83 this.height = document.getElementsByClassName('procnf')[0].getBoundingClientRect().top - 83
// console.log(height) // console.log(height)
document.getElementsByClassName('scrollContent')[0].style.transition = 'all .3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s' scrollContent.style.transition = 'all .3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s'
document.getElementsByClassName('scrollContent')[0].style.transform = 'translate(0px, -' + this.height + 'px) scale(1) translateZ(0px)' scrollContent.style.transform = 'translate(0px, -' + this.height + 'px) scale(1) translateZ(0px)'
} }
}, },
returnGo () { returnGo () {
...@@ -183,7 +193,7 @@ export default { ...@@ -183,7 +193,7 @@ export default {
vueTouch: function (s, e) { vueTouch: function (s, e) {
// console.log(s, e) // console.log(s, e)
this.slide = true this.slide = true
this.height = 0 // this.height = 0
// document.getElementsByTagName('hcontent')[0].addEventListener('touchmove',function(e){ // document.getElementsByTagName('hcontent')[0].addEventListener('touchmove',function(e){
// console.log("开始滑动了touchstart"); // console.log("开始滑动了touchstart");
// let a = document.documentElement.scrollTop; // let a = document.documentElement.scrollTop;
...@@ -194,11 +204,11 @@ export default { ...@@ -194,11 +204,11 @@ export default {
let procnfGather = document.getElementsByClassName('procnf')[0].getBoundingClientRect() // 配置信息元素集合 let procnfGather = document.getElementsByClassName('procnf')[0].getBoundingClientRect() // 配置信息元素集合
let detailGather = document.getElementsByClassName('prodetail')[0].getBoundingClientRect() // 详情信息元素集合 let detailGather = document.getElementsByClassName('prodetail')[0].getBoundingClientRect() // 详情信息元素集合
let baseGather = document.getElementsByClassName('base')[0].getBoundingClientRect() // 基本信息元素集合 let baseGather = document.getElementsByClassName('base')[0].getBoundingClientRect() // 基本信息元素集合
if (clientHeight - procnfGather.top >= procnfGather.height) { if (clientHeight - procnfGather.top - 83 >= procnfGather.height) {
this.num = 2 this.num = 2
} else if (clientHeight - detailGather.top >= detailGather.height) { } else if (clientHeight - detailGather.top - 83 >= detailGather.height) {
this.num = 1 this.num = 1
} else if (clientHeight - baseGather.top >= baseGather.height) { } else if (clientHeight - baseGather.top - 83 >= baseGather.height) {
this.num = 0 this.num = 0
} }
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment