Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
memberTag-web
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
memberTag
memberTag-web
Commits
a3f927b7
Commit
a3f927b7
authored
Aug 06, 2021
by
liuchenxi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update: 固化分组好办展示
parent
8f680c5e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
4 deletions
+10
-4
card.vue
src/components/card/card.vue
+2
-2
tag-config-options.vue
src/components/tag/tag-config-options.vue
+8
-1
edit-tag.vue
src/view/memberGroup/edit-tag.vue
+0
-1
No files found.
src/components/card/card.vue
View file @
a3f927b7
...
...
@@ -347,8 +347,8 @@ export default {
};
if
(
this
.
type
)
{
Object
.
assign
(
param
,
{
startTime
:
this
.
sdate
,
endTime
:
this
.
edate
,
//
startTime: this.sdate,
//
endTime: this.edate,
cardModule
:
this
.
type
?
'memberTag'
:
''
// 会员标签传
});
}
...
...
src/components/tag/tag-config-options.vue
View file @
a3f927b7
...
...
@@ -637,7 +637,13 @@
<!-- 会员标签嵌入卡券选择器 com023 -->
<!-- v-if="parent.templateCode == 'com023'" -->
<div
v-if=
"parent.templateCode == 'com023'"
>
选择卡券:
<el-radio-group
v-model=
"cardRadioType"
>
<el-radio
:label=
"0"
>
全部卡券
</el-radio>
<el-radio
:label=
"1"
>
部分卡券
</el-radio>
</el-radio-group>
<vue-gic-card
v-show=
"cardRadioType"
style=
"margin-top:20px"
@
reciver-card-list=
"reciverCardList"
:disabledList=
"disabledList"
:cardLimit=
"cardLimit"
...
...
@@ -645,6 +651,7 @@
:tag-list=
"tagList"
:type=
"1"
>
</vue-gic-card>
<p
v-show=
"!cardRadioType"
class=
"grey"
style=
"margin-top:15px"
>
说明:选择全部卡券后,后续创建的卡券也会进行统计。
</p>
</div>
<!-- 会员分层 tag021 -->
...
...
@@ -754,7 +761,7 @@
天后过期
<span
class=
"grey"
>
(仅支持输入1-30之间的正整数)
</span>
</div>
卡券类型
:
<el-radio-group
v-model=
"cardRadioType"
>
选择卡券
:
<el-radio-group
v-model=
"cardRadioType"
>
<el-radio
:label=
"0"
>
全部卡券
</el-radio>
<el-radio
:label=
"1"
>
部分卡券
</el-radio>
</el-radio-group>
...
...
src/view/memberGroup/edit-tag.vue
View file @
a3f927b7
...
...
@@ -78,7 +78,6 @@ export default {
},
handleSave
()
{
const
ret
=
this
.
$refs
.
tagConfig
.
getTemplateData
();
this
.
templateData
=
JSON
.
parse
(
JSON
.
stringify
(
ret
));
this
.
tagId
=
this
.
tagDataAssgin
.
tagId
;
...
...
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