diff --git a/src/pages/login/index.module.scss b/src/pages/login/index.module.scss index 688e86f..2065bb5 100644 --- a/src/pages/login/index.module.scss +++ b/src/pages/login/index.module.scss @@ -65,7 +65,9 @@ page { color: #909090; } &-button { + height: 90px; margin-top: 120px; + font-size: 32px; } } .isRememberPwd { diff --git a/src/pages/shopping/components/bottomSettleBar/index.tsx b/src/pages/shopping/components/bottomSettleBar/index.tsx index 27111c2..2aaf7f9 100644 --- a/src/pages/shopping/components/bottomSettleBar/index.tsx +++ b/src/pages/shopping/components/bottomSettleBar/index.tsx @@ -1,3 +1,4 @@ +import { formatMillionYuan, toDecimal2 } from '@/common/format' import NormalButton from '@/components/normalButton' import { View, Text } from '@tarojs/components' import { memo } from 'react' @@ -22,7 +23,9 @@ export default props => { 预估金额: ¥ - {amount.toFixed(2)} + {Number(Number(amount) + .toFixed(2)) + .toLocaleString()} diff --git a/src/pages/shopping/index.tsx b/src/pages/shopping/index.tsx index e571277..7306914 100644 --- a/src/pages/shopping/index.tsx +++ b/src/pages/shopping/index.tsx @@ -52,9 +52,9 @@ const ShoppingCartContainer: FC = () => { // 管理 const onStartToManage = () => { - if (isManageStatus) { - handleSelectAllCheckbox(false) // 取消全选 - } + // if (isManageStatus) { + // handleSelectAllCheckbox(false) // 取消全选 + // } dispatch({ type: ShoppingDispatchType.UPDATE_MANAGE_STATUS, data: !isManageStatus }) }