Merge branch 'feature/游戏营销' into test

src/views/game/cmh/form.vue

@@ -105,7 +105,7 @@ export default {
   },
   computed: {
     computedImg() {
-      if (![1, 2, 3, 4].includes(this.templateId)) {
+      if (!['1', '2', '3', '4'].includes(this.templateId)) {
         return '';
       }
       const bcImg = {

src/views/game/cmh/gameTemplate.vue

@@ -187,7 +187,6 @@ export default {
   components: { img },
   data() {
     return {
-      list: ['刷卡拉拉卡', '阿拉卡萨卢克和史莱克', '刷卡拉拉卡', '阿拉卡萨卢克和史莱克'],
       template1Box,
       boxList: [],
       template2Box,
@@ -217,11 +216,12 @@ export default {
   watch: {
     templateId(val) {
       if (!val) return;
-      if ([1, 2, 3, 4].includes(val)) {
+      if (['1', '2', '3', '4'].includes(val)) {
         this.boxList = this['template' + val + 'Box'];
       } else {
         this.boxList = this.template1Box;
       }
+      console.log(this.boxList);
       console.log('template' + val + 'Box');
     },
     basicData: {
@@ -240,7 +240,6 @@ export default {
         this.bulletImageUrl = bulletImageUrl;
         this.backMusicFlag = backMusicFlag;
         this.adsFlag = adsFlag;
-        console.log(this.boxImg);
       }
     }
   }