Browse Source

Merge pull request 'zq-ui' (#40) from zq-ui into master

Reviewed-on: #40
master
zhangqi 1 week ago
parent
commit
aa4b3f7acc
  1. 97
      src/style/theme/common.scss
  2. 9
      src/views/super/Ranking/RankBatchList.vue

97
src/style/theme/common.scss

@ -180,8 +180,8 @@ body {
margin: 0 auto;
}
.min-flex-right {
min-width: 1033px;
max-width: 1556px;
min-width: 1020px;
// max-width: 1556px;
width: 84.75%;
margin: 0 auto;
.flex-common{
@ -727,8 +727,76 @@ body {
color: #1E2226;
}
}
.nowrap{
white-space: nowrap !important;
overflow: hidden !important;
text-overflow: ellipsis !important;
}
.tableHeaderSelect{
height: 18px !important;
}
/* 小屏幕下调整 */
@media screen and (max-width: 1440px) {
.el-table th.el-table__cell > .cell{
white-space: nowrap !important;
}
.cell-content {
display: inline-block;
max-width:60%;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.svg-icon-wrapper{
width: 12px !important;
height: 12px !important;
}
}
@media screen and (min-width: 1321px) and (max-width: 1440px){
.el-table{
th,td{
font-size: 13px !important;
}
}
// body{
// font-size: 13px !important;
// }
.tableHeaderSelect .el-input__inner{
font-size: 13px !important;
}
}
@media screen and (max-width: 1320px){
// body{
// font-size: 12px !important;
// }
.el-table{
th,td{
font-size: 12px !important;
}
}
.tableHeaderSelect .el-input__inner{
font-size: 12px !important;
}
}
@media screen and (min-width: 1440px) {
.el-table{
th,td{
font-size: 14px !important;
}
}
.cell-content {
white-space: normal;
max-width: none;
}
.svg-icon-wrapper{
// width: 12px !important;
// height: 12px !important;
}
}
// table start
.el-table{
min-height: 258px;
@ -737,12 +805,17 @@ body {
font-weight: normal;
letter-spacing: 0.08em;
color: #1E2226;
height: 56px;
padding: 18px 16px !important;
// height: 56px;
padding: 8px 10px !important;
box-sizing: border-box !important;
}
td{
}
.tableColumn{
display: flex;
flex-direction: column;
justify-content: flex-start;
}
}
.el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell {
background-color: #F6F7FA;
@ -762,7 +835,12 @@ body {
// height: auto !important;
// background: transparent !important;
// }
.el-table th.el-table__cell > .cell{
padding-left: 0 !important;
padding-right: 0 !important;
display: flex;
align-items: center;
}
.el-table th.el-table__cell {
background: #F6F7FA;
padding: 10px 0;
@ -778,8 +856,8 @@ body {
}
.el-table .cell {
padding-left: 16px;
padding-right: 16px;
padding-left: 0px;
padding-right: 0px;
}
.el-table .el-form-item {
margin-bottom: 0;
@ -788,10 +866,12 @@ body {
// 表格行内小图标 默认隐藏
.el-table .svg-icon-wrapper{
display: none !important;
margin-left: 8px;
}
//划过时 显示
.el-table__row:hover{
.svg-icon-wrapper{
margin-left: 8px;
display: block !important;
}
}
@ -881,6 +961,9 @@ body {
display: flex;
align-items: center;
}
.flex-end{
align-items: flex-end !important;
}
// 公共圆角类名
.br4{
border-radius: 4px;

9
src/views/super/Ranking/RankBatchList.vue

@ -64,7 +64,7 @@
<span class="lookMore" @click="goLookMoreData(row.id)">查看更多</span>
</h3>
<span class="flex point" @click="closePop(row,'id')">
关闭<img src="@/assets/register/close.svg">
<img src="@/assets/register/close.svg">
</span>
</div>
<el-table :data="tableData1" style="width: 100%">
@ -86,7 +86,7 @@
<span class="lookMore" @click="goLookCheckTypeRank(row.id)">查看更多</span>
</h3>
<span class="flex point" @click="closePop(row,'id')">
关闭<img src="@/assets/register/close.svg">
<img src="@/assets/register/close.svg">
</span>
</div>
<el-table :data="tableData1" style="width: 100%">
@ -134,7 +134,8 @@
key="top" prop="top" label="代理商排行" width="250" fixed="right">
<template v-slot="{ row, $index }">
<el-popover v-model="row.id_popover_2" placement="top" trigger="manual"
:ref="`popover_2-${$index}`" @show="popshow">
popper-class="custom-popover"
:ref="`popover_2-${$index}`" @show="popshow" :append-to-body="false" :visible-arrow="true">
<div class="pop-wrap">
<div class="flex-between flex pop-top">
<h3>
@ -142,7 +143,7 @@
<span class="lookMore" @click="goLookAgentRank(row.id)">查看更多</span>
</h3>
<span class="flex point" @click="closePop(row,'id')">
关闭<img src="@/assets/register/close.svg">
<img src="@/assets/register/close.svg">
</span>
</div>
<el-table :data="tableData1" style="width: 100%">

Loading…
Cancel
Save