From 815581a6a31ec2e47d38df724967daaca103e8ce Mon Sep 17 00:00:00 2001
From: lichong <18518571399@163.com>
Date: Fri, 29 Nov 2024 22:47:57 +0800
Subject: [PATCH] 11.29
---
front/package.json | 2 +-
front/src/renderer/src/views/shujufenxi.vue | 177 ++++++++++++--------
2 files changed, 110 insertions(+), 69 deletions(-)
diff --git a/front/package.json b/front/package.json
index 4814d74..ec947bc 100644
--- a/front/package.json
+++ b/front/package.json
@@ -1,6 +1,6 @@
{
"name": "electron",
- "version": "1.0.21",
+ "version": "1.0.22",
"description": "An Electron application with Vue",
"main": "./out/main/index.js",
"author": "lichong",
diff --git a/front/src/renderer/src/views/shujufenxi.vue b/front/src/renderer/src/views/shujufenxi.vue
index adc2e11..c3ee7d4 100644
--- a/front/src/renderer/src/views/shujufenxi.vue
+++ b/front/src/renderer/src/views/shujufenxi.vue
@@ -214,7 +214,7 @@
{{ _.sumBy(_.filter(dialogDataLocal, { caipiaotype: "体彩" }), "zhu") }}
|
- {{ (((_.sumBy(_.filter(dialogData, { caipiaotype: "体彩" }), "alljine") || 0) *
+ {{ (((_.sumBy(_.filter(dialogDataLocal, { caipiaotype: "体彩" }), "alljine") || 0) *
(checkDailishangRaw.dailifei
|| 0)) / 100).toFixed(2) }}
|
@@ -225,16 +225,20 @@
{{ _.sumBy(_.filter(dialogData, { caipiaotype: "体彩" }), "pei") }}
- {{ ((_.sumBy(_.filter(dialogData, { caipiaotype: "体彩" }), "alljine") * (fuwufei.fuwufeiValue || 0)) /
+ {{ ((_.sumBy(_.filter(dialogDataLocal, { caipiaotype: "体彩" }), "alljine") * (fuwufei.fuwufeiValue ||
+ 0))
+ /
100).toFixed(2) }}
|
- {{ ((_.sumBy(_.filter(dialogData, { caipiaotype: "体彩" }), "alljine") || 0) -
- Number((((_.sumBy(_.filter(dialogData, { caipiaotype: "体彩" }), "alljine") || 0) *
+ {{ ((_.sumBy(_.filter(dialogDataLocal, { caipiaotype: "体彩" }), "alljine") || 0) -
+ Number((((_.sumBy(_.filter(dialogDataLocal, { caipiaotype: "体彩" }), "alljine") || 0) *
((checkDailishangRaw.dailifei || 0))) /
100).toFixed(2)) - _.sumBy(_.filter(dialogData, { caipiaotype: "体彩" }), "zhong")
- - Number(((_.sumBy(_.filter(dialogData, { caipiaotype: "体彩" }), "alljine") * (fuwufei.fuwufeiValue ||
- 0))
+ - Number(((_.sumBy(_.filter(dialogDataLocal, { caipiaotype: "体彩" }), "alljine") *
+ (fuwufei.fuwufeiValue
+ ||
+ 0))
/
100).toFixed(2))).toFixed(2)
}}
@@ -254,7 +258,7 @@
{{ _.sumBy(_.filter(dialogDataLocal, { caipiaotype: "福彩" }), "zhu") }}
|
- {{ (((_.sumBy(_.filter(dialogData, { caipiaotype: "福彩" }), "alljine") || 0) *
+ {{ (((_.sumBy(_.filter(dialogDataLocal, { caipiaotype: "福彩" }), "alljine") || 0) *
(checkDailishangRaw.dailifei
|| 0)) / 100).toFixed(2) }}
|
@@ -265,16 +269,20 @@
{{ _.sumBy(_.filter(dialogData, { caipiaotype: "福彩" }), "pei") }}
- {{ ((_.sumBy(_.filter(dialogData, { caipiaotype: "福彩" }), "alljine") * (fuwufei.fuwufeiValue || 0)) /
+ {{ ((_.sumBy(_.filter(dialogDataLocal, { caipiaotype: "福彩" }), "alljine") * (fuwufei.fuwufeiValue ||
+ 0))
+ /
100).toFixed(2) }}
|
- {{ ((_.sumBy(_.filter(dialogData, { caipiaotype: "福彩" }), "alljine") || 0) -
- Number((((_.sumBy(_.filter(dialogData, { caipiaotype: "福彩" }), "alljine") || 0) *
+ {{ ((_.sumBy(_.filter(dialogDataLocal, { caipiaotype: "福彩" }), "alljine") || 0) -
+ Number((((_.sumBy(_.filter(dialogDataLocal, { caipiaotype: "福彩" }), "alljine") || 0) *
((checkDailishangRaw.dailifei || 0))) /
100).toFixed(2)) - _.sumBy(_.filter(dialogData, { caipiaotype: "福彩" }), "zhong")
- - Number(((_.sumBy(_.filter(dialogData, { caipiaotype: "福彩" }), "alljine") * (fuwufei.fuwufeiValue ||
- 0))
+ - Number(((_.sumBy(_.filter(dialogDataLocal, { caipiaotype: "福彩" }), "alljine") *
+ (fuwufei.fuwufeiValue
+ ||
+ 0))
/
100).toFixed(2))).toFixed(2)
}}
@@ -296,10 +304,7 @@
押注类型
|
- 总押注
- |
-
- 中奖注
+ 中奖注数
|
押注金额
@@ -320,9 +325,6 @@
|
{{ item.zhu }}
|
-
- {{ item.zhongzhu }}
- |
{{ item.alljine }}
|
@@ -385,7 +387,7 @@
{{ _.sumBy(_.filter(dialogDataLocal, { caipiaotype: "体彩" }), "zhu") }}
- {{ (((_.sumBy(_.filter(dialogData, { caipiaotype: "体彩" }), "alljine") || 0) *
+ {{ (((_.sumBy(_.filter(dialogDataLocal, { caipiaotype: "体彩" }), "alljine") || 0) *
(checkDailishangRaw.dailifei
|| 0)) / 100).toFixed(2) }}
|
@@ -396,16 +398,20 @@
{{ _.sumBy(_.filter(dialogData, { caipiaotype: "体彩" }), "pei") }}
- {{ ((_.sumBy(_.filter(dialogData, { caipiaotype: "体彩" }), "alljine") * (fuwufei.fuwufeiValue || 0)) /
+ {{ ((_.sumBy(_.filter(dialogDataLocal, { caipiaotype: "体彩" }), "alljine") * (fuwufei.fuwufeiValue ||
+ 0))
+ /
100).toFixed(2) }}
|
- {{ ((_.sumBy(_.filter(dialogData, { caipiaotype: "体彩" }), "alljine") || 0) -
- Number((((_.sumBy(_.filter(dialogData, { caipiaotype: "体彩" }), "alljine") || 0) *
+ {{ ((_.sumBy(_.filter(dialogDataLocal, { caipiaotype: "体彩" }), "alljine") || 0) -
+ Number((((_.sumBy(_.filter(dialogDataLocal, { caipiaotype: "体彩" }), "alljine") || 0) *
((checkDailishangRaw.dailifei || 0))) /
100).toFixed(2)) - _.sumBy(_.filter(dialogData, { caipiaotype: "体彩" }), "zhong")
- - Number(((_.sumBy(_.filter(dialogData, { caipiaotype: "体彩" }), "alljine") * (fuwufei.fuwufeiValue ||
- 0))
+ - Number(((_.sumBy(_.filter(dialogDataLocal, { caipiaotype: "体彩" }), "alljine") *
+ (fuwufei.fuwufeiValue
+ ||
+ 0))
/
100).toFixed(2))).toFixed(2)
}}
@@ -425,7 +431,7 @@
{{ _.sumBy(_.filter(dialogDataLocal, { caipiaotype: "福彩" }), "zhu") }}
|
- {{ (((_.sumBy(_.filter(dialogData, { caipiaotype: "福彩" }), "alljine") || 0) *
+ {{ (((_.sumBy(_.filter(dialogDataLocal, { caipiaotype: "福彩" }), "alljine") || 0) *
(checkDailishangRaw.dailifei
|| 0)) / 100).toFixed(2) }}
|
@@ -436,16 +442,20 @@
{{ _.sumBy(_.filter(dialogData, { caipiaotype: "福彩" }), "pei") }}
- {{ ((_.sumBy(_.filter(dialogData, { caipiaotype: "福彩" }), "alljine") * (fuwufei.fuwufeiValue || 0)) /
+ {{ ((_.sumBy(_.filter(dialogDataLocal, { caipiaotype: "福彩" }), "alljine") * (fuwufei.fuwufeiValue ||
+ 0))
+ /
100).toFixed(2) }}
|
- {{ ((_.sumBy(_.filter(dialogData, { caipiaotype: "福彩" }), "alljine") || 0) -
- Number((((_.sumBy(_.filter(dialogData, { caipiaotype: "福彩" }), "alljine") || 0) *
+ {{ ((_.sumBy(_.filter(dialogDataLocal, { caipiaotype: "福彩" }), "alljine") || 0) -
+ Number((((_.sumBy(_.filter(dialogDataLocal, { caipiaotype: "福彩" }), "alljine") || 0) *
((checkDailishangRaw.dailifei || 0))) /
100).toFixed(2)) - _.sumBy(_.filter(dialogData, { caipiaotype: "福彩" }), "zhong")
- - Number(((_.sumBy(_.filter(dialogData, { caipiaotype: "福彩" }), "alljine") * (fuwufei.fuwufeiValue ||
- 0))
+ - Number(((_.sumBy(_.filter(dialogDataLocal, { caipiaotype: "福彩" }), "alljine") *
+ (fuwufei.fuwufeiValue
+ ||
+ 0))
/
100).toFixed(2))).toFixed(2)
}}
@@ -467,10 +477,7 @@
押注类型
|
- 总押注
- |
-
- 中奖注
+ 中奖注数
|
押注金额
@@ -491,9 +498,6 @@
|
{{ item.zhu }}
|
-
- {{ item.zhongzhu }}
- |
{{ item.alljine }}
|
@@ -725,15 +729,11 @@ export default {
// 选中前面一个
async preSelect() {
let index = this.dailishangList.findIndex(item => item.check)
- console.log(5785, index);
-
await this.checkRow(this.dailishangList[index - 1])
},
// 选中后面一个
async nextSelect() {
let index = this.dailishangList.findIndex(item => item.check)
- console.log(575, index, this.dailishangList[index + 1]);
-
await this.checkRow(this.dailishangList[index + 1])
},
// 选中数据
@@ -1042,7 +1042,6 @@ export default {
let match = item.match(this.fushi)
let numbers = match[1].replace(/\s+/g, '').replace(/[,，\.]+/g, ',');
haoma = _.compact(_.split(numbers, ","))
- console.log(887, haoma);
if (jine % (haoma.length * 6) !== 0) {
errorText.push(itemTemp)
continue
@@ -1206,7 +1205,6 @@ export default {
children: children
})
}
- console.log(1065, fucaiGroupy);
for (let key in fucaiGroupy) {
let value = fucaiGroupy[key]
let children = []
@@ -1235,7 +1233,6 @@ export default {
children: children
})
}
- console.log(1094, ticaiList, fucaiList);
this.rightTableDataTi = ticaiList
this.rightTableDataFu = fucaiList
},
@@ -1342,7 +1339,6 @@ export default {
// 选中的场次
let selectChangci = _.find(this.changciList, { value: this.changciValue })
this.selectChangci = selectChangci
- console.log(1281, selectChangci, this.changciList);
// 中奖号码
let zhonghaoma = `${selectChangci.first}${selectChangci.second}${selectChangci.third}`
let rightTableDataLocal = _.cloneDeep(this.rightTableData)
@@ -1355,7 +1351,6 @@ export default {
return
}
let haomaList = []
- console.log(1293, rightTableDataLocal);
for (let i = 0; i < rightTableDataLocal.length; i++) {
let item = rightTableDataLocal[i];
for (let j = 0; j < item.caipiaotype.length; j++) {
@@ -1375,7 +1370,6 @@ export default {
}
}
}
- console.log(1313, haomaList);
let firstList = []
for (let i = 0; i < haomaList.length; i++) {
let element = haomaList[i]
@@ -1395,6 +1389,7 @@ export default {
if (["danxuan"].includes(element.type)) {
item["xiangmu"] = `${element.value}`
item["alljine"] = Number(element.jine)
+ item["zhu"] = Number(element.jine) / 2
if (item["xiangmu"] === zhonghaoma) {
item["zhong"] = Number(element.jine) * Number(formData[element.type])
item["zhongzhu"] = 1
@@ -1409,8 +1404,11 @@ export default {
else if (["zuxuan"].includes(element.type)) {
item["xiangmu"] = `${element.value}`
item["alljine"] = Number(element.jine)
+ item["zhu"] = Number(element.jine) / 2
let zhonghaomaArr = `${zhonghaoma}`.split("")
let xiangmuArr = `${element.value}`.split("")
+ zhonghaomaArr = _.uniq(zhonghaomaArr)
+ xiangmuArr = _.uniq(xiangmuArr)
if (_.difference(zhonghaomaArr, xiangmuArr).length === 0) {
item["zhong"] = Number(element.jine) * Number(formData[element.type])
item["zhongzhu"] = 1
@@ -1425,9 +1423,12 @@ export default {
else if (["zuliu4", "zuliu5", "zuliu6", "zuliu7"].includes(element.type)) {
item["xiangmu"] = `${element.value}`
item["alljine"] = Number(element.jine)
+ item["zhu"] = Number(element.jine) / 10
let zhonghaomaArr = `${zhonghaoma}`.split("")
let xiangmuArr = `${element.value}`.split("")
- if (_.uniq(zhonghaomaArr).length === 3 && _.difference(zhonghaomaArr, xiangmuArr).length === 0) {
+ zhonghaomaArr = _.uniq(zhonghaomaArr)
+ xiangmuArr = _.uniq(xiangmuArr)
+ if (zhonghaomaArr.length === 3 && _.difference(zhonghaomaArr, xiangmuArr).length === 0) {
item["zhong"] = Number(element.jine) * Number(formData[element.type])
item["zhongzhu"] = 1
item["pei"] = Number(element.jine) * Number(formData[element.type])
@@ -1441,9 +1442,12 @@ export default {
else if (["zusan4", "zusan5", "zusan6", "zusan7"].includes(element.type)) {
item["xiangmu"] = `${element.value}`
item["alljine"] = Number(element.jine)
+ item["zhu"] = Number(element.jine) / 10
let zhonghaomaArr = `${zhonghaoma}`.split("")
let xiangmuArr = `${element.value}`.split("")
- if (_.uniq(zhonghaomaArr).length < 3 && _.difference(zhonghaomaArr, xiangmuArr).length === 0) {
+ zhonghaomaArr = _.uniq(zhonghaomaArr)
+ xiangmuArr = _.uniq(xiangmuArr)
+ if (zhonghaomaArr.length < 3 && _.difference(zhonghaomaArr, xiangmuArr).length === 0) {
item["zhong"] = Number(element.jine) * Number(formData[element.type])
item["zhongzhu"] = 1
item["pei"] = Number(element.jine) * Number(formData[element.type])
@@ -1457,9 +1461,16 @@ export default {
else if (["shuangfei"].includes(element.type)) {
item["xiangmu"] = `${element.value}`
item["alljine"] = Number(element.jine)
+ item["zhu"] = Number(element.jine) / 10
let zhonghaomaArr = `${zhonghaoma}`.split("")
let xiangmuArr = `${element.value}`.split("")
- if (_.difference(zhonghaomaArr, xiangmuArr).length <= 1) {
+ zhonghaomaArr = _.uniq(zhonghaomaArr)
+ xiangmuArr = _.uniq(xiangmuArr)
+ if (xiangmuArr.length === 2 && zhonghaomaArr.includes(xiangmuArr[0]) && zhonghaomaArr.includes(xiangmuArr[1])) {
+ item["zhong"] = Number(element.jine) * Number(formData[element.type])
+ item["zhongzhu"] = 1
+ item["pei"] = Number(element.jine) * Number(formData[element.type])
+ } else if (xiangmuArr.length === 1 && zhonghaomaArr.includes(xiangmuArr[0])) {
item["zhong"] = Number(element.jine) * Number(formData[element.type])
item["zhongzhu"] = 1
item["pei"] = Number(element.jine) * Number(formData[element.type])
@@ -1473,9 +1484,12 @@ export default {
else if (["dudan"].includes(element.type)) {
item["xiangmu"] = `${element.value}`
item["alljine"] = Number(element.jine)
+ item["zhu"] = Number(element.jine) / 10
let zhonghaomaArr = `${zhonghaoma}`.split("")
let xiangmuArr = `${element.value}`.split("")
- if (_.difference(zhonghaomaArr, xiangmuArr).length === 2) {
+ zhonghaomaArr = _.uniq(zhonghaomaArr)
+ xiangmuArr = _.uniq(xiangmuArr)
+ if (xiangmuArr.length === 1 && zhonghaomaArr.includes(xiangmuArr[0])) {
item["zhong"] = Number(element.jine) * Number(formData[element.type])
item["zhongzhu"] = 1
item["pei"] = Number(element.jine) * Number(formData[element.type])
@@ -1489,6 +1503,7 @@ export default {
else if (["yimadingwei"].includes(element.type)) {
item["xiangmu"] = `${element.value}`
item["alljine"] = Number(element.jine)
+ item["zhu"] = Number(element.jine) / 10
let zhonghaomaArr = `${zhonghaoma}`.split("")
if (element.typePos === "百" && zhonghaomaArr[0] === `${element.value}`) {
item["zhong"] = Number(element.jine) * Number(formData["dingwei1"])
@@ -1512,6 +1527,7 @@ export default {
else if (["liangmadingwei"].includes(element.type)) {
item["xiangmu"] = `${element.value}`
item["alljine"] = Number(element.jine)
+ item["zhu"] = Number(element.jine) / 10
let zhonghaomaArr = `${zhonghaoma}`.split("")
let xiangmuArr = `${element.value}`.split("")
if (element.typePos === "百十" && zhonghaomaArr[0] === xiangmuArr[0] && zhonghaomaArr[1] === xiangmuArr[1]) {
@@ -1536,15 +1552,14 @@ export default {
else if (["fushi"].includes(element.type)) {
item["xiangmu"] = `${element.value}`
item["alljine"] = Number(element.jine)
+ item["zhu"] = Number(element.jine) / 6
let zhonghaomaArr = `${zhonghaoma}`.split("")
let xiangmuArr = `${element.value}`.split("")
- xiangmuArr = _.uniq(xiangmuArr)
- if (_.difference(zhonghaomaArr, xiangmuArr).length <= 1) {
- if (xiangmuArr.length === 2) {
- item["zhong"] = Number(element.jine) * Number(formData["fushiduizi"])
- item["zhongzhu"] = 1
- item["pei"] = Number(element.jine) * Number(formData["fushiduizi"])
- } else if (xiangmuArr.length === 3) {
+ xiangmuArr = xiangmuArr.sort()
+ zhonghaomaArr = zhonghaomaArr.sort()
+ let zhonghaomaArrLength = _.uniq(zhonghaomaArr).length
+ if (zhonghaomaArrLength === 3) {
+ if (xiangmuArr[0] === zhonghaomaArr[0] && xiangmuArr[1] === zhonghaomaArr[1] && xiangmuArr[2] === zhonghaomaArr[2]) {
item["zhong"] = Number(element.jine) * Number(formData["fushi"])
item["zhongzhu"] = 1
item["pei"] = Number(element.jine) * Number(formData["fushi"])
@@ -1553,16 +1568,23 @@ export default {
item["zhongzhu"] = 0
item["pei"] = 0
}
- } else {
- item["zhong"] = 0
- item["zhongzhu"] = 0
- item["pei"] = 0
+ } else if (zhonghaomaArrLength <= 2) {
+ if (xiangmuArr[0] === zhonghaomaArr[0] && xiangmuArr[1] === zhonghaomaArr[1] && xiangmuArr[2] === zhonghaomaArr[2]) {
+ item["zhong"] = Number(element.jine) * Number(formData["fushiduizi"])
+ item["zhongzhu"] = 1
+ item["pei"] = Number(element.jine) * Number(formData["fushiduizi"])
+ } else {
+ item["zhong"] = 0
+ item["zhongzhu"] = 0
+ item["pei"] = 0
+ }
}
}
// 处理全包对子的玩法
else if (["quanbaoduizi"].includes(element.type)) {
item["xiangmu"] = `全包对子`
item["alljine"] = Number(element.jine)
+ item["zhu"] = Number(element.jine) / 10
let zhonghaomaArr = `${zhonghaoma}`.split("")
if (zhonghaomaArr.length <= 2) {
item["zhong"] = Number(element.jine) * Number(formData[element.type])
@@ -1578,6 +1600,7 @@ export default {
else if (["baozi"].includes(element.type)) {
item["xiangmu"] = "豹子"
item["alljine"] = Number(element.jine)
+ item["zhu"] = Number(element.jine) / 2
let zhonghaomaArr = `${zhonghaoma}`.split("")
zhonghaomaArr = _.uniq(zhonghaomaArr)
let xiangmuArr = `${element.value}`.split("")
@@ -1599,7 +1622,7 @@ export default {
let element = firstList[i];
let secondItem = _.find(secondList, { xiangmutype: `${element.xiangmu}${element.type}${element.caipiaotype}` })
if (secondItem) {
- secondItem.zhu += 1
+ secondItem.zhu += element.zhu
secondItem.alljine += element.alljine
secondItem.pei += element.pei
secondItem.zhong += element.zhong
@@ -1608,13 +1631,11 @@ export default {
secondList.push({
...element,
xiangmutype: `${element.xiangmu}${element.type}${element.caipiaotype}`,
- zhu: 1
})
}
}
let thirdData = []
let thirdDataLocal = []
- console.log(1512, firstList, secondList);
for (let index = 0; index < secondList.length; index++) {
let element = secondList[index];
if (element.caipiaotype === "体彩") {
@@ -1677,6 +1698,25 @@ export default {
}
}
let firstList = []
+ let jishu = {
+ danxuan: 2,
+ zuxuan: 2,
+ baozi: 2,
+ fushi: 6,
+ zuliu4: 10,
+ zuliu5: 10,
+ zuliu6: 10,
+ zuliu7: 10,
+ zusan4: 10,
+ zusan5: 10,
+ zusan6: 10,
+ zusan7: 10,
+ shuangfei: 10,
+ dudan: 10,
+ quanbaoduizi: 10,
+ yimadingwei: 10,
+ liangmadingwei: 10
+ }
for (let i = 0; i < haomaList.length; i++) {
let element = haomaList[i]
// 单选
@@ -1685,6 +1725,7 @@ export default {
caipiaotype: element.caipiaotype,
valuelabel: `${element.valuelabel}`
}
+ item["zhu"] = Number(element.jine) / jishu[element.type]
if (["danxuan", "zuxuan", "zuliu4", "zuliu5", "zuliu6", "zuliu7", "zusan4", "zusan5", "zusan6", "zusan7", "shuangfei", "dudan", "quanbaoduizi", "baozi"].includes(element.type)) {
item["xiangmu"] = `${element.value}`
item["type"] = `${element.name}`
@@ -1722,14 +1763,13 @@ export default {
let element = firstList[i];
let secondItem = _.find(secondList, { xiangmutype: `${element.valuelabel}${element.caipiaotype}${element.type}` })
if (secondItem) {
- secondItem.zhu += 1
+ secondItem.zhu += element.zhu
secondItem.alljine += element.alljine
secondItem.pei += element.pei
} else {
secondList.push({
...element,
xiangmutype: `${element.valuelabel}${element.caipiaotype}${element.type}`,
- zhu: 1
})
}
}
@@ -1748,6 +1788,7 @@ export default {
}
this.kaijiangqianlist = _.cloneDeep(thirdData)
let typeObj = { ti: "体彩", fu: "福彩", all: "体彩、福彩" }
+ console.log(1794, this.kaijiangqianlist);
this.kaijiangqian = {
visible: true,
title: `开奖前预测(${typeObj[type]})`,