diff --git a/src/main.js b/src/main.js index a5f04b0b1..21707e886 100644 --- a/src/main.js +++ b/src/main.js @@ -12,6 +12,7 @@ import "@/assets/scss/aui.scss"; //按钮 import http from "@/utils/request"; +import { Message } from 'element-ui' // import renRadioGroup from "@/components/ren-radio-group"; // import renSelect from "@/components/ren-select"; // import renProcessMultiple from "@/components/ren-process-multiple"; @@ -33,6 +34,7 @@ import util from "@js/util"; // import Cookies from "js-cookie"; import getQueryPara from "dai-js/modules/getQueryPara"; + // 兼容token传参登录 if (getQueryPara("token")) { console.log("token", getQueryPara("token")); @@ -87,7 +89,7 @@ Vue.directive("fixed", { // 挂载全局 Vue.prototype.$http = http; - +Vue.prototype.$message = Message; // el-uploader的header配置 Vue.prototype.$getElUploadHeaders = () => ({ Authorization: localStorage.getItem("token") || "", diff --git a/src/views/components/tinymce2/index.vue b/src/views/components/tinymce2/index.vue index cac523ab4..96c30ea15 100644 --- a/src/views/components/tinymce2/index.vue +++ b/src/views/components/tinymce2/index.vue @@ -72,7 +72,7 @@ export default { let uploadUrl = window.SITE_CONFIG["apiURL"] + "/oss/file/upload-resi-event-file"; let token = this.getUserToken(); - + let that = this; let init = { selector: `#${this.id}`, language_url: require("./zh_CN.js"), // 中文语言包路径 @@ -115,6 +115,8 @@ export default { nonbreaking_force_tab: true, // 图片上传 images_upload_handler: function (blobInfo, succFun, failFun) { + console.log(that); + that.$message.warning('请上传小于10M的图片!') var xhr, formData; var file = blobInfo.blob(); // 转化为易于理解的file对象 if (file.size > 10 * 1024 * 1024) {