fix: 修改高度计算方式, 更新组件库

app/controller/activity.ts

@@ -12,7 +12,7 @@ export default class ActivityController extends Controller {
       if (process.env.NODE_ENV === 'production' && process.env.EGG_SERVER_ENV === 'sit') {
         apollo = ctx.app.config.apollo || {};
       }
-      let body = await ctx.renderView('activity.js', { url: ctx.url, apollo });
+      body = await ctx.renderView('activity.js', { url: ctx.url, apollo });
       await ctx.service.redis.set(redisKey, body);
     }
     ctx.body = body;

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

@@ -24,23 +24,26 @@ export default class Activity extends Mixins(TransformStyleMixin, SaMixin) {
     h: 60,
     i: 'page-bottom-top'
   };
+  layout: object = [];
   isLayoutComReady = false;
   showBackTop = false;
   targetEle: HTMLElement | null = null;
   loading: boolean = true;
   modfiTabsStyleDebounce = debounce(this.modfiTabsStyle, 300);
 
-  get layout() {
-    return this.pageData && this.pageData.elements.map(v => v.point) || [];
-  }
-
   get backTopList() {
-    return this.pageData && this.pageData.props.showShopCart ? this.pageData.props.backTopAttachInfo : [];
+    return this.pageData && this.pageData.props.showShopCart ? [
+      {
+        icon: 'shopping-cart-o',
+        url: 'xyqb://shoppingCartTab'
+      }
+    ] : [];
   }
 
-  @Watch('layout')
+  @Watch('pageData')
   onLayoutChange(val) {
-    const lastGridItemPoint = val[val.length - 1];
+    const layout = this.pageData && this.pageData.elements.map(v => v.point) || [];
+    const lastGridItemPoint = layout[layout.length - 1];
     if (lastGridItemPoint.w) {
       this.bottomInfo = {
         x: 0,
@@ -52,6 +55,8 @@ export default class Activity extends Mixins(TransformStyleMixin, SaMixin) {
       if (lastGridItemPoint.w > this.bottomInfo.w) { this.bottomInfo.w = lastGridItemPoint.w; }
       this.bottomInfo.y = this.bottomInfo.y + lastGridItemPoint.y + lastGridItemPoint.h;
     }
+    layout.push(this.bottomInfo);
+    this.layout = layout;
   }
 
   @Watch('pageName', { immediate: true })

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

@@ -40,10 +40,6 @@
       </grid-item>
   	</grid-layout>
     <cr-back-top v-if="showBackTop && pageData.props.showBackTop" :list="backTopList" />
-    <div class="page-bottom">
-      <p><img src="" /></p>
-      <p>没有更多啦～</p>
-    </div>
   </div>
 </template>
 <script lang="ts" src="./index.ts"></script>

app/web/page/store/modules/activity/state.ts

@@ -64,7 +64,17 @@ export const defaultState = {
         backgroundImage: ''
       },
       props: {
-        showBackTop: false
+        showBackTop: true,
+        showShopCart: true,
+        backTopAttachInfo: [
+          {
+            icon: 'shopping-cart-o',
+            url: 'xyqb://shoppingCartTab'
+          }
+        ],
+        showPageBottomTip: true,
+        pageBottomTxt: '没有更多啦～',
+        pageBottomColor: '#fff'
       },
       elements: [],
     }

app/web/service/utils.service.ts

@@ -92,7 +92,7 @@ export const convertPointStyle = (point, defaultStyle, directionKey = DK) => {
 
 export const getStyle = function(oElement, sName) {
   const result = oElement.currentStyle ? oElement.currentStyle[sName] : getComputedStyle(oElement, null)[sName];
-  return result.includes('px') ? result.slice(0, -2) : result;
+  return result.indexOf('px') > -1 ? result.slice(0, -2) : result;
 };
 
 export const validateType = function(obj) {

package-lock.json

@@ -1648,9 +1648,9 @@
       "integrity": "sha512-uOCUKu5mvX3PWee+7ZFXQSNIR1V5SN2JVE2yANmW9/wQOgpEct291gXGok8VMw0009HlTWB4JATURPwyOP2DFg=="
     },
     "@qg/cherry-ui": {
-      "version": "2.21.1-beta5",
-      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcherry-ui/-/cherry-ui-2.21.1-beta5.tgz",
-      "integrity": "sha512-C43ydazyjqmsrq2uYJ2prcksnSTmeMyoracVw5dcyV1S9GGQku7C6CmpV1KXXpXiR6HLrXb7HcLyzgrCf/DzUA==",
+      "version": "2.21.1-beta6",
+      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcherry-ui/-/cherry-ui-2.21.1-beta6.tgz",
+      "integrity": "sha512-N99UjjwYrQj1AccZ+08lNRdHWKnlb7ZnKvAn4w48KWRERQNxJ1U2LwclVmQ3FRFlc9x5FRSUDccuoJ3CAf2ZMg==",
       "requires": {
         "@popperjs/core": "^2.5.4",
         "vue-lazyload": "^1.3.3",

package.json

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