f60aa8bf by zhangmeng

Merge branch 'devmatch' into dev

2 parents 8e702a37 addcdebb
......@@ -304,11 +304,11 @@
<i v-else-if="etime>0&&time<=0" class="ii">直播中</i>
<!-- <i class="livetimecount" v-if="etime<=0">直播已结束</i>-->
<div class="imgBox">
<img v-if="time>0" src="/img/111.jpeg">
<img v-if="time>0" src="/img/111.jpg">
<img v-else :src="fillImgUrl_webSite(livelist[0]?.picUrl)">
</div>
<h3 v-if="time>0" class="esp">
2024WDSF亚洲体育舞蹈节
2025WDSF亚洲体育舞蹈节
</h3>
<h3 v-else class="esp">
{{ livelist[0]?.name }}
......
......@@ -291,9 +291,9 @@
</div>
<!-- <i class="ii" v-else-if="etime>0&&time<=0">Living</i>-->
<!-- <i class="livetimecount" v-if="etime<=0">End</i>-->
<div class="imgBox"><img src="/img/111.jpeg"></div>
<div class="imgBox"><img src="/img/111.jpg"></div>
<h3 class="esp">
WUXI 2025 WDSF ASIAN DANCESPORT FESTIVAL
WDSF ASIAN DANCESPORT FESTIVAL 2025.WUXI
</h3>
</a>
</el-col>
......
......@@ -167,7 +167,10 @@
</div>
<div class="text-center mt20 father">
<el-button class="btn-lineG w200px" round type="primary" @click="submitForm()">
<el-button
class="btn-lineG w200px" round style="position: relative ; z-index: 99;" type="primary"
@click="submitForm"
>
{{ language == 0 ? '预览报名信息' : 'Preview Registration Information' }}
</el-button>
......@@ -181,6 +184,7 @@
size="large" true-value="1"
/>
<br v-if="language == 1">
<span
@click="handelInsurance"
>{{ language == 0 ? '赛事购买协议' : 'Event Insurance Procurement Agreement' }} </span>
......@@ -415,7 +419,7 @@ function getSignInfoList() {
}
function submitForm(n) {
function submitForm() {
if (signInfoList.value.length == 0) {
if (language.value == 0) {
ElMessage.warning('请至少选择一个项目')
......@@ -916,21 +920,51 @@ function checkedChange(v) {
}
}
.father {
position: relative;
height: 85px;
}
.checkbox {
position: absolute;
right: 5%;
text-align: left;
@media (max-width: 767px) {
span {
color: #453DEA;
.father {
position: relative;
height: 110px;
padding-top: 45px;
line-height: 40px;
}
.checkbox {
position: absolute;
right: 0%;
top: 0;
text-align: left;
font-size: 14px;
span {
color: #453DEA;
position: relative;
top: -4px;
cursor: pointer
}
}
}
/* 桌面(≥1024px) */
@media (min-width: 1024px) {
.father {
position: relative;
top: -1px;
cursor: pointer
height: 85px;
line-height: 85px;
}
.checkbox {
position: absolute;
right: 0%;
text-align: left;
font-size: 12px;
span {
color: #453DEA;
position: relative;
top: -4px;
cursor: pointer
}
}
}
</style>
......
......@@ -182,10 +182,16 @@
/>
<zu-table v-else :list="zuTableList" @delete="removeThis" />
<div class="text-center mt20 father">
<el-button class="w200px" plain round type="primary" @click="goPrev()">
<el-button
class="w200px" plain round style="position: relative ;z-index: 99" type="primary"
@click="goPrev()"
>
{{ language == 0 ? "上一步" : 'Go back' }}
</el-button>
<el-button class="btn-lineG w200px" round type="primary" @click="submitForm()">
<el-button
class="btn-lineG w200px" round style="position: relative ;z-index: 99" type="primary"
@click="submitForm()"
>
{{ language == 0 ? '预览报名信息' : 'Preview registration information' }}
</el-button>
......@@ -1120,21 +1126,52 @@ function checkedChange(v) {
}
}
.father {
position: relative;
height: 85px;
}
.checkbox {
position: absolute;
right: 5%;
text-align: left;
@media (max-width: 767px) {
span {
color: #453DEA;
.father {
position: relative;
top: -1px;
cursor: pointer
height: 110px;
padding-top: 45px;
line-height: 40px;
}
.checkbox {
position: absolute;
right: 0%;
top: 0;
text-align: left;
font-size: 14px;
span {
color: #453DEA;
position: relative;
top: -4px;
cursor: pointer
}
}
}
/* 桌面(≥1024px) */
@media (min-width: 1024px) {
.father {
position: relative;
height: 85px;
line-height: 85px;
}
.checkbox {
position: absolute;
right: 0%;
text-align: left;
font-size: 12px;
span {
color: #453DEA;
position: relative;
top: -4px;
cursor: pointer
}
}
}
</style>
......
<template>
<el-dialog
v-model="show" :close-on-click-modal="false"
v-model="show"
:title="language==0?'赛事购买协议':'Event Insurance Procurement Agreement'" append-to-body center
class="pcloginpop"
close-icon="CircleClose" destroy-on-close
width="1100px"
width="80%"
>
<div v-html="data" />
<div class="checkbox">
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!