Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-admin
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
project
jinfa-admin
Commits
d1e62395
Commit
d1e62395
authored
Oct 14, 2020
by
Bill
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改时间搜索bug
parent
2f56fc20
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
8 deletions
+14
-8
index.tsx
src/pages/content/advertisement/index.tsx
+3
-3
index.tsx
src/pages/content/advertisement/schema/index.tsx
+3
-1
index.tsx
src/pages/content/infomation/index.tsx
+3
-3
index.tsx
src/pages/content/infomation/schema/index.tsx
+5
-1
No files found.
src/pages/content/advertisement/index.tsx
View file @
d1e62395
...
...
@@ -47,7 +47,7 @@ const Advertisement = () => {
onFieldValueChange$
(
'time'
),
).
subscribe
(
fieldState
=>
{
if
(
fieldState
.
value
)
{
if
(
fieldState
.
value
!=
null
)
{
handleSearch
({})
}
}
...
...
@@ -65,8 +65,8 @@ const Advertisement = () => {
const
postData
=
{
title
:
title
||
''
,
status
:
status
!=
0
?
status
:
''
,
startTime
:
st
*
1000
,
endTime
:
et
*
1000
,
startTime
:
st
&&
st
*
1000
,
endTime
:
et
&&
et
*
1000
,
current
:
1
,
pageSize
:
10
,
...
params
,
...
...
src/pages/content/advertisement/schema/index.tsx
View file @
d1e62395
...
...
@@ -5,6 +5,8 @@ import moment from 'moment';
import
React
from
'react'
;
import
{
ADVERTISE_COLUMN_TYPE
}
from
'../../utils/utils'
;
const
CustomTimeList
=
[{
label
:
'全部'
,
value
:
0
}].
concat
(
TimeList
.
slice
(
1
));
const
columns
=
[
{
title
:
'ID'
,
dataIndex
:
'id'
},
{
title
:
'标题'
,
...
...
@@ -156,7 +158,7 @@ const advertisementSchema = {
'x-component'
:
'Select'
,
'x-component-props'
:
{
placeholder
:
'发布时间(全部)'
,
options
:
TimeList
,
options
:
Custom
TimeList
,
style
:
{
width
:
'160px'
,
}
...
...
src/pages/content/infomation/index.tsx
View file @
d1e62395
...
...
@@ -76,7 +76,7 @@ const Infomation = () => {
onFieldValueChange$
(
'status'
),
onFieldValueChange$
(
'time'
)
).
subscribe
((
state
)
=>
{
if
(
state
.
value
)
{
if
(
state
.
value
!=
null
)
{
handleSearch
({})
}
})
...
...
@@ -96,8 +96,8 @@ const Infomation = () => {
title
:
title
,
status
:
status
!=
0
?
status
:
''
,
columnId
:
columnId
,
startTime
:
st
*
1000
,
endTime
:
et
*
1000
,
startTime
:
st
&&
st
*
1000
,
endTime
:
et
&&
et
*
1000
,
current
:
1
,
pageSize
:
10
,
...
params
,
...
...
src/pages/content/infomation/schema/index.tsx
View file @
d1e62395
...
...
@@ -4,6 +4,10 @@ import { timeRange } from '@/utils/index';
import
{
TimeList
}
from
'@/pages/logistics/statusList'
;
import
moment
from
'moment'
;
import
React
from
'react'
;
console
.
log
(
TimeList
);
const
CustomTimeList
=
[{
label
:
'全部'
,
value
:
0
}].
concat
(
TimeList
.
slice
(
1
));
console
.
log
(
CustomTimeList
);
const
columns
=
[
{
title
:
'ID'
,
dataIndex
:
'id'
},
...
...
@@ -207,7 +211,7 @@ const infomationSchema = {
'x-component'
:
'Select'
,
'x-component-props'
:
{
placeholder
:
'发布时间(全部)'
,
options
:
TimeList
,
options
:
Custom
TimeList
,
style
:
{
width
:
'160px'
,
}
...
...
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