From 3a76ba2c1f6d17f22ff360ed9b7492fa2ebd9195 Mon Sep 17 00:00:00 2001 From: mabo Date: Fri, 2 Jul 2021 14:26:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=96=87=E7=AB=A0?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E4=B8=8D=E5=9B=9E=E6=98=BE=EF=BC=8C=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E5=95=86=E5=93=81=E4=B8=8D=E9=80=89=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E7=82=B9=E4=B8=8B=E4=B8=80=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/package.json | 2 +- manager/src/api/pages.js | 4 +-- manager/src/config/index.js | 16 +++++------ .../src/views/my-components/lili/editor.vue | 1 + .../page/article-manage/ArticleCategory.vue | 10 ++----- seller/src/config/index.js | 16 +++++------ .../goods/goods-seller/goodsOperation.vue | 28 ++++--------------- 7 files changed, 28 insertions(+), 49 deletions(-) diff --git a/manager/package.json b/manager/package.json index 427ac89e..8c458b60 100644 --- a/manager/package.json +++ b/manager/package.json @@ -47,7 +47,7 @@ "vue-router": "^3.1.3", "vuedraggable": "^2.23.2", "vuex": "^3.4.0", - "wangeditor": "^4.5.3", + "wangeditor": "^4.7.5", "xlsx": "^0.16.2", "xss": "^1.0.7" }, diff --git a/manager/src/api/pages.js b/manager/src/api/pages.js index d8775679..8a8283f3 100644 --- a/manager/src/api/pages.js +++ b/manager/src/api/pages.js @@ -80,11 +80,11 @@ export const updateArticleCategory = (params, id) => { } //文章添加 export const saveArticle = (params) => { - return postRequest('/article', params) + return postRequest('/article', params, {"Content-Type": "application/json"}) } //文章修改 export const updateArticle = (params) => { - return putRequest(`/article/update/${params.id}`, params) + return putRequest(`/article/update/${params.id}`, params, {"Content-Type": "application/json"}) } //文章是否展示修改 export const updateArticleStatus = (id,params) => { diff --git a/manager/src/config/index.js b/manager/src/config/index.js index 680fb1b1..8b6b162f 100644 --- a/manager/src/config/index.js +++ b/manager/src/config/index.js @@ -17,14 +17,14 @@ export default { * @description api请求基础路径 */ api_dev: { - common: "https://common-api.pickmall.cn", - buyer: "https://buyer-api.pickmall.cn", - seller: "https://store-api.pickmall.cn", - manager: "https://admin-api.pickmall.cn" - // common: 'http://192.168.0.109:8890', - // buyer: 'http://192.168.0.109:8888', - // seller: 'http://192.168.0.109:8889', - // manager: 'http://192.168.0.109:8887' + // common: "https://common-api.pickmall.cn", + // buyer: "https://buyer-api.pickmall.cn", + // seller: "https://store-api.pickmall.cn", + // manager: "https://admin-api.pickmall.cn" + common: 'http://192.168.0.109:8890', + buyer: 'http://192.168.0.109:8888', + seller: 'http://192.168.0.109:8889', + manager: 'http://192.168.0.109:8887' }, api_prod: { common: "https://common-api.pickmall.cn", diff --git a/manager/src/views/my-components/lili/editor.vue b/manager/src/views/my-components/lili/editor.vue index 697bc9ed..e871d5b5 100644 --- a/manager/src/views/my-components/lili/editor.vue +++ b/manager/src/views/my-components/lili/editor.vue @@ -122,6 +122,7 @@ export default { // 如果服务器端返回的不是 {errno:0, data: [...]} 这种格式,可使用该配置 customInsert: function (insertImg, result, editor) { if (result.success == true) { + console.log(insertImg,result,editor); let url = result.result; insertImg(url); that.$Message.success("上传图片成功"); diff --git a/manager/src/views/page/article-manage/ArticleCategory.vue b/manager/src/views/page/article-manage/ArticleCategory.vue index 2d269156..84c46072 100644 --- a/manager/src/views/page/article-manage/ArticleCategory.vue +++ b/manager/src/views/page/article-manage/ArticleCategory.vue @@ -1,6 +1,6 @@