+
@@ -262,6 +262,7 @@ const confirm_event = () => {
.url-value-content {
height: 57.3rem;
gap: 6rem;
+ overflow: hidden;
.left-content {
width: 22.5rem;
.el-menu-item {
diff --git a/src/components/model-coupon/index.vue b/src/components/model-coupon/index.vue
index 7157038c..f84a6ee1 100644
--- a/src/components/model-coupon/index.vue
+++ b/src/components/model-coupon/index.vue
@@ -217,7 +217,7 @@ onMounted(() => {
});
// 获取优惠券列表
const get_coupon = () => {
- const { number, type, keywords, expire_type_ids, use_limit_type_ids, order_by_type, order_by_rule, is_repeat_receive } = form.value;
+ const { number, type, keywords, expire_type_ids, use_limit_type_ids, order_by_type, order_by_rule, is_repeat_receive, is_show } = form.value;
const params = {
coupon_number: number,
coupon_type_ids: type.length > 0 ? type.join(',') : '',
@@ -227,6 +227,7 @@ const get_coupon = () => {
coupon_order_by_type: order_by_type,
coupon_order_by_rule: order_by_rule,
coupon_is_repeat_receive: is_repeat_receive,
+ coupon_is_show: is_show,
};
// 获取商品列表
CouponAPI.getCoupon(params).then((res: any) => {
@@ -240,8 +241,8 @@ const get_coupon = () => {
};
// 监听数据类型
const data_list_computer = computed(() => {
- const { data_type, type, number, data_list, keywords, expire_type_ids, use_limit_type_ids, order_by_type, order_by_rule, is_repeat_receive } = form.value;
- return { data_type, type, number, data_list, keywords, expire_type_ids, use_limit_type_ids, order_by_type, order_by_rule, is_repeat_receive };
+ const { data_type, type, number, data_list, keywords, expire_type_ids, use_limit_type_ids, order_by_type, order_by_rule, is_repeat_receive, is_show } = form.value;
+ return { data_type, type, number, data_list, keywords, expire_type_ids, use_limit_type_ids, order_by_type, order_by_rule, is_repeat_receive, is_show };
});
// 监听数据类型变化
watch(
diff --git a/src/components/model-custom/components/custom-dialog/index.vue b/src/components/model-custom/components/custom-dialog/index.vue
index 2315dd6d..604a894c 100644
--- a/src/components/model-custom/components/custom-dialog/index.vue
+++ b/src/components/model-custom/components/custom-dialog/index.vue
@@ -6,7 +6,9 @@
-
+
+
+
@@ -194,5 +196,10 @@ watch(() => default_data.value, (val) => {
\ No newline at end of file
diff --git a/src/config/const/coupon.ts b/src/config/const/coupon.ts
index d4ebfa20..ee74eb27 100644
--- a/src/config/const/coupon.ts
+++ b/src/config/const/coupon.ts
@@ -16,6 +16,7 @@ interface DefaultCoupon {
order_by_type: number,
order_by_rule: number,
is_repeat_receive: string,
+ is_show: string,
title: string;
desc: string;
data_list: object[];
@@ -61,6 +62,7 @@ const defaultCoupoin: DefaultCoupon = {
order_by_type: 0,
order_by_rule: 0,
is_repeat_receive: '0',
+ is_show: '0',
// 只有主题4用到
title: '先领券 再购物',
// 只有主题4用到