fix: 高度计算

app/web/page/activity/view/activity/index.ts

@@ -38,10 +38,15 @@ export default class Activity extends Mixins(TransformStyleMixin, SaMixin) {
     return this.pageData && this.pageData.props.showShopCart ? this.pageData.props.backTopAttachInfo : [];
   }
 
-  @Watch('layout')
-  onLayoutChange(val) {
-    const lastGridItemPoint = val[val.length - 1];
-    if (lastGridItemPoint.w) {
+  @Watch('pageData', { deep: true })
+  onPageDataChange(val) {
+    const lastGridItem = val.elements[val.elements.length - 1];
+    // 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 = {
         x: 0,
         y: 0,
@@ -112,6 +117,7 @@ export default class Activity extends Mixins(TransformStyleMixin, SaMixin) {
   }
 
   layoutUpdatedEvent() {
+    console.log('layoutUpdatedEvent');
     // 高度更新时重新计算导航组件样式
     this.modfiTabsStyleDebounce();
   }

package-lock.json

@@ -1648,9 +1648,9 @@
       "integrity": "sha512-uOCUKu5mvX3PWee+7ZFXQSNIR1V5SN2JVE2yANmW9/wQOgpEct291gXGok8VMw0009HlTWB4JATURPwyOP2DFg=="
     },
     "@qg/cherry-ui": {
-      "version": "2.21.1-beta6",
-      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcherry-ui/-/cherry-ui-2.21.1-beta6.tgz",
-      "integrity": "sha512-N99UjjwYrQj1AccZ+08lNRdHWKnlb7ZnKvAn4w48KWRERQNxJ1U2LwclVmQ3FRFlc9x5FRSUDccuoJ3CAf2ZMg==",
+      "version": "2.21.1-beta7",
+      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcherry-ui/-/cherry-ui-2.21.1-beta7.tgz",
+      "integrity": "sha512-9CcQ7eTwQTjHnaQ4DAk18WWTCasiRMK9iKRN01/td2HXAPemjPnUbQsEnyxZJgsvGDkaJGFSkMucDjlAtUigvA==",
       "requires": {
         "@popperjs/core": "^2.5.4",
         "vue-lazyload": "^1.3.3",
@@ -1658,9 +1658,9 @@
       }
     },
     "@qg/citrus-ui": {
-      "version": "0.1.15-beta3",
-      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.1.15-beta3.tgz",
-      "integrity": "sha512-TDTj991UndKulkfDn4jLwIp9vshcte2VpG1XHtJaqtqy6ypqW3VmvpuZnGp+rV5+SbFLFPriPvfcwZXxUXv0Pw==",
+      "version": "0.1.15-beta4",
+      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.1.15-beta4.tgz",
+      "integrity": "sha512-DqLR4peJapLIOQrVjvDjRsWwve4qJ0/+IZczDNYSjr2b2XB2KRahf9vYNEDDjEiRwnbDFVQYRPlVrA/BKbn0uw==",
       "requires": {
         "@better-scroll/core": "^2.1.1",
         "@qg/cherry-ui": "^2.21.1-beta5",

package.json

@@ -23,8 +23,8 @@
   "dependencies": {
     "@better-scroll/core": "^2.0.5",
     "@qg/apollo-nodejs": "^2.1.2",
-    "@qg/cherry-ui": "2.21.1-beta6",
-    "@qg/citrus-ui": "0.1.15-beta3",
+    "@qg/cherry-ui": "2.21.1-beta7",
+    "@qg/citrus-ui": "0.1.15-beta4",
     "babel-plugin-transform-vue-jsx": "^4.0.1",
     "cos-nodejs-sdk-v5": "^2.9.12",
     "egg": "^2.3.0",