From f1a56a80c9323df8b363eced1ea236b3f1fbfe30 Mon Sep 17 00:00:00 2001
From: "ex_zhangwenlei@exiot.cmcc" <15196725410@139.com>
Date: Wed, 24 Jan 2024 23:01:59 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=85=BC=E5=AE=B9=E5=8E=9F=E6=9C=89?=
 =?UTF-8?q?=E4=B8=8D=E5=90=AB=E9=85=8D=E7=BD=AE=E5=8D=95=E6=AC=A1=E6=8A=BD?=
 =?UTF-8?q?=E5=A5=96=E4=BA=BA=E6=95=B0=E7=9A=84=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Config/Person/PersonAll.vue  | 2 +-
 src/views/Config/Prize/PrizeConfig.vue | 6 +++---
 src/views/Home/index.vue               | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/Config/Person/PersonAll.vue b/src/views/Config/Person/PersonAll.vue
index 646f4ab..4467056 100644
--- a/src/views/Config/Person/PersonAll.vue
+++ b/src/views/Config/Person/PersonAll.vue
@@ -174,7 +174,7 @@ onMounted(() => {
                         <input type="file" class="" id="explore" style="display: none" @change="handleFileChange"
                             :accept="limitType" />
 
-                        <span class="btn btn-primary btn-sm">上传文件</span>
+                        <span class="btn btn-primary btn-sm">导入人员数据</span>
                     </div>
                 </label>
                 <!-- <button class="btn btn-primary btn-sm">上传excel</button> -->
diff --git a/src/views/Config/Prize/PrizeConfig.vue b/src/views/Config/Prize/PrizeConfig.vue
index b679a75..15cf0f7 100644
--- a/src/views/Config/Prize/PrizeConfig.vue
+++ b/src/views/Config/Prize/PrizeConfig.vue
@@ -67,7 +67,7 @@ const selectPrize = (item: IPrizeConfig) => {
 const changePrizeStatus=(item:IPrizeConfig)=>{
     if(item.isUsed==true){
         item.isUsedCount=0;
-        if(item.separateCount.countList.length){
+        if(item.separateCount&&item.separateCount.countList.length){
             item.separateCount.countList.forEach((countItem:any)=>{
                 countItem.isUsedCount=0;
             })
@@ -75,7 +75,7 @@ const changePrizeStatus=(item:IPrizeConfig)=>{
     }
     else{
         item.isUsedCount=item.count;
-        if(item.separateCount.countList.length){
+        if(item.separateCount&&item.separateCount.countList.length){
             item.separateCount.countList.forEach((countItem:any)=>{
                 countItem.isUsedCount=countItem.count;
             })
@@ -206,7 +206,7 @@ watch(() => prizeList.value, (val: IPrizeConfig[]) => {
                         </option>
                     </select>
                 </label>
-                <label class="w-full max-w-xs mb-10 form-control">
+                <label class="w-full max-w-xs mb-10 form-control" v-if="item.separateCount">
                     <div class="label">
                         <span class="label-text">单次抽取个数</span>
                     </div>
diff --git a/src/views/Home/index.vue b/src/views/Home/index.vue
index da10be3..4dd30ba 100644
--- a/src/views/Home/index.vue
+++ b/src/views/Home/index.vue
@@ -408,7 +408,7 @@ const stopLottery = async () => {
     
     let leftover = currentPrize.value.count - currentPrize.value.isUsedCount
     const customCount=currentPrize.value.separateCount
-    if(customCount.enable&&customCount.countList.length>0){
+    if(customCount&&customCount.enable&&customCount.countList.length>0){
         for(let i=0;i<customCount.countList.length;i++){
             if(customCount.countList[i].isUsedCount<customCount.countList[i].count){
                 leftover=customCount.countList[i].count-customCount.countList[i].isUsedCount
@@ -466,7 +466,7 @@ const continueLottery = async () => {
     }
 
     const customCount=currentPrize.value.separateCount
-    if(customCount.enable&&customCount.countList.length>0){
+    if(customCount&&customCount.enable&&customCount.countList.length>0){
         for(let i=0;i<customCount.countList.length;i++){
             if(customCount.countList[i].isUsedCount<customCount.countList[i].count){
                 customCount.countList[i].isUsedCount+= luckyCount.value