Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
marketing
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
marketing-web
marketing
Commits
a5ada470
Commit
a5ada470
authored
Apr 08, 2022
by
crushh
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/3月迭代' of
http://git.gicdev.com/marketing-web/marketing
into feature/3月迭代
parents
423a1b7f
781f559d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
index.scss
src/assets/style/base/index.scss
+1
-0
record-get.vue
src/views/card/record-get.vue
+3
-2
No files found.
src/assets/style/base/index.scss
View file @
a5ada470
...
...
@@ -355,6 +355,7 @@
.member-block
{
display
:
block
;
height
:
50px
;
cursor
:
pointer
;
}
.tooltip-icon
{
font-weight
:
inherit
;
...
...
src/views/card/record-get.vue
View file @
a5ada470
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment