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
eaace02f
You need to sign in or sign up before continuing.
Commit
eaace02f
authored
Apr 09, 2021
by
陈羽
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update: 添加文案提示
parent
3e626bfe
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
7 deletions
+13
-7
form.vue
src/views/card/form.vue
+2
-2
form.vue
src/views/ewash/form.vue
+2
-2
form.vue
src/views/pop/form.vue
+9
-3
No files found.
src/views/card/form.vue
View file @
eaace02f
...
...
@@ -227,7 +227,7 @@
</el-form-item>
<el-form-item
class=
"is-required"
prop=
"useCustomCode"
>
<el-tooltip
slot=
"label"
open-delay=
"
1
00"
content=
"用户使用有效期为用户领取卡券后的使用有效期计算规则"
placement=
"top"
>
<el-tooltip
slot=
"label"
open-delay=
"
2
00"
content=
"用户使用有效期为用户领取卡券后的使用有效期计算规则"
placement=
"top"
>
<span
class=
"tooltip-icon cursor"
>
用户使用有效期
</span>
</el-tooltip>
<div>
...
...
@@ -245,7 +245,7 @@
<!-- 当输入完整用户使用有效期后,出现卡券模板投放期限 -->
<el-form-item
v-show=
"showSendDateTime"
prop=
"sendDateTime"
>
<el-tooltip
slot=
"label"
open-delay=
"
1
00"
content=
"卡券模板投放期限为该张卡券可在GIC后台或通过API接口可投放给用户的期限"
placement=
"top"
>
<el-tooltip
slot=
"label"
open-delay=
"
2
00"
content=
"卡券模板投放期限为该张卡券可在GIC后台或通过API接口可投放给用户的期限"
placement=
"top"
>
<span
class=
"tooltip-icon cursor"
>
卡券模板投放期限
</span>
</el-tooltip>
<div
v-if=
"form.cardEffectiveMode == 0"
>
...
...
src/views/ewash/form.vue
View file @
eaace02f
...
...
@@ -84,7 +84,7 @@
</el-form-item> -->
<el-form-item
class=
"is-required"
prop=
"useCustomCode"
>
<el-tooltip
slot=
"label"
open-delay=
"
1
00"
content=
"用户使用有效期为用户领取卡券后的使用有效期计算规则"
placement=
"top"
>
<el-tooltip
slot=
"label"
open-delay=
"
2
00"
content=
"用户使用有效期为用户领取卡券后的使用有效期计算规则"
placement=
"top"
>
<span
class=
"tooltip-icon cursor"
>
用户使用有效期
</span>
</el-tooltip>
<div>
...
...
@@ -102,7 +102,7 @@
<!-- 当输入完整用户使用有效期后,出现卡券模板投放期限 -->
<el-form-item
v-show=
"showSendDateTime"
prop=
"sendDateTime"
>
<el-tooltip
slot=
"label"
open-delay=
"
1
00"
content=
"卡券模板投放期限为该张卡券可在GIC后台或通过API接口可投放给用户的期限"
placement=
"top"
>
<el-tooltip
slot=
"label"
open-delay=
"
2
00"
content=
"卡券模板投放期限为该张卡券可在GIC后台或通过API接口可投放给用户的期限"
placement=
"top"
>
<span
class=
"tooltip-icon cursor"
>
卡券模板投放期限
</span>
</el-tooltip>
<div
v-if=
"form.cardEffectiveMode == 0"
>
...
...
src/views/pop/form.vue
View file @
eaace02f
...
...
@@ -15,7 +15,10 @@
<el-checkbox
label=
"签到日历"
></el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item
label=
"计划时间:"
prop=
"dateTime"
>
<el-form-item
prop=
"dateTime"
>
<el-tooltip
slot=
"label"
open-delay=
"200"
content=
"计划时间不能和已有进行中的计划重叠"
placement=
"top"
>
<span
class=
"tooltip-icon cursor"
>
计划时间:
</span>
</el-tooltip>
<el-date-picker
v-model=
"group.dateTime"
@
change=
"filedAllPopDate"
:disabled=
"!!group.id"
:picker-options=
"pickerOptions"
:default-time=
"['00:00:00', '23:59:59']"
class=
"w400"
type=
"datetimerange"
range-separator=
"~"
start-placeholder=
"开始日期"
end-placeholder=
"结束日期"
></el-date-picker>
</el-form-item>
<p
class=
"line"
></p>
...
...
@@ -81,7 +84,10 @@
</
template
>
<el-button
type=
"text"
:disabled=
"pop.activeStatus == 2"
@
click=
"showPutonPage(pop, elIndex)"
>
设置
</el-button>
</el-form-item>
<el-form-item
label=
"投放时间:"
:prop=
"`dateTime_${elIndex}`"
>
<el-form-item
:prop=
"`dateTime_${elIndex}`"
>
<el-tooltip
slot=
"label"
open-delay=
"200"
content=
"投放时间不能超过本次计划时间"
placement=
"top"
>
<span
class=
"tooltip-icon cursor"
>
投放时间:
</span>
</el-tooltip>
<el-date-picker
v-model=
"pop.dateTime"
:picker-options=
"pickerOptions2"
@
focus=
"checkGroupDate"
@
blur=
"datePickerBulr(elIndex)"
@
change=
"time => changePoptime(time, elIndex)"
:disabled=
"pop.activeStatus == 2"
:default-time=
"['00:00:00', '23:59:59']"
class=
"w400"
type=
"datetimerange"
range-separator=
"~"
start-placeholder=
"开始日期"
end-placeholder=
"结束日期"
></el-date-picker>
</el-form-item>
<el-form-item
label=
"弹出频次:"
:prop=
"`popupType_${elIndex}`"
>
...
...
@@ -320,7 +326,7 @@ export default {
disabledDate
:
time
=>
{
if
(
this
.
group
.
dateTime
[
0
]
&&
this
.
group
.
dateTime
[
1
])
{
const
startTime
=
new
Date
(
new
Date
(
this
.
group
.
dateTime
[
0
])
>
new
Date
()
?
new
Date
(
this
.
group
.
dateTime
[
0
])
:
new
Date
()).
getTime
();
const
endTime
=
new
Date
(
this
.
group
.
dateTime
[
1
]);
//
const endTime = new Date(this.group.dateTime[1]);
return
time
<=
new
Date
(
startTime
-
24
*
3600
*
1000
)
||
time
>
new
Date
(
this
.
group
.
dateTime
[
1
]);
}
else
{
return
true
;
...
...
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