Commit 87c544f2 authored by xiaoye's avatar xiaoye

fix

parent 02c3553d
......@@ -67,3 +67,14 @@
}
}
</style>
<style>
/* span {
font-family:
"黑体",
"SimHei",
"Microsoft YaHei",
"PingFang SC",
"Hiragino Sans GB",
sans-serif;
} */
</style>
\ No newline at end of file
......@@ -44,7 +44,7 @@
:thumbnail = 'Mycard.avatar'
:style = "{ '--size' : `${size.width > size.height ? size.width / 2 : size.width / 1.2}px`, '--minsize' : `${size.width > size.height ? size.width / 4 : size.width / 2.4}px` }"
>
<view v-show = 'Mycard.id >= 0'><h2>{{ Mycard.id }}</h2></view>
<view v-show = 'Mycard.id >= 0'><h2><span>{{ Mycard.id }}</span></h2></view>
<hr v-show = 'Mycard.id >= 0'>
<view
v-show = 'Mycard.id >= 0'
......
......@@ -86,7 +86,7 @@
class = 'button'
id = 'deckbutton'
:style = "{ '--color' : participant.move.this === i ? '#409eff' : 'gray', 'background-color' : participant.move.this === i ? '#e6e6e6' : 'white'}"
v-show = '!i.quit'
v-show = "!i.quit && tournament.this.status == 'Ready'"
@click = 'tournament.operatorChk(participant.move.start, [i, $event])'
>
<uni-icons :type = "participant.move.this && participant.move.this !== i ? 'pulldown' : 'list'"></uni-icons>
......@@ -159,14 +159,14 @@
>
<view id = 'round'>
<div>
<span></span>
<uni-number-box
v-model = 'match.round'
:min = '0'
:max = 'match.maxRound'
:disabled = "tournament.this.status == 'Ready'"
></uni-number-box>
<span></span>
</div>
<view class = 'button' @click = '() => { match.round = 0; }'>全部轮次</view>
</view>
......@@ -233,13 +233,13 @@
</span>
</view>
<view id = 'center'>
{{ `第${i.round}轮` }}
<span>{{ `第${i.round}轮` }}</span>
<br v-show = 'i.round == match.maxRound'>
<span class = 'small' v-show = 'i.isThirdPlaceMatch'>季军赛</span>
<span class = 'small' v-show = '!i.isThirdPlaceMatch && i.round == match.maxRound'>决赛</span>
</view>
<view id = 'right'>
{{ participant.array.find(p => p.id == i.player2Id)?.name }}
<span>{{ participant.array.find(p => p.id == i.player2Id)?.name }}</span>
<br>
<span v-if = '
// @ts-ignore
......
......@@ -138,7 +138,8 @@
padding: 0 $uni-spacing-sm;
border-radius: 4px;
overflow: hidden;
font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, SimSun, sans-serif;
// font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, SimSun, sans-serif;
font-family: Microsoft YaHei;
background-color: #fff;
flex: 1;
......
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