Merge branch 'master' of http://git.ycjcjy.com/pet_identity/pc-admin

config/config.js

@@ -8,7 +8,7 @@ const { REACT_APP_ENV } = process.env;
 
 export default defineConfig({
   define: {
-    API_BASE: 'http://resumework-service.njyunzhi.com',
+    API_BASE: 'https://pet-certificate-online.njyunzhi.com',
   },
   base: '/admin/',  // 路由跳转必须加 admin
   publicPath: './', // 静态文件相对路径

src/components/rich-editor/index.jsx

@@ -1,4 +1,5 @@
 import React, { forwardRef, useRef, useEffect, useMemo, useImperativeHandle } from 'react'
+import { uploadImage } from '@/services/image'
 
 export default forwardRef((props, ref) => {
   const editorRef = useRef()
@@ -8,7 +9,15 @@ export default forwardRef((props, ref) => {
     window.tinymce.init({
       selector: `#${id}`,
       menubar: false,
+<<<<<<< HEAD
       branding:false,
+=======
+      language: 'zh_CN',
+      plugins: 'image',
+      image_description: false,   // 禁用图片描述
+      image_dimensions: false,  // 禁用图片宽高设置
+      toolbar: 'blocks fontfamily fontsize bold italic backcolor alignleft aligncenter alignright alignjustify image outdent indent undo redo removeformat',
+>>>>>>> e802d9d3811cf3d0cfc27f187e96c8dee54bfb7e
       setup: (editor) => {
         editor.on('change', () => {
           props.onChange(editor.getContent());
@@ -17,6 +26,13 @@ export default forwardRef((props, ref) => {
       },
       init_instance_callback: (editor) => {
         editorRef.current = editor;
+      },
+      images_upload_handler: (blobInfo, progress) => {
+        return new Promise((resolve, reject) => {
+          const formData = new FormData();
+          formData.append('file', blobInfo.blob(), blobInfo.filename());
+          uploadImage(formData).then(resolve)
+        })
       }
     });
   // eslint-disable-next-line react-hooks/exhaustive-deps

src/services/image.js

@@ -0,0 +1,5 @@
+import request from '@/utils/request';
+
+export function uploadImage(formdata) {
+  return request('/image', { method: 'post', data: formdata })  
+}

src/utils/request.js

@@ -30,6 +30,7 @@ function requestInterceptor(url, options) {
     url: `${prefix}${url}`,
     options: {
       ...options,
+      // mode: 'same-origin', // no-cors, *cors, same-origin
       headers: {
         ...headers,
         ...token,