From 5beed6e3c837ceff41b15caa1b4c973ef931de37 Mon Sep 17 00:00:00 2001 From: ZhengJie <201507802@qq.com> Date: Sat, 5 Sep 2020 10:48:25 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96](v2.5):?= =?UTF-8?q?=20=E7=94=B1=E4=BA=8E=E5=85=8D=E8=B4=B9=E5=9B=BE=E5=BA=8A?= =?UTF-8?q?=E8=BF=87=E4=BA=8E=E4=B8=8D=E7=A8=B3=E5=AE=9A=EF=BC=8C=E5=BD=B1?= =?UTF-8?q?=E5=93=8D=E4=BD=93=E9=AA=8C=EF=BC=8C=E5=9B=A0=E6=AD=A4=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=9B=BE=E5=BA=8A=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E3=80=82=20=E5=AF=8C=E6=96=87=E6=9C=AC=EF=BC=8Cmarkdown=20?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E4=B8=BA=E4=BD=BF=E7=94=A8=E6=9C=AC=E5=9C=B0?= =?UTF-8?q?=E5=AD=98=E5=82=A8=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/tools/picture.js | 18 --- src/store/modules/api.js | 2 +- src/views/components/Editor.vue | 14 ++- src/views/components/MarkDown.vue | 10 +- src/views/tools/picture/index.vue | 177 ------------------------------ 5 files changed, 15 insertions(+), 206 deletions(-) delete mode 100644 src/api/tools/picture.js delete mode 100644 src/views/tools/picture/index.vue 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 @@ - - - - -