Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
member
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
member
member
Commits
c9fffd44
Commit
c9fffd44
authored
Aug 22, 2022
by
曾经
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/7月基础一异常冻结会员' into dev
* feature/7月基础一异常冻结会员: 部分浏览器版本 deep 不生效问题
parents
1cc00f3c
93e13c59
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
74 additions
and
5 deletions
+74
-5
abnormal-member.less
...abnormal-member/abnormal-member-list/abnormal-member.less
+71
-2
abnormal-member.vue
.../abnormal-member/abnormal-member-list/abnormal-member.vue
+3
-3
No files found.
src/components/wechatmembers/abnormal-member/abnormal-member-list/abnormal-member.less
View file @
c9fffd44
...
...
@@ -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 {
...
...
src/components/wechatmembers/abnormal-member/abnormal-member-list/abnormal-member.vue
View file @
c9fffd44
...
...
@@ -45,7 +45,7 @@
<el-button
@
click=
"download"
v-if=
"getCodeAuth('memberAbnormalSearchReasultDownload')"
:limit-code=
"getCode('memberAbnormalSearchReasultDownload')"
>
<i
class=
"iconfont icon-xiazai
rizhi
"
></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
>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment