Merge branch 'feat/h5herf' into 'master'

Feat/h5herf

See merge request !30

app/web/service/sa.service.ts

@@ -21,7 +21,7 @@ export function initSa(router) {
     use_app_track: true,
     show_log: config.test,
     app_js_bridge: true,
-    batch_send:true,
+    batch_send: true,
   });
   // 添加公共属性
   sa.registerPage({

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","loginUrl":"","h5ShopHost":"https://tenet-test1.liangkebang.net/#","qiniuUpHost":"https://up-z0.qiniup.com","qiniuHost":"https://appsync.lkbang.net"}
\ No newline at end of file
+{
+  "apiHost": "https://quantum-blocks-vcc2.liangkebang.net",
+  "h5Host": "https://quantum-h5-vcc2.liangkebang.net",
+  "opapiHost": "https://opapi-vcc2.liangkebang.net",
+  "passportHost": "https://passportapi-vcc2.liangkebang.net",
+  "kdspHost": "https://talos-vcc2.liangkebang.net",
+  "loginUrl": "",
+  "h5ShopHost": "https://tenet-vcc2.liangkebang.net/#",
+  "qiniuUpHost": "https://up-z0.qiniup.com",
+  "qiniuHost": "https://appsync.lkbang.net"
+}
\ No newline at end of file

config/config.local.ts

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

package-lock.json

@@ -1658,9 +1658,9 @@
       }
     },
     "@qg/citrus-ui": {
-      "version": "0.2.18",
-      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.2.18.tgz",
-      "integrity": "sha512-GMcMbG8SBR6ZFOOeP7Zp9nPbs4j2cN1YrtZgE/yFxeoaCVKA4Sm+llRRVD3ZpYp5J4nmMztOvHlu+upy24yF4A==",
+      "version": "0.2.20",
+      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.2.20.tgz",
+      "integrity": "sha512-eKyAqqsUgk34ztLfnL7XyCbariEtkVv30FltCfxm/zx9QhqzFLmB54VR6/F3lOeGQveQcT/NE9hXHsC9K+QjaQ==",
       "requires": {
         "@better-scroll/core": "^2.1.1",
         "@qg/cherry-ui": "^2.21.1",

package.json

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