From 6933522e3f1ffe8f8b1b7e169e2c54a7d24f0443 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 02 九月 2025 14:55:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 manager/src/views/activity-prize/index.vue |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/manager/src/views/activity-prize/index.vue b/manager/src/views/activity-prize/index.vue
index 60917a8..b3b0f58 100644
--- a/manager/src/views/activity-prize/index.vue
+++ b/manager/src/views/activity-prize/index.vue
@@ -88,8 +88,17 @@
             <Button
               type="info"
               size="small"
+              :disabled="!row.canSet"
               @click="setPrize(row)"
             >濂栧搧璁剧疆</Button>
+            <Button
+              type="info"
+              size="small"
+              :disabled="row.popup"
+              @click="setPopup(row)"
+              >
+              寮圭獥娲诲姩
+            </Button>
 <!--            <Button-->
 <!--              type="info"-->
 <!--              size="small"-->
@@ -489,7 +498,8 @@
   del,
   addActivityRefPrizeList,
   getActivityRefPrizeByActivityId,
-  publishPrizeActivity
+  publishPrizeActivity,
+  popup
 } from '@/api/activity-prize.js'
 import {delByKey, uploadFileByLmk} from "../../api/common";
 
@@ -746,6 +756,16 @@
     this.init();
   },
   methods: {
+    setPopup(row){
+      popup(row.id).then(res =>{
+        if (res.code === 200){
+          this.$Message.success(res.msg)
+          this.getPage()
+        }else {
+          this.$Message.error(res.msg)
+        }
+      })
+    },
     handleProbabilityInput(event, index) {
       const inputValue = event.target.value;
       let numericValue = parseFloat(inputValue);
@@ -900,7 +920,7 @@
         this.$Message.error("鎶藉宸插紑鍚紝涓嶈兘缂栬緫!")
         return
       }
-
+      //鍒ゆ柇鏄惁宸叉湁濂栧搧鏈夌殑璇濅笉璁╄缃�
       this.activityPrizeId = row.id;
       this.getPrizeList();
       this.prizeSettingShow = true;

--
Gitblit v1.8.0