diff --git a/src/assets/images/chip.png b/src/assets/images/chip.png new file mode 100644 index 00000000..69820a3e Binary files /dev/null and b/src/assets/images/chip.png differ diff --git a/src/assets/images/chip/10000k.png b/src/assets/images/chip/10000k.png index 032a4160..0d3a3119 100644 Binary files a/src/assets/images/chip/10000k.png and b/src/assets/images/chip/10000k.png differ diff --git a/src/assets/images/chip/20000k.png b/src/assets/images/chip/20000k.png index 34f20ebd..ce6c9b27 100644 Binary files a/src/assets/images/chip/20000k.png and b/src/assets/images/chip/20000k.png differ diff --git a/src/assets/images/chip/50000k.png b/src/assets/images/chip/50000k.png index c13cc361..93318a7b 100644 Binary files a/src/assets/images/chip/50000k.png and b/src/assets/images/chip/50000k.png differ diff --git a/src/components/HallList.vue b/src/components/HallList.vue index 1c9f971f..8bd154db 100644 --- a/src/components/HallList.vue +++ b/src/components/HallList.vue @@ -91,7 +91,7 @@
- {{ Lang[Type].limit }} :{{ item.limit_money }} + {{ Lang[Type].limit }} :{{ $fk((item.game_id == 4 || item.game_id == 5) && userInfo.limit_low_nn > 0 ? (userInfo.limit_low_nn + '-' + userInfo.limit_high_nn) : (userInfo.limit_low + '-' + userInfo.limit_high)) }}
@@ -126,6 +126,7 @@ const Type = computed(() => store.state.config.$Type) const Lang = computed(() => store.state.config.$lang) const wayType = computed(() => store.state.config.hallWayType) + const userInfo = computed(() => store.state.app.userInfo) const routerName = computed(() => router.currentRoute.value.name) const list = computed(() => { const allTableData = store.state.app.allTableData @@ -304,6 +305,7 @@ list, textType, wayType, + userInfo, getSendMode, getTextVal, routerName, diff --git a/src/components/HallNav.vue b/src/components/HallNav.vue index 229099e9..fd52f504 100644 --- a/src/components/HallNav.vue +++ b/src/components/HallNav.vue @@ -10,7 +10,7 @@ />
{{ userInfo.username }}
-
{{ userInfo.money }}
+
{{ $fk(userInfo.money) }}
diff --git a/src/components/OnLinePop.vue b/src/components/OnLinePop.vue index 89f25420..068f8dac 100644 --- a/src/components/OnLinePop.vue +++ b/src/components/OnLinePop.vue @@ -21,12 +21,12 @@
{{ item.name }}
-
{{ item.money }}
+
{{ $fk(item.money) }}
{{ Lang[Type].place_bet }} - {{ item.win }} + {{ $fk(item.win) }}
{{ Lang[Type].to_win }} diff --git a/src/components/PlayTable/Index.vue b/src/components/PlayTable/Index.vue index 27843776..faad0045 100644 --- a/src/components/PlayTable/Index.vue +++ b/src/components/PlayTable/Index.vue @@ -300,8 +300,8 @@ export default { const downBet = (e, type) => { store.commit("app/standbyTime") const { value: chip, key } = chooseChip.value - // 临时注释时间限制,方便测试界面效果 - // if (props.sendMode == "startBetCountDown") { + // 只有倒计时下注阶段才允许下注 + if (props.sendMode == "startBetCountDown") { if (type == "luck_six_amount" && props.can_bet_luck_six != 1) { showToast(Lang.value[Type.value].to_bet_fail_7) } else if ( @@ -334,7 +334,7 @@ export default { }) audioMp3(["push"]).Play() } - // } + } } const nameArray = [ // 百家乐&龙虎 diff --git a/src/components/PlayTable/TableBaccarat.vue b/src/components/PlayTable/TableBaccarat.vue index a449a8d6..e0948db3 100644 --- a/src/components/PlayTable/TableBaccarat.vue +++ b/src/components/PlayTable/TableBaccarat.vue @@ -15,7 +15,7 @@ >
- {{ bet_amount_msg.player_amount }} + {{ $fk(bet_amount_msg.player_amount) }}
- {{ bet_amount_msg.tie_amount }} + {{ $fk(bet_amount_msg.tie_amount) }}
- {{ bet_amount_msg.banker_amount }} + {{ $fk(bet_amount_msg.banker_amount) }}
- {{ bet_amount_msg.small_amount }} + {{ $fk(bet_amount_msg.small_amount) }}
- {{ bet_amount_msg.player_pair_amount }} + {{ $fk(bet_amount_msg.player_pair_amount) }}
- {{ bet_amount_msg.banker_pair_amount }} + {{ $fk(bet_amount_msg.banker_pair_amount) }}
- {{ bet_amount_msg.big_amount }} + {{ $fk(bet_amount_msg.big_amount) }}
- {{ bet_amount_msg[`amount_${pName}_banker_times`] }} + {{ $fk(bet_amount_msg[`amount_${pName}_banker_times`]) }}
- {{ bet_amount_msg[`amount_${pName}_banker`] }} + {{ $fk(bet_amount_msg[`amount_${pName}_banker`]) }}
- {{ bet_amount_msg[`amount_${pName}_times`] }} + {{ $fk(bet_amount_msg[`amount_${pName}_times`]) }}
- {{ bet_amount_msg[`amount_${pName}`] }} + {{ $fk(bet_amount_msg[`amount_${pName}`]) }}
diff --git a/src/components/PlayTable/TableDice.vue b/src/components/PlayTable/TableDice.vue index 278f838d..d01cdcd6 100644 --- a/src/components/PlayTable/TableDice.vue +++ b/src/components/PlayTable/TableDice.vue @@ -23,7 +23,7 @@ 4-10 1:1
-
{{ bet_amount_msg.small || 0 }}
+
{{ $fk(bet_amount_msg.small || 0) }}
1:10
@@ -47,7 +47,7 @@
-
{{ bet_amount_msg.two_11 || 0 }}
+
{{ $fk(bet_amount_msg.two_11 || 0) }}
@@ -69,7 +69,7 @@
-
{{ bet_amount_msg.two_22 || 0 }}
+
{{ $fk(bet_amount_msg.two_22 || 0) }}
@@ -91,7 +91,7 @@
-
{{ bet_amount_msg.two_33 || 0 }}
+
{{ $fk(bet_amount_msg.two_33 || 0) }}
@@ -117,7 +117,7 @@
-
{{ bet_amount_msg.three_111 || 0 }}
+
{{ $fk(bet_amount_msg.three_111 || 0) }}
@@ -140,7 +140,7 @@
-
{{ bet_amount_msg.three_222 || 0 }}
+
{{ $fk(bet_amount_msg.three_222 || 0) }}
@@ -163,7 +163,7 @@
-
{{ bet_amount_msg.three_333 || 0 }}
+
{{ $fk(bet_amount_msg.three_333 || 0) }}
@@ -220,7 +220,7 @@
-
{{ bet_amount_msg.leopard || 0 }}
+
{{ $fk(bet_amount_msg.leopard || 0) }}
@@ -246,7 +246,7 @@
-
{{ bet_amount_msg.three_444 || 0 }}
+
{{ $fk(bet_amount_msg.three_444 || 0) }}
@@ -269,7 +269,7 @@
-
{{ bet_amount_msg.three_555 || 0 }}
+
{{ $fk(bet_amount_msg.three_555 || 0) }}
@@ -292,7 +292,7 @@
-
{{ bet_amount_msg.three_666 || 0 }}
+
{{ $fk(bet_amount_msg.three_666 || 0) }}
@@ -317,7 +317,7 @@
-
{{ bet_amount_msg.two_44 || 0 }}
+
{{ $fk(bet_amount_msg.two_44 || 0) }}
@@ -339,7 +339,7 @@
-
{{ bet_amount_msg.two_55 || 0 }}
+
{{ $fk(bet_amount_msg.two_55 || 0) }}
@@ -361,7 +361,7 @@
-
{{ bet_amount_msg.two_66 || 0 }}
+
{{ $fk(bet_amount_msg.two_66 || 0) }}
@@ -384,7 +384,7 @@ 11-17 1:1
-
{{ bet_amount_msg.big || 0 }}
+
{{ $fk(bet_amount_msg.big || 0) }}
@@ -408,7 +408,7 @@ 4 1:60
-
{{ bet_amount_msg.number_4 || 0 }}
+
{{ $fk(bet_amount_msg.number_4 || 0) }}
@@ -430,7 +430,7 @@ 5 1:30
-
{{ bet_amount_msg.number_5 || 0 }}
+
{{ $fk(bet_amount_msg.number_5 || 0) }}
@@ -452,7 +452,7 @@ 6 1:18
-
{{ bet_amount_msg.number_6 || 0 }}
+
{{ $fk(bet_amount_msg.number_6 || 0) }}
@@ -474,7 +474,7 @@ 7 1:12
-
{{ bet_amount_msg.number_7 || 0 }}
+
{{ $fk(bet_amount_msg.number_7 || 0) }}
@@ -496,7 +496,7 @@ 8 1:8
-
{{ bet_amount_msg.number_8 || 0 }}
+
{{ $fk(bet_amount_msg.number_8 || 0) }}
@@ -518,7 +518,7 @@ 9 1:6
-
{{ bet_amount_msg.number_9 || 0 }}
+
{{ $fk(bet_amount_msg.number_9 || 0) }}
@@ -540,7 +540,7 @@ 10 1:6
-
{{ bet_amount_msg.number_10 || 0 }}
+
{{ $fk(bet_amount_msg.number_10 || 0) }}
@@ -562,7 +562,7 @@ 11 1:6
-
{{ bet_amount_msg.number_11 || 0 }}
+
{{ $fk(bet_amount_msg.number_11 || 0) }}
@@ -584,7 +584,7 @@ 12 1:6
-
{{ bet_amount_msg.number_12 || 0 }}
+
{{ $fk(bet_amount_msg.number_12 || 0) }}
@@ -606,7 +606,7 @@ 13 1:8
-
{{ bet_amount_msg.number_13 || 0 }}
+
{{ $fk(bet_amount_msg.number_13 || 0) }}
@@ -628,7 +628,7 @@ 14 1:12
-
{{ bet_amount_msg.number_14 || 0 }}
+
{{ $fk(bet_amount_msg.number_14 || 0) }}
@@ -650,7 +650,7 @@ 15 1:18
-
{{ bet_amount_msg.number_15 || 0 }}
+
{{ $fk(bet_amount_msg.number_15 || 0) }}
@@ -672,7 +672,7 @@ 16 1:30
-
{{ bet_amount_msg.number_16 || 0 }}
+
{{ $fk(bet_amount_msg.number_16 || 0) }}
@@ -694,7 +694,7 @@ 17 1:60
-
{{ bet_amount_msg.number_17 || 0 }}
+
{{ $fk(bet_amount_msg.number_17 || 0) }}
@@ -718,7 +718,7 @@
-
{{ bet_amount_msg.two_12 || 0 }}
+
{{ $fk(bet_amount_msg.two_12 || 0) }}
@@ -740,7 +740,7 @@
-
{{ bet_amount_msg.two_13 || 0 }}
+
{{ $fk(bet_amount_msg.two_13 || 0) }}
@@ -762,7 +762,7 @@
-
{{ bet_amount_msg.two_14 || 0 }}
+
{{ $fk(bet_amount_msg.two_14 || 0) }}
@@ -784,7 +784,7 @@
-
{{ bet_amount_msg.two_15 || 0 }}
+
{{ $fk(bet_amount_msg.two_15 || 0) }}
@@ -806,7 +806,7 @@
-
{{ bet_amount_msg.two_16 || 0 }}
+
{{ $fk(bet_amount_msg.two_16 || 0) }}
@@ -828,7 +828,7 @@
-
{{ bet_amount_msg.two_23 || 0 }}
+
{{ $fk(bet_amount_msg.two_23 || 0) }}
@@ -850,7 +850,7 @@
-
{{ bet_amount_msg.two_24 || 0 }}
+
{{ $fk(bet_amount_msg.two_24 || 0) }}
@@ -872,7 +872,7 @@
-
{{ bet_amount_msg.two_25 || 0 }}
+
{{ $fk(bet_amount_msg.two_25 || 0) }}
@@ -894,7 +894,7 @@
-
{{ bet_amount_msg.two_26 || 0 }}
+
{{ $fk(bet_amount_msg.two_26 || 0) }}
@@ -916,7 +916,7 @@
-
{{ bet_amount_msg.two_34 || 0 }}
+
{{ $fk(bet_amount_msg.two_34 || 0) }}
@@ -938,7 +938,7 @@
-
{{ bet_amount_msg.two_35 || 0 }}
+
{{ $fk(bet_amount_msg.two_35 || 0) }}
@@ -960,7 +960,7 @@
-
{{ bet_amount_msg.two_36 || 0 }}
+
{{ $fk(bet_amount_msg.two_36 || 0) }}
@@ -982,7 +982,7 @@
-
{{ bet_amount_msg.two_45 || 0 }}
+
{{ $fk(bet_amount_msg.two_45 || 0) }}
@@ -1004,7 +1004,7 @@
-
{{ bet_amount_msg.two_46 || 0 }}
+
{{ $fk(bet_amount_msg.two_46 || 0) }}
@@ -1026,7 +1026,7 @@
-
{{ bet_amount_msg.two_56 || 0 }}
+
{{ $fk(bet_amount_msg.two_56 || 0) }}
1:5
@@ -1051,7 +1051,7 @@ {{ Lang[Type].odd }} 1:1 -
{{ bet_amount_msg.singular || 0 }}
+
{{ $fk(bet_amount_msg.singular || 0) }}
@@ -1074,7 +1074,7 @@
-
{{ bet_amount_msg.living_1 || 0 }}
+
{{ $fk(bet_amount_msg.living_1 || 0) }}
@@ -1095,7 +1095,7 @@
-
{{ bet_amount_msg.living_2 || 0 }}
+
{{ $fk(bet_amount_msg.living_2 || 0) }}
@@ -1116,7 +1116,7 @@
-
{{ bet_amount_msg.living_3 || 0 }}
+
{{ $fk(bet_amount_msg.living_3 || 0) }}
@@ -1137,7 +1137,7 @@
-
{{ bet_amount_msg.living_4 || 0 }}
+
{{ $fk(bet_amount_msg.living_4 || 0) }}
@@ -1158,7 +1158,7 @@
-
{{ bet_amount_msg.living_5 || 0 }}
+
{{ $fk(bet_amount_msg.living_5 || 0) }}
@@ -1179,7 +1179,7 @@
-
{{ bet_amount_msg.living_6 || 0 }}
+
{{ $fk(bet_amount_msg.living_6 || 0) }}
@@ -1208,7 +1208,7 @@ {{ Lang[Type].even }} 1:1
-
{{ bet_amount_msg.plural || 0 }}
+
{{ $fk(bet_amount_msg.plural || 0) }}
diff --git a/src/components/PlayTable/TableLonghu.vue b/src/components/PlayTable/TableLonghu.vue index 614b5987..d4ee0185 100644 --- a/src/components/PlayTable/TableLonghu.vue +++ b/src/components/PlayTable/TableLonghu.vue @@ -14,7 +14,7 @@ >
- {{ bet_amount_msg.banker_amount }} + {{ $fk(bet_amount_msg.banker_amount) }}
- {{ bet_amount_msg.tie_amount }} + {{ $fk(bet_amount_msg.tie_amount) }}
- {{ bet_amount_msg.player_amount }} + {{ $fk(bet_amount_msg.player_amount) }}
1:12 -
{{ bet_amount_msg.toning_zero }}
+
{{ $fk(bet_amount_msg.toning_zero) }}
@@ -48,7 +48,7 @@ {{ Lang[Type].even }} 1:0.96
-
{{ bet_amount_msg.toning_plural }}
+
{{ $fk(bet_amount_msg.toning_plural) }}
@@ -70,7 +70,7 @@ {{ Lang[Type].odd }} 1:0.96
-
{{ bet_amount_msg.toning_singular }}
+
{{ $fk(bet_amount_msg.toning_singular) }}
@@ -97,7 +97,7 @@
1:12
-
{{ bet_amount_msg.toning_four }}
+
{{ $fk(bet_amount_msg.toning_four) }}
@@ -126,7 +126,7 @@
1:2.6
-
{{ bet_amount_msg.toning_one }}
+
{{ $fk(bet_amount_msg.toning_one) }}
@@ -148,7 +148,7 @@ {{ Lang[Type].small }} 1:0.96
-
{{ bet_amount_msg.toning_small }}
+
{{ $fk(bet_amount_msg.toning_small) }}
@@ -170,7 +170,7 @@ {{ Lang[Type].big }} 1:0.96
-
{{ bet_amount_msg.toning_big }}
+
{{ $fk(bet_amount_msg.toning_big) }}
@@ -197,7 +197,7 @@
1:2.6
-
{{ bet_amount_msg.toning_three }}
+
{{ $fk(bet_amount_msg.toning_three) }}
diff --git a/src/components/PlayWay.vue b/src/components/PlayWay.vue index a114f343..78a8713e 100644 --- a/src/components/PlayWay.vue +++ b/src/components/PlayWay.vue @@ -57,35 +57,6 @@
- -
-
-
{{ Lang[Type].askbanker }}
-
- - - - - - - - -
-
-
-
{{ Lang[Type].askplayer }}
-
- - - - - - - - -
-
-
@@ -271,73 +242,6 @@ export default { display: block; } - /* Ask Panel - Integrated into grid (bottom 3 rows, far right) */ - .ask-panel { - position: absolute; - right: 0; - bottom: 0; - width: 25%; /* Roughly 6/24 of width */ - height: 50%; /* Covers bottom 3 rows (50% of 6 rows) */ - display: flex; - background: #fff; - border-left: 1px solid #eee; - border-top: 1px solid #eee; - z-index: 10; - - .ask-group { - flex: 1; - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; - cursor: pointer; - - &.banker { - border-right: 1px solid #f5f5f5; - } - - .ask-title { - font-size: 11px !important; - font-weight: 500; - color: #333; - margin-bottom: 2px; - white-space: nowrap; - } - - .ask-icons { - display: flex; - gap: 4px; - align-items: center; - - .dot { - display: inline-block; - &.solid { - width: 10px; - height: 10px; - border-radius: 50%; - &.red { background: #e40000; } - &.blue { background: #0056ee; } - } - &.hollow { - width: 8px; - height: 8px; - border-radius: 50%; - border: 1.5px solid; - &.red { border-color: #e40000; } - &.blue { border-color: #0056ee; } - } - &.slash { - width: 2px; - height: 10px; - transform: rotate(-45deg); - border-radius: 1px; - &.red { background: #e40000; } - &.blue { background: #0056ee; } - } - } - } - } - } } } diff --git a/src/components/Record.vue b/src/components/Record.vue index e327fc1a..88a92358 100644 --- a/src/components/Record.vue +++ b/src/components/Record.vue @@ -169,9 +169,9 @@ {{ item.create_time }} - {{ item.money_before_bet }} - {{ item.amount }} - {{ item.win_total }} + {{ $fk(item.money_before_bet) }} + {{ $fk(item.amount) }} + {{ $fk(item.win_total) }} @@ -194,9 +194,9 @@ {{ item.id }} {{ item.mode }} {{ item.create_time }} - {{ item.old_money }} - {{ item.new_money }} - {{ item.amount }} + {{ $fk(item.old_money) }} + {{ $fk(item.new_money) }} + {{ $fk(item.amount) }} @@ -213,7 +213,7 @@ - + @@ -254,22 +254,22 @@ class="alldown" v-if="type == 1 || type == 2 || type == 4 || type == 5" > - {{ $lang[$Type].Totalbet }} {{ alldown }} + {{ $lang[$Type].Totalbet }} {{ $fk(alldown) }} - {{ $lang[$Type].TotalWin }} {{ returnFloat(allwin) }} + {{ $lang[$Type].TotalWin }} {{ $fk(returnFloat(allwin)) }} - {{ $lang[$Type].Upperscore }} {{ recharge_amount }} + {{ $lang[$Type].Upperscore }} {{ $fk(recharge_amount) }} - {{ $lang[$Type].Subordinate }} {{ recharge_amount }} + {{ $lang[$Type].Subordinate }} {{ $fk(recharge_amount) }} - {{ $lang[$Type].Pagerewarded }} {{ recharge_amount }} + {{ $lang[$Type].Pagerewarded }} {{ $fk(recharge_amount) }} @@ -298,8 +298,8 @@ - - + +
{{ item.id }}{{ item.money }}{{ $fk(item.money) }} {{ item.table_name }} {{ item.create_time }}
{{ item.user_bet }} {{ item.card_result }}{{ item.amount }}{{ item.win_total }}{{ $fk(item.amount) }}{{ $fk(item.win_total) }} {{ item.create_time }}
@@ -341,9 +341,9 @@ {{ $lang[$Type].Next }} - {{ $lang[$Type].Totalbet }} {{ roballdown }} + {{ $lang[$Type].Totalbet }} {{ $fk(roballdown) }} - {{ $lang[$Type].TotalWin }} {{ roballwin }} + {{ $lang[$Type].TotalWin }} {{ $fk(roballwin) }} diff --git a/src/components/TableInfoPop.vue b/src/components/TableInfoPop.vue index 80f35873..1d4e173a 100644 --- a/src/components/TableInfoPop.vue +++ b/src/components/TableInfoPop.vue @@ -38,22 +38,22 @@ {{ tableData.price_banker }}/1({{ Lang[Type].is_commission }}) - {{ tableData.limit_money }} + {{ $fk(userLimit) }}
{{ Lang[Type].player }} {{ tableData.price_player }} - {{ tableData.limit_money }} + {{ $fk(userLimit) }}
{{ Lang[Type].dragon }} {{ tableData.price_dragon }} - {{ tableData.limit_money }} + {{ $fk(userLimit) }}
{{ Lang[Type].tiger }} {{ tableData.price_tiger }} - {{ tableData.limit_money }} + {{ $fk(userLimit) }}
- {{ tableData.limit_money_tie }} + {{ $fk(userLimitTie) }}
{{ Lang[Type].p_banker }} {{ tableData.price_pair }} - {{ tableData.limit_money_pair }} + {{ $fk(userLimitPair) }}
{{ Lang[Type].p_player }} {{ tableData.price_pair }} - {{ tableData.limit_money_pair }} + {{ $fk(userLimitPair) }}
{{ Lang[Type].big }} 0.5 - {{ tableData.limit_money }} + {{ $fk(userLimit) }}
{{ Lang[Type].small }} 1.5 - {{ tableData.limit_money }} + {{ $fk(userLimit) }}
{{ Lang[Type].luckSix }} 12~20 - {{ tableData.limit_money }} + {{ $fk(userLimit) }}
{{ Lang[Type].limit }} 1 - {{ tableData.limit_money }} + {{ $fk((tableData.game_id == 4 || tableData.game_id == 5) && userInfo.limit_low_nn > 0 ? (userInfo.limit_low_nn + '-' + userInfo.limit_high_nn) : userLimit) }}
@@ -128,11 +128,19 @@ export default { const showTableInfo = computed(() => store.state.config.showTableInfo) const Type = computed(() => store.state.config.$Type) const Lang = computed(() => store.state.config.$lang) + const userInfo = computed(() => store.state.app.userInfo) + const userLimit = computed(() => userInfo.value.limit_low + '-' + userInfo.value.limit_high) + const userLimitTie = computed(() => userInfo.value.limit_low_tie + '-' + userInfo.value.limit_high_tie) + const userLimitPair = computed(() => userInfo.value.limit_low_pair + '-' + userInfo.value.limit_high_pair) console.log(props) return { Type, Lang, - showTableInfo + showTableInfo, + userInfo, + userLimit, + userLimitTie, + userLimitPair } } } diff --git a/src/components/confirmBet.vue b/src/components/confirmBet.vue index 4d55f551..4e6c348e 100644 --- a/src/components/confirmBet.vue +++ b/src/components/confirmBet.vue @@ -13,10 +13,10 @@
- {{ data.money }} + {{ $fk(data.money) }} {{ data.times - ? `${Lang[Type].withhold}${data.money * (data.game_id == 4 ? 4 : 19)}` + ? `${Lang[Type].withhold}${$fk(data.money * (data.game_id == 4 ? 4 : 19))}` : "" }}
@@ -98,14 +98,14 @@ $red-highlight: #ff3b3b; background: rgba(197, 160, 89, 0.95); border-radius: 1rem; color: #000; - font-size: 0.28rem; - padding: 0.03rem 0.08rem; + font-size: 12px; + padding: 2px 8px; border: 1px solid $gold; font-weight: 600; z-index: 1000; box-shadow: 0 2px 8px rgba(0, 0, 0, 0.3); white-space: nowrap; - margin-top: 0.06rem; /* 在按钮下方,与按钮保持间距 */ + margin-top: 4px; } .btn-box { display: flex; diff --git a/src/main.js b/src/main.js index 6a491dd9..dc268621 100644 --- a/src/main.js +++ b/src/main.js @@ -5,7 +5,9 @@ import { vants } from "@/plugins/vant.config" import "@/plugins/fox.config" import "@/plugins/sound.config" import App from "@/App.vue" +import { formatK } from "@/utils/common" const app = createApp(App) vants(app) +app.config.globalProperties.$fk = formatK app.use(store).use(router).mount("#app") diff --git a/src/utils/common.js b/src/utils/common.js index 93903280..5f71b12b 100644 --- a/src/utils/common.js +++ b/src/utils/common.js @@ -1,3 +1,18 @@ +// 金额格式化为K +const formatK = (val) => { + if (val === null || val === undefined || val === '') return val + if (typeof val === 'string' && val.includes('-')) { + return val.split('-').map(s => formatK(isNaN(s) ? s : Number(s))).join('-') + } + const n = Number(val) + if (isNaN(n)) return val + if (n >= 1000 || n <= -1000) { + const k = n / 1000 + return (k % 1 === 0 ? k.toFixed(0) : k) + 'K' + } + return val +} + // 百家乐&龙虎 const baccaratData = { key: [ @@ -633,6 +648,7 @@ const updateBetAmount = (tableData, data) => { } export { + formatK, sendScanResult, resetCardInfo, updateBetAmount, diff --git a/src/views/play.vue b/src/views/play.vue index 924b41df..a1b5d38c 100644 --- a/src/views/play.vue +++ b/src/views/play.vue @@ -77,7 +77,7 @@ @@ -280,6 +280,7 @@ import { getUserBetDice, getUserBetRoulette } from "@/utils/api" +import { formatK } from "@/utils/common" export default { name: "playView", @@ -422,6 +423,7 @@ export default { } const userInfo = computed(() => store.state.app.userInfo) + const nnGame = computed(() => tableData.value && (tableData.value.game_id == 4 || tableData.value.game_id == 5)) // 视频开关 const offCamera = () => { store.commit("config/switchVideo", !switchVideo.value) @@ -830,11 +832,11 @@ export default { Lang.value[Type.value].msg_balance + "" + '
' + - data.amount + + formatK(data.amount) + "" + - returnFloat(data.win_total) + + formatK(returnFloat(data.win_total)) + "" + - data.end_money + + formatK(data.end_money) + "
", className: "alert", confirmButtonText: Lang.value[Type.value].Confirm @@ -869,11 +871,11 @@ export default { '
' + v.name + "" + - v.amount + + formatK(v.amount) + "" + text + "" + - v.win_amount + + formatK(v.win_amount) + "
" } }) @@ -894,7 +896,7 @@ export default { title: Lang.value[Type.value].msg_win_lose + ":" + - returnFloat(data.win_total), + formatK(returnFloat(data.win_total)), message: html, className: "alert", confirmButtonText: Lang.value[Type.value].Confirm @@ -1225,6 +1227,7 @@ export default { videoConfig, hideVideo, userInfo, + nnGame, tableData, switchVideo, router,