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

src/views/game/cmh/form.vue

@@ -18,11 +18,15 @@
             {{ el }}
           </el-menu-item>
         </el-menu>
-        <div class="iphone">
-          <span class="gameTitle">{{ gameName }}</span>
-          <img src="../../../assets/img/Navbar.png" class="braImg" alt="" />
-          <gameTemplate :ruleData="ruleData" :templateId="templateId" :basicData="previewData" v-show="menuActive == 0" />
-          <img :src="computedImg" v-show="menuActive != 0" style="min-height:724px;margin-top: 70px;" />
+        <div style="margin: 0 20px 0 13px;">
+          <div class="nav">
+            <span class="gameTitle">{{ gameName }}</span>
+            <img src="../../../assets/img/Navbar.png" class="braImg" alt="" />
+          </div>
+          <div class="iphone">
+            <gameTemplate :ruleData="ruleData" :templateId="templateId" :basicData="previewData" v-show="menuActive == 0" />
+            <img :src="computedImg" v-show="menuActive != 0" style="min-height:724px; " />
+          </div>
         </div>
       </div>
       <div class="rightForm" v-show="!isInfo">
@@ -105,7 +109,7 @@ export default {
   },
   computed: {
     computedImg() {
-      if (![1, 2, 3, 4].includes(this.templateId)) {
+      if (!['1', '2', '3', '5'].includes(this.templateId)) {
         return '';
       }
       const bcImg = {
@@ -490,13 +494,19 @@ export default {
     }
   }
 }
+.nav {
+  height: 83px;
+  img {
+    width: 375px;
+    border-radius: 8px 8px 0px 0px;
+  }
+}
 .iphone {
   width: 375px;
-  border-radius: 8px 8px 0px 0px;
-  margin: 0 20px 0 13px;
   position: relative;
   overflow-y: auto;
   overflow-x: hidden;
+  height: 100%;
   img {
     width: 375px;
   }
@@ -507,7 +517,7 @@ export default {
   color: #000000;
   font-weight: 600;
   z-index: 101;
-  top: 56px;
+  top: 82px;
   width: 100%;
   height: 20px;
   display: flex;