diff --git a/src/common/js/betCompute.js b/src/common/js/betCompute.js
index 27a74316..0ef03f80 100644
--- a/src/common/js/betCompute.js
+++ b/src/common/js/betCompute.js
@@ -1,83 +1,95 @@
var fn={};
fn.showChip=function(e,chiptype,downbet,gameId){
if(downbet==0){return false};
-var w5 = parseInt(downbet / 50000),
- w2 = parseInt((downbet - w5 * 50000) / 20000),
- w1 = parseInt((downbet - w5 * 50000 - w2 * 20000) / 10000),
- w = parseInt(downbet / 10000),
- k5 = parseInt((downbet - w * 10000) / 5000),
- k2 = parseInt((downbet - w * 10000 - k5 * 5000) / 2000),
- k1 = parseInt((downbet - w * 10000 - k5 * 5000 - k2 * 2000) / 1000),
- k = parseInt((downbet - w * 10000) / 1000),
- b5 = parseInt((downbet - w * 10000 - k * 1000) / 500),
- b2 = parseInt((downbet - w * 10000 - k * 1000 - b5 * 500) / 200),
- b1 = parseInt((downbet - w * 10000 - k * 1000 - b5 * 500 - b2 * 200) / 100),
- b = parseInt((downbet - w * 10000 - k * 1000) / 100),
- s5 = parseInt((downbet - w * 10000 - k * 1000 - b * 100) / 50),
- s2 = parseInt((downbet - w * 10000 - k * 1000 - b * 100 - s5 * 50) / 20),
- s1 = parseInt((downbet - w * 10000 - k * 1000 - b * 100 - s5 * 50 - s2 * 20) / 10),
- s = parseInt((downbet - w * 10000 - k * 1000 - b * 100) / 10),
- y5 = parseInt((downbet - w * 10000 - k * 1000 - b * 100 - s * 10) / 5);
+// 新的 K 格式筹码计算逻辑
+var k100000 = parseInt(downbet / 100000000),
+ k50000 = parseInt((downbet - k100000 * 100000000) / 50000000),
+ k20000 = parseInt((downbet - k100000 * 100000000 - k50000 * 50000000) / 20000000),
+ k10000 = parseInt((downbet - k100000 * 100000000 - k50000 * 50000000 - k20000 * 20000000) / 10000000),
+ k5000 = parseInt((downbet - k100000 * 100000000 - k50000 * 50000000 - k20000 * 20000000 - k10000 * 10000000) / 5000000),
+ k2000 = parseInt((downbet - k100000 * 100000000 - k50000 * 50000000 - k20000 * 20000000 - k10000 * 10000000 - k5000 * 5000000) / 2000000),
+ k1000 = parseInt((downbet - k100000 * 100000000 - k50000 * 50000000 - k20000 * 20000000 - k10000 * 10000000 - k5000 * 5000000 - k2000 * 2000000) / 1000000),
+ k500 = parseInt((downbet - k100000 * 100000000 - k50000 * 50000000 - k20000 * 20000000 - k10000 * 10000000 - k5000 * 5000000 - k2000 * 2000000 - k1000 * 1000000) / 500000),
+ k200 = parseInt((downbet - k100000 * 100000000 - k50000 * 50000000 - k20000 * 20000000 - k10000 * 10000000 - k5000 * 5000000 - k2000 * 2000000 - k1000 * 1000000 - k500 * 500000) / 200000),
+ k100 = parseInt((downbet - k100000 * 100000000 - k50000 * 50000000 - k20000 * 20000000 - k10000 * 10000000 - k5000 * 5000000 - k2000 * 2000000 - k1000 * 1000000 - k500 * 500000 - k200 * 200000) / 100000),
+ k50 = parseInt((downbet - k100000 * 100000000 - k50000 * 50000000 - k20000 * 20000000 - k10000 * 10000000 - k5000 * 5000000 - k2000 * 2000000 - k1000 * 1000000 - k500 * 500000 - k200 * 200000 - k100 * 100000) / 50000),
+ k20 = parseInt((downbet - k100000 * 100000000 - k50000 * 50000000 - k20000 * 20000000 - k10000 * 10000000 - k5000 * 5000000 - k2000 * 2000000 - k1000 * 1000000 - k500 * 500000 - k200 * 200000 - k100 * 100000 - k50 * 50000) / 20000),
+ k10 = parseInt((downbet - k100000 * 100000000 - k50000 * 50000000 - k20000 * 20000000 - k10000 * 10000000 - k5000 * 5000000 - k2000 * 2000000 - k1000 * 1000000 - k500 * 500000 - k200 * 200000 - k100 * 100000 - k50 * 50000 - k20 * 20000) / 10000);
var str='';
- for (var o = 0; o < w5; o++) {
- str=str+''
+ var stackCount = 0;
+ for (var a = 0; a < k100000; a++) {
+ str=str+'';
+ stackCount++;
}
- for (var p = 0; p < w2; p++) {
- str=str+''
+ for (var b = 0; b < k50000; b++) {
+ str=str+'';
+ stackCount++;
}
- for (var q = 0; q < w1; q++) {
- str=str+''
+ for (var c = 0; c < k20000; c++) {
+ str=str+'';
+ stackCount++;
}
- for (var r = 0; r < k5; r++) {
- str=str+''
+ for (var d = 0; d < k10000; d++) {
+ str=str+'';
+ stackCount++;
}
- for (var t = 0; t < k2; t++) {
- str=str+''
+ for (var f = 0; f < k5000; f++) {
+ str=str+'';
+ stackCount++;
}
- for (var u = 0; u < k1; u++) {
- str=str+''
+ for (var g = 0; g < k2000; g++) {
+ str=str+'';
+ stackCount++;
}
- for (var v = 0; v < b5; v++) {
- str=str+''
+ for (var h = 0; h < k1000; h++) {
+ str=str+'';
+ stackCount++;
}
- for (var w = 0; w < b2; w++) {
- str=str+''
+ for (var i = 0; i < k500; i++) {
+ str=str+'';
+ stackCount++;
}
- for (var x = 0; x < b1; x++) {
- str=str+''
+ for (var j = 0; j < k200; j++) {
+ str=str+'';
+ stackCount++;
}
- for (var z = 0; z < s5; z++) {
- str=str+''
+ for (var l = 0; l < k100; l++) {
+ str=str+'';
+ stackCount++;
}
-
- for (var k = 0; k < s2; k++) {
- str=str+''
+ for (var m = 0; m < k50; m++) {
+ str=str+'';
+ stackCount++;
}
- for (var j = 0; j < s1; j++) {
- str=str+''
+ for (var n = 0; n < k20; n++) {
+ str=str+'';
+ stackCount++;
}
- for (var l = 0; l < y5; l++) {
- str=str+''
+ for (var o = 0; o < k10; o++) {
+ str=str+'';
+ stackCount++;
}
if (downbet > 0) {
+ // 格式化显示金额，添加千位分隔符
+ var displayBet = downbet.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
if(gameId==1||gameId==2){
- str=str+'' + downbet + ''
+ str=str+'' + displayBet + ''
}else if(gameId==4){
- var index = chiptype.lastIndexOf("\_");
+ var index = chiptype.lastIndexOf("\_");
var times= chiptype.substring(index + 1, chiptype.length);
if(times=='double'){
- str=str+'' + downbet + '预扣：'+downbet*4+''
+ str=str+'' + displayBet + '预扣：'+(downbet*4).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")+''
}else if(times=='haploid'){
- str=str+'' + downbet + ''
+ str=str+'' + displayBet + ''
}
}
else if(gameId==5){
var index = chiptype.lastIndexOf("\_");
var times= chiptype.substring(index + 1, chiptype.length);
if(times=='double'){
- str=str+'' + downbet + '预扣：'+downbet*19+''
+ str=str+'' + displayBet + '预扣：'+(downbet*19).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")+''
}else if(times=='haploid'){
- str=str+'' + downbet + ''
+ str=str+'' + displayBet + ''
}
}
}
diff --git a/src/components/multiple-tab/multiple-tab.css b/src/components/multiple-tab/multiple-tab.css
index 5a6f5810..51fc2e1e 100644
--- a/src/components/multiple-tab/multiple-tab.css
+++ b/src/components/multiple-tab/multiple-tab.css
@@ -247,47 +247,44 @@
transition: all 0.1s;
}
-.multipleTab .chip-view .chip-5{
- background-position: -2px -89px;
-}
-.multipleTab .chip-view .chip-10{
+/* 新的 K 格式筹码样式 - 需要配合新的 chip.png 图片使用 */
+.multipleTab .chip-view .chip-10k{
background-position: -1px -3px;
}
-.multipleTab .chip-view .chip-20{
+.multipleTab .chip-view .chip-20k{
background-position: -2px -46px;
}
-.multipleTab .chip-view .chip-50{
+.multipleTab .chip-view .chip-50k{
background-position: -43px -89px;
}
-.multipleTab .chip-view .chip-100{
+.multipleTab .chip-view .chip-100k{
background-position: -42px -3px;
}
-.multipleTab .chip-view .chip-200{
+.multipleTab .chip-view .chip-200k{
background-position: -42px -46px;
}
-.multipleTab .chip-view .chip-500{
+.multipleTab .chip-view .chip-500k{
background-position: -83px -89px;
}
-.multipleTab .chip-view .chip-1k{
+.multipleTab .chip-view .chip-1000k{
background-position: -83px -3px;
}
-.multipleTab .chip-view .chip-2k{
+.multipleTab .chip-view .chip-2000k{
background-position: -83px -45.5px;
}
-.multipleTab .chip-view .chip-5k{
+.multipleTab .chip-view .chip-5000k{
background-position: -124px -89px;
}
-.multipleTab .chip-view .chip-1w{
+.multipleTab .chip-view .chip-10000k{
background-position: -124px -2.5px;
}
-.multipleTab .chip-view .chip-2w{
+.multipleTab .chip-view .chip-20000k{
background-position: -124px -45.5px;
}
-
-.multipleTab .chip-view .chip-10w{
+.multipleTab .chip-view .chip-50000k{
background-position: -165px -2.5px;
}
-.multipleTab .chip-view .chip-20w{
+.multipleTab .chip-view .chip-100000k{
background-position: -165px -45px;
}
@@ -566,58 +563,59 @@
}
-.multipleTab .chip-box .chip-5 {
- background-position: -3px -159px;
-}
-
-.multipleTab .chip-box .chip-10 {
+/* 下注区域 K 格式筹码样式 */
+.multipleTab .chip-box .chip-10k {
background-position: -101px -129px;
}
-.multipleTab .chip-box .chip-20 {
+.multipleTab .chip-box .chip-20k {
background-position: -126px -144px;
}
-.multipleTab .chip-box .chip-50 {
+.multipleTab .chip-box .chip-50k {
background-position: -27px -159px;
}
-.multipleTab .chip-box .chip-100 {
+.multipleTab .chip-box .chip-100k {
background-position: -52px -129px;
}
-.multipleTab .chip-box .chip-200 {
+.multipleTab .chip-box .chip-200k {
background-position: -101px -159px;
}
-.multipleTab .chip-box .chip-500 {
+.multipleTab .chip-box .chip-500k {
background-position: -101px -144px;
}
-.multipleTab .chip-box .chip-1k {
+.multipleTab .chip-box .chip-1000k {
background-position: -3px -129px;
}
-.multipleTab .chip-box .chip-2k {
+.multipleTab .chip-box .chip-2000k {
background-position: -52px -159px;
}
-.multipleTab .chip-box .chip-5k {
+.multipleTab .chip-box .chip-5000k {
background-position: -76px -159px;
}
-.multipleTab .chip-box .chip-1w {
+.multipleTab .chip-box .chip-10000k {
background-position: -126px -159px;
}
-.multipleTab .chip-box .chip-2w {
+.multipleTab .chip-box .chip-20000k {
background-position: -76px -129px;
}
-.multipleTab .chip-box .chip-5w {
+.multipleTab .chip-box .chip-50000k {
background-position: -126px -129px;
}
+.multipleTab .chip-box .chip-100000k {
+ background-position: -3px -159px;
+}
+
.multipleTab .chip-box .money {
position: absolute;
bottom: 12px;
diff --git a/src/components/multiple-tab/multiple-tab.vue b/src/components/multiple-tab/multiple-tab.vue
index bc2023e4..8dc75747 100644
--- a/src/components/multiple-tab/multiple-tab.vue
+++ b/src/components/multiple-tab/multiple-tab.vue
@@ -258,8 +258,8 @@ export default {
data(){
return{
camera:1,
- chipIndex:3,
- chip:localStorage.getItem("chipArray")?JSON.parse(localStorage.getItem("chipArray"))[0].value:20,
+ chipIndex:1,
+ chip:localStorage.getItem("chipArray")?JSON.parse(localStorage.getItem("chipArray"))[0].value:10000,
msg:'欢迎光临',
isMsg:false,
askInterval:null,
@@ -324,14 +324,14 @@ export default {
ApiUrl:JSON.parse(localStorage.getItem('ApiUrl')),
istoBetsusses:true,
chipArrayJson:[],
- chipArray:[{"index":3,"value":"20","cls":"20"},{"index":4,"value":"50","cls":"50"},{"index":5,"value":"100","cls":"100"},{"index":6,"value":"200","cls":"200"},
- {"index":7,"value":"500","cls":"500"},{"index":8,"value":"1000","cls":"1k"}],
- chipArrayNoSet:[{"index":3,"value":"20","cls":"20"},{"index":4,"value":"50","cls":"50"},{"index":5,"value":"100","cls":"100"},{"index":6,"value":"200","cls":"200"},
- {"index":7,"value":"500","cls":"500"},{"index":8,"value":"1000","cls":"1k"},{"index":9,"value":"2000","cls":"2k"},{"index":10,"value":"5000","cls":"5k"},{"index":11,"value":"10000","cls":"1w"},
- {"index":12,"value":"20000","cls":"2w"},{"index":13,"value":"100000","cls":"10w"},{"index":14,"value":"200000","cls":"20w"}
+ chipArray:[{"index":1,"value":"10000","cls":"10k"},{"index":2,"value":"20000","cls":"20k"},{"index":3,"value":"50000","cls":"50k"},{"index":4,"value":"100000","cls":"100k"},
+ {"index":5,"value":"200000","cls":"200k"},{"index":6,"value":"500000","cls":"500k"}],
+ chipArrayNoSet:[{"index":1,"value":"10000","cls":"10k"},{"index":2,"value":"20000","cls":"20k"},{"index":3,"value":"50000","cls":"50k"},{"index":4,"value":"100000","cls":"100k"},
+ {"index":5,"value":"200000","cls":"200k"},{"index":6,"value":"500000","cls":"500k"},{"index":7,"value":"1000000","cls":"1000k"},{"index":8,"value":"2000000","cls":"2000k"},{"index":9,"value":"5000000","cls":"5000k"},
+ {"index":10,"value":"10000000","cls":"10000k"},{"index":11,"value":"20000000","cls":"20000k"},{"index":12,"value":"50000000","cls":"50000k"},{"index":13,"value":"100000000","cls":"100000k"}
],
- chipArray100:[{"index":5,"value":"100","cls":"100"},{"index":6,"value":"200","cls":"200"},
- {"index":7,"value":"500","cls":"500"},{"index":8,"value":"1000","cls":"1k"},{"index":9,"value":"2000","cls":"2k"},{"index":10,"value":"5000","cls":"5k"}
+ chipArray100:[{"index":1,"value":"10000","cls":"10k"},{"index":2,"value":"20000","cls":"20k"},
+ {"index":3,"value":"50000","cls":"50k"},{"index":4,"value":"100000","cls":"100k"},{"index":5,"value":"200000","cls":"200k"},{"index":6,"value":"500000","cls":"500k"}
]
}
diff --git a/src/components/play-chip/play-chip.vue b/src/components/play-chip/play-chip.vue
index 099be929..f1921aaf 100644
--- a/src/components/play-chip/play-chip.vue
+++ b/src/components/play-chip/play-chip.vue
@@ -47,24 +47,23 @@
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
@@ -93,20 +92,20 @@
export default {
data(){
return{
- chipIndex:3,
+ chipIndex:1,
videoShow:true,
minivideoShow:false,
fullVideo:'far',
routeName:'',
chipArrayJson:[],
- chipArray:[{"index":3,"value":"20","cls":"20"},{"index":4,"value":"50","cls":"50"},{"index":5,"value":"100","cls":"100"},{"index":6,"value":"200","cls":"200"},
- {"index":7,"value":"500","cls":"500"},{"index":8,"value":"1000","cls":"1k"}],
- chipArrayNoSet:[{"index":3,"value":"20","cls":"20"},{"index":4,"value":"50","cls":"50"},{"index":5,"value":"100","cls":"100"},{"index":6,"value":"200","cls":"200"},
- {"index":7,"value":"500","cls":"500"},{"index":8,"value":"1000","cls":"1k"},{"index":9,"value":"2000","cls":"2k"},{"index":10,"value":"5000","cls":"5k"},{"index":11,"value":"10000","cls":"1w"},
- {"index":12,"value":"20000","cls":"2w"},{"index":13,"value":"100000","cls":"10w"},{"index":14,"value":"200000","cls":"20w"}
+ chipArray:[{"index":1,"value":"10000","cls":"10k"},{"index":2,"value":"20000","cls":"20k"},{"index":3,"value":"50000","cls":"50k"},{"index":4,"value":"100000","cls":"100k"},
+ {"index":5,"value":"200000","cls":"200k"},{"index":6,"value":"500000","cls":"500k"}],
+ chipArrayNoSet:[{"index":1,"value":"10000","cls":"10k"},{"index":2,"value":"20000","cls":"20k"},{"index":3,"value":"50000","cls":"50k"},{"index":4,"value":"100000","cls":"100k"},
+ {"index":5,"value":"200000","cls":"200k"},{"index":6,"value":"500000","cls":"500k"},{"index":7,"value":"1000000","cls":"1000k"},{"index":8,"value":"2000000","cls":"2000k"},{"index":9,"value":"5000000","cls":"5000k"},
+ {"index":10,"value":"10000000","cls":"10000k"},{"index":11,"value":"20000000","cls":"20000k"},{"index":12,"value":"50000000","cls":"50000k"},{"index":13,"value":"100000000","cls":"100000k"}
],
- chipArray100:[{"index":5,"value":"100","cls":"100"},{"index":6,"value":"200","cls":"200"},
- {"index":7,"value":"500","cls":"500"},{"index":8,"value":"1000","cls":"1k"},{"index":9,"value":"2000","cls":"2k"},{"index":10,"value":"5000","cls":"5k"}
+ chipArray100:[{"index":1,"value":"10000","cls":"10k"},{"index":2,"value":"20000","cls":"20k"},
+ {"index":3,"value":"50000","cls":"50k"},{"index":4,"value":"100000","cls":"100k"},{"index":5,"value":"200000","cls":"200k"},{"index":6,"value":"500000","cls":"500k"}
]
}
@@ -525,61 +524,62 @@
top: 0;
}
- .chip-view .chip-5{
- background-position: -2px -120px;
- }
- .chip-view .chip-10{
+ /* 新的 K 格式筹码样式 - 需要配合新的 chip.png 图片使用 */
+ .chip-view .chip-10k{
background-position: -2px -4px;
}
- .chip-view .chip-20{
+ .chip-view .chip-20k{
background-position: -2px -62px;
}
- .chip-view .chip-50{
+ .chip-view .chip-50k{
background-position: -57px -120px;
}
-
- .chip-view .chip-100{
+ .chip-view .chip-100k{
background-position: -57px -4px;
}
- .chip-view .chip-200{
+ .chip-view .chip-200k{
background-position: -57px -62px;
}
- .chip-view .chip-500{
+ .chip-view .chip-500k{
background-position: -112px -120px;
}
- .chip-view .chip-1k{
+ .chip-view .chip-1000k{
background-position: -112px -4px;
}
- .chip-view .chip-2k{
+ .chip-view .chip-2000k{
background-position: -112px -62px;
}
- .chip-view .chip-5k{
+ .chip-view .chip-5000k{
background-position: -167px -120px;
}
- .chip-view .chip-1w{
+ .chip-view .chip-10000k{
background-position: -167px -4px;
}
- .chip-view .chip-2w{
+ .chip-view .chip-20000k{
background-position: -167px -62px;
}
- .chip-view .chip-10w{
+ .chip-view .chip-50000k{
background-position: -222px -3px;
}
- .chip-view .chip-20w{
+ .chip-view .chip-100000k{
background-position: -222px -62px;
}
- .chip-set-view .chip-20{ background-position: 0.5px -40px; }
- .chip-set-view .chip-50{ background-position: -38px -80px; }
- .chip-set-view .chip-100{ background-position: -38px -0px; }
- .chip-set-view .chip-200{ background-position: -38px -40px; }
- .chip-set-view .chip-500{ background-position: -76px -80px; }
- .chip-set-view .chip-1k{ background-position: -76px -0px; }
- .chip-set-view .chip-2k{ background-position: -76px -40px; }
- .chip-set-view .chip-5k{ background-position: -114px -80px; }
- .chip-set-view .chip-1w{ background-position: -114px -0px; }
- .chip-set-view .chip-2w{ background-position: -114px -40px; }
- .chip-set-view .chip-10w{ background-position: -152px -0px; }
- .chip-set-view .chip-20w{ background-position: -152px -40px; }
+
+ /* 筹码设置弹窗中的 K 格式筹码样式 */
+ .chip-set-view .chip-10k{ background-position: 0.5px -0px; }
+ .chip-set-view .chip-20k{ background-position: 0.5px -40px; }
+ .chip-set-view .chip-50k{ background-position: -38px -80px; }
+ .chip-set-view .chip-100k{ background-position: -38px -0px; }
+ .chip-set-view .chip-200k{ background-position: -38px -40px; }
+ .chip-set-view .chip-500k{ background-position: -76px -80px; }
+ .chip-set-view .chip-1000k{ background-position: -76px -0px; }
+ .chip-set-view .chip-2000k{ background-position: -76px -40px; }
+ .chip-set-view .chip-5000k{ background-position: -114px -80px; }
+ .chip-set-view .chip-10000k{ background-position: -114px -0px; }
+ .chip-set-view .chip-20000k{ background-position: -114px -40px; }
+ .chip-set-view .chip-50000k{ background-position: -152px -0px; }
+ .chip-set-view .chip-100000k{ background-position: -152px -40px; }
+
@keyframes lightY {
0%,
70% {
diff --git a/src/store/index.js b/src/store/index.js
index 68ce7929..1e5f0b6f 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -17,7 +17,7 @@ const state = {
lang: JSON.parse(localStorage.getItem("lang")) || "tw",
chip: localStorage.getItem("chipArray")
? JSON.parse(localStorage.getItem("chipArray"))[0].value
- : 20,
+ : 10000,
loding: false,
userInfo: {
uid: "",