Commit c3b75ee5 by crushh

Merge branch 'bugfix/会员积分数据' into test

parents 7d22c9f7 efc0bd1d
.max1600 {
max-width: 1600px;
}
.fz12{
font-size: 12px;
}
.fz14{
font-size: 14px;
}
.customer-contain-wrap {
padding: 20px;
background: #fff;
......@@ -235,7 +240,7 @@
align-items: center;
.flex-moudle-item {
width: 400px;
width: 265px;
height: 224px;
padding: 20px;
background: #ffffff;
......@@ -443,7 +448,7 @@
display: flex;
flex-direction: column;
justify-content: space-between;
width: 300px;
width: 265px;
height: 224px;
.flex-column-item {
......@@ -464,6 +469,36 @@
border-bottom: 1px dashed #E4E7ED;
padding-bottom: 15px;
margin-bottom:15px ;
}
.clique-item{
position: relative;
.label {
position: absolute;
top: -6px;
left: 70px;
}
.num {
position: absolute;
top: 24px;
left: 57px;
}
.icon-wrap {
margin: 0;
width: 48px !important;
height: 48px!important;
.iconfont {
&.icon-jifenduihuan {
font-size: 28px!important;
}
&.icon-jifenjiabei {
font-size: 28px!important;
}
}
}
}
.available-point {
width: 108px;
......@@ -499,7 +534,7 @@
}
.available-point-h{
height: 110px;
padding: 16px 14px 5px 12px;
padding:16px 12px 5px 12px;
}
}
}
......
......@@ -356,7 +356,7 @@
<div class="flex-moudle-item">
<template v-for="item in section.childrenList.point">
<div
:class="['flex-item line-item assets-item','hover', {'other-assets-item': !showClique},item.iconTheme==='integral_clique'&&showClique?'slipt-line':'']"
:class="['flex-item line-item assets-item','hover', !showClique?'other-assets-item':'clique-item',item.iconTheme==='integral_clique'&&showClique?'slipt-line':'']"
v-if="item.iconTheme!=='integral_clique'||(item.iconTheme==='integral_clique'&&showClique)"
:key="item"
@click="goLink(item.path)">
......@@ -373,7 +373,6 @@
</div>
<div class="el-icon-arrow-right" v-if="item.path" />
</div>
<!-- <div class="slipt-line" v-show="item.iconTheme==='integral_clique'&&showClique"></div> -->
<div class="flex-item" :key="item" v-if="item.iconTheme!=='integral_clique'">
<div :class="['available-point',!showClique?'available-point-h':'']">
<div class="label">可用积分</div>
......@@ -384,7 +383,7 @@
<div class="label">
不可用积分
<el-tooltip content="不可用原因:积分为冻结/预扣状态,详情可查看客户日志" placement="top">
<i class="iconfont icon-QuestionCircleOutlined" style="color: #909399"/>
<i :class="['iconfont icon-QuestionCircleOutlined',!showClique?'fz14':'fz12']" style="color: #909399"/>
</el-tooltip>
</div>
<div class="num">{{ memberInfo.invalidIntegral?memberInfo.invalidIntegral:0 }}</div>
......
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