Merge branch 'dev' of ssh://git.online.zzfzyc.com:10022/mp/spider_cloud_warehouse into 售后模块

src/pages/colorRelated/takeColor/index.tsx

@@ -4,7 +4,7 @@ import LinkBlueTooth from '../components/bluetooth/LinkBlueTooth'
 import SelectProduct from '@/components/selectProduct/index'
 import styles from './index.module.scss'
 import ColorCard from './components/ColorCard'
-import IconFont from '@/components/iconfont'
+import IconFont from '@/components/iconfont/iconfont'
 import { ColorListApi, ColorDetailedApi, TextureSaveApi, ColorSamplingSaveApi } from '@/api/index'
 import { formatHashTag } from '@/common/format'
 // 颜色取样

src/pages/login/index.tsx

@@ -1,5 +1,5 @@
 import Divider from '@/components/divider'
-import IconFont from '@/components/iconfont'
+import IconFont from '@/components/iconfont/iconfont'
 import { View, Image, Text, Input } from '@tarojs/components'
 import { FC, useState } from 'react'
 import styles from './index.module.scss'

src/pages/user/index.tsx

@@ -7,7 +7,7 @@ import Tag from '@/components/tag'
 import Divider from '@/components/Divider'
 import LayoutBlock from '@/components/layoutBlock'
 import IconCard from '@/components/iconCard'
-import IconFont from '@/components/iconfont'
+import IconFont from '@/components/iconfont/iconfont'
 import useUserInfo from '@/use/useUserInfo'
 import { goLink } from '@/common/common'