|
@@ -4,9 +4,9 @@
|
|
|
<img src="@assets/roomBg.png" alt="" />
|
|
<img src="@assets/roomBg.png" alt="" />
|
|
|
</div>
|
|
</div>
|
|
|
|
|
|
|
|
- <div class="back">
|
|
|
|
|
|
|
+ <!-- <div class="back">
|
|
|
<img src="@assets/back.png" @click="back" alt="" />
|
|
<img src="@assets/back.png" @click="back" alt="" />
|
|
|
- </div>
|
|
|
|
|
|
|
+ </div> -->
|
|
|
|
|
|
|
|
<div class="content">
|
|
<div class="content">
|
|
|
<div class="content-top">
|
|
<div class="content-top">
|
|
@@ -80,7 +80,7 @@
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
|
|
|
|
|
- <div class="bg-icon">
|
|
|
|
|
|
|
+ <div class="bg-icon" :class="{ bgOne: info.maxPlayerNum === 2 }">
|
|
|
<img src="@assets/png-1v1-bg.png" v-if="info.maxPlayerNum === 2" class="img1" alt="" />
|
|
<img src="@assets/png-1v1-bg.png" v-if="info.maxPlayerNum === 2" class="img1" alt="" />
|
|
|
<img
|
|
<img
|
|
|
src="@assets/png-2v2~5v5-bg.png"
|
|
src="@assets/png-2v2~5v5-bg.png"
|
|
@@ -95,11 +95,11 @@
|
|
|
</div>
|
|
</div>
|
|
|
|
|
|
|
|
<div class="help">
|
|
<div class="help">
|
|
|
- <div class="help-btn" v-if="isJoin" @click="back">
|
|
|
|
|
|
|
+ <div class="help-btn" v-if="isJoin && !isHost && info.status == 'GAMING'" @click="quit">
|
|
|
<img src="@assets/png-tuichu.png" alt="" />
|
|
<img src="@assets/png-tuichu.png" alt="" />
|
|
|
<span>退出</span>
|
|
<span>退出</span>
|
|
|
</div>
|
|
</div>
|
|
|
- <div class="help-btn" v-if="isHost" @click="$refs.failed.init()">
|
|
|
|
|
|
|
+ <div class="help-btn" v-if="isHost && info.status == 'GAMING'" @click="$refs.failed.init()">
|
|
|
<img src="@assets/png-liuju.png" alt="" />
|
|
<img src="@assets/png-liuju.png" alt="" />
|
|
|
<span>流局</span>
|
|
<span>流局</span>
|
|
|
</div>
|
|
</div>
|
|
@@ -110,14 +110,14 @@
|
|
|
</div>
|
|
</div>
|
|
|
|
|
|
|
|
<div class="bottom" v-if="isJoin">
|
|
<div class="bottom" v-if="isJoin">
|
|
|
- <div class="join-btn" v-if="isFull">
|
|
|
|
|
|
|
+ <div class="join-btn" v-if="isFull && (info.status == 'WAITING' || info.status == 'GAMING')">
|
|
|
<van-button type="primary" v-if="info.status == 'WAITING'" block @click="start">开始比赛</van-button>
|
|
<van-button type="primary" v-if="info.status == 'WAITING'" block @click="start">开始比赛</van-button>
|
|
|
<van-button type="primary" v-else-if="info.status == 'GAMING'" block @click="$refs.joinGame.init()"
|
|
<van-button type="primary" v-else-if="info.status == 'GAMING'" block @click="$refs.joinGame.init()"
|
|
|
>进入比赛</van-button
|
|
>进入比赛</van-button
|
|
|
>
|
|
>
|
|
|
</div>
|
|
</div>
|
|
|
<div class="btns">
|
|
<div class="btns">
|
|
|
- <div class="btn" v-if="!isHost" @click="quit">
|
|
|
|
|
|
|
+ <div class="btn" v-if="!isHost && info.status == 'WAITING'" @click="quit">
|
|
|
<img src="@assets/png-quxiaobaoming.png" alt="" />
|
|
<img src="@assets/png-quxiaobaoming.png" alt="" />
|
|
|
<span>取消报名</span>
|
|
<span>取消报名</span>
|
|
|
</div>
|
|
</div>
|
|
@@ -125,6 +125,10 @@
|
|
|
<img src="@assets/png-xiugaidizhi.png" alt="" />
|
|
<img src="@assets/png-xiugaidizhi.png" alt="" />
|
|
|
<span>修改地址</span>
|
|
<span>修改地址</span>
|
|
|
</div>
|
|
</div>
|
|
|
|
|
+ <div class="btn" v-if="info.status == 'FINISH'" @click="$router.push('/roomResult?roomId=' + roomId)">
|
|
|
|
|
+ <img src="@assets/png-xiugaidizhi.png" alt="" />
|
|
|
|
|
+ <span>查看战绩</span>
|
|
|
|
|
+ </div>
|
|
|
<div class="btn" @click="$router.push('/exceptionLogAdd?roomId=' + roomId)">
|
|
<div class="btn" @click="$router.push('/exceptionLogAdd?roomId=' + roomId)">
|
|
|
<img src="@assets/png-yicangshenbao.png" alt="" />
|
|
<img src="@assets/png-yicangshenbao.png" alt="" />
|
|
|
<span>异常申报</span>
|
|
<span>异常申报</span>
|
|
@@ -318,7 +322,6 @@ export default {
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
-
|
|
|
|
|
beforeRouteLeave(to, from, next) {
|
|
beforeRouteLeave(to, from, next) {
|
|
|
if (this && this.emitter) {
|
|
if (this && this.emitter) {
|
|
|
this.emitter.emit('updateList', this.info);
|
|
this.emitter.emit('updateList', this.info);
|
|
@@ -455,24 +458,29 @@ export default {
|
|
|
position: absolute;
|
|
position: absolute;
|
|
|
left: 0;
|
|
left: 0;
|
|
|
right: 0;
|
|
right: 0;
|
|
|
- top: 130px;
|
|
|
|
|
|
|
+ top: 104px;
|
|
|
z-index: 1;
|
|
z-index: 1;
|
|
|
.img1 {
|
|
.img1 {
|
|
|
width: 100%;
|
|
width: 100%;
|
|
|
display: block;
|
|
display: block;
|
|
|
|
|
+ margin-top: 26px;
|
|
|
}
|
|
}
|
|
|
.img2 {
|
|
.img2 {
|
|
|
width: 74px;
|
|
width: 74px;
|
|
|
display: block;
|
|
display: block;
|
|
|
position: absolute;
|
|
position: absolute;
|
|
|
- top: 0;
|
|
|
|
|
|
|
+ top: 50%;
|
|
|
left: 50%;
|
|
left: 50%;
|
|
|
- transform: translateX(-50%);
|
|
|
|
|
|
|
+ transform: translate(-50%, -50%);
|
|
|
}
|
|
}
|
|
|
.img3 {
|
|
.img3 {
|
|
|
width: 100%;
|
|
width: 100%;
|
|
|
display: block;
|
|
display: block;
|
|
|
- margin-top: -26px;
|
|
|
|
|
|
|
+ }
|
|
|
|
|
+ &.bgOne {
|
|
|
|
|
+ .img2 {
|
|
|
|
|
+ top: calc(50% + 13px);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -500,7 +508,7 @@ export default {
|
|
|
position: relative;
|
|
position: relative;
|
|
|
z-index: 2;
|
|
z-index: 2;
|
|
|
.player-item {
|
|
.player-item {
|
|
|
- width: 110px;
|
|
|
|
|
|
|
+ width: 29vw;
|
|
|
.title {
|
|
.title {
|
|
|
font-size: 14px;
|
|
font-size: 14px;
|
|
|
font-weight: bold;
|
|
font-weight: bold;
|
|
@@ -534,13 +542,13 @@ export default {
|
|
|
.btns {
|
|
.btns {
|
|
|
.flex();
|
|
.flex();
|
|
|
height: 56px;
|
|
height: 56px;
|
|
|
- padding: 0 32px;
|
|
|
|
|
- justify-content: space-between;
|
|
|
|
|
|
|
+ padding: 0 16px;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
.btn {
|
|
.btn {
|
|
|
.flex();
|
|
.flex();
|
|
|
justify-content: center;
|
|
justify-content: center;
|
|
|
|
|
+ flex-grow: 1;
|
|
|
img {
|
|
img {
|
|
|
width: 24px;
|
|
width: 24px;
|
|
|
height: 24px;
|
|
height: 24px;
|