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 @@
-
+
@@ -28,17 +27,14 @@
type="error"
@click="remove(scope.row)"
size="small"
- icon="md-add"
style="margin-right:5px"
>删除
-
diff --git a/seller/src/config/index.js b/seller/src/config/index.js
index 8dfd55fa..ec12ba69 100644
--- a/seller/src/config/index.js
+++ b/seller/src/config/index.js
@@ -18,14 +18,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: {
diff --git a/seller/src/views/goods/goods-seller/goodsOperation.vue b/seller/src/views/goods/goods-seller/goodsOperation.vue
index b061b591..d5d32241 100644
--- a/seller/src/views/goods/goods-seller/goodsOperation.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperation.vue
@@ -151,12 +151,6 @@
-
@@ -808,23 +802,6 @@ export default {
this.draftId = "";
}
},
-
- // 移动商品图片位置
- handleGoodsPicRemoteUp(fieldData, index) {
- if (index != 0) {
- fieldData[index] = fieldData.splice(index - 1, 1, fieldData[index])[0];
- } else {
- fieldData.push(fieldData.shift());
- }
- },
- // 移动商品图片位置
- handleGoodsPicRemoteDown(fieldData, index) {
- if (index != fieldData.length - 1) {
- fieldData[index] = fieldData.splice(index + 1, 1, fieldData[index])[0];
- } else {
- fieldData.unshift(fieldData.splice(index, 1)[0]);
- }
- },
// 获取商品模板
GET_GoodsTemplate() {
let searchParams = {
@@ -1460,6 +1437,11 @@ export default {
this.GET_GoodsParams();
/** 1级校验 */
this.loading = true;
+ if (this.activestep === 0 && !this.baseInfoForm.goodsType) {
+ this.$Message.error('请选择商品类型')
+ this.loading = false;
+ return
+ }
if (this.activestep === 0 && !this.activeCategoryName1) {
this.$Message.error("请选择商品分类");
this.loading = false;