Commit 36ba085d by xiaohai

样式优化

parent 1da13c3b
......@@ -65,7 +65,7 @@
ref="templateTable"
:data="temporaryData"
tooltip-effect="dark"
height="510"
height="480"
style="width: 100%"
@select="selectRow"
@select-all="handleSelectAll"
......
......@@ -193,8 +193,8 @@
.common-wrap__currentTag__name {
cursor: pointer;
}
.common-wrap__childTag__name {
}
.common-wrap__childTag__name {
display: inline-block;
padding: 3px 5px;
cursor: pointer;
......@@ -203,5 +203,4 @@
color: #303133;
}
}
}
</style>
......@@ -281,7 +281,7 @@
.right-content {
/*width: 100%;*/
padding: 24px;
min-height: calc(100% - 224px);
min-height: calc(100% - 240px);
.right-box {
background: #fff;
......
......@@ -195,8 +195,7 @@
width="200"
trigger="hover">
<span>勾选后,此前被该标签标记的会员将移除此标签,此标签标记会员以本次导入为准。</span>
<!-- <a slot="reference" class="pointer" :href="'#/memberGroupDetail?memberTagGroupId='+scope.row.memberTagGroupId">{{ scope.row.groupName }}</a> -->
<i slot="reference" class="el-icon-question"></i>
<i slot="reference" class="iconfont icon-xinxixianshi"></i>
</el-popover>
</template>
</el-table-column>
......@@ -1074,12 +1073,13 @@
overflow: hidden;
}
.el-icon-question {
.icon-xinxixianshi {
display: inline-block;
vertical-align: middle;
font-size: 14px;
color: #909399;
cursor: pointer;
line-height: 1px;
}
.w-447 {
......
......@@ -271,7 +271,7 @@
.right-content {
/*width: 100%;*/
padding: 24px;
min-height: calc(100% - 224px);
min-height: calc(100% - 240px);
.right-box {
background: #fff;
......
......@@ -51,7 +51,7 @@
@show="showSingleInfo(scope.row.memberId)">
<div class="pointer" @click="linkDetail(scope.row.memberId, scope.row.isWeixinMember)">
<div class="singelinfo flex">
<div class="singelinfo-img"><img width="100" height="100" :src="scope.row.thirdImgUrl ? scope.row.thirdImgUrl : require('../../assets/group/default.png')" alt=""></div>
<div class="singelinfo-img"><img width="100" height="100" :src="scope.row.thirdImgUrl ? scope.row.thirdImgUrl : require('../../assets/group/member_img.png')" alt=""></div>
<div class="singelinfo-content flex-1 pLeft10 pRight10">
<span class="lheigth0">{{ scope.row.memberName }}
<span :title="singleInfo.status == 0 ? '取消关注公众号' : singleInfo.status == 1 ? '已关注公众号' : '未关注公众号'" class="channelicon fr"
......@@ -80,8 +80,9 @@
<span slot="reference">
<!-- <img class="tablecontent-cellimg mr6" width="60" height="60" :src="scope.row.thirdImgUrl ? scope.row.thirdImgUrl : './static/img/default.png'" alt=""> -->
<span class="table-member__img inline-block middle border-box m-r-8">
<i class="iconfont icon-huiyuanguanli" v-if="!scope.row.thirdImgUrl"></i>
<img v-if="scope.row.thirdImgUrl" :src="scope.row.thirdImgUrl"/>
<!-- <i class="iconfont icon-huiyuanguanli" v-if="!scope.row.thirdImgUrl"></i> -->
<!-- <img v-if="!scope.row.thirdImgUrl" src="../../assets/group/member_img.png"/> -->
<img :src="scope.row.thirdImgUrl ? scope.row.thirdImgUrl : require('../../assets/group/member_img.png')"/>
</span><span>{{scope.row.memberName}}</span>
</span>
</el-popover>
......@@ -604,7 +605,8 @@
padding-top: 10px;
}
.group-name {
font-weight: bold;
font-weight: 500;
font-size: 16px;
}
.real-time {
padding: 3px 4px;
......@@ -703,9 +705,9 @@
.table-member__img {
width: 40px;
height: 40px;
line-height: 40px;
// line-height: 40px;
text-align: center;
background: #F3F6F9;
// background: #F3F6F9;
img {
display: inline-block;
width: 100%;
......
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