feature: 修改bug

app/web/asset/css/reset.css

@@ -139,3 +139,9 @@ a {
 li {
   list-style: none;
 }
+
+*,
+*:before,
+*:after {
+  box-sizing: inherit;
+}

app/web/framework/app.ts

@@ -56,9 +56,11 @@ export default class App {
   client() {
     Vue.prototype.$http = require('axios');
     const vm = this.create(window.__INITIAL_STATE__);
-    vm.router.afterEach(() => {
-      this.fetch(vm);
-    });
+    if (!window.__INITIAL_STATE__?.activity) {
+      vm.router.afterEach(() => {
+        this.fetch(vm);
+      });
+    }
     const app = new Vue(vm);
     const root = document.getElementById('app');
     const hydrate = root.childNodes.length > 0;

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

@@ -20,7 +20,7 @@
   	             :h="item.point.h"
   	             :i="item.point.i"
   	             :key="item.point.i">
-  	      <component :style="transformStyle(item.commonStyle)" :data-index="index" :containerIndex="index" :childItem="item" :is="item.name" :key="index" v-bind="item.props"></component>
+  	      <component :style="transformStyle(item.commonStyle)" :data-index="index" :containerIndex="index" :childItem="item" :is="item.name" :key="item.id" v-bind="item.props"></component>
   	  </grid-item>
   	</grid-layout>
     <cr-back-top v-if="showBackTop && pageData.props.showBackTop" />

package-lock.json

@@ -1590,9 +1590,9 @@
       "integrity": "sha512-DvJbbn3dUgMxDnJLH+RZQPnXak1h4ZVYQ7CWiFWjQwBFkVajT4rfw2PdpHLTSTwxrYfnoEXkuBiwkDm6tPMQeA=="
     },
     "@qg/cherry-ui": {
-      "version": "2.19.0",
-      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcherry-ui/-/cherry-ui-2.19.0.tgz",
-      "integrity": "sha512-bzrn7Wv+hhsjqR3buoRPVCLBB8ZBKThksTVbvuyh1le+mC9P+aI+RI3u0kzOOR0r1G8Yhdyp6IV1lB719GV9Iw==",
+      "version": "2.19.2",
+      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcherry-ui/-/cherry-ui-2.19.2.tgz",
+      "integrity": "sha512-II08ZVAofNCPL3FM5os5P2TlmgsiNKLxO0f+dLFUb8YpbFmrj/fIKh4z7NO4MFQ+pK5TzwXi4M+ptS3onjOrIg==",
       "requires": {
         "@popperjs/core": "^2.5.4",
         "vue-lazyload": "^1.3.3",
@@ -1600,9 +1600,9 @@
       }
     },
     "@qg/citrus-ui": {
-      "version": "0.0.21",
-      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.0.21.tgz",
-      "integrity": "sha512-um+tQJJ+3R4qZ3IjZ8bNtnkaNqtnHypihbagNNKKkm3iS9XuL77MFzjX+SrXMCJlU1i3/aXBdLOokeKZc9FOoQ==",
+      "version": "0.0.23",
+      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.0.23.tgz",
+      "integrity": "sha512-Hmgm7KGFyqEoZzRE0r0ybMULQSA+fJ2V2T0po9xKv+eNehIuyTJ903UganwmaYz7sK21BuQg+hrMi2OznFWO/Q==",
       "requires": {
         "@better-scroll/core": "^2.1.1",
         "@qg/cherry-ui": "^2.18.72",

package.json

@@ -19,8 +19,8 @@
   },
   "dependencies": {
     "@better-scroll/core": "^2.0.5",
-    "@qg/cherry-ui": "^2.18.75",
-    "@qg/citrus-ui": "0.0.21",
+    "@qg/cherry-ui": "^2.19.2",
+    "@qg/citrus-ui": "0.0.23",
     "babel-plugin-transform-vue-jsx": "^4.0.1",
     "egg": "^2.3.0",
     "egg-bin": "^4.9.0",