diff --git a/src/api/tools/picture.js b/src/api/tools/picture.js deleted file mode 100644 index 237d5f5..0000000 --- a/src/api/tools/picture.js +++ /dev/null @@ -1,18 +0,0 @@ -import request from '@/utils/request' - -export function del(ids) { - return request({ - url: 'api/pictures', - method: 'delete', - data: ids - }) -} - -export function sync() { - return request({ - url: 'api/pictures/synchronize', - method: 'post' - }) -} - -export default { del, sync } diff --git a/src/store/modules/api.js b/src/store/modules/api.js index 6893445..30dad61 100644 --- a/src/store/modules/api.js +++ b/src/store/modules/api.js @@ -8,7 +8,7 @@ const api = { // 实时控制台 socketApi: baseUrl + '/websocket?token=kl', // 图片上传 - imagesUploadApi: baseUrl + '/api/pictures', + imagesUploadApi: baseUrl + '/api/localStorage/pictures', // 修改头像 updateAvatarApi: baseUrl + '/api/users/updateAvatar', // 上传文件到七牛云 diff --git a/src/views/components/Editor.vue b/src/views/components/Editor.vue index 2befe93..b602d70 100644 --- a/src/views/components/Editor.vue +++ b/src/views/components/Editor.vue @@ -3,7 +3,6 @@

富文本基于 wangEditor - ,图片上传使用 SM.MS

@@ -27,14 +26,15 @@ export default { editorContent: ` ` + + ` } }, computed: { ...mapGetters([ - 'imagesUploadApi' + 'imagesUploadApi', + 'baseApi' ]) }, mounted() { @@ -47,8 +47,10 @@ export default { // files 是 input 中选中的文件列表 // insert 是获取图片 url 后,插入到编辑器的方法 files.forEach(image => { - upload(_this.imagesUploadApi, image).then(data => { - insert(data.data.url) + upload(_this.imagesUploadApi, image).then(res => { + const data = res.data + const url = _this.baseApi + '/file/' + data.type + '/' + data.realName + insert(url) }) }) } diff --git a/src/views/components/MarkDown.vue b/src/views/components/MarkDown.vue index ed734a5..4eff05c 100644 --- a/src/views/components/MarkDown.vue +++ b/src/views/components/MarkDown.vue @@ -3,7 +3,6 @@

Markdown 基于 MavonEditor - ,图片上传使用 SM.MS

@@ -21,7 +20,8 @@ export default { }, computed: { ...mapGetters([ - 'imagesUploadApi' + 'imagesUploadApi', + 'baseApi' ]) }, mounted() { @@ -32,8 +32,10 @@ export default { }, methods: { imgAdd(pos, $file) { - upload(this.imagesUploadApi, $file).then(data => { - this.$refs.md.$img2Url(pos, data.data.url) + upload(this.imagesUploadApi, $file).then(res => { + const data = res.data + const url = this.baseApi + '/file/' + data.type + '/' + data.realName + this.$refs.md.$img2Url(pos, url) }) } } diff --git a/src/views/tools/picture/index.vue b/src/views/tools/picture/index.vue deleted file mode 100644 index 0e0124f..0000000 --- a/src/views/tools/picture/index.vue +++ /dev/null @@ -1,177 +0,0 @@ - - - - -