From aa68e2ae949909d7bce9392d354f7f2662c3c38d Mon Sep 17 00:00:00 2001
From: xuan <w1359774872@gmail.com>
Date: Fri, 28 Oct 2022 17:37:43 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=88=20perf(=E7=99=BB=E9=99=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2):=20=E8=B0=83=E6=95=B4=E7=99=BB=E9=99=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/login/index.module.scss                       | 2 ++
 src/pages/shopping/components/bottomSettleBar/index.tsx | 5 ++++-
 src/pages/shopping/index.tsx                            | 6 +++---
 3 files changed, 9 insertions(+), 4 deletions(-)

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 => {
         <Text className={styles.moneyText}>预估金额：</Text>
         <Text className={styles.moneyNumber}>
           <Text className={styles.unit}>¥</Text>
-          {amount.toFixed(2)}
+          {Number(Number(amount)
+            .toFixed(2))
+            .toLocaleString()}
         </Text>
       </View>
       <View className={styles.bottomRight}>
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<InternalContainer> = () => {
 
   // 管理
   const onStartToManage = () => {
-    if (isManageStatus) {
-      handleSelectAllCheckbox(false) // 取消全选
-    }
+    // if (isManageStatus) {
+    //   handleSelectAllCheckbox(false) // 取消全选
+    // }
     dispatch({ type: ShoppingDispatchType.UPDATE_MANAGE_STATUS, data: !isManageStatus })
   }