diff --git a/buyer/src/pages/Cart.vue b/buyer/src/pages/Cart.vue index eac00dd7..321376b2 100644 --- a/buyer/src/pages/Cart.vue +++ b/buyer/src/pages/Cart.vue @@ -183,7 +183,7 @@ >全选 -
删除选中商品
+
删除选中商品
清空购物车
@@ -278,7 +278,9 @@ export default { const list = this.cartList; list.forEach((shop) => { shop.skuList.forEach((goods) => { - idArr.push(goods.goodsSku.id); + if(goods.checked) { + idArr.push(goods.goodsSku.id); + } }); }); } else { diff --git a/manager/src/api/index.js b/manager/src/api/index.js index 012ee5b0..14be0e36 100644 --- a/manager/src/api/index.js +++ b/manager/src/api/index.js @@ -437,6 +437,10 @@ export const setHotWords = (params) => { return postRequest(`/hotwords`, params); }; +// 删除热搜词 +export const deleteHotWords = (words) => { + return deleteRequest(`/hotwords/${words}`); +}; // 获取热搜词 export const getHotWords = () => { diff --git a/manager/src/api/promotion.js b/manager/src/api/promotion.js index c3e34f61..8fcede9a 100644 --- a/manager/src/api/promotion.js +++ b/manager/src/api/promotion.js @@ -215,7 +215,7 @@ export const getFullDiscountById = id => { }; // 开启、关闭满额活动 export const updateFullDiscount = (id, promotionStatus) => { - return putRequest(`/promotion/fullDiscount/status/${id}/${promotionStatus}`) + return putRequest(`/promotion/fullDiscount/status/${id}`) } // 积分商品列表 export const getPointsGoodsList = params => { diff --git a/manager/src/views/promotions/coupon/coupon.vue b/manager/src/views/promotions/coupon/coupon.vue index a779f267..1c5843ed 100644 --- a/manager/src/views/promotions/coupon/coupon.vue +++ b/manager/src/views/promotions/coupon/coupon.vue @@ -120,7 +120,7 @@ export default { // 搜索框初始化对象 pageNumber: 1, // 当前页数 pageSize: 10, // 页面大小 - sort: "startTime", // 默认排序字段 + sort: "create_time", // 默认排序字段 order: "desc", // 默认排序方式 getType: "", // 默认排序方式 }, diff --git a/manager/src/views/promotions/full-discount/full-discount.vue b/manager/src/views/promotions/full-discount/full-discount.vue index 7f6d23a6..0c141967 100644 --- a/manager/src/views/promotions/full-discount/full-discount.vue +++ b/manager/src/views/promotions/full-discount/full-discount.vue @@ -79,14 +79,6 @@ @click="openOrClose(row)" >关闭 - @@ -177,27 +169,25 @@ export default { // 开启或关闭活动 openOrClose(row) { let name = "开启"; - let status = "START"; if (row.promotionStatus === "START") { name = "关闭"; - status = "CLOSE"; + this.$Modal.confirm({ + title: "提示", + // 记得确认修改此处 + content: `确认${name}此活动吗?需要一定时间才能生效,请耐心等待`, + loading: true, + onOk: () => { + // 删除 + updateFullDiscount(row.id).then((res) => { + this.$Modal.remove(); + if (res.success) { + this.$Message.success(`${name}成功`); + this.getDataList(); + } + }); + }, + }); } - this.$Modal.confirm({ - title: "提示", - // 记得确认修改此处 - content: `确认${name}此活动吗?需要一定时间才能生效,请耐心等待`, - loading: true, - onOk: () => { - // 删除 - updateFullDiscount(row.id, status).then((res) => { - this.$Modal.remove(); - if (res.success) { - this.$Message.success(`${name}成功`); - this.getDataList(); - } - }); - }, - }); }, changePage(v) { // 改变页数 diff --git a/manager/src/views/promotions/points-goods/points-goods-add.vue b/manager/src/views/promotions/points-goods/points-goods-add.vue index 0676e227..417a7278 100644 --- a/manager/src/views/promotions/points-goods/points-goods-add.vue +++ b/manager/src/views/promotions/points-goods/points-goods-add.vue @@ -341,10 +341,10 @@ export default { onOk: () => { let ids = []; this.selectedGoods.forEach(function (e) { - ids.push(e.id); + ids.push(e.skuId); }); this.promotionGoodsList = this.promotionGoodsList.filter((item) => { - return !ids.includes(item.id); + return !ids.includes(item.skuId); }); }, }); diff --git a/manager/src/views/promotions/points-goods/points-goods.vue b/manager/src/views/promotions/points-goods/points-goods.vue index ec786ea4..2eaa27f0 100644 --- a/manager/src/views/promotions/points-goods/points-goods.vue +++ b/manager/src/views/promotions/points-goods/points-goods.vue @@ -121,7 +121,7 @@ >关闭