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
c2b50242
Commit
c2b50242
authored
Jan 13, 2021
by
chenxin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: card 转赠
parent
e0c6fba8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
4 deletions
+14
-4
form.js
src/views/card/form.js
+12
-2
form.vue
src/views/card/form.vue
+2
-2
No files found.
src/views/card/form.js
View file @
c2b50242
...
...
@@ -595,9 +595,9 @@ export default {
this
.
form
.
manualGetFlag
=
1
;
// 永远设置为手动领取
}
// 转赠
const
canCopyGive
=
card
.
giveFlag
==
1
&&
((
this
.
isCopy
&&
res
.
result
.
giveEnable
)
||
!
this
.
isCopy
);
// 拷贝必须是开启开关的
const
canCopyGive
=
card
.
giveFlag
==
1
&&
((
this
.
isCopy
&&
res
.
result
.
giveEnable
)
||
!
this
.
isCopy
)
&&
card
.
cardExtend
;
// 拷贝必须是开启开关的
if
(
canCopyGive
)
{
const
{
giveContent
,
giveImage
,
giveImageField
,
bannerImage
,
bannerImageField
,
useJumpFlag
,
bannerJumpUrl
,
giveRule
}
=
card
;
const
{
giveContent
,
giveImage
,
giveImageField
,
bannerImage
,
bannerImageField
,
useJumpFlag
,
bannerJumpUrl
,
giveRule
}
=
card
.
cardExtend
;
this
.
form
.
giveContent
=
giveContent
;
this
.
form
.
giveImage
=
giveImage
;
this
.
form
.
giveImageField
=
giveImageField
;
...
...
@@ -606,6 +606,16 @@ export default {
this
.
form
.
useJumpFlag
=
useJumpFlag
;
this
.
form
.
bannerJumpUrl
=
useJumpFlag
?
JSON
.
parse
(
bannerJumpUrl
)
:
{};
this
.
form
.
giveRule
=
giveRule
;
this
.
giveImg1
=
{
// 转赠对话框图片
code
:
giveImageField
,
imgUrl
:
giveImage
};
this
.
giveImg2
=
{
// 转赠页面首图
code
:
bannerImageField
,
imgUrl
:
bannerImage
};
}
if
(
!
this
.
isCopy
)
{
// 非复制才赋值有效期,跳转链接
...
...
src/views/card/form.vue
View file @
c2b50242
...
...
@@ -288,10 +288,10 @@
<
/el-form-item
>
<
el
-
form
-
item
label
=
"首图链接设置"
prop
=
"bannerJumpUrl"
>
<
el
-
checkbox
v
-
model
=
"form.useJumpFlag"
:
true
-
label
=
"1"
:
false
-
label
=
"0"
>
首图链接
<
/el-checkbox
>
<
template
v
-
if
=
"form.useJumpFlag"
>
<
span
style
=
"position:relative;top:3px;"
v
-
if
=
"form.useJumpFlag"
>
<
el
-
button
@
click
=
"linkToolsVisible2 = true"
type
=
"text"
class
=
"ml10"
>
{{
JSON
.
stringify
(
form
.
bannerJumpUrl
)
==
'{
}
'
?
'设置链接'
:
'修改链接:'
}}
<
/el-button
>
<
span
class
=
"gray ml10"
>
{{
form
.
bannerJumpUrl
.
name
}}
<
/span
>
<
/
template
>
<
/
span
>
<
/el-form-item
>
<
el
-
form
-
item
label
=
"卡券转赠规则"
prop
=
"giveRule"
v
-
show
=
"form.giveFlag === 1"
>
<
dm
-
input
type
=
"textarea"
class
=
"autosize w400"
:
rows
=
"4"
:
autosize
=
"{ minRows: 4, maxRows: 8
}
"
v
-
model
=
"form.giveRule"
:
byte
-
type
=
"1"
:
maxlength
=
"200"
/>
...
...
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