Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-platform
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
shenshaokai
jinfa-platform
Commits
65bfa3ee
Commit
65bfa3ee
authored
Feb 14, 2022
by
前端-黄佳鑫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 修改积分相关运费相关
parent
7294021e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
18 deletions
+22
-18
index.tsx
src/pages/accountSetting/index.tsx
+16
-16
index.tsx
src/pages/systemSetting/parameterSetting/index.tsx
+2
-2
index.tsx
...ity/components/detail/components/contrastLyout1/index.tsx
+4
-0
No files found.
src/pages/accountSetting/index.tsx
View file @
65bfa3ee
...
...
@@ -22,22 +22,22 @@ const AccountSetting = () => {
return
(
<
PageHeaderWrapper
>
<
div
>
<
Row
gutter=
{
[
24
,
24
]
}
>
{
TYPES
.
map
((
item
)
=>
{
return
(
<
Col
xxl=
{
12
}
xl=
{
12
}
lg=
{
24
}
md=
{
24
}
sm=
{
24
}
xs=
{
24
}
key=
{
item
}
>
<
TypeVerify
type=
{
item
as
'phone'
}
phone=
{
account
.
phone
}
email=
{
account
.
email
}
paycode=
{
account
.
hasPayPassword
}
isAuth=
{
account
.
isAuth
}
/>
</
Col
>
)
})
}
<
Row
gutter=
{
[
24
,
24
]
}
>
{
TYPES
.
map
((
item
)
=>
{
return
(
<
Col
xxl=
{
12
}
xl=
{
12
}
lg=
{
24
}
md=
{
24
}
sm=
{
24
}
xs=
{
24
}
key=
{
item
}
>
<
TypeVerify
type=
{
item
as
'phone'
}
phone=
{
account
.
phone
}
email=
{
account
.
email
}
paycode=
{
account
.
hasPayPassword
}
isAuth=
{
account
.
isAuth
}
/>
</
Col
>
)
})
}
</
Row
>
</
div
>
</
PageHeaderWrapper
>
...
...
src/pages/systemSetting/parameterSetting/index.tsx
View file @
65bfa3ee
...
...
@@ -425,7 +425,7 @@ const ParameterSetting: React.FC<{}> = () => {
</
Drawer
>
{
/* 设置下单时积分可抵扣的订单金额 */
}
<
Drawer
title=
{
intl
.
formatMessage
({
id
:
'systemSetting.parameterSetting.ApplicableMall'
})
}
title=
'积分抵扣订单金额'
width=
{
600
}
onClose=
{
()
=>
setIntegralVisible
(
false
)
}
visible=
{
integralVisible
}
...
...
@@ -474,7 +474,7 @@ const ParameterSetting: React.FC<{}> = () => {
</
Drawer
>
{
/* 设置订单满多少金额免运费 */
}
<
Drawer
title=
{
intl
.
formatMessage
({
id
:
'systemSetting.parameterSetting.ApplicableMall'
})
}
title=
'满额包邮'
width=
{
600
}
onClose=
{
()
=>
setLogisticsVisible
(
false
)
}
visible=
{
logisticsVisible
}
...
...
src/pages/transaction/purchaseAbility/components/detail/components/contrastLyout1/index.tsx
View file @
65bfa3ee
...
...
@@ -266,6 +266,10 @@ const ContrastLyout1: React.FC<IProps> = (props: any) => {
useEffect
(()
=>
{
if
(
!
isEmpty
(
context
))
{
/**
* 1: 未解密
* 2: 已解密
*/
let
priceContrast
=
(
context
.
priceContrast
===
1
?
PRICECONTRAST_TYPE
.
UNDECRYPTED
:
PRICECONTRAST_TYPE
.
UNENCRYPTED
);
setEncrypt
(
priceContrast
)
}
...
...
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