Commit a5ada470 by crushh

Merge branch 'feature/3月迭代' of http://git.gicdev.com/marketing-web/marketing into feature/3月迭代

parents 423a1b7f 781f559d
......@@ -355,6 +355,7 @@
.member-block {
display: block;
height: 50px;
cursor: pointer;
}
.tooltip-icon {
font-weight: inherit;
......
......@@ -41,13 +41,13 @@
</el-table-column>
<el-table-column :show-overflow-tooltip="true" min-width="140" header-align="left" align="left" prop="clerkId" label="会员信息">
<template slot-scope="scope">
<a class="member-block" :href="'/member/#/wechatmemberDetail?memberId=' + scope.row.memberId" target="_blank">
<div class="member-block" @click="toPage('/customerDetail?memberId=' + scope.row.memberId, 'member')">
<img class="vertical-middle table__avatar--40" :src="scope.row.thirdimgurl || defaultAvatar" width="60" height="60" />
<div class="inline-block vertical-middle">
<p class="table-name--ellipsis">{{ scope.row.thirdName || scope.row.memberName || '--' }}</p>
<p class="gray">{{ scope.row.phoneNum || '--' }}</p>
</div>
</a>
</div>
</template>
</el-table-column>
<el-table-column width="120" align="left" prop="receiveTime" label="卡券类型">
......@@ -132,6 +132,7 @@ import filterAvater from '@/mixins/filterAvater.js';
export default {
name: 'record-get',
mixins: [tableMethods, filterAvater],
inject: ['toPage'],
components: {
cardOrder,
cardSelectFilter
......
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