Commit 41263106 authored by 郭志伟's avatar 郭志伟

fix: 高度问题修复

parent 21fd0af4
......@@ -46,11 +46,6 @@ export default class Activity extends Mixins(TransformStyleMixin, SaMixin) {
@Watch('pageData', { deep: true })
onPageDataChange(val) {
const lastGridItem = val.elements[val.elements.length - 1];
const isTab = lastGridItem.name === 'cs-goods-tabs';
// if (!lastGridItem) { return; }
// if (lastGridItem.name === 'cs-goods-tabs' && lastGridItem.child.length > 0) {
// lastGridItem = lastGridItem.child[lastGridItem.child.length - 1];
// }
const lastGridItemPoint = lastGridItem.point;
if (lastGridItemPoint && lastGridItemPoint.w) {
this.bottomInfo = {
......@@ -61,7 +56,7 @@ export default class Activity extends Mixins(TransformStyleMixin, SaMixin) {
i: 'page-bottom-top'
};
if (lastGridItemPoint.w > this.bottomInfo.w) { this.bottomInfo.w = lastGridItemPoint.w; }
this.bottomInfo.y = this.bottomInfo.y + lastGridItemPoint.y + lastGridItemPoint.h + (isTab ? -1 : 0);
this.bottomInfo.y = this.bottomInfo.y + lastGridItemPoint.y + lastGridItemPoint.h;
}
}
......
......@@ -1658,9 +1658,9 @@
}
},
"@qg/citrus-ui": {
"version": "0.1.15-beta5",
"resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.1.15-beta5.tgz",
"integrity": "sha512-IP0MI8wvs6hgpBKF0ruv8DYOJB0x5tWTISFjDGhCc4JqiPVM/wtOzNNRDFA5+nHaQrOYH+QpX4P/sRXdlWkChA==",
"version": "0.1.15-beta6",
"resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.1.15-beta6.tgz",
"integrity": "sha512-SjzMlXC5L3ca+/BL0KfACju7njTO0hdU9OiHx+fIZEh1Z45ft59XUHWl5HY2+qMlGWlDxK7eVvJydtmBvNYVcA==",
"requires": {
"@better-scroll/core": "^2.1.1",
"@qg/cherry-ui": "^2.21.1-beta5",
......
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