From 5218388effcac3b054f25daf3066c977fbf185e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E5=BE=88=E5=B7=AE=E5=95=A6?= <17633066053@163.com> Date: Wed, 7 Dec 2022 10:36:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=AF=8C=E6=96=87=E6=9C=AC?= =?UTF-8?q?=E4=B8=AD=E4=B8=8D=E7=94=A8=E7=9A=84=E6=8F=92=E4=BB=B6=EF=BC=8C?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=95=86=E5=93=81=E4=B8=8A=E4=BC=A0=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/src/components/editor/config.js | 12 ++++-------- manager/src/components/editor/toolbar.js | 2 +- seller/src/api/index.js | 7 ++++++- .../views/goods/goods-seller/goodsOperationSec.vue | 5 ++++- seller/src/views/lili-components/editor/config.js | 5 +---- seller/src/views/lili-components/editor/toolbar.js | 2 +- 6 files changed, 17 insertions(+), 16 deletions(-) diff --git a/manager/src/components/editor/config.js b/manager/src/components/editor/config.js index 249c017b..abf72d87 100644 --- a/manager/src/components/editor/config.js +++ b/manager/src/components/editor/config.js @@ -1,29 +1,25 @@ import plugins from "./plugins"; import toobar from "./toolbar"; -import { upLoadFile } from "@/api/common"; +import { upLoadFileMethods } from "@/api/common"; export const initEditor = { height: "400px", language: "zh_CN", - menubar: "file edit insert view format table", // 菜单:指定应该出现哪些菜单 + menubar: "file edit view format table", // 菜单:指定应该出现哪些菜单 toolbar: toobar, // 分组工具栏控件 plugins: plugins, // 插件(比如: advlist | link | image | preview等) object_resizing: false, // 是否禁用表格图片大小调整 end_container_on_empty_block: true, // enter键 分块 powerpaste_word_import: "merge", // 是否保留word粘贴样式 clean | merge - code_dialog_height: 450, // 代码框高度 、宽度 - code_dialog_width: 1000, advlist_bullet_styles: "square", // 无序列表 有序列表 maxSize: "2097152", // 设置图片大小 accept: "image/jpeg, image/png", // 设置图片上传规则 images_upload_handler: async function (blobInfo, success, failure) { - console.log("请求") const formData = new FormData(); formData.append("file", blobInfo.blob()); try { - const res = await upLoadFile(formData); + const res = await upLoadFileMethods(formData); if (res.result) { - success(res.result) } else { failure("上传文件有误请稍后重试"); @@ -33,7 +29,7 @@ export const initEditor = { } }, // init_instance_callback: function (editor) { - // var freeTiny = document.querySelector(".tox .tox-notification--in"); + // var freeTiny = document.querySelector(".tox .tox-notification--in .tox-notification .tox-notification--warning .tox .tox-notification--warning .tox-notifications-container"); // freeTiny.style.display = "none"; // }, content_style: ` diff --git a/manager/src/components/editor/toolbar.js b/manager/src/components/editor/toolbar.js index f3c483d4..9040d6ee 100644 --- a/manager/src/components/editor/toolbar.js +++ b/manager/src/components/editor/toolbar.js @@ -1,2 +1,2 @@ -const toolbar = ['searchreplace bold italic underline strikethrough alignleft aligncenter alignright outdent indent blockquote undo redo removeformat subscript superscript code codesample', 'hr bullist numlist link image charmap preview anchor pagebreak insertdatetime media table emoticons forecolor backcolor '] +const toolbar = ['searchreplace bold italic underline strikethrough alignleft aligncenter alignright outdent indent blockquote undo redo removeformat subscript superscript', 'hr bullist numlist link charmap preview pagebreak insertdatetime table emoticons forecolor backcolor '] export default toolbar diff --git a/seller/src/api/index.js b/seller/src/api/index.js index 438e749a..831fc829 100644 --- a/seller/src/api/index.js +++ b/seller/src/api/index.js @@ -365,4 +365,9 @@ export const editOtherUser = (id, params) => { return putRequest(`/clerk/${id}`,params); }; - +/** + * 搜索部门 先加入此api防止运行warn + */ +export const searchDepartment = (params) => { + return getRequest("/permission/department/search", params); +}; diff --git a/seller/src/views/goods/goods-seller/goodsOperationSec.vue b/seller/src/views/goods/goods-seller/goodsOperationSec.vue index 27d11a9e..75ca2a4c 100644 --- a/seller/src/views/goods/goods-seller/goodsOperationSec.vue +++ b/seller/src/views/goods/goods-seller/goodsOperationSec.vue @@ -535,6 +535,7 @@ prop="intro" style="width: 100%" > + 将文件夹下的图片进行拖拽到文本框内,即可完成单/多图片上传。