feat(activity): 调整配置

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

@@ -17,7 +17,13 @@ export default class Activity extends Mixins(TransformStyleMixin, SaMixin) {
 
   @Provide() editor = this;
 
-  bottomInfo: object = {};
+  bottomInfo: object = {
+    x: 0,
+    y: 0,
+    w: 375,
+    h: 60,
+    i: 'page-bottom-top'
+  };
   isLayoutComReady = false;
   showBackTop = false;
   targetEle: HTMLElement | null = null;
@@ -27,6 +33,11 @@ export default class Activity extends Mixins(TransformStyleMixin, SaMixin) {
   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 : [];
+  }
+
   @Watch('layout')
   onLayoutChange(val) {
     const lastGridItemPoint = val[val.length - 1];
@@ -34,7 +45,7 @@ export default class Activity extends Mixins(TransformStyleMixin, SaMixin) {
       this.bottomInfo = {
         x: 0,
         y: 0,
-        w: 0,
+        w: 375,
         h: 60,
         i: 'page-bottom-top'
       };

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

@@ -39,7 +39,7 @@
         <page-bottom-tip />
       </grid-item>
   	</grid-layout>
-    <cr-back-top v-if="showBackTop && pageData.props.showBackTop" />
+    <cr-back-top v-if="showBackTop && pageData.props.showBackTop" :list="backTopList" />
     <div class="page-bottom">
       <p><img src="" /></p>
       <p>没有更多啦～</p>

package-lock.json

@@ -1648,9 +1648,9 @@
       "integrity": "sha512-uOCUKu5mvX3PWee+7ZFXQSNIR1V5SN2JVE2yANmW9/wQOgpEct291gXGok8VMw0009HlTWB4JATURPwyOP2DFg=="
     },
     "@qg/cherry-ui": {
-      "version": "2.21.1-beta3",
-      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcherry-ui/-/cherry-ui-2.21.1-beta3.tgz",
-      "integrity": "sha512-g68YD+vfJW/gbYrjotv6h0a4CpcEdHoYPjkMU8yRjk8WZUVQDic+9paOorD5W6YwrXBKaKkgo5w3ZFVT5SYsEA==",
+      "version": "2.21.1-beta4",
+      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcherry-ui/-/cherry-ui-2.21.1-beta4.tgz",
+      "integrity": "sha512-xLnvEA1PZWmBWQZX/sVgm3dv+tBvyBEZFdNFmXBe66Qd+TeL6p2dNKhDS0q+uP0O2XEP38rsv2hk3MMCddpQ2w==",
       "requires": {
         "@popperjs/core": "^2.5.4",
         "vue-lazyload": "^1.3.3",
@@ -1658,12 +1658,12 @@
       }
     },
     "@qg/citrus-ui": {
-      "version": "0.1.15-beta1",
-      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.1.15-beta1.tgz",
-      "integrity": "sha512-jDJewXlIFFlxcBPyFwq7ypB0XFXJ62b8Cqb2FU7APOTH8+WkOqGq2MNC2dIdffIw6LX3E2UzRA2M6dZV7tRZ0Q==",
+      "version": "0.1.15-beta2",
+      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.1.15-beta2.tgz",
+      "integrity": "sha512-DBEhmaQFZAxSFDu9I6534BFByDvk7NMtBrDuFBvRm6DurIdxZrDk9WpnySgUiWymhWUKzoisR265EYXeOaYBiQ==",
       "requires": {
         "@better-scroll/core": "^2.1.1",
-        "@qg/cherry-ui": "^2.21.1-beta3",
+        "@qg/cherry-ui": "^2.21.1-beta4",
         "@qg/js-bridge": "^1.1.11",
         "axios": "^0.21.1",
         "intersection-observer": "^0.12.0",

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-beta3",
-    "@qg/citrus-ui": "0.1.15-beta1",
+    "@qg/cherry-ui": "2.21.1-beta4",
+    "@qg/citrus-ui": "0.1.15-beta2",
     "babel-plugin-transform-vue-jsx": "^4.0.1",
     "cos-nodejs-sdk-v5": "^2.9.12",
     "egg": "^2.3.0",