Commit 6237e5ec authored by 毛线's avatar 毛线

bug

parent 954af022
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
</div> </div>
<div class="value-box"> <div class="value-box">
<div class="value">{{ jackpot[0].currentAmount }}</div> <div class="value">{{ jackpot[0].currentAmount }}</div>
<div class="size">{{ jackpot[0].minAmount }} ~ {{ jackpot[0].maxAmount }}</div> <div class="size">{{ jackpot[0].minAmount | filterToMoney }} ~ {{ jackpot[0].maxAmount | filterToMoney }}</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
</div> </div>
<div class="value-box"> <div class="value-box">
<div class="value">{{ jackpot[1].currentAmount }}</div> <div class="value">{{ jackpot[1].currentAmount }}</div>
<div class="size">{{ jackpot[1].minAmount }} ~ {{ jackpot[1].maxAmount }}</div> <div class="size">{{ jackpot[1].minAmount | filterToMoney }} ~ {{ jackpot[1].maxAmount | filterToMoney }}</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
</div> </div>
<div class="value-box"> <div class="value-box">
<div class="value">{{ item.currentAmount }}</div> <div class="value">{{ item.currentAmount }}</div>
<div class="size">{{ item.minAmount }} ~ {{ item.maxAmount }}</div> <div class="size">{{ item.minAmount | filterToMoney }} ~ {{ item.maxAmount | filterToMoney }}</div>
</div> </div>
</div> </div>
<img v-if="index < 5" class="line" src="https://kuawai.s3.ap-east-1.amazonaws.com/resource/assets/Textures/Rectangle%204%20copy%205.png" alt=""> <img v-if="index < 5" class="line" src="https://kuawai.s3.ap-east-1.amazonaws.com/resource/assets/Textures/Rectangle%204%20copy%205.png" alt="">
......
<template> <template>
<div> <div v-if="!hideHeader">
<div :class="{is_mobile: is_mobile}" class="layout-menu"> <div :class="{is_mobile: is_mobile}" class="layout-menu">
<div class="menu-item"> <div class="menu-item">
<img v-audio class="btn" src="https://kuawai.s3.ap-east-1.amazonaws.com/resource/assets/Textures/ic_menu_01.png" alt="" @click="$refs.audioSettingDialog.show()"> <img v-audio class="btn" src="https://kuawai.s3.ap-east-1.amazonaws.com/resource/assets/Textures/ic_menu_01.png" alt="" @click="$refs.audioSettingDialog.show()">
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
</template> </template>
<script> <script>
import { mapGetters } from 'vuex' import { mapGetters, mapState, } from 'vuex'
import AudioSettingDialog from '@/components/dialog/audio/index' import AudioSettingDialog from '@/components/dialog/audio/index'
export default { export default {
components: { components: {
...@@ -20,6 +20,9 @@ export default { ...@@ -20,6 +20,9 @@ export default {
return {} return {}
}, },
computed: { computed: {
...mapState([
'hideHeader',
]),
...mapGetters([ ...mapGetters([
'is_mobile', 'is_mobile',
]), ]),
......
...@@ -2,7 +2,13 @@ ...@@ -2,7 +2,13 @@
<div class="audio-size"> <div class="audio-size">
<div class="title">{{ title }}</div> <div class="title">{{ title }}</div>
<div class="slider"> <div class="slider">
<el-slider v-model="data" :show-tooltip="false"/> <div class="btn" @click="reduce">
<i class="el-icon-minus"/>
</div>
<el-slider v-model="data" :show-tooltip="false" class="slider"/>
<div class="btn" @click="add">
<i class="el-icon-plus"/>
</div>
</div> </div>
</div> </div>
</template> </template>
...@@ -36,7 +42,16 @@ export default { ...@@ -36,7 +42,16 @@ export default {
created() { created() {
this.data = this.value this.data = this.value
}, },
methods: {}, methods: {
reduce() {
const value = this.data - 10
this.data = value >= 0 ? value : 0
},
add() {
const value = this.data + 10
this.data = value <= 100 ? value : 100
},
},
} }
</script> </script>
...@@ -47,6 +62,18 @@ export default { ...@@ -47,6 +62,18 @@ export default {
text-align: left; text-align: left;
} }
.slider { .slider {
display: flex;
.btn {
flex: none;
display: flex;
align-items: center;
width: 50px;
text-align: center;
justify-content: center;
}
.slider {
flex: 1;
}
/deep/ { /deep/ {
.el-slider__bar { .el-slider__bar {
background-color: #17c2cc; background-color: #17c2cc;
......
...@@ -61,6 +61,7 @@ export default { ...@@ -61,6 +61,7 @@ export default {
this.visible = true this.visible = true
this.network().levelCurrent() this.network().levelCurrent()
this.network().latestAchievement() this.network().latestAchievement()
this.network().lastGame()
}, },
network() { network() {
return { return {
......
...@@ -8,30 +8,30 @@ ...@@ -8,30 +8,30 @@
<div class="value-box"> <div class="value-box">
<div class="row"> <div class="row">
<img class="icon" src="https://kuawai.s3.ap-east-1.amazonaws.com/resource/assets/Textures/second/coin.png" alt=""> <img class="icon" src="https://kuawai.s3.ap-east-1.amazonaws.com/resource/assets/Textures/second/coin.png" alt="">
{{ data.beginningCashBalance | filterFixed }} {{ data.beginningCashBalance | filterToFen }}
</div> </div>
<div class="row"> <div class="row">
<img class="icon" src="https://kuawai.s3.ap-east-1.amazonaws.com/resource/assets/Textures/second/coin.png" alt=""> <img class="icon" src="https://kuawai.s3.ap-east-1.amazonaws.com/resource/assets/Textures/second/coin.png" alt="">
{{ data.endingCashBalance - data.beginningCashBalance | filterFixed }} {{ data.endingCashBalance - data.beginningCashBalance | filterToFen }}
</div> </div>
<div class="row"> <div class="row">
<img class="icon" src="https://kuawai.s3.ap-east-1.amazonaws.com/resource/assets/Textures/second/coin.png" alt=""> <img class="icon" src="https://kuawai.s3.ap-east-1.amazonaws.com/resource/assets/Textures/second/coin.png" alt="">
{{ data.endingCashBalance | filterFixed }} {{ data.endingCashBalance | filterToFen }}
</div> </div>
</div> </div>
<div class="line"/> <div class="line"/>
<div class="value-box"> <div class="value-box">
<div class="row"> <div class="row">
<img class="icon" src="https://kuawai.s3.ap-east-1.amazonaws.com/resource/assets/Textures/second/ic_bi.png" alt=""> <img class="icon" src="https://kuawai.s3.ap-east-1.amazonaws.com/resource/assets/Textures/second/ic_bi.png" alt="">
{{ data.beginningRestrictedBalance | filterFixed }} {{ data.beginningRestrictedBalance | filterToFen }}
</div> </div>
<div class="row"> <div class="row">
<img class="icon" src="https://kuawai.s3.ap-east-1.amazonaws.com/resource/assets/Textures/second/ic_bi.png" alt=""> <img class="icon" src="https://kuawai.s3.ap-east-1.amazonaws.com/resource/assets/Textures/second/ic_bi.png" alt="">
{{ data.endingRestrictedBalance - data.beginningRestrictedBalance | filterFixed }} {{ data.endingRestrictedBalance - data.beginningRestrictedBalance | filterToFen }}
</div> </div>
<div class="row"> <div class="row">
<img class="icon" src="https://kuawai.s3.ap-east-1.amazonaws.com/resource/assets/Textures/second/ic_bi.png" alt=""> <img class="icon" src="https://kuawai.s3.ap-east-1.amazonaws.com/resource/assets/Textures/second/ic_bi.png" alt="">
{{ data.endingRestrictedBalance | filterFixed }} {{ data.endingRestrictedBalance | filterToFen }}
</div> </div>
</div> </div>
</div> </div>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<img v-if="tabIndex === index" class="tab-img" src="https://kuawai.s3.ap-east-1.amazonaws.com/resource/assets/Textures/second/Rounded%20Rectangle%2019.png" alt=""> <img v-if="tabIndex === index" class="tab-img" src="https://kuawai.s3.ap-east-1.amazonaws.com/resource/assets/Textures/second/Rounded%20Rectangle%2019.png" alt="">
<img v-else class="tab-img" src="https://kuawai.s3.ap-east-1.amazonaws.com/resource/assets/Textures/second/last_game%20%E6%8B%B7%E8%B4%9D%202.png" alt=""> <img v-else class="tab-img" src="https://kuawai.s3.ap-east-1.amazonaws.com/resource/assets/Textures/second/last_game%20%E6%8B%B7%E8%B4%9D%202.png" alt="">
<div class="text">{{ text }}</div> <div class="text">{{ text }}</div>
<div v-if="index === 0" class="version">{{ `1.0.033` }}</div> <div v-if="index === 0" class="version">{{ `1.0.037` }}</div>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -8,7 +8,8 @@ ...@@ -8,7 +8,8 @@
"dev": "cross-env APP_ENV=development NODE_ENV=development nuxt", "dev": "cross-env APP_ENV=development NODE_ENV=development nuxt",
"build": "nuxt build APP_ENV=production NODE_ENV=production build", "build": "nuxt build APP_ENV=production NODE_ENV=production build",
"start": "nuxt start", "start": "nuxt start",
"generate": "cross-env APP_ENV=generate NODE_ENV=generate nuxt generate" "generate": "cross-env APP_ENV=generate NODE_ENV=generate nuxt generate",
"generate-dev": "cross-env APP_ENV=generate-dev NODE_ENV=generate nuxt generate"
}, },
"dependencies": { "dependencies": {
"@xkeshi/vue-qrcode": "^1.0.0", "@xkeshi/vue-qrcode": "^1.0.0",
......
...@@ -48,7 +48,7 @@ export default { ...@@ -48,7 +48,7 @@ export default {
data() { data() {
return { return {
showPlayer1: false, showPlayer1: false,
showPlayer2: false, showPlayer2: true,
} }
}, },
computed: { computed: {
......
<template> <template>
<div> <div>
<div class="jackpot"> <div class="jackpot">
<Jackpot/> <Jackpot v-if="!hideHeader"/>
</div> </div>
<Background/> <Background/>
<div :class="{is_mobile: is_mobile, 'hide-header': hideHeader, }" class="player"> <div :class="{is_mobile: is_mobile, 'hide-header': hideHeader, }" class="player">
...@@ -61,6 +61,9 @@ export default { ...@@ -61,6 +61,9 @@ export default {
...mapGetters([ ...mapGetters([
'is_mobile', 'is_mobile',
]), ]),
...mapState('audio', [
'volumeBg',
]),
id() { id() {
return this.$route.query.id return this.$route.query.id
}, },
...@@ -97,11 +100,17 @@ export default { ...@@ -97,11 +100,17 @@ export default {
if (this.device) { if (this.device) {
this.init().play() this.init().play()
} }
if (this.volumeBg > 20) {
this.SetVolumeBg(20)
}
}, },
methods: { methods: {
...mapMutations([ ...mapMutations([
'SetDevice', 'SetDevice',
]), ]),
...mapMutations('audio', [
'SetVolumeBg',
]),
init() { init() {
return { return {
play: () => { play: () => {
......
...@@ -25,3 +25,20 @@ Vue.prototype.$loading = Loading.service ...@@ -25,3 +25,20 @@ Vue.prototype.$loading = Loading.service
Vue.filter('img', function(value) { Vue.filter('img', function(value) {
return `${process.env.img_domain}${value}` return `${process.env.img_domain}${value}`
}) })
Vue.filter('filterToMoney', function(num) {
num = num.toFixed(2)
num = parseFloat(num)
num = num.toLocaleString()
return num // 返回的是字符串23,245.12保留2位小数
})
Vue.filter('filterToFen', function(num) {
num = num.toFixed(2)
const arr = (num + '').split('.')
num = arr[0]
const decimal = arr[1]
num = parseFloat(num)
num = num.toLocaleString()
return num + '.' + decimal // 返回的是字符串23,245.12保留2位小数
})
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