diff --git a/manager/src/views/promotions/full-discount/full-discount-detail.vue b/manager/src/views/promotions/full-discount/full-discount-detail.vue
index 0aba51ea..3c43bfde 100644
--- a/manager/src/views/promotions/full-discount/full-discount-detail.vue
+++ b/manager/src/views/promotions/full-discount/full-discount-detail.vue
@@ -158,7 +158,11 @@
style="width: 100%"
v-if="form.scopeType == 'PORTION_GOODS'"
>
-
+
+
+
+
+
@@ -211,11 +217,16 @@
import { getPlatformCouponList, getFullDiscountById, newFullDiscount, editFullDiscount,} from "@/api/promotion";
import { getGoodsSkuData } from "@/api/goods";
import { regular } from "@/utils";
+import skuSelect from "@/components/lili-dialog";
+
+
import vueQr from "vue-qr";
export default {
name: "add-full-discount",
components: {
"vue-qr": vueQr,
+ skuSelect,
+
},
data() {
const checkPrice = (rule, value, callback) => {
@@ -322,6 +333,20 @@ export default {
this.getGiftList();
},
methods: {
+
+ changeSelect (e) {
+ // 已选商品批量选择
+ this.selectedGoods = e;
+ },
+ openSkuList () {
+ // 显示商品选择器
+ this.$refs.skuSelect.open("goods");
+ let data = JSON.parse(JSON.stringify(this.form.promotionGoodsList));
+ data.forEach((e) => {
+ e.id = e.skuId;
+ });
+ this.$refs.skuSelect.goodsData = data;
+ },
getDetail() {
// 获取活动详情
getFullDiscountById(this.id).then((res) => {
@@ -447,6 +472,14 @@ export default {
}
});
},
+ closeCurrentPage () {
+ this.$store.commit("removeTag", "full-cut-detail");
+ this.$store.commit("removeTag", "promotions/full-discount");
+ localStorage.storeOpenedList = JSON.stringify(
+ this.$store.state.app.storeOpenedList
+ );
+ this.$router.go(-1);
+ },
changeSelect (e) {
// 已选商品批量选择
this.selectedGoods = e;
diff --git a/manager/src/views/promotions/full-discount/full-discount.vue b/manager/src/views/promotions/full-discount/full-discount.vue
index dbc2ca30..1551d0fe 100644
--- a/manager/src/views/promotions/full-discount/full-discount.vue
+++ b/manager/src/views/promotions/full-discount/full-discount.vue
@@ -136,11 +136,7 @@ export default {
key: "endTime",
width: 170,
},
- {
- title: "店铺名称",
- key: "storeName",
- minWidth: 60,
- },
+
{
title: "活动类型",
slot: "promotionType",
diff --git a/manager/src/views/promotions/pintuan/pintuan.vue b/manager/src/views/promotions/pintuan/pintuan.vue
index a00b7ee4..4ca34e4e 100644
--- a/manager/src/views/promotions/pintuan/pintuan.vue
+++ b/manager/src/views/promotions/pintuan/pintuan.vue
@@ -56,6 +56,9 @@
+