Merge branch 'ch/need_pool358' of eta_gn_front/eta_front into debug

src/views/ppt_manage/newVersion/components/formatPage/FormatFour.vue

@@ -103,13 +103,14 @@ export default {
 </script>
 
 <style scoped lang="scss">
-.format-four {
-  .top {
-    height: 40%;
-  }
-  .bottom {
-    top: 40%;
-    height: 60%;
-  }
-}
+// 产品又说上面的图和下面不协调，要求文字这一行矮一点，暂时注释掉
+// .format-four {
+//   .top {
+//     height: 40%;
+//   }
+//   .bottom {
+//     top: 40%;
+//     height: 60%;
+//   }
+// }
 </style>

src/views/ppt_manage/newVersion/components/formatPage/FormatThree.vue

@@ -90,4 +90,10 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.wrap-full-right {
+  top: -15px;
+  .editor-wrap {
+    height: 90%;
+  }
+}
 </style>