From 7070ec425e02e95e06e3954afb9a1a50f4ba2a04 Mon Sep 17 00:00:00 2001
From: xuan <w1359774872@gmail.com>
Date: Wed, 9 Nov 2022 11:55:26 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(#1000663#13):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E8=B4=AD=E7=89=A9=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/iconText/index.module.scss     | 15 +++++++-
 src/components/iconText/index.tsx             | 37 ++++++++++++++++---
 src/components/search/index.tsx               |  1 +
 .../bottomSettleBar/index.module.scss         |  5 ++-
 .../components/bottomSettleBar/index.tsx      |  5 ++-
 .../colorKindItem/index.module.scss           |  3 +-
 .../shoppingCartItem/index.module.scss        |  3 +-
 7 files changed, 56 insertions(+), 13 deletions(-)

diff --git a/src/components/iconText/index.module.scss b/src/components/iconText/index.module.scss
index 87de601..0969aa3 100644
--- a/src/components/iconText/index.module.scss
+++ b/src/components/iconText/index.module.scss
@@ -1,9 +1,20 @@
 .iconText{
   display: flex;
-  flex-flow: row nowrap;
-  align-items: center;
   font-size: 28px;
   .iconfont{
     font-size: 40px;
   }
+  .text{
+    padding: 8px;
+  }
+}
+// 水平方向
+.iconText--horizontal{
+  flex-flow: row nowrap;
+  align-items: center;
+}
+// 垂直方向
+.iconText--vertical{
+  flex-flow: column nowrap;
+  align-items: center;
 }
diff --git a/src/components/iconText/index.tsx b/src/components/iconText/index.tsx
index db3ef30..1bc9231 100644
--- a/src/components/iconText/index.tsx
+++ b/src/components/iconText/index.tsx
@@ -1,27 +1,54 @@
-import { FC } from "react"
+import React, { FC, useMemo } from "react"
 import { View, Text } from '@tarojs/components'
 import IconFont, { IconNames } from '../iconfont/iconfont'
 import styles from './index.module.scss'
 import classnames from 'classnames'
 
+type Direaction = 'left' | 'right' | 'bottom' | 'top'
+
 type PropsType = {
   iconName: IconNames
   iconSize?: number
   svg?: boolean
   color?: string,
   text?: string
+  direction?: Direaction
   children?: React.ReactNode
   customClass?: string
   customStyle?: React.CSSProperties
   textClassName?: string
+  textCustomStyle?: React.CSSProperties
 }
 
 const IconText: FC<PropsType> = (props) => {
-  const { children, svg = false, iconName, iconSize = 40, text = '', color } = props
+  const { children, svg = false, iconName, iconSize = 40, text = '', color,textCustomStyle,direction='left' } = props
+  const classNameObject = {
+    [styles['iconText--horizontal']]: ['left', 'right'].includes(direction),
+    [styles['iconText--vertical']]: ['bottom', 'top'].includes(direction)
+  }
+  const iconComponent = svg ? <IconFont name={iconName} size={iconSize} color={color}></IconFont> : <Text className={classnames('iconfont', iconName, styles.iconfont)}></Text>
+
+  const textComponent = children ? children : <Text className={classnames(props.textClassName, styles['text'])} style={textCustomStyle}>{text}</Text>
+
+  const component = ()=>{
+    console.log('direction===>',direction);
+    if(direction === 'left' || direction === 'top'){
+      return <>
+      {iconComponent}
+      {textComponent}
+      </>
+    }else if(direction === 'right' || direction === 'bottom'){
+      return <>
+      {textComponent}
+      {iconComponent}
+      </>
+    }
+  }
+  
+
   return (
-    <View className={classnames(styles.iconText, props.customStyle, props.customClass)}>
-      {svg ? <IconFont name={iconName} size={iconSize} color={color}></IconFont> : <Text className={classnames('iconfont', iconName, styles.iconfont)}></Text>}
-      {children ? children : <Text className={classnames(props.textClassName)}>{text}</Text>}
+    <View className={classnames(styles.iconText,classNameObject, props.customStyle, props.customClass)}>
+      {component()}
     </View>
   )
 }
diff --git a/src/components/search/index.tsx b/src/components/search/index.tsx
index 132fff3..e9885d2 100644
--- a/src/components/search/index.tsx
+++ b/src/components/search/index.tsx
@@ -92,6 +92,7 @@ export default memo(
                 <IconFont
                   name='icon-sousuo'
                   size={37}
+                  color='#ababac'
                   customClassName={classnames(styles.icon_a_sousuo1_self, placeIcon == 'inner' ? styles.icon_inner : styles.icon_out)}></IconFont>
               )}
               <View className={styles.input_bar}>
diff --git a/src/pages/shopping/components/bottomSettleBar/index.module.scss b/src/pages/shopping/components/bottomSettleBar/index.module.scss
index c4ba37f..54db43b 100644
--- a/src/pages/shopping/components/bottomSettleBar/index.module.scss
+++ b/src/pages/shopping/components/bottomSettleBar/index.module.scss
@@ -33,7 +33,10 @@
 }
 
 .unit{
-  font-size: 24px;
+  font-size: 22px;
   transform: scale(.7);
   margin-right: 10px;
 }
+.money{
+  font-size: 36px;
+}
diff --git a/src/pages/shopping/components/bottomSettleBar/index.tsx b/src/pages/shopping/components/bottomSettleBar/index.tsx
index 2aaf7f9..c002a0e 100644
--- a/src/pages/shopping/components/bottomSettleBar/index.tsx
+++ b/src/pages/shopping/components/bottomSettleBar/index.tsx
@@ -23,9 +23,10 @@ export default props => {
         <Text className={styles.moneyText}>预估金额：</Text>
         <Text className={styles.moneyNumber}>
           <Text className={styles.unit}>¥</Text>
-          {Number(Number(amount)
+          <Text className={styles.money}>{Number(Number(amount)
             .toFixed(2))
-            .toLocaleString()}
+            .toLocaleString()}</Text>
+          
         </Text>
       </View>
       <View className={styles.bottomRight}>
diff --git a/src/pages/shopping/components/colorKindItem/index.module.scss b/src/pages/shopping/components/colorKindItem/index.module.scss
index ed55816..d2e84fd 100644
--- a/src/pages/shopping/components/colorKindItem/index.module.scss
+++ b/src/pages/shopping/components/colorKindItem/index.module.scss
@@ -22,6 +22,7 @@
     display: flex;
     flex-flow: column nowrap;
     justify-content: space-between;
+    align-self: stretch;
     flex: 1 1 auto;
     &--title {
       color: $color_font_one;
@@ -46,7 +47,7 @@
     display: flex;
     flex-flow: column nowrap;
     align-items: flex-end;
-    justify-content: space-around;
+    justify-content: space-between;
     align-self: stretch;
     &--price {
       color: $color_money;
diff --git a/src/pages/shopping/components/shoppingCartItem/index.module.scss b/src/pages/shopping/components/shoppingCartItem/index.module.scss
index b95ed11..5963532 100644
--- a/src/pages/shopping/components/shoppingCartItem/index.module.scss
+++ b/src/pages/shopping/components/shoppingCartItem/index.module.scss
@@ -1,7 +1,6 @@
 .layout {
   margin: 24px;
-  padding-left: 0;
-  padding-right: 0;
+  padding: 30px 0;
   border: 1px solid transparent;
   .checkbox {
     padding: 0 24px;