Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-app-operator-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
lanbaoming
jiedao-app-operator-master
Commits
3024dc08
Commit
3024dc08
authored
Aug 14, 2024
by
chenwei
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/099_customer_filter' into 'dev'
新增跳转逻辑 See merge request
!6
parents
ab1c965c
2c9cdfa8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
40 additions
and
20 deletions
+40
-20
index.vue
src/views/ecw/memberManagement/exchangeRecord/index.vue
+11
-5
index.vue
src/views/ecw/memberManagement/memberPointsSummary/index.vue
+29
-15
No files found.
src/views/ecw/memberManagement/exchangeRecord/index.vue
View file @
3024dc08
...
@@ -181,11 +181,17 @@
...
@@ -181,11 +181,17 @@
align=
"center"
align=
"center"
:prop=
"isChinese ? 'rewardTitleZh' : 'rewardTitleEn'"
:prop=
"isChinese ? 'rewardTitleZh' : 'rewardTitleEn'"
></el-table-column>
></el-table-column>
<el-table-column
<el-table-column
:label=
"$t('会员名称')"
align=
"center"
>
:label=
"$t('会员名称')"
<template
v-slot=
"
{ row }">
align=
"center"
<el-button
:prop=
"isChinese ? 'memberNameZh' : 'memberNameEn'"
type=
"text"
></el-table-column>
@
click=
"
$router.push('/member/member/member-details/' + row.memberId)
"
>
{{
isChinese
?
row
.
memberNameZh
:
row
.
memberNameEn
}}
</el-button
>
</
template
>
</el-table-column>
<el-table-column
:label=
"$t('兑换时间')"
align=
"center"
>
<el-table-column
:label=
"$t('兑换时间')"
align=
"center"
>
<
template
v-slot=
"{ row }"
>
<
template
v-slot=
"{ row }"
>
{{
parseTime
(
row
.
redemptionTime
)
||
"
/
"
}}
</
template
{{
parseTime
(
row
.
redemptionTime
)
||
"
/
"
}}
</
template
...
...
src/views/ecw/memberManagement/memberPointsSummary/index.vue
View file @
3024dc08
...
@@ -120,11 +120,17 @@
...
@@ -120,11 +120,17 @@
align=
"center"
align=
"center"
prop=
"id"
prop=
"id"
></el-table-column>
></el-table-column>
<el-table-column
<el-table-column
:label=
"$t('会员名称')"
align=
"center"
>
:label=
"$t('会员名称')"
<template
v-slot=
"
{ row }">
align=
"center"
<el-button
:prop=
"isChinese ? 'memberNameZh' : 'memberNameEn'"
type=
"text"
></el-table-column>
@
click=
"
$router.push('/member/member/member-details/' + row.memberId)
"
>
{{
isChinese
?
row
.
memberNameZh
:
row
.
memberNameEn
}}
</el-button
>
</
template
></el-table-column
>
<el-table-column
<el-table-column
width=
"140"
width=
"140"
...
@@ -138,16 +144,24 @@
...
@@ -138,16 +144,24 @@
:label=
"$t('国家')"
:label=
"$t('国家')"
:prop=
"isChinese ? 'countryNameZh' : 'countryNameEn'"
:prop=
"isChinese ? 'countryNameZh' : 'countryNameEn'"
></el-table-column>
></el-table-column>
<el-table-column
<el-table-column
:label=
"$t('当前积分')"
align=
"center"
>
:label=
"$t('当前积分')"
<
template
v-slot=
"{ row }"
>
align=
"center"
<el-button
prop=
"holdScore"
type=
"text"
></el-table-column>
@
click=
"$router.push('/memberManagement/integralRecord')"
<el-table-column
>
{{
row
.
holdScore
}}
</el-button
:label=
"$t('已兑换积分')"
>
align=
"center"
</
template
>
prop=
"usedScore"
</el-table-column>
></el-table-column>
<el-table-column
:label=
"$t('已兑换积分')"
align=
"center"
>
<
template
v-slot=
"{ row }"
>
<el-button
type=
"text"
@
click=
"$router.push('/memberManagement/exchangeRecord')"
>
{{
row
.
usedScore
}}
</el-button
>
</
template
>
</el-table-column>
<el-table-column
<el-table-column
:label=
"$t('已失效积分')"
:label=
"$t('已失效积分')"
align=
"center"
align=
"center"
...
...
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