diff --git a/iconfont.json b/iconfont.json index d98966a..cb30488 100644 --- a/iconfont.json +++ b/iconfont.json @@ -1,5 +1,5 @@ { - "symbol_url": "http://at.alicdn.com/t/c/font_3619513_a8xfcrr18ef.js", + "symbol_url": "http://at.alicdn.com/t/c/font_3619513_04u5gsao0let.js", "save_dir": "./src/components/iconfont", "trim_icon_prefix": "", "default_icon_size": 36, diff --git a/src/components/iconfont/iconfont.tsx b/src/components/iconfont/iconfont.tsx index ad741d2..37cbfe8 100644 --- a/src/components/iconfont/iconfont.tsx +++ b/src/components/iconfont/iconfont.tsx @@ -1,46 +1,45 @@ -import { Block, View } from '@tarojs/components' -import Taro from '@tarojs/taro' -import type { FC } from 'react' -import React, { useEffect, useState } from 'react' -import './iconfont.scss' -import classnames from 'classnames' +import React, { useState, useEffect, FC } from "react"; +import { Block, View } from "@tarojs/components"; +import "./iconfont.scss"; +import Taro from "@tarojs/taro"; +import classnames from "classnames"; const SystemWidth = Taro.getSystemInfoSync().windowWidth const quot = '"' function hex2rgb(hex) { - const rgb: number[] = [] + var rgb = []; - hex = hex.substr(1) + hex = hex.substr(1); if (hex.length === 3) { - hex = hex.replace(/(.)/g, '$1$1') + hex = hex.replace(/(.)/g, "$1$1"); } - hex.replace(/../g, (color: string) => { - rgb.push(parseInt(color, 0x10)) - return color - }) + hex.replace(/../g, function(color: string) { + rgb.push(parseInt(color, 0x10)); + return color; + }); - return `rgb(${rgb.join(',')})` + return "rgb(" + rgb.join(",") + ")"; } -export type IconNames = 'icon-shangchuanwenli' | 'icon-gouwuche' | 'icon-zixun' | 'icon-dianhua' | 'icon-peibu' | 'icon-zhankai1' | 'icon-shouqi1' | 'icon-shouhou1' | 'icon-cangku1' | 'icon-saoma' | 'icon-dizhi1' | 'icon-huodaofukuan' | 'icon-yufukuan1' | 'icon-yue' | 'icon-zidingyi' | 'icon-jinetiaozheng' | 'icon-tuikuan1' | 'icon-zhankai' | 'icon-shouqi' | '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 type IconNames = 'icon-huozhuziti' | 'icon-a-0tianzhangqi' | 'icon-shangchuanwenli' | 'icon-gouwuche' | 'icon-zixun' | 'icon-dianhua' | 'icon-peibu' | 'icon-zhankai1' | 'icon-shouqi1' | 'icon-shouhou1' | 'icon-cangku1' | 'icon-saoma' | 'icon-dizhi1' | 'icon-huodaofukuan' | 'icon-yufukuan1' | 'icon-yue' | 'icon-zidingyi' | 'icon-jinetiaozheng' | 'icon-tuikuan1' | 'icon-zhankai' | 'icon-shouqi' | '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 PropsType { - name: IconNames - size?: number - color?: string | string[] - customStyle?: React.CSSProperties - customClassName?: string -} +type PropsType = { + name: IconNames; + size?: number; + color?: string | string[]; + customStyle?: React.CSSProperties; + customClassName?: string; +}; -const IconFont: FC = ({ +const IconFont:FC = ({ name, size = 36, color, customStyle = {}, - customClassName = '', + customClassName = "" }) => { const [colors, setColors] = useState() const [isStr, setIsStr] = useState(true) @@ -50,12 +49,11 @@ const IconFont: FC = ({ setIsStr(typeof color === 'string') if (typeof color === 'string') { setColors(color.indexOf('#') === 0 ? hex2rgb(color) : color) - } - else { + } else { setColors( - color?.map((item) => { + color?.map(function (item) { return item.indexOf('#') === 0 ? hex2rgb(item) : item - }), + }) ) } return () => {} @@ -84,240 +82,246 @@ const IconFont: FC = ({ className={classnames(icon, customClassName)} /> )} */} - {/* icon-shangchuanwenli */} + {/* icon-huozhuziti */} - { name === 'icon-shangchuanwenli' && () } - {/* icon-gouwuche */} + { name === 'icon-huozhuziti' && () } +{/* icon-a-0tianzhangqi */} - { name === 'icon-gouwuche' && () } - {/* icon-zixun */} + { name === 'icon-a-0tianzhangqi' && () } +{/* icon-shangchuanwenli */} - { name === 'icon-zixun' && () } - {/* icon-dianhua */} + { name === 'icon-shangchuanwenli' && () } +{/* icon-gouwuche */} - { name === 'icon-dianhua' && () } - {/* icon-peibu */} + { name === 'icon-gouwuche' && () } +{/* icon-zixun */} - { name === 'icon-peibu' && () } - {/* icon-zhankai1 */} + { name === 'icon-zixun' && () } +{/* icon-dianhua */} - { name === 'icon-zhankai1' && () } - {/* icon-shouqi1 */} + { name === 'icon-dianhua' && () } +{/* icon-peibu */} - { name === 'icon-shouqi1' && () } - {/* icon-shouhou1 */} + { name === 'icon-peibu' && () } +{/* icon-zhankai1 */} - { name === 'icon-shouhou1' && () } - {/* icon-cangku1 */} + { name === 'icon-zhankai1' && () } +{/* icon-shouqi1 */} - { name === 'icon-cangku1' && () } - {/* icon-saoma */} + { name === 'icon-shouqi1' && () } +{/* icon-shouhou1 */} - { name === 'icon-saoma' && () } - {/* icon-dizhi1 */} + { name === 'icon-shouhou1' && () } +{/* icon-cangku1 */} - { name === 'icon-dizhi1' && () } - {/* icon-huodaofukuan */} + { name === 'icon-cangku1' && () } +{/* icon-saoma */} - { name === 'icon-huodaofukuan' && () } - {/* icon-yufukuan1 */} + { name === 'icon-saoma' && () } +{/* icon-dizhi1 */} - { name === 'icon-yufukuan1' && () } - {/* icon-yue */} + { name === 'icon-dizhi1' && () } +{/* icon-huodaofukuan */} - { name === 'icon-yue' && () } - {/* icon-zidingyi */} + { name === 'icon-huodaofukuan' && () } +{/* icon-yufukuan1 */} - { name === 'icon-zidingyi' && () } - {/* icon-jinetiaozheng */} + { name === 'icon-yufukuan1' && () } +{/* icon-yue */} - { name === 'icon-jinetiaozheng' && () } - {/* icon-tuikuan1 */} + { name === 'icon-yue' && () } +{/* icon-zidingyi */} - { name === 'icon-tuikuan1' && () } - {/* icon-zhankai */} + { name === 'icon-zidingyi' && () } +{/* icon-jinetiaozheng */} - { name === 'icon-zhankai' && () } - {/* icon-shouqi */} + { name === 'icon-jinetiaozheng' && () } +{/* icon-tuikuan1 */} - { name === 'icon-shouqi' && () } - {/* icon-lujing */} + { name === 'icon-tuikuan1' && () } +{/* icon-zhankai */} - { name === 'icon-lujing' && () } - {/* icon-jizhumima */} + { name === 'icon-zhankai' && () } +{/* icon-shouqi */} - { name === 'icon-jizhumima' && () } - {/* icon-a-jizhumima */} + { name === 'icon-shouqi' && () } +{/* icon-lujing */} - { name === 'icon-a-jizhumima' && () } - {/* icon-weixindenglu */} + { name === 'icon-lujing' && () } +{/* icon-jizhumima */} - { name === 'icon-weixindenglu' && () } - {/* icon-kehuxinxi */} + { name === 'icon-jizhumima' && () } +{/* icon-a-jizhumima */} - { name === 'icon-kehuxinxi' && () } - {/* icon-yewuyuanqizi */} + { name === 'icon-a-jizhumima' && () } +{/* icon-weixindenglu */} - { name === 'icon-yewuyuanqizi' && () } - {/* icon-chakanquanbukehu */} + { name === 'icon-weixindenglu' && () } +{/* icon-kehuxinxi */} - { name === 'icon-chakanquanbukehu' && () } - {/* icon-biyan */} + { name === 'icon-kehuxinxi' && () } +{/* icon-yewuyuanqizi */} - { name === 'icon-biyan' && () } - {/* icon-bianji */} + { name === 'icon-yewuyuanqizi' && () } +{/* icon-chakanquanbukehu */} - { name === 'icon-bianji' && () } - {/* icon-daikuan */} + { name === 'icon-chakanquanbukehu' && () } +{/* icon-biyan */} - { name === 'icon-daikuan' && () } - {/* icon-cangku */} + { name === 'icon-biyan' && () } +{/* icon-bianji */} - { name === 'icon-cangku' && () } - {/* icon-guanlidingdan */} + { name === 'icon-bianji' && () } +{/* icon-daikuan */} - { name === 'icon-guanlidingdan' && () } - {/* icon-mima */} + { name === 'icon-daikuan' && () } +{/* icon-cangku */} - { name === 'icon-mima' && () } - {/* icon-guanbi */} + { name === 'icon-cangku' && () } +{/* icon-guanlidingdan */} - { name === 'icon-guanbi' && () } - {/* icon-jianshao */} + { name === 'icon-guanlidingdan' && () } +{/* icon-mima */} - { name === 'icon-jianshao' && () } - {/* icon-dingwei */} + { name === 'icon-mima' && () } +{/* icon-guanbi */} - { name === 'icon-dingwei' && () } - {/* icon-saomiao */} + { name === 'icon-guanbi' && () } +{/* icon-jianshao */} - { name === 'icon-saomiao' && () } - {/* icon-peihuo */} + { name === 'icon-jianshao' && () } +{/* icon-dingwei */} - { name === 'icon-peihuo' && () } - {/* icon-shaixuan */} + { name === 'icon-dingwei' && () } +{/* icon-saomiao */} - { name === 'icon-shaixuan' && () } - {/* icon-paiming */} + { name === 'icon-saomiao' && () } +{/* icon-peihuo */} - { name === 'icon-paiming' && () } - {/* icon-shanchusousuoxinxi */} + { name === 'icon-peihuo' && () } +{/* icon-shaixuan */} - { name === 'icon-shanchusousuoxinxi' && () } - {/* icon-shijian */} + { name === 'icon-shaixuan' && () } +{/* icon-paiming */} - { name === 'icon-shijian' && () } - {/* icon-sousuo */} + { name === 'icon-paiming' && () } +{/* icon-shanchusousuoxinxi */} - { name === 'icon-sousuo' && () } - {/* icon-shouhou */} + { name === 'icon-shanchusousuoxinxi' && () } +{/* icon-shijian */} - { name === 'icon-shouhou' && () } - {/* icon-sousuofanhui */} + { name === 'icon-shijian' && () } +{/* icon-sousuo */} - { name === 'icon-sousuofanhui' && () } - {/* icon-sousuoshanchu */} + { name === 'icon-sousuo' && () } +{/* icon-shouhou */} - { name === 'icon-sousuoshanchu' && () } - {/* icon-tuikuan */} + { name === 'icon-shouhou' && () } +{/* icon-sousuofanhui */} - { name === 'icon-tuikuan' && () } - {/* icon-tishi */} + { name === 'icon-sousuofanhui' && () } +{/* icon-sousuoshanchu */} - { name === 'icon-tishi' && () } - {/* icon-xianxiahuizong */} + { name === 'icon-sousuoshanchu' && () } +{/* icon-tuikuan */} - { name === 'icon-xianxiahuizong' && () } - {/* icon-xinzeng */} + { name === 'icon-tuikuan' && () } +{/* icon-tishi */} - { name === 'icon-xinzeng' && () } - {/* icon-yonghuming */} + { name === 'icon-tishi' && () } +{/* icon-xianxiahuizong */} - { name === 'icon-yonghuming' && () } - {/* icon-yanjing */} + { name === 'icon-xianxiahuizong' && () } +{/* icon-xinzeng */} - { name === 'icon-yanjing' && () } - {/* icon-yufukuan */} + { name === 'icon-xinzeng' && () } +{/* icon-yonghuming */} - { name === 'icon-yufukuan' && () } - {/* icon-wodekefu */} + { name === 'icon-yonghuming' && () } +{/* icon-yanjing */} - { name === 'icon-wodekefu' && () } - {/* icon-dizhi */} + { name === 'icon-yanjing' && () } +{/* icon-yufukuan */} - { name === 'icon-dizhi' && () } - {/* icon-shouhouzhongxin */} + { name === 'icon-yufukuan' && () } +{/* icon-wodekefu */} - { name === 'icon-shouhouzhongxin' && () } - {/* icon-wodeshoucang */} + { name === 'icon-wodekefu' && () } +{/* icon-dizhi */} - { name === 'icon-wodeshoucang' && () } - {/* icon-shoukuanliebiao */} + { name === 'icon-dizhi' && () } +{/* icon-shouhouzhongxin */} - { name === 'icon-shoukuanliebiao' && () } - {/* icon-madanguanli */} + { name === 'icon-shouhouzhongxin' && () } +{/* icon-wodeshoucang */} - { name === 'icon-madanguanli' && () } - {/* icon-qusechazhao */} + { name === 'icon-wodeshoucang' && () } +{/* icon-shoukuanliebiao */} - { name === 'icon-qusechazhao' && () } - {/* icon-pandiansaoma */} + { name === 'icon-shoukuanliebiao' && () } +{/* icon-madanguanli */} - { name === 'icon-pandiansaoma' && () } - {/* icon-yaoqingma */} + { name === 'icon-madanguanli' && () } +{/* icon-qusechazhao */} - { name === 'icon-yaoqingma' && () } - {/* icon-duizhang */} + { name === 'icon-qusechazhao' && () } +{/* icon-pandiansaoma */} - { name === 'icon-duizhang' && () } - {/* icon-tihuoliebiao */} + { name === 'icon-pandiansaoma' && () } +{/* icon-yaoqingma */} - { name === 'icon-tihuoliebiao' && () } - {/* icon-yangpinduibi */} + { name === 'icon-yaoqingma' && () } +{/* icon-duizhang */} - { name === 'icon-yangpinduibi' && () } - {/* icon-yansequyang */} + { name === 'icon-duizhang' && () } +{/* icon-tihuoliebiao */} - { name === 'icon-yansequyang' && () } - {/* icon-fahuoliebiao */} + { name === 'icon-tihuoliebiao' && () } +{/* icon-yangpinduibi */} - { name === 'icon-fahuoliebiao' && () } - {/* icon-yuncangkucun */} + { name === 'icon-yangpinduibi' && () } +{/* icon-yansequyang */} - { name === 'icon-yuncangkucun' && () } - {/* icon-xiaoshou */} + { name === 'icon-yansequyang' && () } +{/* icon-fahuoliebiao */} - { name === 'icon-xiaoshou' && () } - {/* icon-qianzhicangkucun */} + { name === 'icon-fahuoliebiao' && () } +{/* icon-yuncangkucun */} - { name === 'icon-qianzhicangkucun' && () } - {/* icon-lingquseka */} + { name === 'icon-yuncangkucun' && () } +{/* icon-xiaoshou */} - { name === 'icon-lingquseka' && () } - {/* icon-gouwu1 */} + { name === 'icon-xiaoshou' && () } +{/* icon-qianzhicangkucun */} - { name === 'icon-gouwu1' && () } - {/* icon-dingdan1 */} + { name === 'icon-qianzhicangkucun' && () } +{/* icon-lingquseka */} - { name === 'icon-dingdan1' && () } - {/* icon-gerenzhongxin1 */} + { name === 'icon-lingquseka' && () } +{/* icon-gouwu1 */} - { name === 'icon-gerenzhongxin1' && () } - {/* icon-shouye1 */} + { name === 'icon-gouwu1' && () } +{/* icon-dingdan1 */} - { name === 'icon-shouye1' && () } - {/* icon-gerenzhongxin */} + { name === 'icon-dingdan1' && () } +{/* icon-gerenzhongxin1 */} - { name === 'icon-gerenzhongxin' && () } - {/* icon-dingdan */} + { name === 'icon-gerenzhongxin1' && () } +{/* icon-shouye1 */} - { name === 'icon-dingdan' && () } - {/* icon-shouye */} + { name === 'icon-shouye1' && () } +{/* icon-gerenzhongxin */} - { name === 'icon-shouye' && () } - {/* icon-gouwu */} + { name === 'icon-gerenzhongxin' && () } +{/* icon-dingdan */} - { name === 'icon-gouwu' && () } + { name === 'icon-dingdan' && () } +{/* icon-shouye */} + + { name === 'icon-shouye' && () } +{/* icon-gouwu */} + + { name === 'icon-gouwu' && () } ) diff --git a/src/pages/order/components/PayPopup/index.tsx b/src/pages/order/components/PayPopup/index.tsx index aa46f6c..f816be0 100644 --- a/src/pages/order/components/PayPopup/index.tsx +++ b/src/pages/order/components/PayPopup/index.tsx @@ -134,7 +134,7 @@ const PayPopup = (props: Props) => { clickItem?.(item)}> {/* */} diff --git a/src/pages/order/index.tsx b/src/pages/order/index.tsx index 33ec4a4..64b0c67 100644 --- a/src/pages/order/index.tsx +++ b/src/pages/order/index.tsx @@ -339,12 +339,11 @@ const Order = () => { }, { id: 3, - iconfont: 'icon-xianxiahuizong', + iconfont: 'icon-a-0tianzhangqi', name: 'x天账期', fonts: '可用额度 ', money: '', isCheck: false, - color: '#ffffff', }, { iconfont: 'icon-yue', @@ -486,7 +485,7 @@ const Order = () => { if (obj.length === 0) { payList.unshift({ id: 6, - iconfont: 'icon-xianxiahuizong', + iconfont: 'icon-huozhuziti', color: '#ffffff', name: '货主自提', fonts: '', @@ -529,7 +528,7 @@ const Order = () => { if (obj.length === 0) { arr.unshift({ id: 6, - iconfont: 'icon-xianxiahuizong', + iconfont: 'icon-huozhuziti', name: '货主自提', color: '#ffffff', fonts: '', diff --git a/src/pages/orderDetails/index.tsx b/src/pages/orderDetails/index.tsx index b14d63e..9f861f1 100644 --- a/src/pages/orderDetails/index.tsx +++ b/src/pages/orderDetails/index.tsx @@ -358,7 +358,7 @@ const OrderDetails = () => { }, { id: 3, - iconfont: 'icon-xianxiahuizong', + iconfont: 'icon-a-0tianzhangqi', name: 'x天账期', fonts: '可用额度 ', money: '', @@ -401,7 +401,7 @@ const OrderDetails = () => { if (obj.length === 0) { payList.unshift({ id: 6, - iconfont: 'icon-xianxiahuizong', + iconfont: 'icon-huozhuziti', name: '货主自提', fonts: '', money: '', @@ -441,7 +441,7 @@ const OrderDetails = () => { if (obj.length === 0) { arr.unshift({ id: 6, - iconfont: 'icon-xianxiahuizong', + iconfont: 'icon-huozhuziti', name: '货主自提', fonts: '', money: '',