+
diff --git a/src/views/Demo/index.vue b/src/views/Demo/index.vue
index 88c6719..38aca13 100644
--- a/src/views/Demo/index.vue
+++ b/src/views/Demo/index.vue
@@ -1,12 +1,24 @@
-
+
+
diff --git a/src/views/Home/index.vue b/src/views/Home/index.vue
index 2279fa4..da10be3 100644
--- a/src/views/Home/index.vue
+++ b/src/views/Home/index.vue
@@ -403,21 +403,20 @@ const stopLottery = async () => {
intervalTimer.value = null
canOperate.value = false
rollBall(0, 1)
- // 抽奖池是否为全体人员
- // 每次最多抽十个
luckyCount.value = 10
- const leftover = currentPrize.value.count - currentPrize.value.isUsedCount
- leftover < luckyCount.value ? luckyCount.value = leftover : luckyCount
- if (personPool.value.length < leftover) {
- toast.open({
- message: '抽奖人数不够',
- type: 'warning',
- position: 'top-right',
- duration: 10000
- })
-
- return;
+ // 自定义抽奖个数
+
+ let leftover = currentPrize.value.count - currentPrize.value.isUsedCount
+ const customCount=currentPrize.value.separateCount
+ if(customCount.enable&&customCount.countList.length>0){
+ for(let i=0;i
0) {
const randomIndex = Math.round(Math.random() * (personPool.value.length - 1))
@@ -465,6 +464,16 @@ const continueLottery = async () => {
if (!canOperate.value) {
return
}
+
+ const customCount=currentPrize.value.separateCount
+ if(customCount.enable&&customCount.countList.length>0){
+ for(let i=0;i= currentPrize.value.count) {
diff --git a/tailwind.config.js b/tailwind.config.js
index 14c1c36..136b8fc 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -4,6 +4,9 @@ module.exports = {
corePlugins: {
preflight: false
},
+ theme: {
+
+ },
content: ['./index.html', './src/**/*.{vue,js,ts,jsx,tsx}'],
plugins: [require('@tailwindcss/typography'), require('daisyui')],
daisyui: {