Commit e3366705 by chenyu

update: style

parent 499fe2f4
......@@ -139,4 +139,27 @@
white-space: nowrap;
}
}
.status-icon {
font-size: 20px;
line-height: 19px;
vertical-align: middle;
color: #e2e4e8;
&.icon-weixin1 {
&.follow {
color: #28c445;
}
}
&.unfollow {
width: 20px;
height: 20px;
}
&.icon-xiaochengxu1 {
&.used {
color: #11c18b;
}
}
& + .status-icon {
margin-left: 6px;
}
}
}
......@@ -83,12 +83,12 @@
<span v-else-if="colum == 'grade'">{{ row.gradeName }}</span>
<!-- 状态 -->
<span v-else-if="colum == 'status'">
<span :title="row.wxStatus == 0 ? '未使用小程序' : row.wxStatus == 1 ? '已使用小程序' : ''"
class="channelicon"
:class="row.wxStatus == 0 ? 'xcxicongray' : row.wxStatus == 1 ? 'xcxicon' : ''"></span>
<span :title="row.status == 0 ? '取消关注公众号' : row.status == 1 ? '已关注公众号' : '未关注公众号'"
class="channelicon"
:class="row.status == 0 ? 'gzhiconcanclegray' : row.status == 1 ? 'gzhicon' : 'gzhicongray'"></span>
<span title="取消关注公众号" v-if="row.status==0" style="margin-right: 6px;"><svg class="icon status-icon unfollow" aria-hidden="true"
><use xlink:href="#icon-weixinquguan"></use>
</svg></span><i :title="row.status==1?'已关注公众号':'未关注公众号'" v-else
:class="['iconfont status-icon ',row.status==1?'icon-weixin1 follow':'icon-weixin1']"></i><i
:title="row.status==1?'已使用小程序':'未使用小程序'"
:class="['iconfont status-icon icon-xiaochengxu1',row.status==1?'used':'']"></i>
</span>
<!-- 关联渠道 -->
<span v-else-if="colum == 'channel'">
......
......@@ -20,7 +20,7 @@
justify-content: flex-start;
align-items: center;
line-height: 40px;
font-size: 14px;
font-size: 16px;
font-weight: 500;
color: #303133;
.vertical-line {
......@@ -121,7 +121,14 @@
line-height: 19px;
vertical-align: middle;
&.icon-weixin1 {
color: #28c445;
color: #e2e4e8;
&.follow {
color: #28c445;
}
}
&.unfollow {
width: 20px;
height: 20px;
}
&.icon-xiaochengxu1 {
color: #11c18b;
......@@ -192,7 +199,7 @@
transform: translateY(-5px);
box-shadow: 0 2px 7px rgba(122, 138, 203, 0.2);
}
&.balance.nohover:hover{
&.balance.nohover:hover {
cursor: default;
transform: translateY(0);
box-shadow: none;
......@@ -512,6 +519,9 @@
.info-lebel,
.info-content {
font-size: 14px;
.gray-font {
color: #909399;
}
}
.el-descriptions-item__cell {
padding-bottom: 20px;
......
......@@ -32,12 +32,17 @@
<el-descriptions :column="3" labelClassName="info-lebel"
contentClassName="info-content">
<el-descriptions-item label="姓名">
{{member.memberName}}<span>(昵称:{{member.thirdNickname}}</span>
{{member.memberName}}<span
class="gray-font">(昵称:{{member.thirdNickname}}</span>
<el-tag type="success" v-if="member.customerType" class="tag">
{{member.customerType|customerTypeFilter}}</el-tag><i v-if="member.status==1"
class="iconfont status-icon icon-weixin1" title="微信会员"></i><i
v-if="member.wxStatus==1" class="iconfont status-icon icon-xiaochengxu1"
title="小程序"></i>
{{member.customerType|customerTypeFilter}}</el-tag>
<svg class="icon status-icon unfollow" title="取消关注公众号" aria-hidden="true"
v-if="member.status==0">
<use xlink:href="#icon-weixinquguan"></use>
</svg><i :title="member.status==1?'已关注公众号':'未关注公众号'" v-else
:class="['iconfont status-icon ',member.status==1?'icon-weixin1 follow':'icon-weixin1']"></i><i
title="已使用小程序" v-if="member.wxStatus==1"
class="iconfont status-icon icon-xiaochengxu1"></i>
</el-descriptions-item>
<el-descriptions-item label="性别">{{member.memberGender|genderFilter}}
</el-descriptions-item>
......@@ -119,8 +124,9 @@
<el-descriptions-item label="商户会员卡号:">{{memberInfo.cardNum||'--'}}
</el-descriptions-item>
<el-descriptions-item label="商户会员等级:">{{memberInfo.gradeName||'--'}}
<el-popconfirm popper-class="grade-confirm-wrap" placement="top" width="184" @confirm="gradeDialogVisible=true"
confirm-button-text="继续修改" title="等级由ERP计算,建议前往ERP修改等级,以确保双方等级一致">
<el-popconfirm popper-class="grade-confirm-wrap" placement="top" width="184"
@confirm="gradeDialogVisible=true" confirm-button-text="继续修改"
title="等级由ERP计算,建议前往ERP修改等级,以确保双方等级一致">
<el-tooltip slot="reference" class="item" effect="dark" open-delay="200"
content="编辑商户会员等级" placement="top-start"><span class="edit-span"><i
class="el-icon-edit"></i></span>
......@@ -142,8 +148,9 @@
<!-- 资产信息 -->
<template v-if="section.name==='assets'">
<ul class="card-list-wrap max1600">
<li :class="['card-item',item.iconTheme,memberInfo.storedValueFlag?'':'nohover']" v-for="item in section.childrenList"
:key="item" @click="item.iconTheme==='balance'?goStoreValue():goLink(item.path)">
<li :class="['card-item',item.iconTheme,memberInfo.storedValueFlag?'':'nohover']"
v-for="item in section.childrenList" :key="item"
@click="item.iconTheme==='balance'?goStoreValue():goLink(item.path)">
<p :class="['icon-wrap', item.iconTheme]"><i :class="['iconfont', item.icon]"></i>
</p>
<div class="middle">
......
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