Merge branch 'master' into feature/tenant

# Conflicts:
#	app/web/page/store/modules/editor/state.ts

.npmrc

+registry=http://npmprivate.quantgroups.com/
\ No newline at end of file

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

@@ -34,8 +34,8 @@ export default class DynamicForm extends Vue {
 
   @Watch('pageData', { immediate: true })
   onPageDataChange(newVal) {
-    const { pageName, pageDescribe, pageKeywords, coverImage, isPublish, isTemplate, shareCoverImage, shareOpenMethod } = this.pageInfo;
-    this.formCustom = { pageName, pageDescribe, pageKeywords, coverImage, isPublish: !!isPublish, isTemplate: !!isTemplate, shareCoverImage, shareOpenMethod };
+    const { pageName, pageDescribe, pageKeywords, coverImage, isPublish, isTemplate, shareCoverImage, shareOpenMethod, diversion } = this.pageInfo;
+    this.formCustom = { pageName, pageDescribe, pageKeywords, coverImage, isPublish: !!isPublish, isTemplate: !!isTemplate, shareCoverImage, shareOpenMethod, diversion };
   }
 
   @Watch('value')

app/web/page/editor/component/BasicPageFormModal/index.vue

@@ -24,6 +24,9 @@
       <FormItem label="是否发布" prop="isPublish">
         <i-switch v-model="formCustom.isPublish"></i-switch>
       </FormItem>
+      <FormItem label="导流url" prop="diversion">
+        <Input v-model="formCustom.diversion"  placeholder="可选，具体url请联系对应导流项目的产品或开发" :rows="3"></Input>
+      </FormItem>
       <FormItem label="设为模板" prop="isTemplate" v-if="formCustom.isPublish">
         <i-switch v-model="formCustom.isTemplate"></i-switch>
       </FormItem>

app/web/page/editor/view/dashboard/index.ts

@@ -87,8 +87,8 @@ export default class DashBoard extends Mixins(ContextMenuMixin, GoodsTabsMixin,
         let pageData = this.handleTabsRepaetCom();
         pageData = this.handleComAchorScrollEnable();
         pageData = this.handleGoodsTabs();
-        const { pageName, pageDescribe, pageKeywords, coverImage, isPublish, isTemplate, shareCoverImage, shareOpenMethod } = pageConfig;
-        const pageInfo = { page: JSON.stringify(pageData), author: user?.account, isPublish,  pageName, pageDescribe, pageKeywords, coverImage, isTemplate, shareCoverImage, shareOpenMethod } as pageInfo;
+        const { pageName, pageDescribe, pageKeywords, coverImage, isPublish, isTemplate, shareCoverImage, shareOpenMethod, diversion } = pageConfig;
+        const pageInfo = { diversion, page: JSON.stringify(pageData), author: user?.account, isPublish,  pageName, pageDescribe, pageKeywords, coverImage, isTemplate, shareCoverImage, shareOpenMethod } as pageInfo;
         if (this.uuid) { pageInfo.uuid = this.uuid; }
         await this.savePageData({ pageInfo, pageData: this.pageData });
         if (this.uuid) { await this.getPageDate({ pageId: this.uuid }); }

app/web/page/store/modules/editor/state.ts

@@ -58,6 +58,7 @@ export interface PageInfo {
   pageKeywords?: string;
   uuid?: string;
   tenantId?: number;
+  diversion?: string;
 }
 
 export default interface EditorState {

typings/app/controller/index.d.ts

-// This file is created by egg-ts-helper@1.25.9
+// This file is created by egg-ts-helper@1.26.0
 // Do not modify this file!!!!!!!!!
 
 import 'egg';

typings/app/extend/helper.d.ts

-// This file is created by egg-ts-helper@1.25.9
+// This file is created by egg-ts-helper@1.26.0
 // Do not modify this file!!!!!!!!!
 
 import 'egg';

typings/app/index.d.ts

-// This file is created by egg-ts-helper@1.25.9
+// This file is created by egg-ts-helper@1.26.0
 // Do not modify this file!!!!!!!!!
 
 import 'egg';

typings/app/middleware/index.d.ts

-// This file is created by egg-ts-helper@1.25.9
+// This file is created by egg-ts-helper@1.26.0
 // Do not modify this file!!!!!!!!!
 
 import 'egg';

typings/app/model/index.d.ts

-// This file is created by egg-ts-helper@1.25.9
+// This file is created by egg-ts-helper@1.26.0
 // Do not modify this file!!!!!!!!!
 
 import 'egg';

typings/app/service/index.d.ts

-// This file is created by egg-ts-helper@1.25.9
+// This file is created by egg-ts-helper@1.26.0
 // Do not modify this file!!!!!!!!!
 
 import 'egg';

typings/config/plugin.d.ts

-// This file is created by egg-ts-helper@1.25.9
+// This file is created by egg-ts-helper@1.26.0
 // Do not modify this file!!!!!!!!!
 
 import 'egg';