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
715aee08
Commit
715aee08
authored
Sep 06, 2024
by
chenwei
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'cherry-pick-
08db7893
' into 'pre-release'
Merge branch 'cherry-pick-
761bb895
' into 'hotfix/preReleaseDefect' See merge request
!30
parents
c0aeb658
5c732dec
Changes
4
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
168 additions
and
145 deletions
+168
-145
en_US.json
src/i18n/languages/en_US.json
+0
-1
index.vue
src/views/ecw/giftManagement/index.vue
+1
-1
chooseGift.vue
...agement/exchangeRecordOperation/components/chooseGift.vue
+1
-1
index.vue
src/views/ecw/memberManagement/integrationRule/index.vue
+166
-142
No files found.
src/i18n/languages/en_US.json
View file @
715aee08
...
...
@@ -4524,7 +4524,6 @@
"礼品ID"
:
"Gift ID"
,
"允许兑换次数"
:
"Allow redemption times"
,
"已兑换次数"
:
"Redemption times"
,
"剩余次数"
:
"Remaining times"
,
"添加礼品"
:
"Add Gift"
,
"查看礼品"
:
"View gifts"
,
"中文礼品名称"
:
"Chinese gift name"
,
...
...
src/views/ecw/giftManagement/index.vue
View file @
715aee08
...
...
@@ -227,7 +227,7 @@
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
:
label
=
"
$t('剩余
次数
')
"
:
label
=
"
$t('剩余
数量
')
"
align
=
"
center
"
prop
=
"
quantityRemain
"
/>
...
...
src/views/ecw/memberManagement/exchangeRecordOperation/components/chooseGift.vue
View file @
715aee08
...
...
@@ -238,7 +238,7 @@
prop=
"exchangeCount"
></el-table-column>
<el-table-column
:label=
"$t('剩余
次数
')"
:label=
"$t('剩余
数量
')"
align=
"center"
prop=
"quantityRemain"
></el-table-column>
...
...
src/views/ecw/memberManagement/integrationRule/index.vue
View file @
715aee08
This diff is collapsed.
Click to expand it.
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