update: dist

index.html

@@ -8,8 +8,8 @@
     <link rel="stylesheet" type="text/css" href="<%= htmlWebpackPlugin.options.BASE_URL %>static/css/common.css">
     <link rel="stylesheet" href="//at.alicdn.com/t/font_688955_2dxzdzrb3a7.css"> <!--GIC后台3.0-->
     <script src="//at.alicdn.com/t/font_688955_2dxzdzrb3a7.js"></script> <!--GIC后台3.0-->
-    <link rel="stylesheet" href="//at.alicdn.com/t/font_3229694_f4zx0uhc8y.css"> <!--GIC3.0营销-->
-    <script src="//at.alicdn.com/t/font_3229694_f4zx0uhc8y.js"></script> <!--GIC3.0营销-->
+    <link rel="stylesheet" href="//at.alicdn.com/t/c/font_3229694_yzk6z4765g.css"> <!--GIC3.0营销-->
+    <script src="//at.alicdn.com/t/font_3229694_yzk6z4765g.js"></script> <!--GIC3.0营销-->
     <link src="//at.alicdn.com/t/font_2859043_udehp133w1.css"><!--3.0组件库-->
     <script src="//at.alicdn.com/t/font_2859043_udehp133w1.js"></script><!--3.0组件库-->
     <link rel="stylesheet" href="//at.alicdn.com/t/font_2996579_dv9vctk5vdt.css"> <!-- 3.0企业 -->

src/views/game/cmh/base-config.vue

@@ -274,15 +274,7 @@ export default {
       if (type == 'adsFlag') {
         this.$nextTick(_ => {
           const formContent = document.getElementById('formContent');
-
           formContent.scrollTop = formContent.scrollHeight + 500;
-          // adsImg[0].scrollIntoView({
-          //   // 滚动到指定节点
-          //   // 值有start,center,end，nearest，当前显示在视图区域中间
-          //   block: 'center',
-          //   // 值有auto、instant,smooth，缓动动画（当前是慢速的）
-          //   behavior: 'smooth'
-          // });
         });
       } else if (type == 'gameTime' && this.baseForm.gameTime && this.baseForm.gameTime.length) {
         this.baseForm.gameTime[1] = this.baseForm.gameTime[1] + 86399000;

src/views/game/cmh/form.vue

@@ -24,7 +24,7 @@
             <img src="../../../assets/img/Navbar.png" class="braImg" alt="" />
           </div>
           <div class="iphone">
-            <gameTemplate :ruleData="ruleData" :templateId="templateId" :basicData="previewData" v-show="menuActive == 0" />
+            <gameTemplate :ruleData="ruleData" :templateId="templateId" :basicData="previewData" v-show="menuActive == 0" :viewPrize="viewPrize" />
             <img :src="computedImg" v-show="menuActive != 0" style="min-height:724px; " />
           </div>
         </div>
@@ -37,7 +37,7 @@
         </dm-steps>
         <div class="formContent" id="formContent">
           <baseConfig ref="baseConfig" :gameStatus="gameStatus" :templateArr="templateData" :echoData="baseForm" v-show="active == 0" @change="handleBaseConfigChange" @nextStep="nextStep" />
-          <prizeConfig ref="prizeConfig" :gameStatus="gameStatus" :invalidCard="invalidCard" :prizeMax="prizeMax" :echoData="prizeForm" :prizeMin="prizeMin" v-show="active == 1" @nextStep="nextStep" @prevStep="step => active--" />
+          <prizeConfig ref="prizeConfig" :gameStatus="gameStatus" :invalidCard="invalidCard" :prizeMax="prizeMax" :imageType="imageType" :echoData="prizeForm" :prizeMin="prizeMin" v-show="active == 1" @nextStep="nextStep" @prevStep="step => active--" />
           <ruleConfig ref="ruleConfig" :gameStatus="gameStatus" :templateId="templateId" :gameTime="gameTime" :shareImgData="shareImgData" :echoData="ruleForm" v-show="active == 2" @nextStep="nextStep" @prevStep="step => active--" @submit="submitForm" :btnLoading="btnLoading" @change="handleRuleConfigChange" />
         </div>
       </div>
@@ -68,6 +68,7 @@ export default {
       active: 0,
       menuActive: 0,
       templateData: [],
+      viewPrize: 9,
       prizeMax: 10,
       prizeMin: 1,
       gameName: '游戏名称',
@@ -98,6 +99,7 @@ export default {
         0: {},
         1: {}
       },
+      imageType: {},
       previewData: {},
       documentTitle: {
         edit: '幸运盲盒编辑',
@@ -139,9 +141,22 @@ export default {
   watch: {
     templateId(val) {
       const data = this.templateData.filter(item => item.templateId == val)[0];
-      const { prizeMax, prizeMin } = data;
+      const { prizeMax, prizeMin, viewPrize, gameTemplateMaterialList } = data;
       this.prizeMax = prizeMax;
       this.prizeMin = prizeMin;
+      this.viewPrize = viewPrize;
+      let imageType = {
+        cashCouponImgUrl: 0,
+        exchangeCouponImgUrl: 2,
+        discountCouponImgUrl: 1,
+        pointImgUrl: 3
+        // 0 抵金券1 折扣券2 兑换券3：积分
+      };
+      gameTemplateMaterialList.forEach(item => {
+        if (imageType.hasOwnProperty(item.materialKey)) {
+          this.imageType[imageType[item.materialKey]] = item.materialValue;
+        }
+      });
     }
   },
   methods: {
@@ -224,9 +239,10 @@ export default {
         });
     },
     handleBaseConfigChange(data) {
-      const { backMusicFlag, adsFlag, backImageUrl, noticeImageUrl, adsImageUrl, bulletImageUrl, bulletFlag, gameName, templateId, shareCard, shareReport, gameTime, shareCardSize0, shareCardSize1, shareReportSize1, shareReportSize0 } = data;
-      this.previewData = { backMusicFlag, backImageUrl, noticeImageUrl, adsImageUrl, bulletImageUrl, bulletFlag, adsFlag };
-      this.previewData.boxImg = data.prizeStyleJson[0].imageNoSelectUrl;
+      console.log(data);
+      const { myPointImageUrl, resetTimeImageUrl, backMusicFlag, adsFlag, backImageUrl, noticeImageUrl, adsImageUrl, bulletImageUrl, bulletFlag, gameName, templateId, shareCard, shareReport, gameTime, shareCardSize0, shareCardSize1, shareReportSize1, shareReportSize0 } = data;
+      this.previewData = { myPointImageUrl, resetTimeImageUrl, backMusicFlag, backImageUrl, noticeImageUrl, adsImageUrl, bulletImageUrl, bulletFlag, adsFlag };
+      this.previewData.boxImg = data.prizeStyleJson.map(item => item.imageNoSelectUrl);
       this.previewData = Object.assign({}, this.previewData);
       this.gameName = gameName;
       this.templateId = templateId;

src/views/game/cmh/gameTemplate.vue

@@ -8,31 +8,34 @@
       <div class="right-btn award" :style="rightBtn[templateId]">我的奖品</div>
       <div class="music-icon iconfont icon-yinfu" :style="rightBtn[templateId]" v-show="backMusicFlag"></div>
       <div class="integral" v-if="ruleData[0].type == 0">{{ ruleData[0].val }}积分/次</div>
-      <div class="swiper-item" v-if="bulletFlag == 1" :style="bulletTop[templateId]">
+      <div class="swiper-item" v-if="bulletFlag == 1" :style="bulletTop[templateId] || bulletTop[2]">
         <img :src="bulletImageUrl" />
         <span>恭喜 张* 获得 100元优惠券</span>
       </div>
       <div class="box-box">
-        <img v-for="item in boxList" :key="item" :src="boxImg" :style="{ left: item.left, top: item.top, width: item.width, height: item.height }" @click="showOpenBoxDialog = true" />
+        <div v-for="(item, index) in boxList" :key="index">
+          <img :src="boxImg.length > 1 ? boxImg[index] : boxImg[0]" v-if="boxImg.length > 1 ? boxImg[index] : boxImg[0]" :style="{ left: item.left, top: item.top, width: item.width, height: item.height }" />
+        </div>
       </div>
+
       <div class="points-count-box">
         <div class="text-box">
           <div class="text" :style="textColor[templateId]">1500</div>
-          <img class="text-shadow" :src="'https://pic01-10001430.cos.ap-shanghai.myqcloud.com/game/template' + templateId + '/circle_bg.png'" />
-          <img class="title-image" src="https://pic01-10001430.cos.ap-shanghai.myqcloud.com/game/template1/我的积分.png" />
+          <img class="text-shadow" :src="'https://pic01-10001430.cos.ap-shanghai.myqcloud.com/game/template' + (['1', '2', '3', '5'].includes(templateId) ? templateId : 1) + '/circle_bg.png'" />
+          <img class="title-image" :src="myPointImageUrl" />
         </div>
         <div class="game-name-box">
           <img :src="noticeImageUrl" style="height: 17px;" />
         </div>
         <div class="text-box">
           <div class="text fontSize" :style="textColor[templateId]">55</div>
-          <img class="text-shadow" :src="'https://pic01-10001430.cos.ap-shanghai.myqcloud.com/game/template' + templateId + '/circle_bg.png'" />
-          <img class="title-image" src="https://pic01-10001430.cos.ap-shanghai.myqcloud.com/game/template1/剩余次数.png" />
+          <img class="text-shadow" :src="'https://pic01-10001430.cos.ap-shanghai.myqcloud.com/game/template' + (['1', '2', '3', '5'].includes(templateId) ? templateId : 1) + '/circle_bg.png'" />
+          <img class="title-image" :src="resetTimeImageUrl" />
         </div>
       </div>
 
       <img class="ad-image" :src="adsImageUrl" mode="widthFix" v-if="adsImageUrl && adsFlag == 1" />
-      <!-- <div class="share-box" v-if="ruleData[1].type == 1">
+      <!-- <div class="share-box">
         <div class="icon">
           <div class="iconfont icon-yaoqing"></div>
         </div>
@@ -82,7 +85,6 @@ const template3Box = [
     width: '120px'
   }
 ];
-// const leftVal = 0;
 const template1Box = [
   {
     left: 'calc(51%)',
@@ -262,10 +264,12 @@ export default {
       template5Box,
       backImageUrl: '',
       noticeImageUrl: '',
-      boxImg: '',
+      boxImg: [],
       adsImageUrl: '',
       bulletFlag: 0,
       bulletImageUrl: '',
+      resetTimeImageUrl: '',
+      myPointImageUrl: '',
       backMusicFlag: 0,
       adsFlag: 0,
       rightBtn: {
@@ -297,7 +301,8 @@ export default {
       type: Object,
       default: () => {}
     },
-    templateId: String
+    templateId: String,
+    viewPrize: [String, Number]
   },
   watch: {
     templateId(val) {
@@ -305,7 +310,7 @@ export default {
       if (['1', '2', '3', '5'].includes(val)) {
         this.boxList = this['template' + val + 'Box'];
       } else {
-        this.boxList = this.template1Box;
+        this.boxList = this.template5Box.slice(0, this.viewPrize);
       }
       console.log(this.boxList);
       console.log('template' + val + 'Box');
@@ -317,15 +322,17 @@ export default {
         console.log('basicData----->');
         console.log(val);
         if (!val) return;
-        const { backImageUrl, noticeImageUrl, boxImg, adsImageUrl, bulletFlag, bulletImageUrl, backMusicFlag, adsFlag } = val;
+        const { myPointImageUrl, resetTimeImageUrl, backImageUrl, noticeImageUrl, boxImg, adsImageUrl, bulletFlag, bulletImageUrl, backMusicFlag, adsFlag } = val;
         this.backImageUrl = backImageUrl;
         this.noticeImageUrl = noticeImageUrl;
-        this.boxImg = boxImg;
         this.adsImageUrl = adsImageUrl;
         this.bulletFlag = bulletFlag;
         this.bulletImageUrl = bulletImageUrl;
         this.backMusicFlag = backMusicFlag;
         this.adsFlag = adsFlag;
+        this.boxImg = boxImg;
+        this.myPointImageUrl = myPointImageUrl;
+        this.resetTimeImageUrl = resetTimeImageUrl;
       }
     }
   }

src/views/game/cmh/prize-config.vue

@@ -172,13 +172,13 @@ export default {
         prizeName: { type: 'string', required: true, message: '请输入奖品名称' },
         prizeType: { required: true, message: '请选择奖品类型' }
       },
-      imgeType: {
-        // 0 抵金券1 折扣券2 兑换券3：积分
-        0: 'https://pic01-10001430.image.myqcloud.com/522b7c1e-dea4-4068-b0a3-0e07bc229b0d',
-        1: 'https://pic01-10001430.image.myqcloud.com/32fa9132-5aed-4f7f-8be1-a3f81f2e58f7',
-        2: 'https://pic01-10001430.image.myqcloud.com/029abce4-660c-4115-a70f-55ba8f626832',
-        3: 'https://pic01-10001430.image.myqcloud.com/7fbc9e9b-4115-4795-aea3-cd2c1ec8da63'
-      },
+      // imageType: {
+      //   // 0 抵金券1 折扣券2 兑换券3：积分
+      //   0: 'https://pic01-10001430.image.myqcloud.com/522b7c1e-dea4-4068-b0a3-0e07bc229b0d',
+      //   1: 'https://pic01-10001430.image.myqcloud.com/32fa9132-5aed-4f7f-8be1-a3f81f2e58f7',
+      //   2: 'https://pic01-10001430.image.myqcloud.com/029abce4-660c-4115-a70f-55ba8f626832',
+      //   3: 'https://pic01-10001430.image.myqcloud.com/7fbc9e9b-4115-4795-aea3-cd2c1ec8da63'
+      // },
       show: false,
       prizeForm: {
         winChance: 100,
@@ -218,6 +218,10 @@ export default {
     prizeMax: 0,
     prizeMin: 0,
     gameStatus: 0,
+    imageType: {
+      type: Object,
+      default: () => {}
+    },
     echoData: {
       type: Object,
       default: () => {}
@@ -346,7 +350,7 @@ export default {
       data.prizeRelationId = selectedData.coupCardId;
       data.prizeName = selectedData.cardName.length > 30 ? selectedData.cardName.slice(0, 30) : selectedData.cardName;
       data.prizeNameStr = data.prizeName;
-      data.prizeImageUrl = { imgUrl: this.imgeType[selectedData.cardType], code: this.imgeType[selectedData.cardType] };
+      data.prizeImageUrl = { imgUrl: this.imageType[selectedData.cardType], code: this.imageType[selectedData.cardType] };
       data.prizeNumber = 1;
       data.status = 0;
       data.max = selectedData.couponStock;
@@ -370,26 +374,27 @@ export default {
       this.$refs.prizeForm.validateField(`gamePrizeList.${index}.prizeStock`);
     },
     handleTypeChange(val, index) {
-      // this.prizeForm.gamePrizeList[index].prizeName ? delete this.prizeForm.gamePrizeList[index].prizeName : '';
-      // this.prizeForm.gamePrizeList[index].prizeNameStr ? delete this.prizeForm.gamePrizeList[index].prizeNameStr : '';
-      // this.prizeForm.gamePrizeList[index].prizeNumber ? delete this.prizeForm.gamePrizeList[index].prizeNumber : '';
-      // this.prizeForm.gamePrizeList[index].optNum ? delete this.prizeForm.gamePrizeList[index].optNum : '';
       if (val == 0) {
         this.prizeForm.gamePrizeList[index].prizeImageUrl = { imgUrl: '', code: '' };
         this.prizeForm.gamePrizeList[index].prizeName = '谢谢参与';
         this.prizeForm.gamePrizeList[index].prizeNumber = 1;
         this.prizeForm.gamePrizeList[index].optNum = -1;
+        this.prizeForm.gamePrizeList[index].prizeNameStr = '';
+        delete this.prizeForm.gamePrizeList[index].prizeRelationId;
       } else if (val == 1) {
-        this.prizeForm.gamePrizeList[index].prizeImageUrl = { imgUrl: this.imgeType[3], code: this.imgeType[3] };
+        this.prizeForm.gamePrizeList[index].prizeImageUrl = { imgUrl: this.imageType[3], code: this.imageType[3] };
         this.prizeForm.gamePrizeList[index].prizeName = '';
         this.prizeForm.gamePrizeList[index].prizeNameStr = '';
         delete this.prizeForm.gamePrizeList[index].prizeNumber;
         this.prizeForm.gamePrizeList[index].optNum = '';
+        delete this.prizeForm.gamePrizeList[index].prizeRelationId;
       } else if (val == 2) {
+        this.prizeForm.gamePrizeList[index].prizeImageUrl = { imgUrl: '', code: '' };
         this.prizeForm.gamePrizeList[index].prizeName = '';
         this.prizeForm.gamePrizeList[index].prizeNameStr = '';
         this.prizeForm.gamePrizeList[index].prizeNumber = '';
         this.prizeForm.gamePrizeList[index].optNum = '';
+        delete this.prizeForm.gamePrizeList[index].prizeRelationId;
       }
       this.$refs.prizeForm.clearValidate(`gamePrizeList.${index}.prizeStock`);
       this.calculateRate();