From 1973bb563e462df9fd200ee1a26fef2bb1d99f3f Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Tue, 19 Sep 2023 13:59:33 +0800
Subject: [PATCH] 2023.9.19

---
 src/views/activity/drawPrize.vue        | 11 +++++++++--
 src/views/page/MidAutumnLotteryDraw.vue |  4 ++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/views/activity/drawPrize.vue b/src/views/activity/drawPrize.vue
index 0cbb37d..956a3e4 100644
--- a/src/views/activity/drawPrize.vue
+++ b/src/views/activity/drawPrize.vue
@@ -47,11 +47,11 @@
               @click="$refs['addDrawPrize'].id = row.id,$refs['addDrawPrize'].isShow = true,$refs['addDrawPrize'].type = 'editor'">编辑
             </Button>
 
-            <Button v-if="row.activity_list_id === 8 && (row.draw_logs_count < row.total)" style="margin-left: 4px;" size="small" type="primary" ghost
+            <Button v-if="row.activity_list_id === 8 && !(row.draw_logs_count > 0)" style="margin-left: 4px;" size="small" type="primary" ghost
               @click="toDraw(1,row)">抽奖
             </Button>
 
-            <Button v-if="row.activity_list_id === 8 && !(row.draw_logs_count < row.total)" style="margin-left: 4px;" size="small" type="primary" ghost
+            <Button v-if="row.activity_list_id === 8 && (row.draw_logs_count > 0)" style="margin-left: 4px;" size="small" type="primary" ghost
               @click="toDraw(2,row)">中奖结果
             </Button>
 
@@ -184,6 +184,13 @@
     mounted() {
       this.load();
       this.loadActivity()
+
+      window.onfocus = () => {
+        this.load();
+      }
+    },
+    destroyed() {
+      window.onfocus = null;
     },
     created() {
       let type = parseInt(this.$route.path.split("_")[1]);
diff --git a/src/views/page/MidAutumnLotteryDraw.vue b/src/views/page/MidAutumnLotteryDraw.vue
index a45d261..ba5d06d 100644
--- a/src/views/page/MidAutumnLotteryDraw.vue
+++ b/src/views/page/MidAutumnLotteryDraw.vue
@@ -22,8 +22,8 @@
         </el-image>
 
         <div class="info">
-          <p>奖品： {{ config.draw_prize.price_item }}</p>
-          <p>本次抽取： {{ config.draw_prize.total }} 个</p>
+          <p>奖品： {{ config.draw_prize.price_item }} x {{ config.draw_prize.total }}个</p>
+          <p>本次抽取： {{ config.draw_prize.has_total }} 个</p>
           <p>赞助商： {{ config.draw_prize.apply }}</p>
         </div>
       </div>