Merge remote-tracking branch 'origin/main'

11.19
2024-11-20 09:15:45 +08:00 · 2024-11-19 17:57:08 +08:00
1 changed files with 1 additions and 1 deletions
--- a/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue
@ -882,7 +882,7 @@ import {delLJGoods, listLJGoods} from "@/api/convenienceStore/ljgoods";
        const id = row.id || this.ids
        mmc(id).then(response => {
          this.form = response.data;
-          this.youhuiquanlist = response.data.cardValueChildList.filter(item => item.activeGift == '1')
+          this.youhuiquanlist = response.data.cardValueChildList
          this.duihuanquanlist = response.data.cardValueChildList.filter(item => item.activeGift == '2')
          this.dialog = true
          if (this.form.isonline==1) {
Author	SHA1	Message	Date
WN	8131596c93	Merge remote-tracking branch 'origin/main'	2024-11-20 09:15:45 +08:00
WN	bd1aed562b	11.19	2024-11-19 17:57:08 +08:00