Merge branch 'feat/price' into 'master'

Feat/price

See merge request !16

app/web/config/test.config.ts

 const protocol = EASY_ENV_IS_BROWSER ? window.location.protocol : 'https';
 
 export default {
-  apiHost: `https://quantum-blocks-vcc2.liangkebang.net/`,
-  // opApiHost: 'https://opapi-vcc2.liangkebang.net',
+  apiHost: `https://quantum-blocks-test1.liangkebang.net/`,
+  // opApiHost: 'https://opapi-test1.liangkebang.net',
   shenceUrl: `${protocol}//bn.xyqb.com/sa?project=default`,
   test: true
 };

config/config.default.ts

@@ -42,6 +42,10 @@ export default (appInfo: EggAppConfig) => {
     origin: '*',
     allowMethods: 'GET,HEAD,PUT,POST,DELETE,PATCH'
   };
-
+  config.security = {
+    xframe: {
+      enable: false
+    }
+  };
   return config;
 };

package-lock.json

@@ -1658,9 +1658,9 @@
       }
     },
     "@qg/citrus-ui": {
-      "version": "0.1.0",
-      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.1.0.tgz",
-      "integrity": "sha512-j/KJkQtatcJJQ2W6pZlMqXxJ6XSUW7Z8EJJFH5e7AaMq0WM7XrUKelKP1k83f0tD72RRbZsPfg3Ml1F4QCoktg==",
+      "version": "0.1.4",
+      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.1.4.tgz",
+      "integrity": "sha512-rwgMpfHVOFEDljkmiO2e/ZV4MIhlKPaQdK32xUAmSpL6CdQjR6NSdVY2LwCxulDUKiXKTyld3jZ0OJJtic0BIA==",
       "requires": {
         "@better-scroll/core": "^2.1.1",
         "@qg/cherry-ui": "^2.20.19",
@@ -20870,9 +20870,9 @@
       "integrity": "sha1-8z/pz7Urv9UgqhgyO8ZdsRCht2w="
     },
     "rollup": {
-      "version": "2.48.0",
-      "resolved": "http://npmprivate.quantgroups.com/rollup/-/rollup-2.48.0.tgz",
-      "integrity": "sha512-wl9ZSSSsi5579oscSDYSzGn092tCS076YB+TQrzsGuSfYyJeep8eEWj0eaRjuC5McuMNmcnR8icBqiE/FWNB1A==",
+      "version": "2.50.0",
+      "resolved": "http://npmprivate.quantgroups.com/rollup/-/rollup-2.50.0.tgz",
+      "integrity": "sha512-wO+F2MqWPGUCZx0549oqY8dsQqHVjuSxoyBWWnxKoQE+1UGcDKjtL7wHq/8jnnLJEeoGDQLf3ztrpgRwlbGJ0A==",
       "requires": {
         "fsevents": "~2.3.1"
       },
@@ -20949,9 +20949,9 @@
       }
     },
     "sa-sdk-javascript": {
-      "version": "1.16.15",
-      "resolved": "http://npmprivate.quantgroups.com/sa-sdk-javascript/-/sa-sdk-javascript-1.16.15.tgz",
-      "integrity": "sha512-mG/k/P9oMbgEPwcAvqL8SzXQYZmJqaXwlVH6sFmXkwEVOR8qihaGYadZo0PAz5pCiRTVhUEKIGZ8u+DOYxF1ew=="
+      "version": "1.17.1",
+      "resolved": "http://npmprivate.quantgroups.com/sa-sdk-javascript/-/sa-sdk-javascript-1.17.1.tgz",
+      "integrity": "sha512-UyQtN2Aj9FRS/Q/G75Ue1ig0Fdv1P5pmGu/NUGEBvsVWfXFCgm2rRIqInLq9IVBhXdlQZtNSNfNiKPV1bSE6Ww=="
     },
     "safe-buffer": {
       "version": "5.2.1",

package.json

@@ -23,7 +23,7 @@
     "@better-scroll/core": "^2.0.5",
     "@qg/apollo-nodejs": "^2.1.2",
     "@qg/cherry-ui": "2.20.19",
-    "@qg/citrus-ui": "0.1.0",
+    "@qg/citrus-ui": "0.1.4",
     "babel-plugin-transform-vue-jsx": "^4.0.1",
     "cos-nodejs-sdk-v5": "^2.9.12",
     "egg": "^2.3.0",