冲突合并

.gitignore

@@ -1,4 +1,5 @@
 dist/
+build/
 deploy_versions/
 .temp/
 .rn_temp/

iconfont.json

@@ -1,7 +1,7 @@
 {
-    "symbol_url": "//at.alicdn.com/t/c/font_3619513_i9fjrthdbsd.js",
+    "symbol_url": "//at.alicdn.com/t/c/font_3619513_pecprurprt.js",
     "save_dir": "./src/components/iconfont",
-    "use_typescript": false,
+    "use_typescript": true,
     "platforms": ["weapp","h5"],
     "use_rpx": true,
     "trim_icon_prefix": "",

src/api/index.ts

@@ -1,8 +1,15 @@
+export { LoginApi } from './login/index'
+export {
+  productabsorbcontrast,
+  SelectProductListApi,
+  ColorListApi,
+  ColorDetailedApi,
+  ColorSamplingSaveApi,
+  TextureSaveApi,
+  FindColorListApi,
+} from './product/index'
 
-
+import { useRequest } from '@/use/useHttp'
-export {LoginApi} from './login/index'
-
-import { useRequest } from "@/use/useHttp"
 /**
  *  系列列表
  * @returns
@@ -10,7 +17,7 @@ import { useRequest } from "@/use/useHttp"
 export const kindListApi = () => {
   return useRequest({
     url: `/v1/mp/product/kind/list`,
-        method: "get",
+    method: 'get',
   })
 }
 
@@ -21,6 +28,6 @@ export const kindListApi = () => {
 export const ProductListApi = () => {
   return useRequest({
     url: `/v1/mp/product/list`,
-        method: "get",
+    method: 'get',
   })
 }

src/api/product/findColor.ts

@@ -0,0 +1,11 @@
+import { useRequest } from "@/use/useHttp"
+/**
+ *  颜色列表
+ * @returns
+ */
+export const FindColorListApi = () => {
+  return useRequest({
+    url: `/v1/mp/product/color/absorb/match`,
+    method: 'get',
+  })
+}

src/api/product/index.ts

@@ -0,0 +1,3 @@
+export { productabsorbcontrast, SelectProductListApi } from './product'
+export { ColorListApi, ColorDetailedApi, ColorSamplingSaveApi, TextureSaveApi } from './takeColor'
+export { FindColorListApi } from './findColor'

src/api/product/product.ts

@@ -0,0 +1,20 @@
+import { useRequest } from '@/use/useHttp'
+
+//取色对比
+export const productabsorbcontrast = () => {
+  return useRequest({
+    url: `/v1/mall/product/color/absorb/contrast`,
+    method: 'get',
+  })
+}
+
+/**
+ *  面料列表(下拉选择)
+ * @returns
+ */
+export const SelectProductListApi = () => {
+  return useRequest({
+    url: `/v1/mp/enum/product/list`,
+    method: 'get',
+  })
+}

src/api/product/takeColor.ts

@@ -0,0 +1,45 @@
+import { useRequest } from '@/use/useHttp'
+
+/**
+ *  颜色列表
+ * @returns
+ */
+export const ColorListApi = () => {
+  return useRequest({
+    url: `/v1/mp/product/color/absorb/list`,
+    method: 'get',
+  })
+}
+
+/**
+ *  颜色详细
+ * @returns
+ */
+export const ColorDetailedApi = () => {
+  return useRequest({
+    url: `/v1/mp/product/texture`,
+    method: 'get',
+  })
+}
+
+/**
+ *  取色存储
+ * @returns
+ */
+export const ColorSamplingSaveApi = () => {
+  return useRequest({
+    url: `/v1/mp/product/color/absorb`,
+    method: 'put',
+  })
+}
+
+/**
+ *  保存纹理
+ * @returns
+ */
+export const TextureSaveApi = () => {
+  return useRequest({
+    url: `/v1/mp/product/texture`,
+    method: 'put',
+  })
+}

src/app.config.ts

@@ -49,5 +49,14 @@ export default defineAppConfig({
     'custom-wrapper': '/custom-wrapper',
     ...useGlobalIconFont(),
   },
-  subPackages: [],
+  subPackages: [
+    {
+      root: 'pages/colorRelated',
+      pages: [
+        'sampleComparison/index', 
+        'takeColor/index', 
+        'findColor/index'
+      ],
+    },
+  ],
 })

src/app.tsx

@@ -6,8 +6,14 @@ import './app.scss'
 import Taro, { onAppShow, useDidShow } from '@tarojs/taro'
 import { shareShop } from './common/util'
 
+type ParamsType = {
+  children?: React.ReactNode
+}
+
 const store = configStore()
-const App: FC = (params) => {
+const App: FC<ParamsType> = (params) => {
+  const { children } = params
+
   Taro.showShareMenu({
     withShareTicket: true,
   })
@@ -41,7 +47,7 @@ const App: FC = (params) => {
 
   return (
     <ContextBlueTooth>
-      <Provider store={store}>{params.children}</Provider>
+      <Provider store={store}>{children}</Provider>
     </ContextBlueTooth>
   )
 }

src/common/util.ts

@@ -1,4 +1,4 @@
-import { formatImgUrl } from './fotmat'
+import { formatImgUrl } from './format'
 import { analysisShortCodeApi } from './shortCode'
 import Taro from '@tarojs/taro'
 

src/components/LabAndImg/index.tsx

@@ -1,4 +1,4 @@
-import { formatImgUrl, formatRemoveHashTag } from '@/common/fotmat'
+import { formatImgUrl, formatRemoveHashTag } from '@/common/format'
 import Preview from '@/pages/details/components/preview'
 import { Image, View } from '@tarojs/components'
 import { memo, useCallback, useEffect, useMemo, useState } from 'react'

src/components/LabAndImgShow/index.tsx

@@ -1,65 +1,64 @@
-import { formatImgUrl } from "@/common/fotmat"
+import { formatImgUrl } from '@/common/format'
-import { View } from "@tarojs/components"
+import { View } from '@tarojs/components'
-import { useEffect, useMemo, useState } from "react"
+import { useEffect, useMemo, useState } from 'react'
 import styles from './index.module.scss'
 import Taro from '@tarojs/taro'
 
-
 export type colorParams = {
   value?: {
-        texture_url?: string, //纹理图路径
+    texture_url?: string //纹理图路径
-        lab?: {l:number, a:number, b:number}, //lab
+    lab?: { l: number; a: number; b: number } //lab
-        rgb?: {r:number, g:number, b:number} //rgb
+    rgb?: { r: number; g: number; b: number } //rgb
     title?: string //标题
-    },
+  }
-    show?: false|true
+  show?: false | true
-    onClose?: () => void,
+  onClose?: () => void
-    showNumber?: number, //图片显示张数，0不限制
+  showNumber?: number //图片显示张数，0不限制
 }
-export default ({value, show = false, onClose, showNumber = 1}: colorParams) => {
+export default ({ value, show = false, onClose, showNumber = 1 }: colorParams) => {
-
   useEffect(() => {
-        if(show&&rgbStyle) setLabShow(() => true)
+    if (show && rgbStyle) setLabShow(() => true)
-        if(show&&value?.texture_url) onShowImage()
+    if (show && value?.texture_url) onShowImage()
-        if(!show) setLabShow(() => false)
+    if (!show) setLabShow(() => false)
   }, [show])
 
   //显示颜色
   const [labShow, setLabShow] = useState(false)
   //lab是否都是0
   const rgbStyle = useMemo(() => {
-        if(value?.lab&&(value.lab.l||value.lab.a||value.lab.b)) {
+    if (value?.lab && (value.lab.l || value.lab.a || value.lab.b)) {
-            return {'backgroundColor':`rgb(${value.rgb?.r} ${value.rgb?.g} ${value.rgb?.b})`}
+      return { backgroundColor: `rgb(${value.rgb?.r} ${value.rgb?.g} ${value.rgb?.b})` }
     } else {
       return null
     }
   }, [value])
 
-    
   //显示图片
   const onShowImage = () => {
     onClose?.()
     let res: string[] = []
-        if(value?.texture_url) {
+    if (value?.texture_url) {
-            res = value?.texture_url?.split(',').map(item => {
+      res = value?.texture_url?.split(',').map((item) => {
         return formatImgUrl(item)
       })
     }
-        let n_res = showNumber == 0? res : res?.splice(0, showNumber)
+    let n_res = showNumber == 0 ? res : res?.splice(0, showNumber)
     Taro.previewImage({
       current: n_res[0],
-            urls: n_res  
+      urls: n_res,
     })
   }
 
   return (
     <>
-            {labShow&&<View className={styles.main} catch-move="true" onClick={() => onClose?.()}>
+      {labShow && (
+        <View className={styles.main} catch-move='true' onClick={() => onClose?.()}>
           <View className={styles.con}>
             <View className={styles.rgb} style={rgbStyle!}></View>
             <View className={styles.name}>{value?.title}</View>
           </View>
-            </View>}
+        </View>
+      )}
     </>
   )
 }

src/components/amountShow/index.tsx

@@ -1,14 +1,14 @@
-import { Text, View } from "@tarojs/components";
+import { Text, View } from '@tarojs/components'
-import { memo, useCallback } from "react";
+import { memo, useCallback } from 'react'
 import styles from './index.module.scss'
-import classnames from "classnames";
+import classnames from 'classnames'
-import { numberWithCommas } from "@/common/fotmat";
+import { numberWithCommas } from '@/common/format'
 
 type Param = {
-    number: number, //数字
+  number: number //数字
-    status: 0|1|2 //0 小型，1中型，2大
+  status: 0 | 1 | 2 //0 小型，1中型，2大
 }
-export default memo(({number = 0, status = 1}:Param) => {
+export default memo(({ number = 0, status = 1 }: Param) => {
   const priceDom = useCallback(() => {
     let res = number.toFixed(2).split('.')
     let int_num = parseInt(res[0]) + ''
@@ -16,14 +16,10 @@ export default memo(({number = 0, status = 1}:Param) => {
     return (
       <>
         <Text className={styles.price_text}>¥</Text>
-                <Text className={styles.price_text}>{numberWithCommas({number:int_num, digit:0})}</Text>
+        <Text className={styles.price_text}>{numberWithCommas({ number: int_num, digit: 0 })}</Text>
         <Text className={styles.price_text}>.{decimals_num}</Text>
       </>
     )
   }, [number])
-    return (
+  return <View className={classnames(styles.order_price_num, status == 1 && styles.emphasis_num, status == 2 && styles.emphasis_num_big)}>{priceDom()}</View>
-        <View className={classnames(styles.order_price_num, status==1&&styles.emphasis_num, status==2&&styles.emphasis_num_big)} >
-            {priceDom()}
-        </View>
-    )
 })

src/components/banner/index.tsx

@@ -3,7 +3,7 @@ import { goLink } from '@/common/common'
 import { GetBannerList } from '@/api/banner'
 import styles from './index.module.scss'
 import { useEffect, useState } from 'react'
-import { formatImgUrl } from '@/common/fotmat'
+import { formatImgUrl } from '@/common/format'
 
 type item = { title: string; img: string; url: string; id: number }
 

src/components/bindSalesmanPopup/index.tsx

@@ -1,14 +1,14 @@
-import { Image, Swiper, SwiperItem, Text, View } from "@tarojs/components"
+import { Image, Swiper, SwiperItem, Text, View } from '@tarojs/components'
 import styles from './index.module.scss'
-import { formatImgUrl } from "@/common/fotmat"
+import { formatImgUrl } from '@/common/format'
-import Taro from "@tarojs/taro";
+import Taro from '@tarojs/taro'
-import { goLink } from "@/common/common";
+import { goLink } from '@/common/common'
 
 type params = {
-    show?: true|false,
+  show?: true | false
   onClose?: () => void
 }
-export default ({show, onClose}:params) => {
+export default ({ show, onClose }: params) => {
   const onCustomer = async () => {
     let res = await Taro.showModal({
       title: '是否拨打服务热线',
@@ -16,9 +16,9 @@ export default ({show, onClose}:params) => {
       content: '(0757) 8270 6695',
       cancelText: '取消',
     })
-        if(res.confirm) {
+    if (res.confirm) {
       Taro.makePhoneCall({
-                phoneNumber: '(0757)82706695'
+        phoneNumber: '(0757)82706695',
       })
     }
   }
@@ -29,23 +29,28 @@ export default ({show, onClose}:params) => {
   }
   return (
     <>
-            {show&&<View className={styles.bindSalesman_main}>
+      {show && (
+        <View className={styles.bindSalesman_main}>
           <View className={styles.bindSalesman_pop}>
             <View className={styles.bindSalesman_header}>
-                        <Image src={formatImgUrl('/mall/invite_code_top.png', '!w400')} mode="aspectFill"/>
+              <Image src={formatImgUrl('/mall/invite_code_top.png', '!w400')} mode='aspectFill' />
             </View>
             <View className={styles.bindSalesman_message}>
               <Text>提示</Text>
               <Text>暂未开通下单权限功能，稍后有客服联系您，请注意接收电话。</Text>
             </View>
             <View className={styles.bindSalesman_operation}>
-                        <View className={styles.btns} onClick={() => onConfirm()}>输入邀请码</View>
+              <View className={styles.btns} onClick={() => onConfirm()}>
-                        <View className={styles.btns} onClick={() => onCustomer()}>联系客服</View>
+                输入邀请码
+              </View>
+              <View className={styles.btns} onClick={() => onCustomer()}>
+                联系客服
+              </View>
             </View>
           </View>
           <View className={styles.bindSalesman_mask} onClick={onClose}></View>
-            </View>}
+        </View>
+      )}
     </>
   )
-   
 }

src/components/iconCard/index.tsx

@@ -1,6 +1,6 @@
-import { View } from "@tarojs/components"
+import { View } from '@tarojs/components'
-import { FC, ReactNode } from "react"
+import { FC, ReactNode } from 'react'
-import IconFont from "../iconfont"
+import IconFont from '../iconfont'
 import styles from './index.module.scss'
 
 import classname from 'classnames'
@@ -16,8 +16,9 @@ interface PropsType {
   iconSize?: number
 }
 const IconCard: FC<PropsType> = (props) => {
-  const { iconName, title, onClick, customClass = '', iconSize=72 } = props
+  const { iconName, title, onClick, customClass = '', iconSize = 72 } = props
   const handleClick = (event) => {
+    console.log(event)
     onClick && onClick(event)
   }
   return (

src/components/iconfont/h5/IconAJizhumima.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconAJizhumima = ({ size, color, style: _style, ...rest }) => {
+const IconAJizhumima: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconBianji.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconBianji = ({ size, color, style: _style, ...rest }) => {
+const IconBianji: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconBiyan.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconBiyan = ({ size, color, style: _style, ...rest }) => {
+const IconBiyan: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconCangku.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconCangku = ({ size, color, style: _style, ...rest }) => {
+const IconCangku: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconChakanquanbukehu.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconChakanquanbukehu = ({ size, color, style: _style, ...rest }) => {
+const IconChakanquanbukehu: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconDaikuan.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconDaikuan = ({ size, color, style: _style, ...rest }) => {
+const IconDaikuan: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconDingdan.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconDingdan = ({ size, color, style: _style, ...rest }) => {
+const IconDingdan: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconDingdan1.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconDingdan1 = ({ size, color, style: _style, ...rest }) => {
+const IconDingdan1: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconDingwei.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconDingwei = ({ size, color, style: _style, ...rest }) => {
+const IconDingwei: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconDizhi.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconDizhi = ({ size, color, style: _style, ...rest }) => {
+const IconDizhi: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconDuizhang.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconDuizhang = ({ size, color, style: _style, ...rest }) => {
+const IconDuizhang: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconFahuoliebiao.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconFahuoliebiao = ({ size, color, style: _style, ...rest }) => {
+const IconFahuoliebiao: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconGerenzhongxin.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconGerenzhongxin = ({ size, color, style: _style, ...rest }) => {
+const IconGerenzhongxin: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconGerenzhongxin1.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconGerenzhongxin1 = ({ size, color, style: _style, ...rest }) => {
+const IconGerenzhongxin1: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconGouwu.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconGouwu = ({ size, color, style: _style, ...rest }) => {
+const IconGouwu: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconGouwu1.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconGouwu1 = ({ size, color, style: _style, ...rest }) => {
+const IconGouwu1: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconGuanbi.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconGuanbi = ({ size, color, style: _style, ...rest }) => {
+const IconGuanbi: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconGuanlidingdan.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconGuanlidingdan = ({ size, color, style: _style, ...rest }) => {
+const IconGuanlidingdan: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconJianshao.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconJianshao = ({ size, color, style: _style, ...rest }) => {
+const IconJianshao: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconJizhumima.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconJizhumima = ({ size, color, style: _style, ...rest }) => {
+const IconJizhumima: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconKehuxinxi.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconKehuxinxi = ({ size, color, style: _style, ...rest }) => {
+const IconKehuxinxi: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconLingquseka.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconLingquseka = ({ size, color, style: _style, ...rest }) => {
+const IconLingquseka: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconLujing.tsx

@@ -0,0 +1,33 @@
+/* tslint:disable */
+/* eslint-disable */
+
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
+import { getIconColor } from './helper';
+
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
+  display: 'block',
+};
+
+const IconLujing: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
+  const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
+
+  return (
+    <svg viewBox="0 0 1450 1024" width={size + 'rem'} height={size + 'rem'} style={style} {...rest}>
+      <path
+        d="M495.06688 1024a44.672 44.672 0 0 1-31.786667-13.653333L12.080213 549.461333a48.298667 48.298667 0 0 1 0.938667-64.938666 44.373333 44.373333 0 0 1 62.72-2.133334l419.328 428.373334L1375.877547 11.093333a44.330667 44.330667 0 0 1 61.696 2.944c16.682667 17.493333 17.493333 45.354667 1.962666 63.914667l-912.64 931.669333c-8.362667 8.96-19.797333 14.122667-31.829333 14.378667z"
+        fill={getIconColor(color, 0, '#405C87')}
+      />
+    </svg>
+  );
+};
+
+IconLujing.defaultProps = {
+  size: 18,
+};
+
+export default IconLujing;

src/components/iconfont/h5/IconMadanguanli.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconMadanguanli = ({ size, color, style: _style, ...rest }) => {
+const IconMadanguanli: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconMima.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconMima = ({ size, color, style: _style, ...rest }) => {
+const IconMima: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconPaiming.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconPaiming = ({ size, color, style: _style, ...rest }) => {
+const IconPaiming: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconPandiansaoma.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconPandiansaoma = ({ size, color, style: _style, ...rest }) => {
+const IconPandiansaoma: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconPeihuo.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconPeihuo = ({ size, color, style: _style, ...rest }) => {
+const IconPeihuo: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconQianzhicangkucun.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconQianzhicangkucun = ({ size, color, style: _style, ...rest }) => {
+const IconQianzhicangkucun: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconQusechazhao.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconQusechazhao = ({ size, color, style: _style, ...rest }) => {
+const IconQusechazhao: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconSaomiao.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconSaomiao = ({ size, color, style: _style, ...rest }) => {
+const IconSaomiao: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconShaixuan.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconShaixuan = ({ size, color, style: _style, ...rest }) => {
+const IconShaixuan: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconShanchusousuoxinxi.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconShanchusousuoxinxi = ({ size, color, style: _style, ...rest }) => {
+const IconShanchusousuoxinxi: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconShijian.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconShijian = ({ size, color, style: _style, ...rest }) => {
+const IconShijian: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconShouhou.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconShouhou = ({ size, color, style: _style, ...rest }) => {
+const IconShouhou: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconShouhouzhongxin.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconShouhouzhongxin = ({ size, color, style: _style, ...rest }) => {
+const IconShouhouzhongxin: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconShoukuanliebiao.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconShoukuanliebiao = ({ size, color, style: _style, ...rest }) => {
+const IconShoukuanliebiao: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconShouye.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconShouye = ({ size, color, style: _style, ...rest }) => {
+const IconShouye: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconShouye1.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconShouye1 = ({ size, color, style: _style, ...rest }) => {
+const IconShouye1: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconSousuo.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconSousuo = ({ size, color, style: _style, ...rest }) => {
+const IconSousuo: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconSousuofanhui.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconSousuofanhui = ({ size, color, style: _style, ...rest }) => {
+const IconSousuofanhui: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconSousuoshanchu.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconSousuoshanchu = ({ size, color, style: _style, ...rest }) => {
+const IconSousuoshanchu: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconTihuoliebiao.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconTihuoliebiao = ({ size, color, style: _style, ...rest }) => {
+const IconTihuoliebiao: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconTishi.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconTishi = ({ size, color, style: _style, ...rest }) => {
+const IconTishi: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconTuikuan.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconTuikuan = ({ size, color, style: _style, ...rest }) => {
+const IconTuikuan: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconWeixindenglu.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconWeixindenglu = ({ size, color, style: _style, ...rest }) => {
+const IconWeixindenglu: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconWodekefu.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconWodekefu = ({ size, color, style: _style, ...rest }) => {
+const IconWodekefu: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconWodeshoucang.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconWodeshoucang = ({ size, color, style: _style, ...rest }) => {
+const IconWodeshoucang: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconXianxiahuizong.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconXianxiahuizong = ({ size, color, style: _style, ...rest }) => {
+const IconXianxiahuizong: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconXiaoshou.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconXiaoshou = ({ size, color, style: _style, ...rest }) => {
+const IconXiaoshou: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconXinzeng.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconXinzeng = ({ size, color, style: _style, ...rest }) => {
+const IconXinzeng: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconYangpinduibi.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconYangpinduibi = ({ size, color, style: _style, ...rest }) => {
+const IconYangpinduibi: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconYanjing.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconYanjing = ({ size, color, style: _style, ...rest }) => {
+const IconYanjing: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconYansequyang.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconYansequyang = ({ size, color, style: _style, ...rest }) => {
+const IconYansequyang: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconYaoqingma.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconYaoqingma = ({ size, color, style: _style, ...rest }) => {
+const IconYaoqingma: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconYewuyuanqizi.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconYewuyuanqizi = ({ size, color, style: _style, ...rest }) => {
+const IconYewuyuanqizi: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconYonghuming.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconYonghuming = ({ size, color, style: _style, ...rest }) => {
+const IconYonghuming: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconYufukuan.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconYufukuan = ({ size, color, style: _style, ...rest }) => {
+const IconYufukuan: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/IconYuncangkucun.tsx

@@ -1,13 +1,19 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { CSSProperties, SVGAttributes, FunctionComponent } from 'react';
 import { getIconColor } from './helper';
 
-const DEFAULT_STYLE = {
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  size?: number;
+  color?: string | string[];
+}
+
+const DEFAULT_STYLE: CSSProperties = {
   display: 'block',
 };
 
-const IconYuncangkucun = ({ size, color, style: _style, ...rest }) => {
+const IconYuncangkucun: FunctionComponent<Props> = ({ size, color, style: _style, ...rest }) => {
   const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE;
 
   return (

src/components/iconfont/h5/helper.js

@@ -1,17 +0,0 @@
-/* eslint-disable */
-
-/**
- * @param {string | string[] | undefined} color
- * @param {number} index
- * @param {string} defaultColor
- * @return {string}
- */
-export const getIconColor = (color, index, defaultColor) => {
-  return color
-    ? (
-      typeof color === 'string'
-        ? color
-        : color[index] || defaultColor
-    )
-    : defaultColor;
-};

src/components/iconfont/h5/helper.ts

@@ -0,0 +1,12 @@
+/* tslint:disable */
+/* eslint-disable */
+
+export const getIconColor = (color: string | string[] | undefined, index: number, defaultColor: string) => {
+  return color
+    ? (
+      typeof color === 'string'
+        ? color
+        : color[index] || defaultColor
+    )
+    : defaultColor;
+};

src/components/iconfont/h5/index.tsx

@@ -1,6 +1,8 @@
+/* tslint:disable */
 /* eslint-disable */
 
-import React from 'react';
+import React, { SVGAttributes, FunctionComponent } from 'react';
+import IconLujing from './IconLujing';
 import IconJizhumima from './IconJizhumima';
 import IconAJizhumima from './IconAJizhumima';
 import IconWeixindenglu from './IconWeixindenglu';
@@ -59,6 +61,7 @@ import IconGerenzhongxin from './IconGerenzhongxin';
 import IconDingdan from './IconDingdan';
 import IconShouye from './IconShouye';
 import IconGouwu from './IconGouwu';
+export { default as IconLujing } from './IconLujing';
 export { default as IconJizhumima } from './IconJizhumima';
 export { default as IconAJizhumima } from './IconAJizhumima';
 export { default as IconWeixindenglu } from './IconWeixindenglu';
@@ -118,8 +121,18 @@ export { default as IconDingdan } from './IconDingdan';
 export { default as IconShouye } from './IconShouye';
 export { default as IconGouwu } from './IconGouwu';
 
-const IconFont = ({ name, ...rest }) => {
+export type IconNames = 'icon-lujing' | 'icon-jizhumima' | 'icon-a-jizhumima' | 'icon-weixindenglu' | 'icon-kehuxinxi' | 'icon-yewuyuanqizi' | 'icon-chakanquanbukehu' | 'icon-biyan' | 'icon-bianji' | 'icon-daikuan' | 'icon-cangku' | 'icon-guanlidingdan' | 'icon-mima' | 'icon-guanbi' | 'icon-jianshao' | 'icon-dingwei' | 'icon-saomiao' | 'icon-peihuo' | 'icon-shaixuan' | 'icon-paiming' | 'icon-shanchusousuoxinxi' | 'icon-shijian' | 'icon-sousuo' | 'icon-shouhou' | 'icon-sousuofanhui' | 'icon-sousuoshanchu' | 'icon-tuikuan' | 'icon-tishi' | 'icon-xianxiahuizong' | 'icon-xinzeng' | 'icon-yonghuming' | 'icon-yanjing' | 'icon-yufukuan' | 'icon-wodekefu' | 'icon-dizhi' | 'icon-shouhouzhongxin' | 'icon-wodeshoucang' | 'icon-shoukuanliebiao' | 'icon-madanguanli' | 'icon-qusechazhao' | 'icon-pandiansaoma' | 'icon-yaoqingma' | 'icon-duizhang' | 'icon-tihuoliebiao' | 'icon-yangpinduibi' | 'icon-yansequyang' | 'icon-fahuoliebiao' | 'icon-yuncangkucun' | 'icon-xiaoshou' | 'icon-qianzhicangkucun' | 'icon-lingquseka' | 'icon-gouwu1' | 'icon-dingdan1' | 'icon-gerenzhongxin1' | 'icon-shouye1' | 'icon-gerenzhongxin' | 'icon-dingdan' | 'icon-shouye' | 'icon-gouwu';
+
+interface Props extends Omit<SVGAttributes<SVGElement>, 'color'> {
+  name: IconNames;
+  size?: number;
+  color?: string | string[];
+}
+
+const IconFont: FunctionComponent<Props> = ({ name, ...rest }) => {
   switch (name) {
+    case 'icon-lujing':
+      return <IconLujing {...rest} />;
     case 'icon-jizhumima':
       return <IconJizhumima {...rest} />;
     case 'icon-a-jizhumima':

src/components/iconfont/index.d.ts

@@ -1,13 +0,0 @@
-/* eslint-disable */
-import React, { FunctionComponent } from 'react';
-
-interface Props {
-  name: 'icon-jizhumima' | 'icon-a-jizhumima' | 'icon-weixindenglu' | 'icon-kehuxinxi' | 'icon-yewuyuanqizi' | 'icon-chakanquanbukehu' | 'icon-biyan' | 'icon-bianji' | 'icon-daikuan' | 'icon-cangku' | 'icon-guanlidingdan' | 'icon-mima' | 'icon-guanbi' | 'icon-jianshao' | 'icon-dingwei' | 'icon-saomiao' | 'icon-peihuo' | 'icon-shaixuan' | 'icon-paiming' | 'icon-shanchusousuoxinxi' | 'icon-shijian' | 'icon-sousuo' | 'icon-shouhou' | 'icon-sousuofanhui' | 'icon-sousuoshanchu' | 'icon-tuikuan' | 'icon-tishi' | 'icon-xianxiahuizong' | 'icon-xinzeng' | 'icon-yonghuming' | 'icon-yanjing' | 'icon-yufukuan' | 'icon-wodekefu' | 'icon-dizhi' | 'icon-shouhouzhongxin' | 'icon-wodeshoucang' | 'icon-shoukuanliebiao' | 'icon-madanguanli' | 'icon-qusechazhao' | 'icon-pandiansaoma' | 'icon-yaoqingma' | 'icon-duizhang' | 'icon-tihuoliebiao' | 'icon-yangpinduibi' | 'icon-yansequyang' | 'icon-fahuoliebiao' | 'icon-yuncangkucun' | 'icon-xiaoshou' | 'icon-qianzhicangkucun' | 'icon-lingquseka' | 'icon-gouwu1' | 'icon-dingdan1' | 'icon-gerenzhongxin1' | 'icon-shouye1' | 'icon-gerenzhongxin' | 'icon-dingdan' | 'icon-shouye' | 'icon-gouwu';
-  size?: number;
-  color?: string | string[];
-  style?: React.CSSProperties;
-}
-
-declare const IconFont: FunctionComponent<Props>;
-
-export default IconFont;

src/components/iconfont/index.h5.js

@@ -1,17 +0,0 @@
-/* eslint-disable */
-
-import React from 'react';
-import Taro from '@tarojs/taro';
-import Icon from './h5';
-
-const IconFont = (props) => {
-  const { name, size, color, style } = props;
-
-  return <Icon name={name} size={parseFloat(Taro.pxTransform(size, 750))} color={color} style={style} />;
-};
-
-IconFont.defaultProps = {
-  size: 18,
-};
-
-export default IconFont;

src/components/iconfont/index.h5.tsx

@@ -0,0 +1,27 @@
+/* tslint:disable */
+/* eslint-disable */
+
+import React, { FunctionComponent } from 'react';
+import Taro from '@tarojs/taro';
+import Icon from './h5';
+
+export type IconNames = 'icon-lujing' | 'icon-jizhumima' | 'icon-a-jizhumima' | 'icon-weixindenglu' | 'icon-kehuxinxi' | 'icon-yewuyuanqizi' | 'icon-chakanquanbukehu' | 'icon-biyan' | 'icon-bianji' | 'icon-daikuan' | 'icon-cangku' | 'icon-guanlidingdan' | 'icon-mima' | 'icon-guanbi' | 'icon-jianshao' | 'icon-dingwei' | 'icon-saomiao' | 'icon-peihuo' | 'icon-shaixuan' | 'icon-paiming' | 'icon-shanchusousuoxinxi' | 'icon-shijian' | 'icon-sousuo' | 'icon-shouhou' | 'icon-sousuofanhui' | 'icon-sousuoshanchu' | 'icon-tuikuan' | 'icon-tishi' | 'icon-xianxiahuizong' | 'icon-xinzeng' | 'icon-yonghuming' | 'icon-yanjing' | 'icon-yufukuan' | 'icon-wodekefu' | 'icon-dizhi' | 'icon-shouhouzhongxin' | 'icon-wodeshoucang' | 'icon-shoukuanliebiao' | 'icon-madanguanli' | 'icon-qusechazhao' | 'icon-pandiansaoma' | 'icon-yaoqingma' | 'icon-duizhang' | 'icon-tihuoliebiao' | 'icon-yangpinduibi' | 'icon-yansequyang' | 'icon-fahuoliebiao' | 'icon-yuncangkucun' | 'icon-xiaoshou' | 'icon-qianzhicangkucun' | 'icon-lingquseka' | 'icon-gouwu1' | 'icon-dingdan1' | 'icon-gerenzhongxin1' | 'icon-shouye1' | 'icon-gerenzhongxin' | 'icon-dingdan' | 'icon-shouye' | 'icon-gouwu';
+
+interface Props {
+  name: IconNames;
+  size?: number;
+  color?: string | string[];
+  style?: React.CSSProperties;
+}
+
+const IconFont: FunctionComponent<Props> = (props) => {
+  const { name, size, color, style } = props;
+
+  return <Icon name={name} size={parseFloat(Taro.pxTransform(size, 750))} color={color} style={style} />;
+};
+
+IconFont.defaultProps = {
+  size: 18,
+};
+
+export default IconFont;

src/components/iconfont/index.js

@@ -1,7 +0,0 @@
-/* eslint-disable */
-
-const IconFont = () => {
-  return null;
-};
-
-export default IconFont;

src/components/iconfont/index.tsx

@@ -0,0 +1,19 @@
+/* tslint:disable */
+/* eslint-disable */
+
+import React, { FunctionComponent } from 'react';
+
+export type IconNames = 'icon-lujing' | 'icon-jizhumima' | 'icon-a-jizhumima' | 'icon-weixindenglu' | 'icon-kehuxinxi' | 'icon-yewuyuanqizi' | 'icon-chakanquanbukehu' | 'icon-biyan' | 'icon-bianji' | 'icon-daikuan' | 'icon-cangku' | 'icon-guanlidingdan' | 'icon-mima' | 'icon-guanbi' | 'icon-jianshao' | 'icon-dingwei' | 'icon-saomiao' | 'icon-peihuo' | 'icon-shaixuan' | 'icon-paiming' | 'icon-shanchusousuoxinxi' | 'icon-shijian' | 'icon-sousuo' | 'icon-shouhou' | 'icon-sousuofanhui' | 'icon-sousuoshanchu' | 'icon-tuikuan' | 'icon-tishi' | 'icon-xianxiahuizong' | 'icon-xinzeng' | 'icon-yonghuming' | 'icon-yanjing' | 'icon-yufukuan' | 'icon-wodekefu' | 'icon-dizhi' | 'icon-shouhouzhongxin' | 'icon-wodeshoucang' | 'icon-shoukuanliebiao' | 'icon-madanguanli' | 'icon-qusechazhao' | 'icon-pandiansaoma' | 'icon-yaoqingma' | 'icon-duizhang' | 'icon-tihuoliebiao' | 'icon-yangpinduibi' | 'icon-yansequyang' | 'icon-fahuoliebiao' | 'icon-yuncangkucun' | 'icon-xiaoshou' | 'icon-qianzhicangkucun' | 'icon-lingquseka' | 'icon-gouwu1' | 'icon-dingdan1' | 'icon-gerenzhongxin1' | 'icon-shouye1' | 'icon-gerenzhongxin' | 'icon-dingdan' | 'icon-shouye' | 'icon-gouwu';
+
+export interface IconProps {
+  name: IconNames;
+  size?: number;
+  color?: string | string[];
+  style?: React.CSSProperties;
+}
+
+const IconFont: FunctionComponent<IconProps> = () => {
+  return null;
+};
+
+export default IconFont;

src/components/iconfont/index.weapp.js

@@ -1,16 +0,0 @@
-/* eslint-disable */
-
-import React from 'react';
-import Taro from '@tarojs/taro';
-
-const IconFont = (props) => {
-  const { name, size, color, style } = props;
-
-  return <iconfont name={name} size={parseFloat(Taro.pxTransform(size))} color={color} style={style} />;
-};
-
-IconFont.defaultProps = {
-  size: 18,
-};
-
-export default IconFont;

src/components/iconfont/index.weapp.tsx

@@ -0,0 +1,27 @@
+/* tslint:disable */
+/* eslint-disable */
+
+import React, { FunctionComponent } from 'react';
+import Taro from '@tarojs/taro';
+
+export type IconNames = 'icon-lujing' | 'icon-jizhumima' | 'icon-a-jizhumima' | 'icon-weixindenglu' | 'icon-kehuxinxi' | 'icon-yewuyuanqizi' | 'icon-chakanquanbukehu' | 'icon-biyan' | 'icon-bianji' | 'icon-daikuan' | 'icon-cangku' | 'icon-guanlidingdan' | 'icon-mima' | 'icon-guanbi' | 'icon-jianshao' | 'icon-dingwei' | 'icon-saomiao' | 'icon-peihuo' | 'icon-shaixuan' | 'icon-paiming' | 'icon-shanchusousuoxinxi' | 'icon-shijian' | 'icon-sousuo' | 'icon-shouhou' | 'icon-sousuofanhui' | 'icon-sousuoshanchu' | 'icon-tuikuan' | 'icon-tishi' | 'icon-xianxiahuizong' | 'icon-xinzeng' | 'icon-yonghuming' | 'icon-yanjing' | 'icon-yufukuan' | 'icon-wodekefu' | 'icon-dizhi' | 'icon-shouhouzhongxin' | 'icon-wodeshoucang' | 'icon-shoukuanliebiao' | 'icon-madanguanli' | 'icon-qusechazhao' | 'icon-pandiansaoma' | 'icon-yaoqingma' | 'icon-duizhang' | 'icon-tihuoliebiao' | 'icon-yangpinduibi' | 'icon-yansequyang' | 'icon-fahuoliebiao' | 'icon-yuncangkucun' | 'icon-xiaoshou' | 'icon-qianzhicangkucun' | 'icon-lingquseka' | 'icon-gouwu1' | 'icon-dingdan1' | 'icon-gerenzhongxin1' | 'icon-shouye1' | 'icon-gerenzhongxin' | 'icon-dingdan' | 'icon-shouye' | 'icon-gouwu';
+
+interface Props {
+  name: IconNames;
+  size?: number;
+  color?: string | string[];
+  style?: React.CSSProperties;
+}
+
+const IconFont: FunctionComponent<Props> = (props) => {
+  const { name, size, color, style } = props;
+
+  // @ts-ignore
+  return <iconfont name={name} size={parseFloat(Taro.pxTransform(size))} color={color} style={style} />;
+};
+
+IconFont.defaultProps = {
+  size: 18,
+};
+
+export default IconFont;

src/components/iconfont/weapp/weapp.js

@@ -1,6 +1,6 @@
 Component({
   properties: {
-    // icon-jizhumima | icon-a-jizhumima | icon-weixindenglu | icon-kehuxinxi | icon-yewuyuanqizi | icon-chakanquanbukehu | icon-biyan | icon-bianji | icon-daikuan | icon-cangku | icon-guanlidingdan | icon-mima | icon-guanbi | icon-jianshao | icon-dingwei | icon-saomiao | icon-peihuo | icon-shaixuan | icon-paiming | icon-shanchusousuoxinxi | icon-shijian | icon-sousuo | icon-shouhou | icon-sousuofanhui | icon-sousuoshanchu | icon-tuikuan | icon-tishi | icon-xianxiahuizong | icon-xinzeng | icon-yonghuming | icon-yanjing | icon-yufukuan | icon-wodekefu | icon-dizhi | icon-shouhouzhongxin | icon-wodeshoucang | icon-shoukuanliebiao | icon-madanguanli | icon-qusechazhao | icon-pandiansaoma | icon-yaoqingma | icon-duizhang | icon-tihuoliebiao | icon-yangpinduibi | icon-yansequyang | icon-fahuoliebiao | icon-yuncangkucun | icon-xiaoshou | icon-qianzhicangkucun | icon-lingquseka | icon-gouwu1 | icon-dingdan1 | icon-gerenzhongxin1 | icon-shouye1 | icon-gerenzhongxin | icon-dingdan | icon-shouye | icon-gouwu
+    // icon-lujing | icon-jizhumima | icon-a-jizhumima | icon-weixindenglu | icon-kehuxinxi | icon-yewuyuanqizi | icon-chakanquanbukehu | icon-biyan | icon-bianji | icon-daikuan | icon-cangku | icon-guanlidingdan | icon-mima | icon-guanbi | icon-jianshao | icon-dingwei | icon-saomiao | icon-peihuo | icon-shaixuan | icon-paiming | icon-shanchusousuoxinxi | icon-shijian | icon-sousuo | icon-shouhou | icon-sousuofanhui | icon-sousuoshanchu | icon-tuikuan | icon-tishi | icon-xianxiahuizong | icon-xinzeng | icon-yonghuming | icon-yanjing | icon-yufukuan | icon-wodekefu | icon-dizhi | icon-shouhouzhongxin | icon-wodeshoucang | icon-shoukuanliebiao | icon-madanguanli | icon-qusechazhao | icon-pandiansaoma | icon-yaoqingma | icon-duizhang | icon-tihuoliebiao | icon-yangpinduibi | icon-yansequyang | icon-fahuoliebiao | icon-yuncangkucun | icon-xiaoshou | icon-qianzhicangkucun | icon-lingquseka | icon-gouwu1 | icon-dingdan1 | icon-gerenzhongxin1 | icon-shouye1 | icon-gerenzhongxin | icon-dingdan | icon-shouye | icon-gouwu
     name: {
       type: String,
     },

src/components/iconfont/weapp/weapp.wxml

@@ -1,3 +1,6 @@
+<!--icon-lujing-->
+<view wx:if="{{name === 'icon-lujing'}}" style="background-image: url({{quot}}data:image/svg+xml, %3Csvg viewBox='0 0 1450 1024' xmlns='http://www.w3.org/2000/svg' width='{{svgSize}}px' height='{{svgSize}}px'%3E%3Cpath d='M495.06688 1024a44.672 44.672 0 0 1-31.786667-13.653333L12.080213 549.461333a48.298667 48.298667 0 0 1 0.938667-64.938666 44.373333 44.373333 0 0 1 62.72-2.133334l419.328 428.373334L1375.877547 11.093333a44.330667 44.330667 0 0 1 61.696 2.944c16.682667 17.493333 17.493333 45.354667 1.962666 63.914667l-912.64 931.669333c-8.362667 8.96-19.797333 14.122667-31.829333 14.378667z' fill='{{(isStr ? colors : colors[0]) || 'rgb(64,92,135)'}}' /%3E%3C/svg%3E{{quot}}); width: {{svgSize}}px; height: {{svgSize}}px; " class="icon" />
+
 <!--icon-jizhumima-->
 <view wx:if="{{name === 'icon-jizhumima'}}" style="background-image: url({{quot}}data:image/svg+xml, %3Csvg viewBox='0 0 1024 1024' xmlns='http://www.w3.org/2000/svg' width='{{svgSize}}px' height='{{svgSize}}px'%3E%3Cpath d='M36.571429 36.571429m146.285714 0l658.285714 0q146.285714 0 146.285714 146.285714l0 658.285714q0 146.285714-146.285714 146.285714l-658.285714 0q-146.285714 0-146.285714-146.285714l0-658.285714q0-146.285714 146.285714-146.285714Z' fill='{{(isStr ? colors : colors[0]) || 'rgb(51,127,255)'}}' /%3E%3Cpath d='M722.358857 262.144a54.857143 54.857143 0 0 1 93.988572 56.32l-2.706286 4.534857-292.571429 438.857143a54.857143 54.857143 0 0 1-80.457143 11.995429l-3.986285-3.657143-219.428572-219.428572a54.857143 54.857143 0 0 1 73.435429-81.334857l4.169143 3.766857 172.068571 172.105143 255.488-383.158857z' fill='{{(isStr ? colors : colors[1]) || 'rgb(255,255,255)'}}' /%3E%3C/svg%3E{{quot}}); width: {{svgSize}}px; height: {{svgSize}}px; " class="icon" />
 

src/components/product/index.tsx

@@ -1,31 +1,37 @@
-import { Image, View } from "@tarojs/components"
+import { Image, View } from '@tarojs/components'
-import Taro from "@tarojs/taro"
+import Taro from '@tarojs/taro'
-import { goLink } from "@/common/common"
+import { goLink } from '@/common/common'
 import styles from './index.module.scss'
-import { formatHashTag, formatImgUrl } from "@/common/fotmat"
+import { formatHashTag, formatImgUrl } from '@/common/format'
-import LabAndImg from "../LabAndImg"
+import LabAndImg from '../LabAndImg'
-import { useCallback, useMemo } from "react"
+import { useCallback, useMemo } from 'react'
 
 type Params = {
-    desStatus?: true | false,
+  desStatus?: true | false
-    productList?: any[],
+  productList?: any[]
   popupShow?: (any) => void
 }
 export default ({ desStatus = true, productList = [], popupShow }: Params) => {
-
+  const labAndImgObj = useCallback(
-    const labAndImgObj = useCallback((item) => {
+    (item) => {
       return { lab: item.lab, rgb: item.rgb, texture_url: item.texture_url }
-    }, [productList])
+    },
+    [productList],
+  )
   return (
     <View className={styles.products_list}>
-            {productList?.map(item => {
+      {productList?.map((item) => {
-                return <View className={styles.products_item} onClick={() => popupShow?.(item)}>
+        return (
+          <View className={styles.products_item} onClick={() => popupShow?.(item)}>
             <View className={styles.item_img}>
               <LabAndImg value={labAndImgObj(item)} />
               <View className={styles.num}>{item.product_color_count}色</View>
             </View>
             <View className={styles.item_con}>
-                        <View className={styles.title}><text>{formatHashTag(item.code, '')} </text>{item.name}</View>
+              <View className={styles.title}>
+                <text>{formatHashTag(item.code, '')} </text>
+                {item.name}
+              </View>
               <View className={styles.tag_list}>
                 <View className={styles.tag}>{item.width}</View>
                 <View className={styles.tag_g}>{item.weight_density}</View>
@@ -34,7 +40,8 @@ export default ({ desStatus = true, productList = [], popupShow }: Params) => {
               {desStatus && <View className={styles.des}>{item.describe}</View>}
             </View>
           </View>
+        )
       })}
-        </View >
+    </View>
   )
 }

src/components/selectProduct/index.module.scss

@@ -0,0 +1,82 @@
+
+.select_input{
+    width: 100%;
+}
+.stock_ipnut_des{
+    border-bottom: 1rpx solid #F0F0F0;
+    padding: 20rpx 0 10rpx 10rpx !important;
+    .con_input{
+        display: flex;
+        align-items: center;
+        display: flex;
+        .label{
+            width: 120px;
+            font-size: 27px;
+            height: 60px;
+            display: flex;
+            align-items: center;
+            padding-left: 10px;
+            color: #707070;
+            font-weight: 700;
+            border-right: 2px solid #F3F3F3 ;
+        }
+        .input_con{
+            flex:1;
+        }
+        .input_type{
+            padding-left: 50px;
+            font-size: 28px;
+            @include common_ellipsis();
+            max-width: 430px;
+        }
+        .noCon{
+            color: #cccccc;
+        }
+        .iconfont{
+            color: #cccccc;
+            font-size: 30px;
+        }
+    }
+}
+.stock_disabled{
+    background: #f7f7f7;
+    border-radius: 10px;
+    .label{
+        color: #cccccc !important;
+    }
+}
+
+.drawer {
+    top:0;
+    position:fixed;
+}
+.selectCon{
+    width:100%;
+    .selectInput{
+        width:100%;
+        padding: 0 20px 20px 20px;
+        border-bottom: 2px solid #F3F3F3;
+        box-sizing: border-box;
+    }
+    .selectList{
+        .selectList-scroll-view{
+            height: 600px;
+            padding-top: 22px;
+            .selectItem{
+                font-size: 28px;
+                color: #707070;
+                padding: 22px 30px;
+            }
+            .selected{
+                color: #3287EC;
+                font-weight: 700;
+            }
+        }
+    }
+}
+.flexBox {
+    display: flex;
+    width: 200px;
+    align-items: center;
+    justify-content: flex-end;
+}

src/components/selectProduct/index.tsx

@@ -0,0 +1,112 @@
+import styles from './index.module.scss'
+import { Image, Text, ScrollView, View } from '@tarojs/components'
+import React, { FC, useCallback, useEffect, useMemo, useState } from 'react'
+import classnames from 'classnames'
+import Search from '../search'
+import Popup from '../popup'
+import { SelectProductListApi } from '@/api/index'
+
+
+type PropsType = {
+  selectColorId: number
+  noAll?: boolean
+  onSelect?: Function
+  children?: React.ReactNode
+}
+
+const SelectProduct:FC<PropsType> = (params) => {
+  const { selectColorId, noAll, onSelect } = params
+
+  const [selectId, setSelectId] = useState(0)
+
+  useEffect(()=>{
+    setSelectId(selectColorId)
+  }, [selectColorId])
+
+  const {fetchData, state} = SelectProductListApi()
+
+  const [selectValue, setSelectValue] = useState()
+
+  const [productList, setProductList] = useState([{id:1}])
+
+  const clickEvent = () => {}
+
+  const getSelectData = (item) => {
+    setSelectId(item.id)
+    setSelectValue(changeName(item))
+    setShowPopup(false)
+    onSelect && onSelect(item)
+  }
+
+  const changeName = (item) => {
+    if (item.id) {
+      return item.code.includes('#') ? item.code + ' ' + item.name : item.code + '# ' + item.name
+    } else {
+      return item.name
+    }
+  }
+
+  useEffect(() => {
+    getProductList()
+  }, [])
+
+  const getProductList = async () => {
+    let res = await fetchData()
+    !noAll && res.data.list?.unshift({ name: '全部', id: 0 })
+    setProductList(res.data.list)
+  }
+  
+
+  const list = useMemo(() => {
+    console.log('state', state)
+    return state.data.list || [{ id: 1 }]
+  }, [productList])
+
+  const [showPopup, setShowPopup] = useState(false)
+
+  const closeEven = () => {}
+
+  //输入了搜索关键字
+  const getSearchData = useCallback((e) => {
+    // pageNum.current.page = 1
+    // setOrderData(() => ({ list: [], total: 0 }))
+    // setSearchField((val) => ({ ...val, name: e, size: 10 }))
+  }, [])
+
+  useEffect(() => {
+    setSelectId(selectColorId)
+    const res = productList.find((item) => item.id == selectColorId)
+    setSelectValue(changeName(res))
+  }, [selectColorId])
+
+  return (
+    <>
+      <View className={styles.select_input}>
+        <View className={styles.stock_ipnut_des} onClick={clickEvent}>
+          <View className={styles.con_input}>
+            <View className={styles.label}>面料名称</View>
+            <View className={styles.input_con}>
+              <View className={classnames(styles.input_type, selectValue ? '' : 'noCon')}>{selectValue ? selectValue : '请选择'}</View>
+            </View>
+            <Text className='iconfont icon-more'></Text>
+          </View>
+        </View>
+      </View>
+      <Popup title='请选择面料名称' showTitle show={showPopup} onClose={closeEven}>
+        <Search placeholder='请输入编号/面料' showBtn={false} changeOnSearch={getSearchData} debounceTime={300}></Search>
+        <View className='selectList'>
+          <ScrollView className={styles['selectList-scroll-View']} scrollY>
+            {list.map((item) => {
+              return (
+                <View key={item.id} className={classnames(styles.selectItem, selectId == item.id ? styles.selected : '')} onClick={() => getSelectData(item)}>
+                  {/* {changeName(item)} */}
+                </View>
+              )
+            })}
+          </ScrollView>
+        </View>
+      </Popup>
+    </>
+  )
+}
+export default SelectProduct

src/components/shopCart/index.tsx

@@ -9,7 +9,7 @@ import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import Taro from '@tarojs/taro'
 import { alert, goLink } from '@/common/common'
 import { GetShoppingCartApi, DelShoppingCartApi, UpdateShoppingCartApi } from '@/api/shopCart'
-import { formatHashTag, formatImgUrl, formatPriceDiv } from '@/common/fotmat'
+import { formatHashTag, formatImgUrl, formatPriceDiv } from '@/common/format'
 import { setParam } from '@/common/system'
 import { debounce, throttle } from '@/common/util'
 import Counter from '../counter'

src/components/uploadImage/index.tsx

@@ -2,7 +2,7 @@ import Taro, { FC } from '@tarojs/taro'
 import { memo, useEffect, useState } from 'react'
 import useUploadCDNImg from '@/use/useUploadImage'
 import { Image, Text, View } from '@tarojs/components'
-import { formatImgUrl } from '@/common/fotmat'
+import { formatImgUrl } from '@/common/format'
 import classnames from 'classnames'
 import styles from './index.module.scss'
 

src/pages/colorRelated/components/bluetooth/LinkBlueTooth.tsx

@@ -0,0 +1,82 @@
+import { View } from '@tarojs/components'
+import { memo, useEffect, useMemo, useState } from 'react'
+import Taro from '@tarojs/taro'
+import { useBluetooth } from '@/use/contextBlueTooth'
+import SearchInput from '@/components/searchInput'
+import Popup from './Popup'
+import classnames from 'classnames'
+import styles from '../css/linkBlueTooth.module.scss'
+
+export default memo(() => {
+  const { state, init, startScan, connect, disconnect } = useBluetooth()
+
+  useEffect(() => {
+    init()
+  }, [])
+
+  const [linkStatus, setLinkStatus] = useState(1)
+  useEffect(() => {
+    if (!state.available) {
+      setLinkStatus(1)
+    } else if (state.available && state.connected?.name) {
+      setLinkStatus(3)
+    } else {
+      setLinkStatus(2)
+    }
+  }, [state.available, state.connected])
+
+  const linkName = useMemo(() => {
+    return state.connected?.localName || ''
+  }, [state.connected])
+
+  //链接设备
+  const onLinkListen = (item) => {
+    if (!state.connected && !state.connecting) connect(item)
+  }
+
+  const [popupShow, setPopupShow] = useState(false)
+  //显示设备列表
+  const onFindDevice = () => {
+    if (linkStatus == 1) {
+      Taro.showToast({
+        title: '请打开蓝牙',
+        icon: 'none',
+      })
+    } else {
+      setPopupShow(true)
+      onFindEven()
+    }
+  }
+  const onFindEven = () => {
+    if (!state.discovering && !state.connected && !state.connecting) startScan()
+  }
+
+  //断开链接
+  const onDisconnect = () => {
+    disconnect()
+    setPopupShow(false)
+  }
+
+  return (
+    <>
+      <View className={styles.main}>
+        <SearchInput title='蓝牙设备' showIcon={true} showBorder={false}>
+          <View className={styles.bluetooth_link} onClick={onFindDevice}>
+            <View className={classnames(styles.link_status, linkStatus == 3 && styles.link_statused, linkStatus == 2 && styles.link_statused_no)}></View>
+            {(linkStatus == 1 && <View className={classnames(styles.link_name, styles.link_name_no)}>请开启蓝牙</View>) ||
+              (linkStatus == 2 && <View className={classnames(styles.link_name, styles.link_name_no_link)}>未连接设备</View>) ||
+              (linkStatus == 3 && <View className={classnames(styles.link_name)}>{linkName}</View>)}
+          </View>
+        </SearchInput>
+        <Popup
+          state={state}
+          show={popupShow}
+          onClose={() => setPopupShow(false)}
+          onLink={(item) => onLinkListen(item)}
+          onOff={onDisconnect}
+          onFind={onFindEven}
+        />
+      </View>
+    </>
+  )
+})

src/pages/colorRelated/components/bluetooth/Popup.tsx

@@ -0,0 +1,79 @@
+import { ScrollView, View } from '@tarojs/components'
+import { memo, useEffect, useState } from 'react'
+import Loading from '@/components/loading'
+import style from '../css/popup.module.scss'
+
+interface params {
+  state: any
+  show: Boolean
+  onClose: (Boolean) => void
+  onLink: (any) => void
+  children?: React.ReactNode
+  onOff: () => void
+  onFind: () => void
+}
+
+export default memo(({ state, show = false, onClose, onLink, onOff, onFind }: params) => {
+  const [popupShow, setPopupShow] = useState(show)
+  useEffect(() => {
+    setPopupShow(show)
+  }, [show])
+  const onCloseListener = () => {
+    onClose(false)
+  }
+
+  return (
+    <>
+      {popupShow && (
+        <View className={style.popup}>
+          <View className={style.content}>
+            <View className={style.title}>搜索设备</View>
+            <View className={style.list}>
+              <ScrollView scrollY className={style.scroll}>
+                {(state.devices &&
+                  state.devices.length > 0 &&
+                  state?.devices.map((item) => {
+                    return (
+                      <View className={style.item} onClick={() => onLink(item)}>
+                        <View>{item.name}</View>
+                        {(!state.connecting && !state.connected && <View>链接</View>) ||
+                          (state.connecting && item.deviceId == state.connecting.deviceId && <View className={style.link_ing}>正在链接...</View>) ||
+                          (state.connected && item.deviceId == state.connected.deviceId && <View className={style.link_success}>链接成功</View>)}
+                      </View>
+                    )
+                  })) || (
+                  <View className={style.noDevice}>
+                    {(!state.discovering && (
+                      <>
+                        <View>暂无设备,请按以下条件检查</View>
+                        <View className={style.n_item}>1.请确保取色仪处于激活状态</View>
+                        <View className={style.n_item}>2.请确保取色仪没有链接其他设备</View>
+                        <View className={style.n_item}>3.请打开手机定位</View>
+                      </>
+                    )) || <View>设备搜索中</View>}
+                  </View>
+                )}
+              </ScrollView>
+            </View>
+            {(state.connected && (
+              <View className={`${style.footer} ${style.footer_off}`} onClick={onOff}>
+                断开链接
+              </View>
+            )) ||
+              (!state.connected && state.discovering && (
+                <View className={`${style.footer} ${style.finding}`}>
+                  搜索中
+                  <Loading width={30} color='orange' />
+                </View>
+              )) || (
+                <View className={style.footer} onClick={onFind}>
+                  重新搜索
+                </View>
+              )}
+          </View>
+          <View className={style.mask} onClick={onCloseListener}></View>
+        </View>
+      )}
+    </>
+  )
+})

src/pages/colorRelated/components/css/linkBlueTooth.module.scss

@@ -0,0 +1,39 @@
+.main {
+    width: 100%;
+    background: #ffffff;
+    border-radius: 10px;
+
+    .bluetooth_link {
+        display: flex;
+        align-items: center;
+
+        .link_status {
+            width: 12px;
+            height: 12px;
+            background: #f02409;
+            border-radius: 50%;
+        }
+
+        .link_statused {
+            background: #07C160;
+        }
+
+        .link_statused_no {
+            background: #f0ec09;
+        }
+
+        .link_name {
+            font-size: $font_size;
+            margin-left: 20px;
+
+        }
+
+        .link_name_no {
+            color: #f02409;
+        }
+
+        .link_name_no_link {
+            color: #f0ec09;
+        }
+    }
+}

src/pages/colorRelated/components/css/popup.module.scss

@@ -0,0 +1,90 @@
+.popup{
+    width: 100vw;
+    height: 100vh;
+    position: absolute;
+    top: 0;
+    left: 0;
+    .mask{
+        width: 100%;
+        height: 100%;
+        background-color: rgba(0,0,0,0.5);
+        position: fixed;
+        top:0;
+        left:0;
+        z-index: 9;
+    }
+    .content{
+        z-index: 99;
+        background-color: #fff;
+        width: 75vw;
+        height: 600px;
+        position: fixed;
+        top: 50%;
+        left: 50%;
+        border-radius: 20px;
+        transform: translateX(-50%) translateY(-50%);
+        display: flex;
+        flex-direction: column;
+        font-size: 28px;
+        .title{
+            text-align: center;
+            margin: 20px;
+        }
+        .list{
+            height: 480px;
+            padding: 0 20px;
+            .scroll{
+               height: 100%; 
+            }
+            .item{
+                margin-bottom: 20px;
+                display: flex;
+                justify-content: space-between;
+                border-bottom: 1px dashed #ccc;
+                padding: 15px 0;
+                color: #3b3b3b;
+                @mixin link{
+                    font-size: 25px;
+                }
+                .link_success{
+                    @include link;
+                    color: green;
+                }
+                .link_ing {
+                    color: orange;
+                }
+            }
+            .noDevice{
+                height: 100%;
+                display: flex;
+                flex-direction: column;
+                justify-content: center;
+                align-items: center;
+                color: #a8a8a8;
+                .n_item{
+                    width: 100%;
+                    text-align: left;
+                    margin-top: 20px;
+                    padding: 0 30px;
+                    box-sizing: border-box;
+                }
+            }
+            
+        }
+        .footer{
+            text-align: center;
+            padding: 20px 0;
+            background-color: #f1f1f1;
+            border-radius: 0 0 10px 10px;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+        }
+        .finding{
+            color: orange;
+        }
+        .footer_off{
+            color: red;
+        }
+    }
+}

src/pages/colorRelated/findColor/components/DrawerCenter/index.module.scss

@@ -0,0 +1,46 @@
+.popups {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100vh;
+  .cover {
+    position: fixed;
+    height: 100vh;
+    width: 100vw;
+    top: 0;
+    left: 0;
+    background: rgba(0, 0, 0, 0.5);
+    z-index: 10;
+  }
+  .popcoms {
+    z-index: 100;
+    position: fixed;
+    top: 50%;
+    left: 50%;
+    border-radius: 20px;
+    transform: translateX(-50%) translateY(-50%);
+    .con {
+      width: 500px;
+      height: 100%;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+    }
+    .showRgb {
+      width: 100%;
+      height: 550px;
+      background-color: #fff;
+      border-radius: 20px;
+    }
+    .name {
+      width: 100%;
+      text-align: center;
+      color: #fff;
+      padding: 20px 0;
+      font-size: 26px;
+      background: rgba(0, 0, 0, 0.5);
+      border-radius: 20px;
+    }
+  }
+}

src/pages/colorRelated/findColor/components/DrawerCenter/index.tsx

@@ -0,0 +1,30 @@
+import { View } from "@tarojs/components"
+import React, { FC, memo, useEffect, useState } from "react"
+import styles from './index.module.scss'
+
+type PropsType = {
+  showModal: boolean
+  children?: React.ReactNode
+}
+
+const DrawerCenter: FC<PropsType> = memo((props) => {
+  const { children, showModal } = props
+
+  const [show, setShow] = useState(false)
+
+  useEffect(() => {
+    setShow(showModal)
+  }, [showModal])
+  // 关闭
+  const close = () => {
+    setShow(false)
+  }
+
+  return show ? (
+    <View className={styles.popups} catchMove>
+      <View className={styles.popcoms}>{children}</View>
+      <View className={styles.cover} onClick={close}></View>
+    </View>
+  ) : null
+})
+export default DrawerCenter

src/pages/colorRelated/findColor/components/HistoryColor/index.module.scss

@@ -0,0 +1,113 @@
+
+.history_color {
+  .selectCon {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    height: 100%;
+    .selectList {
+      width: 692px;
+      height: 230px;
+      background: #ffffff;
+      border-radius: 30px;
+      margin-bottom: 20px;
+      display: flex;
+      align-items: center;
+      padding: 20px 0;
+      box-sizing: border-box;
+      .rgbColor {
+        width: 161px;
+        height: 161px;
+        background: red;
+        border-radius: 50%;
+        margin-left: 30px;
+        box-shadow: 0px 0px 3px rgba(0, 0, 0, 0.6);
+      }
+      .product_con {
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        margin-left: 32px;
+        font-size: 26px;
+        height: 100%;
+        width: 300px;
+        color: #505050;
+        .product_name {
+          @include common_ellipsis();
+          font-size: 28px;
+          color: #5f5f5f;
+          font-weight: 700;
+          margin-bottom: 46px;
+        }
+        .product_color {
+          @include common_ellipsis();
+          margin-bottom: 15px;
+        }
+        .contrast {
+          display: flex;
+          margin-bottom: 20px;
+          .g_num {
+            @include common_ellipsis();
+          }
+          .num {
+            color: #00499f;
+            background: #c9e4ff;
+            padding: 3px 10px;
+            border-radius: 7px;
+            margin-left: 18px;
+          }
+        }
+        .date {
+          background: rgba(0, 0, 0, 0.3);
+          color: #fff;
+          padding: 3px 10px;
+          border-radius: 10px;
+          width: 258px;
+        }
+      }
+      .labColor {
+        flex: 1;
+        // height: 100%;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        font-size: 27px;
+        color: #707070;
+        .labColor_btn {
+          width: 47px;
+          height: 47px;
+          background: #007aff;
+          color: #fff;
+          text-align: center;
+          line-height: 47px;
+          border-radius: 50%;
+          font-size: 39px;
+          margin-bottom: 20px;
+        }
+        .labColor_con {
+          flex: 1;
+          .L,
+          .a {
+            margin-bottom: 10px;
+          }
+        }
+      }
+    }
+    .noData {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      color: #707070;
+      height: 100%;
+      width: 100%;
+      font-size: 26px;
+    }
+  }
+  .selectList-scroll-color {
+    height: 70vh;
+    width: 100%;
+  }
+  .drawer-container {
+    background: #f0f0f0;
+  }
+}