fix:游戏update

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.15.js"></script>
+    <script src="//web-1251519181.file.myqcloud.com/components/header.2.0.17.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/dzp/form.vue

@@ -21,7 +21,7 @@
         </span>
       </el-form-item>
       <el-form-item label="banner图片" prop="gameImage">
-        <dm-upload-avatar v-if="form.skinType === 0" :model.sync="form.gameImage" :disabled="isInfo" width="220" height="103" label="上传图片" :limit="{limit: true, width: 750, height: 350}" tips="图片建议尺寸：750*350"></dm-upload-avatar>
+        <dm-upload-avatar v-if="form.skinType === 0" :model.sync="form.gameImage" :disabled="isInfo" width="220" height="103" label="上传图片" :limit="{ type: true, width: 750, height: 350 }" tips="图片上传尺寸：750*350"></dm-upload-avatar>
         <img class="skin-box" v-if="form.skinType === 1" src="../../../assets/img/1.1.jpg" alt="" srcset="" />
         <img class="skin-box" v-if="form.skinType === 2" src="../../../assets/img/1.2.jpg" alt="" srcset="" />
         <img class="skin-box" v-if="form.skinType === 3" src="../../../assets/img/1.3.jpg" alt="" srcset="" />
@@ -119,6 +119,7 @@ import { detailLottery, saveLottery } from '@/service/api/gameApi.js';
 import { numberToChinese, formatDateTimeByType } from '@/utils/index.js';
 import dmUploadAvatar from '@/components/upload/avatar';
 import editAlertMixin from '../common/editAlertMixin.js';
+import dmShare from '../common/share.vue';
 let result = {};
 export default {
   mixins: [editAlertMixin],
@@ -199,7 +200,8 @@ export default {
     }
   },
   components: {
-    dmUploadAvatar
+    dmUploadAvatar,
+    dmShare
   },
   created() {
     if (this.isEdit || this.isInfo) {
@@ -312,10 +314,10 @@ export default {
         return;
       }
 
-      if (this.form.dateTime[0] < Date.now() && this.isAdd) {
-        this.$tips({ type: 'warning', message: `开始时间不能小于当前时间` });
-        return;
-      }
+      // if (this.form.dateTime[0] < Date.now() && this.isAdd) {
+      //   this.$tips({ type: 'warning', message: `开始时间不能小于当前时间` });
+      //   return;
+      // }
       if (await this.editAlert()) return;
 
       this.$refs[formName].validate(valid => {

src/views/game/ggk/form.vue

@@ -21,7 +21,7 @@
         </span>
       </el-form-item>
       <el-form-item label="banner图片" class="width50" prop="gameImage">
-        <dm-upload-avatar v-if="form.skinType === 0" :model.sync="form.gameImage" :disabled="isInfo" width="220" height="103" label="上传图片" tips="图片建议尺寸：750*350"></dm-upload-avatar>
+        <dm-upload-avatar v-if="form.skinType === 0" :model.sync="form.gameImage" :disabled="isInfo" width="220" height="103" label="上传图片" :limit="{ type: true, width: 750, height: 350 }" tips="图片上传尺寸：750*350"></dm-upload-avatar>
         <img class="skin-box" v-if="form.skinType === 1" src="../../../assets/img/2.1.jpg" alt="" srcset="" />
         <img class="skin-box" v-if="form.skinType === 2" src="../../../assets/img/2.2.jpg" alt="" srcset="" />
         <img class="skin-box" v-if="form.skinType === 3" src="../../../assets/img/2.3.jpg" alt="" srcset="" />
@@ -96,6 +96,7 @@
         </div>
       </el-form-item>
     </section>
+    <dm-share shareTitle="刮一刮，中大奖" shareTextInfo="玩游戏，赢大奖~" ref="share"></dm-share>
     <div class="btn-wrap_fixed" :class="{ on: asideShow }">
       <el-button type="primary" @click="saveLottery('form')" v-if="!isInfo">保 存</el-button>
       <el-button @click="$router.go(-1)">返 回</el-button>
@@ -109,6 +110,7 @@ import { detailLottery, saveLottery } from '@/service/api/gameApi.js';
 import { formatDateTimeByType } from '@/utils/index.js';
 import dmUploadAvatar from '@/components/upload/avatar';
 import editAlertMixin from '../common/editAlertMixin.js';
+import dmShare from '../common/share.vue';
 let result = {};
 export default {
   mixins: [editAlertMixin],
@@ -171,7 +173,8 @@ export default {
     }
   },
   components: {
-    dmUploadAvatar
+    dmUploadAvatar,
+    dmShare
   },
   created() {
     if (this.isEdit || this.isInfo) {
@@ -265,10 +268,10 @@ export default {
         }
         if (flag) return;
       });
-      if (this.form.dateTime[0] < Date.now() && this.isAdd) {
-        this.$tips({ type: 'warning', message: `开始时间不能小于当前时间` });
-        return;
-      }
+      // if (this.form.dateTime[0] < Date.now() && this.isAdd) {
+      //   this.$tips({ type: 'warning', message: `开始时间不能小于当前时间` });
+      //   return;
+      // }
       // 编辑弹窗提示 方法editAlertMixin里
       if (await this.editAlert()) return;
 

src/views/game/klfl/form.vue

@@ -168,7 +168,7 @@
         </div>
       </el-form-item>
     </section>
-    <section class="dm-form__wrap">
+    <!-- <section class="dm-form__wrap">
       <h3 class="dm-title__label">分享设置</h3>
       <el-form-item label="分享图片" class="width50">
         <dm-upload-avatar :model.sync="form.shareImg" label="上传图片" tips="图片建议尺寸：高度200*200"></dm-upload-avatar>
@@ -179,7 +179,9 @@
       <el-form-item label="分享描述" prop="shareTextInfo" class="width50">
         <dm-input class="w400" type="textarea" :rows="4" v-model="form.shareTextInfo" :maxlength="50"></dm-input>
       </el-form-item>
-    </section>
+    </section> -->
+    <!-- 分享设置 -->
+    <dm-share :form="form" ref="share"></dm-share>
     <div class="btn-wrap_fixed" :class="{ on: asideShow }">
       <el-button type="primary" @click="klflSave('form')" v-if="!isInfo">保 存</el-button>
       <el-button @click="$router.go(-1)">返 回</el-button>
@@ -199,6 +201,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';
@@ -225,11 +228,12 @@ export default {
         dateTime: [],
         gameIntroduction: '',
         //分享
-        shareTitle: '',
-        shareTextInfo: '',
+        shareGroup: 1, // 1可分享 2不可分享  TODO:
+        shareTitle: '输入口令福利赢大奖',
+        shareTextInfo: '玩游戏，赢大奖~',
         shareImg: {
           code: '',
-          imgUrl: '',
+          imgUrl: require("../common/share.jpg"), // eslint-disable-line
           wxImg: ''
         },
         codeType: 1,
@@ -288,7 +292,8 @@ export default {
     dmUploadAvatar,
     strategy,
     calculate,
-    codeDialog
+    codeDialog,
+    dmShare
   },
   computed: {
     asideShow() {
@@ -524,10 +529,10 @@ export default {
     },
     //提交保存
     async klflSave(formName) {
-      if (this.form.dateTime[0] < Date.now() && this.isAdd) {
-        this.$tips({ type: 'warning', message: `开始时间不能小于当前时间` });
-        return;
-      }
+      // if (this.form.dateTime[0] < Date.now() && this.isAdd) {
+      //   this.$tips({ type: 'warning', message: `开始时间不能小于当前时间` });
+      //   return;
+      // }
       // 编辑弹窗提示
       if (await this.editAlert()) return;
       this.$refs[formName].validate(valid => {

src/views/game/ptyx/form.vue

@@ -66,17 +66,15 @@
       <ptyx-skin ref="ptyxSkin" :accessGame="accessGame" :startGame="startGame" :shareGame="shareGame" :skinType="form.skinType"></ptyx-skin>
     </section>
 
-    <section class="dm-form__wrap clearfix">
+    <!-- <section class="dm-form__wrap clearfix">
       <h3 class="dm-title__label">
         参与门槛
         <i class="iconfont icon-xinxixianshi pl5 gray"></i>
         <span class="gray fz13">满足参与门槛会员才可以参与游戏</span>
       </h3>
       <el-form-item label="参与门槛" prop="memberType">
-        <!-- <el-radio-group > -->
         <el-radio v-model="form.memberType" :label="0">所有用户</el-radio>
         <el-radio v-model="form.memberType" :label="1">会员筛选</el-radio>
-        <!-- </el-radio-group> -->
       </el-form-item>
       <el-form-item label="选择会员" v-show="form.memberType === 1">
         <vue-gic-people :projectName="projectName" :isAdd="isAdd" :triggerReset="true" :useId="useId" :hasSearchData="hasSearchData" :sceneValue="sceneValue" ref="peopleFilter" @findFilter="findFilter" @getBackData="getBackData" @editHide="editHide" @editShow="editShow" @hideBtn="hideBtn" />
@@ -102,8 +100,24 @@
           </div>
         </div>
       </div>
-    </section>
-
+    </section> -->
+    <dm-threshold :form="form">
+      <template v-slot:filter>
+        <el-form-item label="参与门槛" prop="memberType">
+          <el-radio v-model="form.memberType" :label="0">所有用户</el-radio>
+          <el-radio v-model="form.memberType" :label="1">会员筛选</el-radio>
+          <!-- <el-radio v-model="form.memberType" :label="2">会员分组</el-radio> -->
+        </el-form-item>
+        <el-form-item label="选择会员" v-show="form.memberType === 1">
+          <vue-gic-people :projectName="projectName" :isAdd="isAdd" :triggerReset="true" :useId="useId" :hasSearchData="hasSearchData" :sceneValue="sceneValue" ref="peopleFilter" @findFilter="findFilter" @getBackData="getBackData" @editHide="editHide" @editShow="editShow" @hideBtn="hideBtn" />
+          <div class="gic-people--button" v-show="toggleTag">
+            <el-button size="small" type="primary" @click="getData">确 定</el-button>
+            <el-button size="small" @click="cancelFilter">取 消</el-button>
+          </div>
+        </el-form-item>
+        <!-- <vue-gic-member-group v-if="form.memberType === 2" :defaltSelected="defaltSelected" :height="300" :projectName="projectName" :headerList="headerList" @handleDataTransferred="handleDataTransferred" @handleDataLeft="handleDataLeft"></vue-gic-member-group> -->
+      </template>
+    </dm-threshold>
     <!-- 游戏背景音乐设置 -->
     <section class="dm-form__wrap">
       <h3 class="dm-title__label">游戏背景音乐设置</h3>
@@ -170,6 +184,7 @@ import editAlertMixin from '../common/editAlertMixin.js';
 // import shareCom from '../common/share';
 import ptyxSkin from './partials/ptyx-skin.vue';
 import audioUpload from './partials/audio-upload.vue';
+import dmThreshold from '../common/threshold.vue';
 let gameInfo = {};
 // 实例化一个全局的music
 const music = new Audio();
@@ -179,7 +194,8 @@ export default {
     dmUploadAvatar,
     // shareCom,
     ptyxSkin,
-    audioUpload
+    audioUpload,
+    dmThreshold
   },
   mixins: [editAlertMixin],
   data() {
@@ -235,13 +251,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: [],
@@ -409,10 +429,10 @@ export default {
       });
       if (flag) return;
 
-      if (this.form.dateTime[0] < Date.now() && this.isAdd) {
-        this.$tips({ type: 'warning', message: `开始时间不能小于当前时间` });
-        return;
-      }
+      // if (this.form.dateTime[0] < Date.now() && this.isAdd) {
+      //   this.$tips({ type: 'warning', message: `开始时间不能小于当前时间` });
+      //   return;
+      // }
 
       // 编辑弹窗提示
       if (await this.editAlert()) return;
@@ -610,6 +630,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: {