diff --git a/manager/src/components/lili-dialog/link-dialog.vue b/manager/src/components/lili-dialog/link-dialog.vue index b68812de..ee37feec 100644 --- a/manager/src/components/lili-dialog/link-dialog.vue +++ b/manager/src/components/lili-dialog/link-dialog.vue @@ -65,11 +65,13 @@ export default { } return cur; }, []); - this.wap.forEach((items,indexs) => { - if(items.title == '活动'){ - this.wap.splice(indexs,1) - } - }) + if (this.$route.path !== '/floorList/main') { + this.wap.forEach((items, indexs) => { + if (items.title == '活动') { + this.wap.splice(indexs, 1) + } + }) + } }else{ this.wap.push( { title: "活动", diff --git a/manager/src/components/lili-dialog/template/marketing.vue b/manager/src/components/lili-dialog/template/marketing.vue index be39d636..dc6af46b 100644 --- a/manager/src/components/lili-dialog/template/marketing.vue +++ b/manager/src/components/lili-dialog/template/marketing.vue @@ -73,13 +73,6 @@ export default { pageSize: 10, }, pintuanColumns: [ - // 表头 - { - title: "活动标题", - key: "title", - tooltip: true, - width: 250, - }, { title: "商品名称", key: "goodsName", @@ -386,6 +379,7 @@ export default { // 去除优惠券 delete this.promotionList.COUPON; Object.keys(res.result)[0] && this.typeOption(Object.keys(res.result)[0]).methodsed(); + this.promotions = Object.keys(res.result)[0]; } // if (Object.keys(res.result).length) { diff --git a/seller/src/views/promotion/full-discount/full-discount-add.vue b/seller/src/views/promotion/full-discount/full-discount-add.vue index e3818005..6c315ea7 100644 --- a/seller/src/views/promotion/full-discount/full-discount-add.vue +++ b/seller/src/views/promotion/full-discount/full-discount-add.vue @@ -377,6 +377,7 @@ export default { price: e.price, quantity: e.quantity, storeId: e.storeId, + goodsId:e.goodsId, storeName: e.storeName, thumbnail: e.thumbnail, skuId: e.id,