Merge branch 'master' into feature/xc

app/web/config/dev.config.ts

@@ -2,10 +2,10 @@ import apolloSsr from '../../../config/apollo.ssr.json';
 const protocol = EASY_ENV_IS_BROWSER ? window.location.protocol : 'https';
 
 const hostMap = {
-  apiHost: `${protocol}//quantum-blocks-test1.liangkebang.net`,
-  kdspHost: `${protocol}//talos-test1.liangkebang.net`,
+  apiHost: `${protocol}//quantum-blocks-bfe.liangkebang.net`,
+  kdspHost: `${protocol}//talos-bfe.liangkebang.net`,
   shenceUrl: `${protocol}//bn.xyqb.com/sa?project=default`,
-  mallHost: `${protocol}://mall-test1.liangkebang.net`,
+  mallHost: `${protocol}://mall-bfe.liangkebang.net`,
   test: true
 };
 

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"

config/apollo.json

 {
   "api": {
-    "apiHost": "https://quantum-blocks-test1.liangkebang.net",
-    "h5Host": "https://quantum-h5-test1.liangkebang.net",
-    "opapiHost": "https://opapi-test1.liangkebang.net",
-    "passportHost": "https://passportapi-test1.liangkebang.net",
-    "kdspHost": "https://talos-test1.liangkebang.net",
+    "apiHost": "https://quantum-blocks-bfe.liangkebang.net",
+    "h5Host": "https://quantum-h5-bfe.liangkebang.net",
+    "opapiHost": "https://opapi-bfe.liangkebang.net",
+    "passportHost": "https://passportapi-bfe.liangkebang.net",
+    "kdspHost": "https://talos-bfe.liangkebang.net",
     "loginUrl": "",
-    "mallHost": "https://mall-test1.liangkebang.net",
-    "h5ShopHost": "https://tenet-test1.liangkebang.net/#"
+    "mallHost": "https://mall-bfe.liangkebang.net",
+    "h5ShopHost": "https://tenet-bfe.liangkebang.net/#"
   },
   "mysql": {
     "low_code": {
@@ -19,8 +19,8 @@
     }
   },
   "redis": {
-    "port": "172.17.5.2",
-    "host": "32625",
+    "port": "172.17.5.14",
+    "host": "31226",
     "password": "",
     "db": 0
   },

config/apollo.ssr.json

 {
-  "apiHost": "https://quantum-blocks-test1.liangkebang.net",
-  "h5Host": "https://quantum-h5-test1.liangkebang.net",
-  "opapiHost": "https://opapi-test1.liangkebang.net",
-  "passportHost": "https://passportapi-test1.liangkebang.net",
-  "kdspHost": "https://talos-test1.liangkebang.net",
+  "apiHost": "https://quantum-blocks-bfe.liangkebang.net",
+  "h5Host": "https://quantum-h5-bfe.liangkebang.net",
+  "opapiHost": "https://opapi-bfe.liangkebang.net",
+  "passportHost": "https://passportapi-bfe.liangkebang.net",
+  "kdspHost": "https://talos-bfe.liangkebang.net",
   "loginUrl": "",
-  "mallHost": "https://mall-test1.liangkebang.net",
-  "h5ShopHost": "https://tenet-test1.liangkebang.net/#",
+  "mallHost": "https://mall-bfe.liangkebang.net",
+  "h5ShopHost": "https://tenet-bfe.liangkebang.net/#",
   "qiniuUpHost": "https://up-z0.qiniup.com",
   "qiniuHost": "https://appsync.lkbang.net"
 }

config/config.local.ts

@@ -29,8 +29,8 @@ export default (appInfo: EggAppConfig) => {
 
   exports.redis = {
     client: {
-      port: 32625,          // Redis port
-      host: '172.17.5.2',   // Redis host
+      port: 31226,          // Redis port
+      host: '172.17.5.14',   // Redis host
       password: '',
       db: 0
     }

package-lock.json

@@ -1648,9 +1648,9 @@
       "integrity": "sha512-uOCUKu5mvX3PWee+7ZFXQSNIR1V5SN2JVE2yANmW9/wQOgpEct291gXGok8VMw0009HlTWB4JATURPwyOP2DFg=="
     },
     "@qg/cherry-ui": {
-      "version": "2.23.9",
-      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcherry-ui/-/cherry-ui-2.23.9.tgz",
-      "integrity": "sha512-czpyl06OfKKnfUls4o5vX8chpeddc87l06E6lDiPks+mM47PJdhobGgvwDWZBIeYETBnlI+VqvUhAXeQ/ISTKg==",
+      "version": "2.23.10",
+      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcherry-ui/-/cherry-ui-2.23.10.tgz",
+      "integrity": "sha512-8roEGqBr5jEG50Yg5dCWRwKdJoWMsPBapJvmcLTZksFlbxcTcWXqhIxrS+KpTEQkK/40XC5Eir96BLGtAL4bwg==",
       "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.23.9",
+    "@qg/cherry-ui": "2.23.10",
     "@qg/citrus-ui": "0.3.15",
     "@qg/js-bridge": "^1.1.12",
     "babel-plugin-transform-vue-jsx": "^4.0.1",