Merge branch 'master' of http://121.37.12.51:13000/huoran/FE_middlePlatform_server

src/views/parnerOperation/editor.js

@@ -179,8 +179,9 @@ export default {
   promotion: false,
   branding: false,
   width: 940,
-  height: 650, //编辑器高度
+  height: 600, //编辑器高度
   min_height: 400,
+  max_height: 600,
   content_css: [ //可设置编辑区内容展示的css，谨慎使用
     './styles/css/editor.css',
   ],

src/views/parnerOperation/learnMg.vue

@@ -127,7 +127,7 @@
             </div>
           </el-upload>
         </el-form-item>
-        <el-form-item prop="mainBody" label="正文">
+        <el-form-item prop="mainBody" label="正文" > 
           <Editor api-key='rnk6zw9v267xqz7pf98twt1vmrvltmd436je7a642pckltda' v-model="form.mainBody" :init="editorConfig" />
         </el-form-item>
         <el-form-item prop="file" label="文件上传">