6bef8301 by 华明祺

Merge branch 'dev' of https://code.itechtop.cn/yangyang/dance-pc into dev

2 parents 1881b53e 757e7e64
......@@ -36,7 +36,7 @@
<div v-if="activeName=='7'" class="pd20">
<div v-for="b in list" v-loading="loading" class="item">
<div class="title">
<label class="orangeTag"> {{ language == 0 ? '票务' : 'Ticket' }} </label>
<label class="orangeTag"> {{ language == 0 ? '旅游' : 'Tourist' }} </label>
<span>{{ b.id }}</span>
<span class="fr text-warning status">{{ b.invoiceStr }}</span>
</div>
......
<template>
<div>
<div class="box">
<div class="mt20" />
<el-card>
<el-row :gutter="20">
<el-col :lg="12" :sm="24">
<!--赛事日历-->
<el-calendar v-model="currentDate">
<template #date-cell="data">
<div
:class="data.data.day==query.currentDate?'primaryDate':''" class="date"
@click="selectDate(data.data.day)"
>
{{ data.data.day.slice(8, 10) }}
</div>
</template>
</el-calendar>
</el-col>
<el-col :lg="12" :sm="24">
<div class="calendarList">
......@@ -32,13 +32,13 @@
<el-empty v-if="schList.length== 0" :image="`/img/order_no.png`" :image-size="200" />
</ul>
</div>
</el-col>
</el-row>
</el-card>
<el-card class="mt20 mb20">
<el-table :data="rank" stripe>
<el-table-column align="center" label="名次" type="index">
<el-table-column align="center" label="名次" type="index" width="100">
<template #default="scope">
<span v-if="scope.row.mingCi == 1" style="color:#F8A617">{{ scope.row.mingCi }}</span>
<span v-else-if="scope.row.mingCi == 2" style="color:#778B92">{{ scope.row.mingCi }}</span>
......@@ -46,7 +46,7 @@
<span v-else>{{ scope.row.mingCi }}</span>
</template>
</el-table-column>
<el-table-column label="国家" prop="name">
<template #default="scope">
<div>
......@@ -85,7 +85,7 @@
</template>
</el-table-column>
</el-table>
</el-card>
<el-card v-for="(n,index) in cjList" class="mt20 mb20" hidden>
<div class="leftboderTT">{{ language == 0 ? n.title : n.en_title }}</div>
......@@ -116,7 +116,7 @@
</table>
</div>
</div>
</el-card>
<br><br>
</div>
......@@ -209,7 +209,7 @@ h3 {
width: 100%;
max-width: 100%;
margin-bottom: 20px;
td, th {
padding: 8px;
font-size: 14px;
......@@ -225,24 +225,24 @@ h3 {
--el-calendar-cell-width: 51px;
text-align: center;
--el-text-color-regular: #8E8D94;
:deep(.el-calendar__header) {
justify-content: center;
}
:deep(.el-calendar__body) {
border: 1px solid #F0F0F0;
padding: 0
}
:deep(.el-calendar-table .el-calendar-day) {
padding: 1px;
}
:deep(.el-calendar-table td.is-selected) {
background: transparent;
}
:deep(.el-calendar__button-group) {
display: none;
}
......@@ -267,12 +267,12 @@ h3 {
padding: 12px 20px 0;
overflow: hidden;
height: 100%;
ul {
overflow: auto;
height: 330px;
margin: 0;
li {
background: #F6F9FE;
margin: 7px 0 7px 20px;
......@@ -282,11 +282,11 @@ h3 {
font-weight: 500;
font-size: 15px;
cursor: pointer;
label {
color: #453DEA;
margin-right: 15px;
&::before {
content: '';
background: #fff;
......@@ -302,7 +302,7 @@ h3 {
}
}
}
li::before {
content: '';
background: linear-gradient(0deg, #8623FC, #453DEA);
......@@ -316,7 +316,7 @@ h3 {
margin: auto;
z-index: 1;
}
li::after {
content: '';
left: -16px;
......@@ -326,11 +326,11 @@ h3 {
position: absolute;
top: 20px
}
li:hover {
color: #fff;
background: linear-gradient(-90deg, #8623FC, #453DEA);
label {
color: #fff;
}
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!