Merge branch 'feat/finance' into 'master'

Feat/finance

See merge request !84

app/web/config/dev.config.ts

@@ -3,15 +3,15 @@ const protocol = EASY_ENV_IS_BROWSER ? window.location.protocol : 'http';
 const hostMap = {
   apiHost: `http://localhost:7002/`,
   // apiHost: `http://192.168.28.199:7001/`,
-  // apiHost: 'https://quantum-blocks-test1.liangkebang.net/',
-  h5Host: 'https://quantum-h5-test1.liangkebang.net',
+  // apiHost: 'https://quantum-blocks-sc.liangkebang.net/',
+  h5Host: 'https://quantum-h5-sc.liangkebang.net',
   qiniuHost: `https://appsync.lkbang.net`,
   shenceUrl: `${protocol}//bn.xyqb.com/sa?project=default`,
-  opapiHost: `https://opapi-test1.liangkebang.net`,
+  opapiHost: `https://opapi-sc.liangkebang.net`,
   qiniuUpHost: `${protocol}//up-z0.qiniup.com`,
-  // kdspHost: 'https://kdsp-api-test1.liangkebang.net',
-  talosHost: 'https://talos-test1.liangkebang.net',
-  kdspHost: 'https://kdsp-api-test1.liangkebang.net',
+  // kdspHost: 'https://kdsp-api-sc.liangkebang.net',
+  talosHost: 'https://talos-sc.liangkebang.net',
+  kdspHost: 'https://kdsp-api-sc.liangkebang.net',
   yxmTenantId: 560761,
   appIdMap: {
     560761: 'wxe16bf9293671506c',

app/web/lib/config.ts

@@ -11,7 +11,19 @@ export const basicComponents = [
         key: 'link',
         name: '跳转链接',
         desc: '跳转链接',
-        type: 'text'
+        type: 'text',
+      },
+      {
+        key: 'isFinance',
+        name: '是否导流',
+        desc: '是否导流',
+        type: 'checkbox',
+      },
+      {
+        key: 'needLogin',
+        name: '是否登录',
+        desc: '是否登录',
+        type: 'checkbox',
       }
     ],
     value: {

app/web/page/editor/component/DynamicForm/index.ts

@@ -298,6 +298,15 @@ export default class DynamicForm extends Mixins(ContextMenuMixin, DynamicFormMix
       if (element.name !== 'cs-guide-cube') {
         this.adjustHeight();
       }
+      if (element.name === 'freedom-container') {
+        const { isFinance } = newVal;
+        if (isFinance) {
+          newVal.needLogin = true;
+          newVal.disabledSelectNeedLogin = true;
+        } else {
+          newVal.disabledSelectNeedLogin = false;
+        }
+      }
     });
     this.$emit('modProps', params, 'component');
   }

package.json

@@ -8,7 +8,7 @@
     "test": "cross-env NODE_ENV=production EGG_SERVER_ENV=sit egg-scripts start --port 80 --workers 1",
     "stop": "egg-scripts stop",
     "backend": "nohup egg-scripts start --port 7001 --workers 4",
-    "dev": "cross-env NODE_ENV=test APOLLO_CLUSTER=k8s NAMESPACE=test1 npm run apollo && egg-bin dev -r egg-ts-helper/register --port 7002",
+    "dev": "cross-env NODE_ENV=test APOLLO_CLUSTER=k8s NAMESPACE=yxm npm run apollo && egg-bin dev -r egg-ts-helper/register --port 7002",
     "debug": "egg-bin debug -r egg-ts-helper/register",
     "apollo": "node bin/apollo.js",
     "build": "npm run tsc && cross-env NODE_ENV=production APOLLO_CLUSTER=3C npm run apollo && cross-env COS_ENV=production easy build --devtool",