✨ feat:解决冲突

src/components/counter/index.tsx

@@ -98,20 +98,22 @@ export default ({minNum = 0, maxNum = 10000, step=1, digits = 0, defaultNum = 0,
             onBlue?.(defaultNum)
         }
     }   
+    const noop = (e) => {
+        e.stopPropagation()
+
+    }
     return (
-        <View className={styles.main}>
-            <View className={styles.reduce} onClick={minus}>-</View>
-            <View className={styles.input}>
-                <Input 
-                    value={String(value.count)}
-                    onInput={onInputEven}
-                    onBlur={onBluerEven}
-                    type='digit'
-                    disabled={disable}
-                />
-                <View className={styles.unit}>{unit}</View>
-            </View>
-            <View className={styles.plus} onClick={onPlus}>+</View>
+      <View className={styles.main}>
+        <View className={styles.reduce} onClick={minus}>
+          -
         </View>
+        <View className={styles.input} onClick={noop}>
+          <Input value={String(value.count)} onInput={onInputEven} onBlur={onBluerEven} type='digit' disabled={disable} />
+          <View className={styles.unit}>{unit}</View>
+        </View>
+        <View className={styles.plus} onClick={onPlus}>
+          +
+        </View>
+      </View>
     )
 }

src/components/iconText/index.tsx

@@ -8,6 +8,7 @@ type PropsType = {
   iconName: IconNames
   iconSize?: number
   svg?: boolean
+  color?: string,
   text?: string
   children?: React.ReactNode
   customClass?: string
@@ -16,10 +17,10 @@ type PropsType = {
 }
 
 const IconText: FC<PropsType> = (props) => {
-  const { children, svg = false, iconName, iconSize = 40, text = '' } = props
+  const { children, svg = false, iconName, iconSize = 40, text = '', color } = props
   return (
     <View className={classnames(styles.iconText, props.customStyle, props.customClass)}>
-      {svg ? <IconFont name={iconName} size={iconSize}></IconFont> : <Text className={classnames('iconfont', iconName, styles.iconfont)}></Text>}
+      {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>
   )

src/components/iconfont/iconfont.tsx

@@ -4,7 +4,7 @@ import "./iconfont.scss";
 import Taro from "@tarojs/taro";
 import classnames from "classnames";
 
-const initSvgSize = (36 / 750) * Taro.getSystemInfoSync().windowWidth
+const SystemWidth = Taro.getSystemInfoSync().windowWidth
 const quot = '"'
 
 function hex2rgb(hex) {
@@ -43,7 +43,7 @@ const IconFont:FC<PropsType> = ({
 }) => {
   const [colors, setColors] = useState<PropsType['color']>()
   const [isStr, setIsStr] = useState(true)
-  const [svgSize, setSvgSize] = useState(initSvgSize)
+  const [svgSize, setSvgSize] = useState(() => (size / 750) * SystemWidth)
 
   useEffect(() => {
     setIsStr(typeof color === 'string')
@@ -60,7 +60,7 @@ const IconFont:FC<PropsType> = ({
   }, [color])
 
   useEffect(() => {
-    setSvgSize((size / 750) * Taro.getSystemInfoSync().windowWidth)
+    setSvgSize((size / 750) * SystemWidth)
   }, [size])
 
   // 也可以使用 if (name === 'xxx') { return <view> } 来渲染，但是测试发现在ios下会有问题，报错 Maximum call stack啥的。下面这个写法没问题