Skip to content

M
member
Commit 44095f48 by chenyu
Options

update: update

parent ac000fe8
Showing with 315 additions and 132 deletions
src/components/allCustomers/customerDetail.less
......@@ -171,15 +171,28 @@
margin: 0 9px 0 13px;
background: #e4e7ed;
}
}
.extend-description {
display: flex;
padding: 20px 0 0;
transition: height 1s;
&.shrink{
height: 47px;
overflow: hidden;
box-sizing: border-box;
}
.toggleTag {
flex-shrink: 0;
width: 70px;
text-align: right;
font-size: 14px;
font-weight: 400;
color: #1890ff;
cursor: default;
}
}
.extend-description {
padding: 20px 0 0;
.empty-block{
flex: 1;
}
}
}
}
......@@ -221,27 +234,6 @@
height: 48px;
margin: 0 25px 0 0;
border-radius: 6px;
&.integral {
background: rgba(255, 203, 71, 0.15);
.icon-jifen1 {
font-size: 33px;
color: #ffcb48;
}
}
&.coupon {
background: #ecf8fe;
.icon-01_kaquanguanli {
font-size: 38px;
color: #26dad0;
}
}
&.balance {
background: #ecf8fe;
.icon-chuzhizhanghu {
font-size: 27px;
color: #5c89ff;
}
}
&.market {
background: #ecf8fe;
.icon-yingxiaojilu {
......@@ -286,28 +278,46 @@
transform: translateX(5px);
}
}
& + .assets-item {
margin-top: 20px;
}
// 资产信息
&.assets-item {
.el-icon-arrow-right {
align-self: flex-end;
}
}
// 交易记录
&.transaction-item {
& + .transaction-item {
&.line-item {
& + .line-item {
margin-top: 10px;
}
.icon-wrap {
width: 40px;
height: 40px;
margin-right: 10px;
background: #ecf8fe;
// background: #ecf8fe;
img {
height: 26px;
}
&.integral_clique {
background: #FFF5E9;
.icon-jifenjiabei {
font-size: 20px;
color: #FF9D1A;
}
}
&.integral {
background:#FFF7E3;
.icon-jifenduihuan {
font-size: 20px;
color: #ffcb48;
}
}
&.coupon {
background: #ecf8fe;
.icon-01_kaquanguanli {
font-size: 26px;
color: #26dad0;
}
}
&.balance {
background: #ecf8fe;
.icon-chuzhizhanghu {
font-size: 20px;
color: #5c89ff;
}
}
.iconfont {
color: #597ef7;
&.icon-mendianbaojiadan {
......@@ -334,6 +344,9 @@
line-height: 28px;
vertical-align: middle;
}
&.transaction-item .icon-wrap{
background: #ecf8fe;
}
}
}
.flex-column-wrap {
......
src/components/allCustomers/customerDetail.vue
......@@ -7,7 +7,8 @@
<h2 class="item-title">
<i class="vertical-line" /><span>{{ section.title }}</span>
</h2>
<el-button type="text" v-if="section.name==='basic' && getCodeAuth('memberEditInfo')" @click="baseinfoDialogVisible=true" :limit-code="getCode('memberEditInfo')">
<el-button type="text" v-if="section.name==='basic' && getCodeAuth('memberEditInfo')"
@click="baseinfoDialogVisible=true" :limit-code="getCode('memberEditInfo')">
编辑
</el-button>
</div>
......@@ -91,13 +92,13 @@
:class="showFieldType===2?'':'no-active'">会员信息字段</el-button>
</div>
<div class="vertical-line" />
<div class="toggleTag" @click="toggleTag=!toggleTag">
<!-- <div class="toggleTag" @click="toggleTag=!toggleTag">
{{ toggleTag?'收起':'展开' }}<i
:class="toggleTag ? 'el-icon-arrow-up' : 'el-icon-arrow-down'" />
</div>
:class="toggleTag ? 'el-icon-arrow-up' : 'el-icon-arrow-down'" />
</div>-->
</div>
<div v-show="toggleTag" class="max1600">
<div class="extend-description">
<div class="max1600">
<div :class="['extend-description',toggleTag?'':'shrink']">
<!-- 开卡拓展字段 -->
<template
v-if="showFieldType===1&&(extendInfo.openField||extendInfo.openChildrenField)">
......@@ -117,6 +118,10 @@
</el-tooltip>
</el-descriptions-item>
</el-descriptions>
<div class="toggleTag" @click="toggleTag=!toggleTag" v-if="babyStr?extendInfo.openField.length>=2:extendInfo.openField.length>=3">
{{ toggleTag?'收起':'展开更多' }}<i
:class="toggleTag ? 'el-icon-arrow-up' : 'el-icon-arrow-down'" />
</div>
</template>
<!-- 会员信息字段 -->
<template v-if="showFieldType===2&&extendInfo.fieldList">
......@@ -127,6 +132,10 @@
{{ item.fieldValue }}
</el-descriptions-item>
</el-descriptions>
<div class="toggleTag" @click="toggleTag=!toggleTag" v-if="extendInfo.fieldList.length>=3">
{{ toggleTag?'收起':'展开更多' }}<i
:class="toggleTag ? 'el-icon-arrow-up' : 'el-icon-arrow-down'" />
</div>
</template>
<div class="empty-block"
v-if="(showFieldType===1&&!extendInfo.openField&&!extendInfo.openChildrenField)||(showFieldType===2&&!extendInfo.fieldList)">
......@@ -150,14 +159,15 @@
<el-descriptions-item label="集团会员等级:">
{{ memberInfo.cliqueGradeName||'--' }}
</el-descriptions-item>
<el-descriptions-item label="集团会员积分:">
<el-descriptions-item></el-descriptions-item>
<!-- <el-descriptions-item label="集团会员积分:">
{{ memberInfo.cliqueMemberIntegral||'--' }}
</el-descriptions-item>
</el-descriptions-item> -->
</template>
<el-descriptions-item label="商户会员卡号:">
<el-descriptions-item label="会员卡号:">
{{ memberInfo.cardNum||'--' }}
</el-descriptions-item>
<el-descriptions-item label="商户会员等级:">
<el-descriptions-item label="会员等级:">
{{ memberInfo.gradeName||'--' }}
<template v-if="memberInfo.gradeName && getCodeAuth('memberEditGrade')">
<el-popconfirm v-if="memberInfo.erpCalcGrade" popper-class="grade-confirm-wrap"
......@@ -165,13 +175,14 @@
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" :limit-code="getCode('memberEditGrade')" /></span>
<span class="edit-span"><i class="el-icon-edit"
:limit-code="getCode('memberEditGrade')" /></span>
</el-tooltip>
</el-popconfirm>
<el-tooltip v-else class="item" effect="dark" open-delay="200" content="编辑商户会员等级"
placement="top-start">
<span class="edit-span" @click="gradeDialogVisible=true"><i
class="el-icon-edit" :limit-code="getCode('memberEditGrade')" /></span>
<span class="edit-span" @click="gradeDialogVisible=true"><i class="el-icon-edit"
:limit-code="getCode('memberEditGrade')" /></span>
</el-tooltip>
</template>
</el-descriptions-item>
......@@ -196,14 +207,16 @@
<div class="flex-wrap">
<!-- 资产信息 -->
<div class="flex-moudle-item">
<div :class="['flex-item assets-item',item.iconTheme!=='balance'||(item.iconTheme==='balance'&&memberInfo.storedValueFlag)?'hover':'']"
v-for="item in section.childrenList.assets" :key="item"
@click="item.iconTheme==='balance'?goStoreValue():goLink(item.path)">
<div class="left">
<p :class="['icon-wrap', item.iconTheme]">
<i :class="['iconfont', item.icon]" />
</p>
<div class="middle">
<template v-for="item in section.childrenList.assets">
<div
:class="['flex-item line-item assets-item',item.path||(item.iconTheme==='balance'&&memberInfo.storedValueFlag)?'hover':'']"
v-if="item.iconTheme!=='integral_clique'||item.iconTheme==='integral_clique'&&showClique"
:key="item"
@click="item.iconTheme==='balance'?goStoreValue():goLink(item.path)">
<div class="left">
<p :class="['icon-wrap', item.iconTheme]">
<i :class="['iconfont', item.icon]" />
</p>
<div class="label">
{{ item.label }}
</div>
......@@ -213,14 +226,14 @@
:0 }}
</div>
</div>
<div class="el-icon-arrow-right"
v-if="item.path||(item.iconTheme==='balance'&&memberInfo.storedValueFlag)" />
</div>
<div class="el-icon-arrow-right"
v-if="item.iconTheme!=='balance'||(item.iconTheme==='balance'&&memberInfo.storedValueFlag)" />
</div>
</template>
</div>
<!-- 交易记录 -->
<div class="flex-moudle-item">
<div class="flex-item hover transaction-item" @click="goLink(item.path)"
<div class="flex-item line-item hover transaction-item" @click="goLink(item.path)"
v-for="item in section.childrenList.transaction" :key="item">
<div class="left">
<p class="icon-wrap">
......@@ -344,7 +357,8 @@
<!-- 手工标签 -->
<el-tab-pane label="手工标签" name="tag">
<div style="padding:0 0 23px;text-align: right;">
<el-button type="text" v-if="getCodeAuth('memberEditManualTag')" @click="labelDialogVisible=true" :limit-code="getCode('memberEditManualTag')">
<el-button type="text" v-if="getCodeAuth('memberEditManualTag')"
@click="labelDialogVisible=true" :limit-code="getCode('memberEditManualTag')">
编辑手工标签
</el-button>
</div>
......@@ -399,10 +413,9 @@
<template v-for="item in tagAndRemarkInfo.dictFigureList">
<li :key="item" class="dictFigure-item">
<div v-if="item.imageUrl" class="img-wrap">
<el-image
style="width: 68px; height: 68px"
:src="require(`../../../static/img/body-shape-${member.memberGender===1?'man':'woman'}/${item.imageUrl}`)"
fit="contain"></el-image>
<el-image style="width: 68px; height: 68px"
:src="require(`../../../static/img/body-shape-${member.memberGender===1?'man':'woman'}/${item.imageUrl}`)"
fit="contain"></el-image>
</div>
<div class="right">
<p class="dict-name">
......
src/components/allCustomers/info.js
......@@ -104,8 +104,15 @@ export default {
// 资产信息
assets: [
{
label: '积分',
icon: 'icon-jifen1',
label: '集团积分',
icon: 'icon-jifenjiabei',
iconTheme: 'integral_clique',
key: 'accumulatPoints',
path: '',
},
{
label: '商户积分',
icon: 'icon-jifenduihuan',
iconTheme: 'integral',
key: 'accumulatPoints',
path: '/integralDataPage',
......
static/font/demo_index.html
......@@ -55,6 +55,48 @@
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont">&#xe696;</span>
<div class="name">积分加倍</div>
<div class="code-name">&amp;#xe696;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe697;</span>
<div class="name">积分兑换</div>
<div class="code-name">&amp;#xe697;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe695;</span>
<div class="name">详情</div>
<div class="code-name">&amp;#xe695;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe694;</span>
<div class="name">企微</div>
<div class="code-name">&amp;#xe694;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe673;</span>
<div class="name">外部</div>
<div class="code-name">&amp;#xe673;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe672;</span>
<div class="name">search</div>
<div class="code-name">&amp;#xe672;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe693;</span>
<div class="name">QuestionCircleOutlined</div>
<div class="code-name">&amp;#xe693;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe68f;</span>
<div class="name">通话记录</div>
<div class="code-name">&amp;#xe68f;</div>
......@@ -217,18 +259,6 @@
</li>
<li class="dib">
<span class="icon iconfont">&#xe672;</span>
<div class="name">SwapOutlined</div>
<div class="code-name">&amp;#xe672;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe673;</span>
<div class="name">BellOutlined</div>
<div class="code-name">&amp;#xe673;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe892;</span>
<div class="name">查看详情</div>
<div class="code-name">&amp;#xe892;</div>
......@@ -1758,9 +1788,9 @@
<pre><code class="language-css"
>@font-face {
font-family: 'iconfont';
src: url('iconfont.woff2?t=1638173401408') format('woff2'),
url('iconfont.woff?t=1638173401408') format('woff'),
url('iconfont.ttf?t=1638173401408') format('truetype');
src: url('iconfont.woff2?t=1639982128381') format('woff2'),
url('iconfont.woff?t=1639982128381') format('woff'),
url('iconfont.ttf?t=1639982128381') format('truetype');
}
</code></pre>
<h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
......@@ -1787,6 +1817,69 @@
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont icon-jifenjiabei"></span>
<div class="name">
积分加倍
</div>
<div class="code-name">.icon-jifenjiabei
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-jifenduihuan"></span>
<div class="name">
积分兑换
</div>
<div class="code-name">.icon-jifenduihuan
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-xiangqing1"></span>
<div class="name">
详情
</div>
<div class="code-name">.icon-xiangqing1
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-qiwei"></span>
<div class="name">
企微
</div>
<div class="code-name">.icon-qiwei
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-waibu"></span>
<div class="name">
外部
</div>
<div class="code-name">.icon-waibu
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-search"></span>
<div class="name">
search
</div>
<div class="code-name">.icon-search
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-QuestionCircleOutlined"></span>
<div class="name">
QuestionCircleOutlined
</div>
<div class="code-name">.icon-QuestionCircleOutlined
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-tonghuajilu1"></span>
<div class="name">
通话记录
......@@ -2030,24 +2123,6 @@
</li>
<li class="dib">
<span class="icon iconfont icon-SwapOutlined"></span>
<div class="name">
SwapOutlined
</div>
<div class="code-name">.icon-SwapOutlined
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-BellOutlined"></span>
<div class="name">
BellOutlined
</div>
<div class="code-name">.icon-BellOutlined
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-chakanxiangqing"></span>
<div class="name">
查看详情
......@@ -4344,6 +4419,62 @@
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-jifenjiabei"></use>
</svg>
<div class="name">积分加倍</div>
<div class="code-name">#icon-jifenjiabei</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-jifenduihuan"></use>
</svg>
<div class="name">积分兑换</div>
<div class="code-name">#icon-jifenduihuan</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-xiangqing1"></use>
</svg>
<div class="name">详情</div>
<div class="code-name">#icon-xiangqing1</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-qiwei"></use>
</svg>
<div class="name">企微</div>
<div class="code-name">#icon-qiwei</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-waibu"></use>
</svg>
<div class="name">外部</div>
<div class="code-name">#icon-waibu</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-search"></use>
</svg>
<div class="name">search</div>
<div class="code-name">#icon-search</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-QuestionCircleOutlined"></use>
</svg>
<div class="name">QuestionCircleOutlined</div>
<div class="code-name">#icon-QuestionCircleOutlined</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-tonghuajilu1"></use>
</svg>
<div class="name">通话记录</div>
......@@ -4560,22 +4691,6 @@
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-SwapOutlined"></use>
</svg>
<div class="name">SwapOutlined</div>
<div class="code-name">#icon-SwapOutlined</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-BellOutlined"></use>
</svg>
<div class="name">BellOutlined</div>
<div class="code-name">#icon-BellOutlined</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-chakanxiangqing"></use>
</svg>
<div class="name">查看详情</div>
......
static/font/iconfont.css
This source diff could not be displayed because it is too large. You can view the blob instead.
static/font/iconfont.js
This source diff could not be displayed because it is too large. You can view the blob instead.
static/font/iconfont.json
......@@ -6,6 +6,55 @@
"description": "",
"glyphs": [
{
"icon_id": "20657659",
"name": "积分加倍",
"font_class": "jifenjiabei",
"unicode": "e696",
"unicode_decimal": 59030
},
{
"icon_id": "20657666",
"name": "积分兑换",
"font_class": "jifenduihuan",
"unicode": "e697",
"unicode_decimal": 59031
},
{
"icon_id": "966293",
"name": "详情",
"font_class": "xiangqing1",
"unicode": "e695",
"unicode_decimal": 59029
},
{
"icon_id": "26390250",
"name": "企微",
"font_class": "qiwei",
"unicode": "e694",
"unicode_decimal": 59028
},
{
"icon_id": "26389942",
"name": "外部",
"font_class": "waibu",
"unicode": "e673",
"unicode_decimal": 58995
},
{
"icon_id": "462796",
"name": "search",
"font_class": "search",
"unicode": "e672",
"unicode_decimal": 58994
},
{
"icon_id": "20893446",
"name": "QuestionCircleOutlined",
"font_class": "QuestionCircleOutlined",
"unicode": "e693",
"unicode_decimal": 59027
},
{
"icon_id": "25982878",
"name": "通话记录",
"font_class": "tonghuajilu1",
......@@ -195,20 +244,6 @@
"unicode_decimal": 58999
},
{
"icon_id": "20893458",
"name": "SwapOutlined",
"font_class": "SwapOutlined",
"unicode": "e672",
"unicode_decimal": 58994
},
{
"icon_id": "22596519",
"name": "BellOutlined",
"font_class": "BellOutlined",
"unicode": "e673",
"unicode_decimal": 58995
},
{
"icon_id": "9002691",
"name": "查看详情",
"font_class": "chakanxiangqing",
......
static/font/iconfont.ttf
No preview for this file type
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