Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
merchant-manage-ui
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
ui
merchant-manage-ui
Commits
64adc16c
Commit
64adc16c
authored
Nov 02, 2022
by
李腾
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修复地址提醒展示问题
parent
c11ebaeb
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
25 additions
and
19 deletions
+25
-19
env.config.js
config/env.config.js
+1
-1
index.jsx
src/components/FormSearch/index.jsx
+11
-8
data.js
src/pages/AfterSaleManage/data.js
+4
-0
index.jsx
src/pages/orderManage/pendingDeliveryOrder/index.jsx
+9
-10
No files found.
config/env.config.js
View file @
64adc16c
const
isProduction
=
process
.
env
.
NODE_ENV
===
'
production
'
;
const
isPre
=
process
.
env
.
PRE_ENV
===
'
pre
'
;
const
environment
=
'
sc
'
;
const
environment
=
'
yxm2
'
;
const
envAPi
=
{
api
:
`https://security-
${
environment
}
.liangkebang.net`
,
//'https://security-xyqb.liangkebang.net',
kdspOpApi
:
`https://sc-merchant-api-
${
environment
}
.liangkebang.net`
,
...
...
src/components/FormSearch/index.jsx
View file @
64adc16c
...
...
@@ -82,20 +82,23 @@ const FormSearch = props => {
// 选择日期范围类型
const
FormItemRangePicker
=
config
=>
{
const
{
originOptions
=
{},
bindKey
,
rangeNum
,
rangeUn
it
}
=
config
;
const
{
originOptions
=
{},
bindKey
,
lim
it
}
=
config
;
const
attrs
=
{
placeholder
:
[
'
开始日期
'
,
'
结束日期
'
],
...
originOptions
};
// 自动截取日期限制的范围
const
onOpenChange
=
open
=>
{
if
(
!
open
)
{
const
[
date1
,
date2
]
=
form
.
getFieldValue
(
bindKey
);
const
diffNum
=
date2
.
diff
(
date1
,
'
months
'
);
if
(
diffNum
>=
3
)
{
setTimeout
(()
=>
{
form
.
setFieldsValue
({
[
bindKey
]:
[
moment
(
date1
),
moment
(
date1
).
add
(
3
,
'
month
'
)],
if
(
limit
)
{
const
{
rangeNum
,
rangeUnit
}
=
limit
;
const
[
date1
,
date2
]
=
form
.
getFieldValue
(
bindKey
);
const
diffNum
=
date2
.
diff
(
date1
,
rangeNum
);
if
(
diffNum
>=
rangeNum
)
{
setTimeout
(()
=>
{
form
.
setFieldsValue
({
[
bindKey
]:
[
moment
(
date1
),
moment
(
date1
).
add
(
3
,
'
month
'
)],
});
});
}
);
}
}
}
};
...
...
src/pages/AfterSaleManage/data.js
View file @
64adc16c
...
...
@@ -134,6 +134,10 @@ export const getFormConfig = (props = {}) => {
label
:
'
售后日期
'
,
column
:
5
,
bindKey
:
'
afterTime
'
,
limit
:
{
rangeNum
:
3
,
rangeUnit
:
'
months
'
,
},
originOptions
:
{
placeholder
:
[
'
开始日期
'
,
'
结束日期
'
],
allowClear
:
false
,
...
...
src/pages/orderManage/pendingDeliveryOrder/index.jsx
View file @
64adc16c
...
...
@@ -188,19 +188,18 @@ const TableList = props => {
width
:
150
,
render
:
(
_
,
record
)
=>
{
const
{
updateAddressList
,
platformRemark
}
=
record
;
let
addressData
;
if
(
updateAddressList
)
{
addressData
=
updateAddressList
.
pop
();
}
// let addressData;
// if (updateAddressList) {
// addressData = updateAddressList.pop();
// }
const
content
=
()
=>
updateAddressList
?.
map
(
item
=>
(
<
PopoverNotice
time=
{
item
?.
time
}
content=
{
item
?.
content
}
/>
));
return
(
<
div
className=
{
style
[
'
notice-btn
'
]
}
>
{
updateAddressList
?
(
<
Popover
placement=
"top"
title=
"收货地址变更"
content=
{
<
PopoverNotice
time=
{
addressData
?.
time
}
content=
{
addressData
?.
content
}
/>
}
trigger=
"hover"
>
<
Popover
placement=
"top"
title=
"收货地址变更"
content=
{
content
()
}
trigger=
"hover"
>
<
Button
block
type=
"primary"
>
收货地址变更
</
Button
>
...
...
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