diff --git a/buyer/src/components/goodsDetail/ShowGoods.vue b/buyer/src/components/goodsDetail/ShowGoods.vue index dc85314d..006492f6 100644 --- a/buyer/src/components/goodsDetail/ShowGoods.vue +++ b/buyer/src/components/goodsDetail/ShowGoods.vue @@ -101,7 +101,7 @@ > 满{{ promotionMap["FULL_DISCOUNT"].fullMoney }}元，立享{{ promotionMap["FULL_DISCOUNT"].fullRate }}折 { return e.status === status }); - return ob[0].name + return ob && ob[0] ? ob[0].name : status } } }; diff --git a/manager/src/api/promotion.js b/manager/src/api/promotion.js index 50591f28..2628f5d9 100644 --- a/manager/src/api/promotion.js +++ b/manager/src/api/promotion.js @@ -41,7 +41,7 @@ export const getPromotionGoods = (promotionId, params) => { // 获取当前进行中的促销活动 export const getAllPromotion = params => { - return getRequest("/promotion/current", params); + return getRequest("/promotion/promotion/current", params); }; // 获取拼团数据 diff --git a/manager/src/views/lili-floor-renovation/wap/config.js b/manager/src/views/lili-floor-renovation/wap/config.js index cf931eed..cc6808c4 100644 --- a/manager/src/views/lili-floor-renovation/wap/config.js +++ b/manager/src/views/lili-floor-renovation/wap/config.js @@ -519,6 +519,24 @@ export const modelData = [ ] } }, + { + type: "notice", + name: "公告", + img: "md-image", + notAdd: false, + notLink: true, + notImg: true, + options: { + list: [ + { + title: [{context: "这是一条公告"}], + color: "#666", + bk_color: "#FFF", + img: 'http://files.sxcfx.cn/upload/20220318/71e5d27aca82aeedf647052e1e4ceaaa.png' + } + ] + } + }, { type: "promotions", name: "促销活动", diff --git a/manager/src/views/lili-floor-renovation/wap/decorate.scss b/manager/src/views/lili-floor-renovation/wap/decorate.scss index 8c2f85bd..ac7aaaa5 100644 --- a/manager/src/views/lili-floor-renovation/wap/decorate.scss +++ b/manager/src/views/lili-floor-renovation/wap/decorate.scss @@ -148,7 +148,9 @@ display: flex; } -.decorate-notice {} +.decorate-notice { + margin-top: 10px; +} .card {} diff --git a/manager/src/views/lili-floor-renovation/wap/decorate.vue b/manager/src/views/lili-floor-renovation/wap/decorate.vue index ee889144..78d50203 100644 --- a/manager/src/views/lili-floor-renovation/wap/decorate.vue +++ b/manager/src/views/lili-floor-renovation/wap/decorate.vue @@ -274,6 +274,11 @@ class="decorate-notice" > + @@ -503,6 +508,11 @@ export default { this.selectedGoods = item; this.picModelFlag = true; }, + removeNotice(index) { + this.$nextTick(() => { + this.res.options.list[0].title.splice(index, 1); + }); + }, // 关闭 closeDecorate(index) { this.$nextTick(() => { diff --git a/manager/src/views/lili-floor-renovation/wap/index.vue b/manager/src/views/lili-floor-renovation/wap/index.vue index 36fd57e5..e4149dd1 100644 --- a/manager/src/views/lili-floor-renovation/wap/index.vue +++ b/manager/src/views/lili-floor-renovation/wap/index.vue @@ -178,7 +178,7 @@ export default { color1: val.subColor, bk_color: val.subBkColor, data: res.result.commodityList - ? res.result.commodityList + ? res.result.commodityList.splice(0,2) : [], }); } @@ -195,7 +195,7 @@ export default { if (res.success && !exist) { this.contentData.list[newIndex].options.list.push({ data: res.result[val.promotionsType] - ? res.result[val.promotionsType] + ? res.result[val.promotionsType].splice(0,2) : [], type: val.promotionsType, title1: val.subName, diff --git a/manager/src/views/lili-floor-renovation/wap/template/index.js b/manager/src/views/lili-floor-renovation/wap/template/index.js index d1be0999..88e40321 100644 --- a/manager/src/views/lili-floor-renovation/wap/template/index.js +++ b/manager/src/views/lili-floor-renovation/wap/template/index.js @@ -46,5 +46,4 @@ export default { tpl_ad_list, promotions: tpl_promotions, tpl_activity_list, - tpl_adv }; diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_menu.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_menu.vue index 7fd1357c..1e942c32 100644 --- a/manager/src/views/lili-floor-renovation/wap/template/tpl_menu.vue +++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_menu.vue @@ -1,38 +1,39 @@ 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 f1067acf..134ef7d4 100644 --- a/seller/src/views/promotion/full-discount/full-discount-add.vue +++ b/seller/src/views/promotion/full-discount/full-discount-add.vue @@ -53,11 +53,19 @@ 消费达到当前金额可以参与优惠 - - + 减现金 - 打折 @@ -102,7 +110,9 @@ v-model="form.couponFlag" >送优惠券 - 送赠品 - + @@ -140,9 +153,14 @@ :loading="giftLoading" style="width: 280px" > - + @@ -155,17 +173,26 @@ /> - + 全品类 - 指定商品 - +
- +
@@ -280,7 +310,10 @@ export default { promotionName: [{ required: true, message: "活动名称不能为空" }], rangeTime: [{ required: true, message: "请选择活动时间" }], description: [{ required: true, message: "请填写活动描述" }], - price: [{ required: true, message: "请输入面额" }, { validator: checkPrice }], + price: [ + { required: true, message: "请输入面额" }, + { validator: checkPrice }, + ], consumptionLimit: [{ required: true, validator: checkWeight }], fullMoney: [{ required: true, validator: checkWeight }], fullMinus: [ @@ -318,7 +351,10 @@ export default { key: "price", minWidth: 40, render: (h, params) => { - return h("div", this.$options.filters.unitPrice(params.row.price, "￥")); + return h( + "div", + this.$options.filters.unitPrice(params.row.price, "￥") + ); }, }, { @@ -343,8 +379,8 @@ export default { if (this.id) { this.getDetail(); } - this.getCouponList(); - this.getGiftList(); + await this.getCouponList(); + await this.getGiftList(); }, methods: { // 关闭当前页面 @@ -390,14 +426,19 @@ export default { this.$refs.form.validate((valid) => { if (valid) { const params = JSON.parse(JSON.stringify(this.form)); - const strat = this.$options.filters.unixToDate(this.form.rangeTime[0] / 1000); - const end = this.$options.filters.unixToDate(this.form.rangeTime[1] / 1000); + const strat = this.$options.filters.unixToDate( + this.form.rangeTime[0] / 1000 + ); + const end = this.$options.filters.unixToDate( + this.form.rangeTime[1] / 1000 + ); params.startTime = strat; params.endTime = end; if ( params.scopeType == "PORTION_GOODS" && - (!params.promotionGoodsList || params.promotionGoodsList.length == 0) + (!params.promotionGoodsList || + params.promotionGoodsList.length == 0) ) { this.$Modal.warning({ title: "提示", content: "请选择指定商品" }); return; @@ -463,9 +504,11 @@ export default { this.selectedGoods.forEach(function (e) { ids.push(e.id); }); - this.form.promotionGoodsList = this.form.promotionGoodsList.filter((item) => { - return !ids.includes(item.id); - }); + this.form.promotionGoodsList = this.form.promotionGoodsList.filter( + (item) => { + return !ids.includes(item.id); + } + ); }, }); }, @@ -511,7 +554,10 @@ export default { let params = { pageSize: 10, pageNumber: 1, - goodsName: query, + id: query === this.form.giftId ? this.form.giftId : null, + goodsName: query === this.form.giftId ? null : query, + marketEnable: "UPPER", + authFlag: "PASS" }; this.giftLoading = true; getGoodsSkuListDataSeller(params).then((res) => {