浏览代码

Merge branch 'dev' into 'test'

Dev

See merge request quanshu/mp-ui-pc!172
hunagwb 3 年之前
父节点
当前提交
ab21c811f7
共有 2 个文件被更改,包括 3 次插入3 次删除
  1. 2 2
      src/components/WangEditor/index.vue
  2. 1 1
      src/views/business/goods/add.vue

+ 2 - 2
src/components/WangEditor/index.vue

@@ -31,7 +31,6 @@ export default {
       this.editor.config.onchange = (newHtml) => {
         this.$emit("input", newHtml);
       };
-      this.editor.config.placeholder = "请输入回答";
       // 编辑器不需要的菜单
       this.editor.config.excludeMenus = ["emoticon", "video", "code"];
       this.editor.config.showLinkImg = false; //关闭网络路径图片方式
@@ -52,6 +51,7 @@ export default {
       this.editor.config.zIndex = 0;
       // 创建编辑器
       this.editor.create();
+      this.editor.$textContainerElem.css("height", "700px !important"); //设置高
     },
 
     setContent(val) {
@@ -72,5 +72,5 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
 </style>

+ 1 - 1
src/views/business/goods/add.vue

@@ -58,7 +58,7 @@
       <el-divider content-position="left">价格库存</el-divider>
       <el-row>
         <el-col :span="23">
-          <el-form-item label="启用多SKU:" prop="multiSku">
+          <el-form-item label="启用多SKU:">
             <el-switch
               v-model="addData.multiSku"
               :active-value="1"