Commit c9fffd44 by 曾经

Merge branch 'feature/7月基础一异常冻结会员' into dev

* feature/7月基础一异常冻结会员:
  部分浏览器版本 deep 不生效问题
parents 1cc00f3c 93e13c59
......@@ -110,12 +110,12 @@
padding-right: 0px;
}
}
/deep/.table-select-page /deep/.cell {
/deep/.table-select-page .cell {
padding-left: 0px;
padding-right: 0;
display: flex;
align-items: center;
/deep/.el-dropdown {
.el-dropdown {
padding: 0;
}
}
......@@ -123,6 +123,75 @@
padding: 0;
}
}
.el-table {
.setting-cell.el-table__cell {
display: flex;
align-items: center;
height: 50px;
padding: 0;
.cell.setting-cell {
display: flex;
justify-content: space-between;
align-items: center;
height: 50px;
padding-right: 0;
.el-icon-setting {
display: flex;
justify-content: center;
align-items: center;
width: 50px;
height: 100%;
font-size: 20px;
color: #303133;
cursor: pointer;
background: #e5e6eb;
&:hover {
color: #000;
}
}
}
}
.el-table__empty-block {
z-index: 1;
position: relative;
background: white;
}
.cell {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
padding-left: 10px;
}
.el-table__header .cell {
padding-left: 10px;
}
.el-table-column--selection {
.cell {
padding-left: 16px;
padding-right: 0px;
}
}
.table-select-page .cell {
padding-left: 0px;
padding-right: 0;
display: flex;
align-items: center;
.el-dropdown {
padding: 0;
}
}
.el-table__header .el-table__cell{
padding: 0;
}
}
}
.frozen-list {
......
......@@ -45,7 +45,7 @@
<el-button @click="download"
v-if="getCodeAuth('memberAbnormalSearchReasultDownload')"
:limit-code="getCode('memberAbnormalSearchReasultDownload')">
<i class="iconfont icon-xiazairizhi"></i>
<i class="iconfont icon-xiazai"></i>
<span> 搜索结果导出</span>
</el-button>
......@@ -435,11 +435,11 @@
import action from './abnormal-member.js';
export default { ...action };
</script> -->
<style lang="less" scoped src="./abnormal-member.less"></style>
<style lang="less">
.unfreeze-pop-class .el-popconfirm__main {
margin-block-start: 1em;
margin-block-end: 1em;
}
</style>
<style lang="less" scoped src="./abnormal-member.less"></style>
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