Merge branch 'dev' into 'cx'

# Conflicts:
#   src/views/game/dzp/form.vue
#   src/views/game/ggk/form.vue
#   src/views/game/klfl/form.vue
#   src/views/game/ptyx/form.vue

index.html

@@ -19,7 +19,7 @@
     <script src="//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js"></script>
     <script src="//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js"></script>
     <!-- 组件引用cdn -->
-    <script src="//web-1251519181.file.myqcloud.com/components/header.2.0.18.03.js"></script>
+    <script src="//web-1251519181.file.myqcloud.com/components/header.2.0.18.05.js"></script>
     <script src="//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js"></script>
     <script src="//web-1251519181.file.myqcloud.com/components/card.2.0.01.js"></script>
     <script src="//web-1251519181.file.myqcloud.com/components/store.2.0.01.js"></script>

src/views/game/klfl/form.vue

@@ -191,6 +191,7 @@ import dmUploadAvatar from '@/components/upload/avatar';
 import strategy from './strategy';
 import calculate from '@/components/calculate';
 import codeDialog from './codeDialog';
+import dmShare from '../common/share.vue';
 import editAlertMixin from '../common/editAlertMixin.js';
 import axios from 'axios';
 import config from '@/config';

src/views/game/ptyx/form.vue

@@ -222,13 +222,17 @@ export default {
       isEdit: this.$route.meta.type === 'edit',
       isAdd: this.$route.meta.type === 'add',
       // 人群筛选器可传参数
-      projectName: '', // 当前项目名
+      projectName: 'marketing', // 当前项目名，默认是memberTag
       sceneValue: 'member', // 场景值
       useId: '', // 模板id
       hasSearchData: '', // 当前页回显的数据(接口返回)
       toggleTag: false, // 控制按钮显示的参数,仅供参考,可自行修改
       getSaveData: '',
       saveTag: false,
+      // 会员分组可传参数
+      defaltSelected: [], //  默认穿梭窗已选入数据
+      headerList: ['isRealTime', 'latestUpdateTime', 'updateType', 'effectiveStatus', 'effectiveDate'],
+      effectiveStatus: 1, // 不传： 所有状态 1： 有效 0： 失效
 
       // 系统游戏音乐选项
       gameMusicOptions: [],
@@ -654,6 +658,18 @@ export default {
     hideBtn() {
       this.toggleTag = false;
       this.saveTag = false;
+    },
+    handleDataTransferred(data) {
+      // 会员分组 情况下 memberSearchDTO 传数组字符串
+      if (this.form.memberType === 2) {
+        this.form.memberGroupIds = data
+          .map(v => v.memberTagGroupId)
+          .filter(v => v)
+          .join(',');
+      }
+    },
+    handleDataLeft(selectedData, selectionToRemove) {
+      console.log(selectedData, selectionToRemove);
     }
   },
   filters: {