Merge branch 'feature/7月迭代' into master

src/views/game/cmh/form.vue

@@ -18,7 +18,7 @@
             {{ el }}
           </el-menu-item>
         </el-menu>
-        <div style="margin: 0 20px 0 13px;">
+        <div style="margin:0px 20px 80px 13px;">
           <div class="nav">
             <span class="gameTitle">{{ gameName }}</span>
             <img src="../../../assets/img/Navbar.png" class="braImg" alt="" />
@@ -109,15 +109,15 @@ export default {
   },
   computed: {
     computedImg() {
-      if (!['1', '2', '3', '5'].includes(this.templateId)) {
+      if (!['1', '2', '3', '5', '7'].includes(this.templateId)) {
         return '';
       }
       const bcImg = {
-        1: require(`@/assets/img/template${this.templateId}/mould_rule_page.png`),
-        2: require(`@/assets/img/template${this.templateId}/mould_prize_page.png`),
-        3: require(`@/assets/img/template${this.templateId}/mould_success_page.png`),
-        4: require(`@/assets/img/template${this.templateId}/mould_fail_page.png`),
-        5: require(`@/assets/img/template${this.templateId}/mould_share_page.png`)
+        1: `https://pic01-10001430.cos.ap-shanghai.myqcloud.com/game/template${this.templateId}/mould_rule_page.png`,
+        2: `https://pic01-10001430.cos.ap-shanghai.myqcloud.com/game/template${this.templateId}/mould_prize_page.png`,
+        3: `https://pic01-10001430.cos.ap-shanghai.myqcloud.com/game/template${this.templateId}/mould_success_page.png`,
+        4: `https://pic01-10001430.cos.ap-shanghai.myqcloud.com/game/template${this.templateId}/mould_fail_page.png`,
+        5: `https://pic01-10001430.cos.ap-shanghai.myqcloud.com/game/template${this.templateId}/mould_share_page.png`
       };
       return bcImg[this.menuActive];
     }

src/views/game/cmh/gameTemplate.vue

@@ -7,7 +7,7 @@
       <div class="right-btn rule" :style="rightBtn[templateId]">游戏规则</div>
       <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="integral" v-if="ruleData[0].type == 0 && templateId != 7">{{ ruleData[0].val }}积分/次</div>
       <div class="swiper-item" v-if="bulletFlag == 1" :style="bulletTop[templateId]">
         <img :src="bulletImageUrl" />
         <span>恭喜 张* 获得 100元优惠券</span>
@@ -82,6 +82,44 @@ const template3Box = [
     width: '120px'
   }
 ];
+const template7Box = [
+  {
+    left: '24%',
+    top: '192px',
+    height: '100px',
+    width: '100px'
+  },
+  {
+    left: '50%',
+    top: '243px',
+    height: '100px',
+    width: '100px'
+  },
+  {
+    left: '77%',
+    top: '192px',
+    height: '100px',
+    width: '100px'
+  },
+  {
+    left: '24%',
+    top: '330px',
+    height: '100px',
+    width: '100px'
+  },
+  {
+    left: '50%',
+    top: '376px',
+    height: '100px',
+    width: '100px'
+  },
+  {
+    left: '77%',
+    top: '330px',
+    height: '100px',
+    width: '100px'
+  }
+];
 // const leftVal = 0;
 const template1Box = [
   {
@@ -260,6 +298,7 @@ export default {
       template2Box,
       template3Box,
       template5Box,
+      template7Box,
       backImageUrl: '',
       noticeImageUrl: '',
       boxImg: '',
@@ -302,11 +341,12 @@ export default {
   watch: {
     templateId(val) {
       if (!val) return;
-      if (['1', '2', '3', '5'].includes(val)) {
+      if (['1', '2', '3', '5', '7'].includes(val)) {
         this.boxList = this['template' + val + 'Box'];
       } else {
         this.boxList = this.template1Box;
       }
+
       console.log(this.boxList);
       console.log('template' + val + 'Box');
     },
@@ -345,7 +385,6 @@ img {
   left: 0;
   width: 100%;
   height: 723px;
-  max-height: 100%;
   overflow: hidden;
 }
 .bg-image {

src/views/game/cmh/index.vue

@@ -93,7 +93,6 @@ import { api as viewerApi } from 'v-viewer';
 import { cmhPage, stopGame, pageStatistics } from '@/service/api/gameApi.js';
 import links from '../common/links';
 import { formatDateTimeByType } from '@/utils/index.js';
-import img from '@/assets/img/template1/mould_share_page.png';
 
 export default {
   components: {
@@ -104,7 +103,7 @@ export default {
       formatDateTimeByType,
       linkShow: false,
       linksObj: {},
-      img,
+      img: 'https://pic01-10001430.cos.ap-shanghai.myqcloud.com/game/template1/mould_share_page.png',
       listParams: {
         gameName: '',
         status: '',