Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
Y
ybf
Project
Project
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
xulili
ybf
Commits
df8a7032
Commit
df8a7032
authored
5 years ago
by
leiqingsong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ios & android date 上的差异
parent
b13e5e57
master
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
7 deletions
+13
-7
activeDetail.vue
wx_application/src/views/active/activeDetail.vue
+3
-3
createBigWheelActive.vue
wx_application/src/views/active/createBigWheelActive.vue
+10
-4
No files found.
wx_application/src/views/active/activeDetail.vue
View file @
df8a7032
...
@@ -62,7 +62,7 @@
...
@@ -62,7 +62,7 @@
autosize
autosize
type=
"textarea"
type=
"textarea"
show-word-limit
show-word-limit
:disabled=
"
fals
e"
:disabled=
"
tru
e"
/>
/>
</div>
</div>
<div
class=
"time-line"
>
<div
class=
"time-line"
>
...
@@ -277,8 +277,8 @@ export default {
...
@@ -277,8 +277,8 @@ export default {
}
}
if
(
this
.
active_type
===
"wheel"
)
{
if
(
this
.
active_type
===
"wheel"
)
{
let
cur_date
=
new
Date
();
let
cur_date
=
new
Date
();
let
end_time
=
new
Date
(
this
.
timeLine
);
let
end_time
=
new
Date
(
this
.
timeLine
)
||
Date
.
parse
(
this
.
timeLine
.
replace
(
/-/g
,
'/'
))
;
if
(
end_time
-
cur_date
>
0
)
{
if
(
end_time
>
cur_date
)
{
this
.
timer
=
setInterval
(()
=>
{
this
.
timer
=
setInterval
(()
=>
{
CoutDown
(
this
.
timeLine
);
CoutDown
(
this
.
timeLine
);
},
1000
);
},
1000
);
...
...
This diff is collapsed.
Click to expand it.
wx_application/src/views/active/createBigWheelActive.vue
View file @
df8a7032
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
v-model=
"basicInfo.startTime1"
v-model=
"basicInfo.startTime1"
placeholder=
"请选择开始时间"
placeholder=
"请选择开始时间"
readonly=
"readonly"
readonly=
"readonly"
@
click=
"
basicInfo.startShow = tru
e"
@
click=
"
openStartTim
e"
/>
/>
<van-popup
v-model=
"basicInfo.startShow"
position=
"bottom"
:overlay=
"true"
>
<van-popup
v-model=
"basicInfo.startShow"
position=
"bottom"
:overlay=
"true"
>
<van-datetime-picker
<van-datetime-picker
...
@@ -43,7 +43,7 @@
...
@@ -43,7 +43,7 @@
v-model=
"basicInfo.endTime1"
v-model=
"basicInfo.endTime1"
placeholder=
"请选择结束时间"
placeholder=
"请选择结束时间"
readonly=
"readonly"
readonly=
"readonly"
@
click=
"
basicInfo.endShow = tru
e"
@
click=
"
openEndTim
e"
/>
/>
<van-popup
v-model=
"basicInfo.endShow"
position=
"bottom"
:overlay=
"true"
>
<van-popup
v-model=
"basicInfo.endShow"
position=
"bottom"
:overlay=
"true"
>
<van-datetime-picker
<van-datetime-picker
...
@@ -351,10 +351,16 @@ export default {
...
@@ -351,10 +351,16 @@ export default {
};
};
},
},
created
()
{
created
()
{
this
.
minStartDate
=
new
Date
();
this
.
minEndDate
=
new
Date
();
},
},
methods
:
{
methods
:
{
openStartTime
()
{
this
.
basicInfo
.
startShow
=
true
;
this
.
minStartDate
=
new
Date
();
},
openEndTime
()
{
this
.
basicInfo
.
endShow
=
true
;
this
.
minEndDate
=
new
Date
();
},
// 获取模板数据
// 获取模板数据
getTemplateDate
(
id
)
{
getTemplateDate
(
id
)
{
API_Active
.
getTemplateData
(
id
).
then
(
res
=>
{
API_Active
.
getTemplateData
(
id
).
then
(
res
=>
{
...
...
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