Commit 65bfa3ee authored by 前端-黄佳鑫's avatar 前端-黄佳鑫

feat: 修改积分相关运费相关

parent 7294021e
......@@ -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>
......
......@@ -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}
......
......@@ -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)
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment