Commit 59660f44 by zhangyongfeng

删除默认配置

parent cd7de73b
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<el-dialog <el-dialog
:visible="visible" :visible="visible"
:append-to-body="true" :append-to-body="true"
width="400px" width="390px"
@close="$emit('update:visible', false)" @close="$emit('update:visible', false)"
class="c-LotteryConfig" class="c-LotteryConfig"
> >
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
> >
</div> </div>
<div class="container"> <div class="container">
<el-form ref="form" :model="form" label-width="90px" size="mini"> <el-form ref="form" :model="form" size="mini">
<el-form-item label="抽奖标题"> <el-form-item label="抽奖标题">
<el-input v-model="form.name"></el-input> <el-input v-model="form.name"></el-input>
</el-form-item> </el-form-item>
...@@ -31,14 +31,6 @@ ...@@ -31,14 +31,6 @@
:step="1" :step="1"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="特等奖">
<el-input
type="number"
v-model="form.specialAward"
:min="0"
:step="1"
></el-input>
</el-form-item>
<el-form-item label="一等奖"> <el-form-item label="一等奖">
<el-input <el-input
type="number" type="number"
...@@ -47,39 +39,6 @@ ...@@ -47,39 +39,6 @@
:step="1" :step="1"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="二等奖">
<el-input
type="number"
v-model="form.secondPrize"
:min="0"
:step="1"
></el-input>
</el-form-item>
<el-form-item label="三等奖">
<el-input
type="number"
v-model="form.thirdPrize"
:min="0"
:step="1"
></el-input>
</el-form-item>
<el-form-item label="四等奖">
<el-input
type="number"
v-model="form.fourthPrize"
:min="0"
:step="1"
></el-input>
</el-form-item>
<el-form-item label="五等奖">
<el-input
type="number"
v-model="form.fifthPrize"
:min="0"
:step="1"
></el-input>
</el-form-item>
<el-form-item <el-form-item
:label="newitem.name" :label="newitem.name"
v-for="newitem in storeNewLottery" v-for="newitem in storeNewLottery"
......
...@@ -15,6 +15,10 @@ ...@@ -15,6 +15,10 @@
} }
*/ */
export function generateArray(start, end) {
return Array.from(new Array(end + 1).keys()).slice(start);
}
/** /**
* 取范围内随机整数 * 取范围内随机整数
* @param {number} minNum * @param {number} minNum
...@@ -30,13 +34,8 @@ export function randomNum(minNum = 1, maxNum) { ...@@ -30,13 +34,8 @@ export function randomNum(minNum = 1, maxNum) {
* @param {number} num 本次抽取人数 * @param {number} num 本次抽取人数
*/ */
export function luckydrawHandler(total, won = [], num) { export function luckydrawHandler(total, won = [], num) {
const peolist = []; const peolist = generateArray(1, Number(total));
for (let i = 1; i <= total; i++) {
peolist.push(i);
}
const wons = won; const wons = won;
const res = []; const res = [];
for (let j = 0; j < num; j++) { for (let j = 0; j < num; j++) {
const nodraws = peolist.filter(item => !wons.includes(item)); const nodraws = peolist.filter(item => !wons.includes(item));
......
...@@ -40,25 +40,9 @@ export const listField = 'list'; // 名单 ...@@ -40,25 +40,9 @@ export const listField = 'list'; // 名单
export function conversionCategoryName(key) { export function conversionCategoryName(key) {
let name = ''; let name = '';
switch (key) { switch (key) {
case 'specialAward':
name = '特等奖';
break;
case 'firstPrize': case 'firstPrize':
name = '一等奖'; name = '一等奖';
break; break;
case 'secondPrize':
name = '二等奖';
break;
case 'thirdPrize':
name = '三等奖';
break;
case 'fourthPrize':
name = '四等奖';
break;
case 'fifthPrize':
name = '五等奖';
break;
default: default:
break; break;
} }
......
...@@ -14,20 +14,10 @@ export default new Vuex.Store({ ...@@ -14,20 +14,10 @@ export default new Vuex.Store({
config: { config: {
name: '年会抽奖', name: '年会抽奖',
number: 70, number: 70,
specialAward: 0, firstPrize: 1
firstPrize: 1,
secondPrize: 5,
thirdPrize: 8,
fourthPrize: 10,
fifthPrize: 20
}, },
result: { result: {
specialAward: [], firstPrize: []
firstPrize: [],
secondPrize: [],
thirdPrize: [],
fourthPrize: [],
fifthPrize: []
}, },
newLottery: [], newLottery: [],
list: [], list: [],
...@@ -38,12 +28,7 @@ export default new Vuex.Store({ ...@@ -38,12 +28,7 @@ export default new Vuex.Store({
state.config = { state.config = {
name: '年会抽奖', name: '年会抽奖',
number: 70, number: 70,
specialAward: 0, firstPrize: 1
firstPrize: 1,
secondPrize: 5,
thirdPrize: 8,
fourthPrize: 10,
fifthPrize: 20
}; };
state.newLottery = []; state.newLottery = [];
}, },
...@@ -55,32 +40,17 @@ export default new Vuex.Store({ ...@@ -55,32 +40,17 @@ export default new Vuex.Store({
}, },
setClearResult(state) { setClearResult(state) {
state.result = { state.result = {
specialAward: [], firstPrize: []
firstPrize: [],
secondPrize: [],
thirdPrize: [],
fourthPrize: [],
fifthPrize: []
}; };
}, },
setClearStore(state) { setClearStore(state) {
state.config = { state.config = {
name: '年会抽奖', name: '年会抽奖',
number: 70, number: 70,
specialAward: 0, firstPrize: 1
firstPrize: 1,
secondPrize: 5,
thirdPrize: 8,
fourthPrize: 10,
fifthPrize: 20
}; };
state.result = { state.result = {
specialAward: [], firstPrize: []
firstPrize: [],
secondPrize: [],
thirdPrize: [],
fourthPrize: [],
fifthPrize: []
}; };
state.newLottery = []; state.newLottery = [];
state.list = []; state.list = [];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment