Merge branch 'master' into feat/noticeBar

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

@@ -138,6 +138,12 @@ export default class Activity extends Mixins(TransformStyleMixin, SaMixin, Disab
   dot(title) {
     console.log(title, '点击了');
   }
+  fixGridKey(item) {
+    if (typeof item.point?.i === 'number' && !isNaN(item.point?.i)) {
+      return item.id;
+    }
+    return item.point?.i || '';
+  }
   layoutReadyEvent(newLayout) {
     this.$nextTick(() => {
       const loadingEle = document.querySelector('.mainload');

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

@@ -3,7 +3,7 @@
     <template v-if="!noPageData">
       <div class="layout">
         <div :style="transformStyle(item.commonStyle, item.point, item.name)" v-for="(item, index) in pageData.elements"
-          :key="item.point.i"
+          :key="fixGridKey(item)"
            :id="`item_${item.id}`"
           @click="dot(item.title)"
           @touchend="disTouch"

package-lock.json

@@ -1658,9 +1658,9 @@
       }
     },
     "@qg/citrus-ui": {
-      "version": "0.3.9",
-      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.9.tgz",
-      "integrity": "sha512-lo/GdBup72W1MN4sc9yshNzxeK8h4lKqNliDqcGadEiDhUyurl4Y7pyMr3gw9avOsLVz4ic3EfYlazCl9tvjLw==",
+      "version": "0.3.15",
+      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.15.tgz",
+      "integrity": "sha512-r2+TQNexoWy3Gl7egv5cmkA79lyIkWeVLJJt9wQcKzlBXo0vS9HHL/4jHVZJCJpi8ilDavtrjuouQN/aevekmg==",
       "requires": {
         "@better-scroll/core": "^2.1.1",
         "@qg/cherry-ui": "^2.23.9",
@@ -20930,9 +20930,9 @@
       }
     },
     "sa-sdk-javascript": {
-      "version": "1.19.8",
-      "resolved": "http://npmprivate.quantgroups.com/sa-sdk-javascript/-/sa-sdk-javascript-1.19.8.tgz",
-      "integrity": "sha1-KqAs4WnZVCmT0Pm0JozvFn9tv/U="
+      "version": "1.19.9",
+      "resolved": "http://npmprivate.quantgroups.com/sa-sdk-javascript/-/sa-sdk-javascript-1.19.9.tgz",
+      "integrity": "sha1-c/MYrar8KIi7WRoHpHswxIhBtK4="
     },
     "safe-buffer": {
       "version": "5.2.1",

package.json

@@ -24,7 +24,7 @@
     "@better-scroll/core": "^2.0.5",
     "@qg/apollo-nodejs": "^2.1.2",
     "@qg/cherry-ui": "2.23.10",
-    "@qg/citrus-ui": "0.3.9",
+    "@qg/citrus-ui": "0.3.15",
     "@qg/js-bridge": "^1.1.12",
     "babel-plugin-transform-vue-jsx": "^4.0.1",
     "cos-nodejs-sdk-v5": "^2.9.12",