Merge branch 'feature/开门红首页业绩表格' into dev

# Conflicts:
#	src/views/ebiz/product/HomeProduct.vue
This commit is contained in:
mengxiaolong
2020-11-16 13:39:06 +08:00

View File

@@ -1,12 +1,12 @@
<template>
<div ref="product" class="home-product-container">
<div ref="product" class="home-product-container pb20">
<div class="home-product-content">
<!-- 产品中心 -->
<div class="pcenter-title flex pt10 mr20 mb10 ml15 justify-content-s align-items-c" style="height: 30px;">
<h3 class="center-title fs15 pl10" style="border-left: 4px solid red;">知识社区</h3>
<span class="more fs13 c-gray-base" @click="checkZssqMore"><span>查看更多</span><van-icon name="arrow"/></span>
</div>
<div class="home-product-pcenter">
<div class="pcenter-title flex pt10 mr20 mb10 ml15 justify-content-s align-items-c" style="height: 30px;">
<h3 class="center-title fs15 pl10" style="border-left: 4px solid red;">知识社区</h3>
<span class="more fs13 c-gray-base" @click="checkZssqMore"><span>查看更多</span><van-icon name="arrow"/></span>
</div>
<div class="pcenter-list">
<div class="pcenter-title flex mt4 mb10 mr15 ml10 justify-content-s">
<div class="zssq zssq_1" @click="checkZssq">
@@ -35,7 +35,7 @@
<div class="home-product-content">
<!-- 产品中心 -->
<div class="pcenter-title flex pt10 pb10 mr15 justify-content-s align-items-c" style="height: 30px;">
<img class="title-img" :src="performance" alt="" />
<img class="title-img" :src="performance" />
</div>
<div class="home-product-pcenter performance">
<div class="pcenter-list">
@@ -73,6 +73,7 @@
<!-- 产品中心 -->
<div class="pcenter-title flex pt10 mr20 mb10 justify-content-s align-items-c">
<img class="title-img" :src="product" />
<!-- <h3 class="center-title fs15 pl10 ml15" style="border-left: 4px solid red;">产品中心</h3> -->
<span class="more fs13 c-gray-base" @click="getMore"><span>查看更多</span><van-icon name="arrow"/></span>
</div>
<div class="home-product-pcenter">
@@ -100,31 +101,15 @@ export default {
product
}
},
mounted() {
document.body.style.backgroundColor = '#F5F6F8'
// window.onload = () => {
// let contentHeight = document.querySelector('#app>div').offsetHeight
// console.log('页面高度', document.querySelector('#app>div').offsetHeight)
// this.$jump({
// flag: 'content_height',
// extra: {
// height: contentHeight
// }
// })
// }
},
beforeRouteLeave(to, from, next) {
document.body.style.backgroundColor = ''
next()
},
methods: {
showMore() {
this.idMoreDataShow = !this.idMoreDataShow
console.log(this.$refs.product.offsetWidth)
console.log(this.$refs.product.offsetHeight)
this.$nextTick(() => {
console.log(this.$refs.product.offsetWidth)
console.log(this.$refs.product.offsetHeight)
const height = this.$refs.product.offsetHeight
console.log('after: ', height)
window.EWebBridge.webCallAppInJs('updateWebHeight', {
height
})
})
},
//查看更多
@@ -284,10 +269,9 @@ export default {
.van-icon {
transform: rotate(90deg);
}
}
.arrowUp {
transform: rotate(270deg);
.arrowUp {
transform: rotate(270deg);
}
}
span,