From 434b4de4578a8e3c8ad41e4f9c319de9c818976c Mon Sep 17 00:00:00 2001
From: lichong <18518571399@163.com>
Date: Tue, 19 Nov 2024 22:08:28 +0800
Subject: [PATCH] 11.19
---
front/package.json | 2 +-
front/src/renderer/src/views/shujufenxi.vue | 57 ++++++++++++++++-----
2 files changed, 45 insertions(+), 14 deletions(-)
diff --git a/front/package.json b/front/package.json
index d01e83c..989f719 100644
--- a/front/package.json
+++ b/front/package.json
@@ -1,6 +1,6 @@
{
"name": "electron",
- "version": "1.0.19",
+ "version": "1.0.20",
"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 6d84223..c1d89dc 100644
--- a/front/src/renderer/src/views/shujufenxi.vue
+++ b/front/src/renderer/src/views/shujufenxi.vue
@@ -90,7 +90,8 @@
- 输赢计算
+ 体彩
+ 福彩
清空
全部清空
@@ -108,6 +109,11 @@
+
+ 总押注：{{ _.sumBy(kaijiangqianlist, "zhu") }}
+ 总金额：{{ _.sumBy(kaijiangqianlist, "alljine") }}
+ 总赔付：{{ _.sumBy(kaijiangqianlist, "pei") }}
+
@@ -124,6 +130,11 @@
+
+ 总押注：{{ _.sumBy(kaijiangqianlist, "zhu") }}
+ 总金额：{{ _.sumBy(kaijiangqianlist, "alljine") }}
+ 总赔付：{{ _.sumBy(kaijiangqianlist, "pei") }}
+
@@ -165,6 +176,9 @@
|
类型
|
+
+ 总金额
+ |
总押注
|
@@ -193,6 +207,9 @@
体彩
|
+
+ {{ _.sumBy(_.filter(dialogData, { caipiaotype: "体彩" }), "alljine") }}
+ |
{{ _.sumBy(_.filter(dialogData, { caipiaotype: "体彩" }), "zhu") }}
|
@@ -230,6 +247,9 @@
福彩
|
+
+ {{ _.sumBy(_.filter(dialogData, { caipiaotype: "福彩" }), "alljine") }}
+ |
{{ _.sumBy(_.filter(dialogData, { caipiaotype: "福彩" }), "zhu") }}
|
@@ -264,7 +284,7 @@
-
+
-
+
@@ -962,9 +982,9 @@ export default {
let baishiArr = item.match(baishiReg) || ["", ""]
let shigeArr = item.match(shigeReg) || ["", ""]
let baigeArr = item.match(baigeReg) || ["", ""]
- let baishiList = baishiArr[1].split(/[,，]/)
- let shigeList = shigeArr[1].split(/[,，]/)
- let baigeList = baigeArr[1].split(/[,，]/)
+ let baishiList = _.compact(baishiArr[1].split(/[,，]/))
+ let shigeList = _.compact(shigeArr[1].split(/[,，]/))
+ let baigeList = _.compact(baigeArr[1].split(/[,，]/))
let length = baishiList.length + shigeList.length + baigeList.length
if (jine % (length * 10) !== 0) {
errorText.push(itemTemp)
@@ -1236,7 +1256,10 @@ export default {
},
// 开奖前预测弹窗关闭
closeDialog1() {
- this.kaijiangqian.visible = false
+ this.kaijiangqian = {
+ visible: false,
+ title: "开奖前预测",
+ }
},
// 中间清空数据
midClear() {
@@ -1552,20 +1575,24 @@ export default {
for (let index = 0; index < secondList.length; index++) {
let element = secondList[index];
if (element.caipiaotype === "体彩") {
- thirdData.push({ ...element })
+ if (element.zhongzhu) {
+ thirdData.push({ ...element })
+ }
}
}
for (let index = 0; index < secondList.length; index++) {
let element = secondList[index];
if (element.caipiaotype === "福彩") {
- thirdData.push({ ...element })
+ if (element.zhongzhu) {
+ thirdData.push({ ...element })
+ }
}
}
this.dialogData = _.cloneDeep(thirdData)
this.dialogForm.visible = true
},
// 开奖前预测
- kaijiangqianyuce() {
+ kaijiangqianyuce(type = []) {
// 选中的代理商
let checkDailishangRaw = _.find(this.dailishangList, { check: true })
if (!checkDailishangRaw) {
@@ -1588,13 +1615,13 @@ export default {
let item = rightTableDataLocal[i];
for (let j = 0; j < item.caipiaotype.length; j++) {
let element = item.caipiaotype[j];
- if (element == "体彩") {
+ if (element == "体彩" && type.includes("ti")) {
haomaList.push({
...item,
id: `ti${j}`,
caipiaotype: element
})
- } else if (element == "福彩") {
+ } else if (element == "福彩" && type.includes("fu")) {
haomaList.push({
...item,
id: `fu${j}`,
@@ -1674,7 +1701,11 @@ export default {
}
}
this.kaijiangqianlist = _.cloneDeep(thirdData)
- this.kaijiangqian.visible = true
+ let typeObj = { ti: "体彩", fu: "福彩", all: "体彩、福彩" }
+ this.kaijiangqian = {
+ visible: true,
+ title: `开奖前预测(${typeObj[type]})`,
+ }
},
},