🐞 fix(iconfont文件): 引用的 ttf 不能使用相对路径

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/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/pages/order/components/PayPopup/index.tsx

@@ -1,174 +1,156 @@
-
 import { ScrollView, View, Image } from '@tarojs/components'
 import { memo, useCallback, useEffect, useMemo, useState, useRef } from 'react'
 import styles from './index.module.scss'
 import classnames from 'classnames'
-import BottomBtns from '@/components/BottomBtns'
+import { formatPriceDiv, formatImgUrl } from '@/common/format'
-import { formatPriceDiv, formatImgUrl } from '@/common/fotmat'
 import Taro from '@tarojs/taro'
 import Popup from '@/components/popup'
 import useCheckAuthorize from '@/use/useCheckAuthorize'
 import { alert } from '@/common/common'
 
 interface Props {
-    showPopup: true | false,
+  showPopup: true | false
-    popupClose?: () => void,
+  popupClose?: () => void
-    obj: {
+  obj: {
-        wait_pay_amount?: number | string,
+    wait_pay_amount?: number | string
-        actual_amount?: number | string,
+    actual_amount?: number | string
-        total_sale_price?: number | string,
+    total_sale_price?: number | string
-        should_collect_order_id?: number | string,
+    should_collect_order_id?: number | string
-        pre_collect_order_id?: number | string,
+    pre_collect_order_id?: number | string
-        status?: number | string,
+    status?: number | string
-    },
+  }
-    showSide?: boolean,
+  showSide?: boolean
-    list?: any[],
+  list?: any[]
-    clickItem?: (any) => void,
+  clickItem?: (any) => void
-    handsurePay?: (any) => void,
+  handsurePay?: (any) => void
-    title: string,
+  title: string
-    picUrl?: string
+  picUrl?: string
 }
 
 export default memo((props: Props) => {
-    const {
+  const {
-        showSide = true,
+    showSide = true,
-        showPopup = false,
+    showPopup = false,
-        popupClose,
+    popupClose,
-        obj = {
+    obj = {
-            wait_pay_amount: '',
+      wait_pay_amount: '',
-            actual_amount: '',
+      actual_amount: '',
-            total_sale_price: ''
+      total_sale_price: '',
-        },
+    },
-        clickItem,
+    clickItem,
-        handsurePay,
+    handsurePay,
-        list = [],
+    list = [],
-        title = '待支付款项',
+    title = '待支付款项',
-        picUrl = ''
+    picUrl = '',
-    } = props
+  } = props
 
-    const fileData = useRef({
+  const fileData = useRef({
-        filePath: '',
+    filePath: '',
-        base64: '',
+    base64: '',
+  })
+
+  //预览图片
+  const showImage = () => {
+    const time = new Date().valueOf()
+    const [, format, bodyData] = /data:image\/(\w+);base64,(.*)/.exec(picUrl) || []
+    let filePath = Taro.env.USER_DATA_PATH + '/img' + time + '.' + format
+    fileData.current.filePath = filePath
+    fileData.current.base64 = bodyData
+    const save = Taro.getFileSystemManager()
+    save.writeFile({
+      filePath: fileData.current.filePath,
+      data: fileData.current.base64,
+      encoding: 'base64',
     })
+    Taro.previewImage({
+      current: fileData.current.filePath, // 当前显示
+      urls: [fileData.current.filePath], // 需要预览的图片http链接列表
+    })
+  }
 
-    //预览图片
+  //检查是否开启保存图片权限
-    const showImage = () => {
+  const { check } = useCheckAuthorize({ scope: 'scope.writePhotosAlbum', msg: '您没授权，无法保存图片' })
-        const time = new Date().valueOf()
+  const saveImageCheck = async () => {
-        const [, format, bodyData] = /data:image\/(\w+);base64,(.*)/.exec(picUrl) || []
+    const res = await check()
-        let filePath = Taro.env.USER_DATA_PATH + '/img' + time + '.' + format
+    res && saveImage()
-        fileData.current.filePath = filePath
+  }
-        fileData.current.base64 = bodyData
-        const save = Taro.getFileSystemManager()
-        save.writeFile({
-            filePath: fileData.current.filePath,
-            data: fileData.current.base64,
-            encoding: 'base64',
-        })
-        Taro.previewImage({
-            current: fileData.current.filePath, // 当前显示
-            urls: [fileData.current.filePath], // 需要预览的图片http链接列表
-        })
-    }
 
+  //保存图片
+  const saveImage = () => {
+    alert.loading('正在保存图片')
+    Taro.saveImageToPhotosAlbum({
+      filePath: fileData.current.filePath,
+      success: function () {
+        alert.success('图片保存成功')
+      },
+      fail: function (err) {
+        console.log('err::', err)
+      },
+    })
+  }
 
-    //检查是否开启保存图片权限
+  return (
-    const { check } = useCheckAuthorize({ scope: 'scope.writePhotosAlbum', msg: '您没授权，无法保存图片' })
+    <View className={styles.popupBox}>
-    const saveImageCheck = async () => {
+      <Popup show={showPopup} title={title} onClose={() => popupClose?.()}>
-        const res = await check()
+        {showSide && (
-        res && saveImage()
+          <View className={styles.contBox}>
-    }
+            <View className={styles.topMoney}>￥{formatPriceDiv(obj.wait_pay_amount)}</View>
-
+            <View className={styles.itemMoney}>
-    //保存图片
+              <View className={styles.leftFont}>订单金额</View>
-    const saveImage = () => {
+              <View className={styles.rightFont}>￥{formatPriceDiv(obj.total_sale_price)}</View>
-        alert.loading('正在保存图片')
+            </View>
-        Taro.saveImageToPhotosAlbum({
+            <View className={styles.itemMoney}>
-            filePath: fileData.current.filePath,
+              <View className={styles.leftFont}>已付金额</View>
-            success: function () {
+              <View className={styles.rightFont}>￥{formatPriceDiv(obj.actual_amount)}</View>
-                alert.success('图片保存成功')
+            </View>
-            },
+            <View className={styles.line}></View>
-            fail: function (err) {
+            {list.map((item, index) => {
-                console.log('err::', err)
+              return (
-            },
+                <View className={styles.itemBox} key={index} onClick={() => clickItem?.(item)}>
-        })
+                  <View className={styles.leftItem}>
-    }
+                    <View className={styles.leftCrile}>
-
+                      <View className={classnames('iconfont', item.iconfont, styles.lujing)}></View>
-    return (
-        <View className={styles.popupBox}>
-            <Popup show={showPopup} title={title} onClose={() => popupClose?.()}>
-                {
-                    showSide &&
-                    <View className={styles.contBox}>
-                        <View className={styles.topMoney}>
-                            ￥{formatPriceDiv(obj.wait_pay_amount)}
-                        </View>
-                        <View className={styles.itemMoney}>
-                            <View className={styles.leftFont}>
-                                订单金额
-                            </View>
-                            <View className={styles.rightFont}>
-                                ￥{formatPriceDiv(obj.total_sale_price)}
-                            </View>
-                        </View>
-                        <View className={styles.itemMoney}>
-                            <View className={styles.leftFont}>
-                                已付金额
-                            </View>
-                            <View className={styles.rightFont}>
-                                ￥{formatPriceDiv(obj.actual_amount)}
-                            </View>
-                        </View>
-                        <View className={styles.line}></View>
-                        {
-                            list.map((item, index) => {
-                                return (
-                                    <View className={styles.itemBox} key={index} onClick={() => clickItem?.(item)}>
-                                        <View className={styles.leftItem}>
-                                            <View className={styles.leftCrile}>
-                                                <View className={classnames('iconfont', item.iconfont, styles.lujing)}></View>
-                                            </View>
-                                            <View className={styles.rightLeft}>
-                                                <View className={styles.title}>{item.name}</View>
-                                                {
-                                                    item.fonts && <View className={styles.nums}>{item.fonts}{
-                                                        item.money !== "" ? "￥" : ""
-                                                    }{item.money}</View>
-                                                }
-                                            </View>
-                                        </View>
-                                        {
-                                            item.name !== '扫码支付' &&
-                                            <View className={item.checked ? styles.activeChecked : styles.checkYuan}>
-                                                <View className={classnames('iconfont', 'icon-lujing', styles.gou)}></View>
-                                            </View>
-                                        }
-                                        {
-                                            item.name === '扫码支付' &&
-                                            <View className={classnames('iconfont', 'icon-chakanquanbukehu', styles.chakanquanbukehu)}></View>
-                                        }
-                                    </View>
-                                )
-                            })
-                        }
-
                     </View>
-
+                    <View className={styles.rightLeft}>
-                }
+                      <View className={styles.title}>{item.name}</View>
-                {
+                      {item.fonts && (
-                    showSide && <View className={styles.sure} onClick={() => handsurePay?.(props?.obj)}>确认交易</View>
+                        <View className={styles.nums}>
-                }
+                          {item.fonts}
-                {
+                          {item.money !== '' ? '￥' : ''}
-                    !showSide &&
+                          {item.money}
-                    <ScrollView enhanced scrollY style={{ height: '700rpx', marginLeft: '24rpx' }}>
-                        <View className={styles.pic}>
-                            <Image lazyLoad mode='widthFix' style={{ width: '100%', height: '100%' }} src={picUrl} onClick={() => showImage()}></Image>
                         </View>
-                    </ScrollView>
+                      )}
-
+                    </View>
-                }
+                  </View>
-                {
+                  {item.name !== '扫码支付' && (
-                    !showSide && <View className={styles.sure} onClick={() => saveImageCheck()}>保存图片</View>
+                    <View className={item.checked ? styles.activeChecked : styles.checkYuan}>
-                }
+                      <View className={classnames('iconfont', 'icon-lujing', styles.gou)}></View>
-            </Popup >
+                    </View>
-        </View >
+                  )}
-    )
+                  {item.name === '扫码支付' && <View className={classnames('iconfont', 'icon-chakanquanbukehu', styles.chakanquanbukehu)}></View>}
+                </View>
+              )
+            })}
+          </View>
+        )}
+        {showSide && (
+          <View className={styles.sure} onClick={() => handsurePay?.(props?.obj)}>
+            确认交易
+          </View>
+        )}
+        {!showSide && (
+          <ScrollView enhanced scrollY style={{ height: '700rpx', marginLeft: '24rpx' }}>
+            <View className={styles.pic}>
+              <Image lazyLoad mode='widthFix' style={{ width: '100%', height: '100%' }} src={picUrl} onClick={() => showImage()}></Image>
+            </View>
+          </ScrollView>
+        )}
+        {!showSide && (
+          <View className={styles.sure} onClick={() => saveImageCheck()}>
+            保存图片
+          </View>
+        )}
+      </Popup>
+    </View>
+  )
 })

src/pages/order/components/itemList/index.tsx

@@ -3,78 +3,100 @@ import { memo, useCallback, useEffect, useMemo, useState } from 'react'
 import styles from './index.module.scss'
 import classnames from 'classnames'
 import BottomBtns from '@/components/BottomBtns'
-import { formatPriceDiv } from '@/common/fotmat'
+import { formatPriceDiv } from '@/common/format'
 import Taro from '@tarojs/taro'
 
 interface propsObj {
-    obj: any,
+  obj: any
-    cancle?: (arg: any, obj: any) => void,
+  cancle?: (arg: any, obj: any) => void
-    nextBuy?: (arg: any, obj: any) => void,
+  nextBuy?: (arg: any, obj: any) => void
-    toPay?: (arg: any, obj: any) => void
+  toPay?: (arg: any, obj: any) => void
 }
 
-
 export default memo((props: propsObj) => {
-    const navTo = (e) => {
+  const navTo = (e) => {
-        Taro.navigateTo({
+    Taro.navigateTo({
-            url: '/pages/orderDetails/index?id=' + props?.obj?.id
+      url: '/pages/orderDetails/index?id=' + props?.obj?.id,
-        })
+    })
-    }
+  }
 
-
+  return (
-    return (
+    <View className={styles.itemBox} onClick={(e) => navTo(e)}>
-        <View className={styles.itemBox} onClick={(e) => navTo(e)}>
+      <View className={styles.topItem}>
-            <View className={styles.topItem}>
+        <View className={styles.orderNo}>单号：{props?.obj?.order_no}</View>
-                <View className={styles.orderNo}>单号：{props?.obj?.order_no}</View>
+        <View className={styles.status}>{props?.obj?.status_name}</View>
-                <View className={styles.status}>{props?.obj?.status_name}</View>
+      </View>
-            </View>
+      <View className={styles.pussName}>{props?.obj?.purchaser_name}</View>
-            <View className={styles.pussName}>{props?.obj?.purchaser_name}</View>
+      <View className={styles.line}></View>
-            <View className={styles.line}></View>
+      <View className={styles.contBox}>
-            <View className={styles.contBox}>
+        <View
-                <View className={styles.leftCont} style={{ backgroundColor: `rgb(${props?.obj?.product_list[0]?.product_colors[0]?.rgb?.r} ${props?.obj?.product_list[0]?.product_colors[0]?.rgb?.g} ${props?.obj?.product_list[0]?.product_colors[0]?.rgb?.b})` }}>
+          className={styles.leftCont}
-                    <View className={styles.leftContNums}>颜色 ({props?.obj?.total_colors})</View>
+          style={{
-                </View>
+            backgroundColor: `rgb(${props?.obj?.product_list[0]?.product_colors[0]?.rgb?.r} ${props?.obj?.product_list[0]?.product_colors[0]?.rgb?.g} ${props?.obj?.product_list[0]?.product_colors[0]?.rgb?.b})`,
-                <View className={styles.rightCont}>
+          }}>
-                    <View className={styles.rightTop}>
+          <View className={styles.leftContNums}>颜色 ({props?.obj?.total_colors})</View>
-                        <View className={styles.productBox}>
-                            <View className={styles.productName}>{props?.obj?.product_list[0]?.code} {props?.obj?.product_list[0]?.name}</View>
-                            <View className={styles.productMode}>{props?.obj?.sale_mode === 0 ? '大货' : props?.obj?.sale_mode === 1 ? '剪版' : '散剪'}</View>
-                        </View>
-                        <View className={styles.shipMode}>{props?.obj?.shipment_mode_name}</View>
-                    </View>
-                    <View className={styles.colorsBox}>
-                        <View className={styles.colorNameOne}>{props?.obj?.product_list[0]?.product_colors[0]?.code} {props?.obj?.product_list[0]?.product_colors[0]?.name}</View>
-                        <View className={styles.colorName}>x{props?.obj?.sale_mode === 0 ? props?.obj?.product_list[0]?.product_colors[0]?.roll : props?.obj?.product_list[0]?.product_colors[0]?.length / 100} {props?.obj?.sale_mode === 0 ? '条' : 'm'}</View>
-                        <View className={styles.colorNameTwo}>¥ {props?.obj?.product_list[0]?.product_colors[0]?.sale_price / 100}/kg</View>
-                    </View>
-                    {
-                        props?.obj?.product_list[0]?.product_colors?.length > 1 && <>
-                            <View className={styles.colorsBox}>
-                                <View className={styles.colorNameOne}>{props?.obj?.product_list[0]?.product_colors[1]?.code} {props?.obj?.product_list[0]?.product_colors[1]?.name}</View>
-                                <View className={styles.colorName}>x{props?.obj?.sale_mode === 0 ? props?.obj?.product_list[0]?.product_colors[1]?.roll : props?.obj?.product_list[0]?.product_colors[1]?.length / 100} {props?.obj?.sale_mode === 0 ? '条' : 'm'}</View>
-                                <View className={styles.colorNameTwo}>¥ {props?.obj?.product_list[0]?.product_colors[1]?.sale_price / 100}/kg</View>
-                            </View>
-                        </>
-                    }
-                </View>
-            </View>
-            <View className={styles.lineOne}></View>
-            <View className={styles.bottomMsg}>
-                <View className={styles.msgLeft}>布料信息：</View>
-                <View className={styles.msgRight}>{props?.obj?.total_fabrics} 种面料，{props?.obj?.total_colors} 种颜色，共 {props?.obj?.sale_mode === 0 ? props?.obj?.total_number : props?.obj?.total_number / 100} {props?.obj?.sale_mode === 0 ? '条' : 'm'}</View>
-            </View>
-            <View className={styles.bottomMsg}>
-                <View className={styles.msgLeft}>预估金额：</View>
-                <View className={styles.msgRightOne}>¥{formatPriceDiv(props?.obj?.estimate_amount)}</View>
-            </View>
-            <View className={styles.bottomBox}>
-                <BottomBtns
-                    obj={props?.obj}
-                    cancle={(e) => props?.cancle?.(e, props?.obj)}
-                    nextBuy={(e) => props?.nextBuy?.(e, props?.obj)}
-                    toPay={(e) => props?.toPay?.(e, props?.obj)}
-                ></BottomBtns>
-            </View>
         </View>
-    )
+        <View className={styles.rightCont}>
+          <View className={styles.rightTop}>
+            <View className={styles.productBox}>
+              <View className={styles.productName}>
+                {props?.obj?.product_list[0]?.code} {props?.obj?.product_list[0]?.name}
+              </View>
+              <View className={styles.productMode}>{props?.obj?.sale_mode === 0 ? '大货' : props?.obj?.sale_mode === 1 ? '剪版' : '散剪'}</View>
+            </View>
+            <View className={styles.shipMode}>{props?.obj?.shipment_mode_name}</View>
+          </View>
+          <View className={styles.colorsBox}>
+            <View className={styles.colorNameOne}>
+              {props?.obj?.product_list[0]?.product_colors[0]?.code} {props?.obj?.product_list[0]?.product_colors[0]?.name}
+            </View>
+            <View className={styles.colorName}>
+              x
+              {props?.obj?.sale_mode === 0
+                ? props?.obj?.product_list[0]?.product_colors[0]?.roll
+                : props?.obj?.product_list[0]?.product_colors[0]?.length / 100}{' '}
+              {props?.obj?.sale_mode === 0 ? '条' : 'm'}
+            </View>
+            <View className={styles.colorNameTwo}>¥ {props?.obj?.product_list[0]?.product_colors[0]?.sale_price / 100}/kg</View>
+          </View>
+          {props?.obj?.product_list[0]?.product_colors?.length > 1 && (
+            <>
+              <View className={styles.colorsBox}>
+                <View className={styles.colorNameOne}>
+                  {props?.obj?.product_list[0]?.product_colors[1]?.code} {props?.obj?.product_list[0]?.product_colors[1]?.name}
+                </View>
+                <View className={styles.colorName}>
+                  x
+                  {props?.obj?.sale_mode === 0
+                    ? props?.obj?.product_list[0]?.product_colors[1]?.roll
+                    : props?.obj?.product_list[0]?.product_colors[1]?.length / 100}{' '}
+                  {props?.obj?.sale_mode === 0 ? '条' : 'm'}
+                </View>
+                <View className={styles.colorNameTwo}>¥ {props?.obj?.product_list[0]?.product_colors[1]?.sale_price / 100}/kg</View>
+              </View>
+            </>
+          )}
+        </View>
+      </View>
+      <View className={styles.lineOne}></View>
+      <View className={styles.bottomMsg}>
+        <View className={styles.msgLeft}>布料信息：</View>
+        <View className={styles.msgRight}>
+          {props?.obj?.total_fabrics} 种面料，{props?.obj?.total_colors} 种颜色，共{' '}
+          {props?.obj?.sale_mode === 0 ? props?.obj?.total_number : props?.obj?.total_number / 100} {props?.obj?.sale_mode === 0 ? '条' : 'm'}
+        </View>
+      </View>
+      <View className={styles.bottomMsg}>
+        <View className={styles.msgLeft}>预估金额：</View>
+        <View className={styles.msgRightOne}>¥{formatPriceDiv(props?.obj?.estimate_amount)}</View>
+      </View>
+      <View className={styles.bottomBox}>
+        <BottomBtns
+          obj={props?.obj}
+          cancle={(e) => props?.cancle?.(e, props?.obj)}
+          nextBuy={(e) => props?.nextBuy?.(e, props?.obj)}
+          toPay={(e) => props?.toPay?.(e, props?.obj)}></BottomBtns>
+      </View>
+    </View>
+  )
 })

src/pages/order/index.tsx

@@ -1,11 +1,11 @@
 import { View, Input, Button } from '@tarojs/components'
-import { useCallback, useEffect, useMemo, useRef, useState, } from 'react'
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { mpenumsaleorderstatus, OrderListApi } from '@/api/order'
 import OrderStatusList from './components/orderStatusList'
 import Search from '@/components/search'
 import { dataLoadingStatus, getFilterData } from '@/common/util'
-import styles from "./index.module.scss"
+import styles from './index.module.scss'
-import classnames from "classnames";
+import classnames from 'classnames'
 import Popup from '@/components/popup'
 import InfiniteScroll from '@/components/infiniteScroll'
 import Taro, { faceVerifyForPay, useDidShow } from '@tarojs/taro'
@@ -17,10 +17,10 @@ import {
   orderPaymentpreCollectOrderorderPaymentMethodInfo,
   orderPaymentorderPaymentSubmission,
   orderPaymentpreCollectOrderorderPaymentSubmission,
-  GetPayCode
+  GetPayCode,
 } from '@/api/order'
 import PayPopup from './components/PayPopup'
-import { formatDateTime, formatHashTag, formatImgUrl, formatPriceDiv, formatWeightDiv } from '@/common/fotmat'
+import { formatDateTime, formatHashTag, formatImgUrl, formatPriceDiv, formatWeightDiv } from '@/common/format'
 
 export default () => {
   //页码和页数
@@ -37,16 +37,13 @@ export default () => {
   const getOrderList = async () => {
     let res = await listFetchData({
       ...getFilterData(searchField),
-      ...getFilterData(searchObj)
+      ...getFilterData(searchObj),
     })
     setOrderData((e) => ({ ...e, list: res.data?.list, total: res.data?.total }))
     setshowPopup(false)
     setRefresherTriggeredStatus(() => false)
   }
 
-
-
-
   //列表下拉刷新
   const [refresherTriggeredStatus, setRefresherTriggeredStatus] = useState(false)
   const getRefresherRefresh = async () => {
@@ -56,7 +53,10 @@ export default () => {
   }
   //数据加载状态
   const statusMore = useMemo(() => {
-    console.log({ list: orderData.list, total: orderData.total, status: orderState.loading }, '{ list: orderData.list, total: orderData.total, status: orderState.loading }')
+    console.log(
+      { list: orderData.list, total: orderData.total, status: orderState.loading },
+      '{ list: orderData.list, total: orderData.total, status: orderState.loading }',
+    )
     return dataLoadingStatus({ list: orderData.list, total: orderData.total, status: orderState.loading })
   }, [orderData, orderState])
 
@@ -108,12 +108,10 @@ export default () => {
     setshowPopup(false)
   }
 
-
   useDidShow(() => {
-
     //获取选择的客户
-    let pages = Taro.getCurrentPages();
+    let pages = Taro.getCurrentPages()
-    let currPage = pages[pages.length - 1]; // 获取当前页面
+    let currPage = pages[pages.length - 1] // 获取当前页面
     console.log(currPage.data, '8888')
 
     setsearchObj((e) => ({
@@ -126,12 +124,12 @@ export default () => {
   })
 
   interface filterObj {
-    purchaser_id?: string | number,
+    purchaser_id?: string | number
-    clientName?: string,
+    clientName?: string
-    sale_user_id?: string | number,
+    sale_user_id?: string | number
-    saleuserName?: string,
+    saleuserName?: string
-    orderNo?: string | undefined,
+    orderNo?: string | undefined
-    sale_mode?: Number | undefined,
+    sale_mode?: Number | undefined
     shipment_mode?: Number | undefined
   }
 
@@ -143,17 +141,17 @@ export default () => {
     saleuserName: '',
     orderNo: '',
     sale_mode: undefined,
-    shipment_mode: undefined
+    shipment_mode: undefined,
   })
   // 跳转选择客户
   const navTo = (index) => {
     if (index === 1) {
       Taro.navigateTo({
-        url: '/pages/customerPage/index?clientId=' + searchObj?.purchaser_id
+        url: '/pages/customerPage/index?clientId=' + searchObj?.purchaser_id,
       })
     } else {
       Taro.navigateTo({
-        url: '/pages/saleuserPage/index?saleuserId=' + searchObj?.sale_user_id
+        url: '/pages/saleuserPage/index?saleuserId=' + searchObj?.sale_user_id,
       })
     }
   }
@@ -163,10 +161,15 @@ export default () => {
   }
 
   //订单类型
-  const [modeList, setModeList] = useState<any[]>([{ id: -1, name: '不限' }, { id: 0, name: '大货' }, { id: 1, name: '剪版' }, { id: 2, name: '散剪' }])
+  const [modeList, setModeList] = useState<any[]>([
+    { id: -1, name: '不限' },
+    { id: 0, name: '大货' },
+    { id: 1, name: '剪版' },
+    { id: 2, name: '散剪' },
+  ])
   //选择订单类型
   const handCheckMode = (item) => {
-    modeList.map(it => {
+    modeList.map((it) => {
       if (it.id === item.id) {
         it.checked = true
       } else {
@@ -179,10 +182,14 @@ export default () => {
   }
 
   ///发货方式类型
-  const [deliveryList, setdeliveryList] = useState<any[]>([{ id: -1, name: '不限' }, { id: 1, name: '自提' }, { id: 2, name: '物流' }])
+  const [deliveryList, setdeliveryList] = useState<any[]>([
+    { id: -1, name: '不限' },
+    { id: 1, name: '自提' },
+    { id: 2, name: '物流' },
+  ])
   //选择发货方式类型
   const handCheckDelivery = (item) => {
-    deliveryList.map(it => {
+    deliveryList.map((it) => {
       if (it.id === item.id) {
         it.checked = true
       } else {
@@ -195,7 +202,8 @@ export default () => {
   }
   //是否不允许确认筛选
   const isDisabled = useMemo(() => {
-    if (searchObj.clientName !== '' ||
+    if (
+      searchObj.clientName !== '' ||
       searchObj.orderNo !== '' ||
       searchObj.saleuserName !== '' ||
       searchObj.sale_mode !== undefined ||
@@ -216,7 +224,7 @@ export default () => {
       saleuserName: '',
       orderNo: '',
       sale_mode: undefined,
-      shipment_mode: undefined
+      shipment_mode: undefined,
     })
   }
   //确认筛选
@@ -230,9 +238,9 @@ export default () => {
         setsearchObj((e) => ({ ...e, orderNo: res.result }))
       },
       fail(res) {
-        console.log(res);
+        console.log(res)
       },
-    });
+    })
   }
 
   useEffect(() => {
@@ -242,68 +250,68 @@ export default () => {
   const { fetchData: cancelFetch } = mpsaleOrdercancel()
   //取消订单
   const cancle = async (e, item) => {
-    e.stopPropagation();
+    e.stopPropagation()
     Taro.showModal({
-      content: "确定要取消吗？",
+      content: '确定要取消吗？',
-      confirmText: "确认",
+      confirmText: '确认',
-      cancelText: "取消",
+      cancelText: '取消',
       success: async function (res) {
         if (res.confirm) {
           Taro.showLoading({
             title: '请稍等...',
-            mask: true
+            mask: true,
           })
           const res = await cancelFetch({ id: item.id })
           if (res.msg === 'success') {
             Taro.showToast({
-              title: '取消成功'
+              title: '取消成功',
             })
             Taro.hideLoading()
             getOrderList()
           } else {
             Taro.showToast({
               title: res.msg,
-              icon: 'error'
+              icon: 'error',
             })
           }
         }
-      }
+      },
     })
   }
   //再次购买
   const { fetchData: buyFetch } = mpshoppingCartproductColorlist()
   const nextBuy = async (e, item) => {
-    e.stopPropagation();
+    e.stopPropagation()
     Taro.showLoading({
       title: '请稍等...',
-      mask: true
+      mask: true,
     })
     let arr: any = []
-    item.product_list.forEach(item => {
+    item.product_list.forEach((item) => {
-      item.product_colors.forEach(it => {
+      item.product_colors.forEach((it) => {
         arr.push({
           length: it.length,
           roll: it.roll,
-          product_color_id: it.id
+          product_color_id: it.id,
         })
       })
     })
     let query = {
       purchaser_id: item.purchaser_id,
       sale_mode: item.sale_mode,
-      color_list: arr
+      color_list: arr,
     }
     const res = await buyFetch(query)
     if (res.msg === 'success') {
       Taro.showToast({
-        title: '加入购物车成功!'
+        title: '加入购物车成功!',
       })
       Taro.hideLoading()
       getOrderList()
     } else {
       Taro.showToast({
         title: res.msg,
-        icon: 'error'
+        icon: 'error',
       })
     }
   }
@@ -314,103 +322,97 @@ export default () => {
   const [payList, setPayList] = useState<any[]>([
     {
       id: 2,
-      iconfont: "icon-xianxiahuizong",
+      iconfont: 'icon-xianxiahuizong',
-      name: "预存款",
+      name: '预存款',
-      fonts: "可用额度 ",
+      fonts: '可用额度 ',
-      money: "",
+      money: '',
       isCheck: false,
     },
     {
       id: 5,
-      iconfont: "icon-xianxiahuizong",
+      iconfont: 'icon-xianxiahuizong',
-      name: "货到付款",
+      name: '货到付款',
-      fonts: "发货后3天内付款",
+      fonts: '发货后3天内付款',
       isCheck: false,
-      money: "",
+      money: '',
     },
     {
       id: 3,
-      iconfont: "icon-xianxiahuizong",
+      iconfont: 'icon-xianxiahuizong',
-      name: "x天账期",
+      name: 'x天账期',
-      fonts: "可用额度 ",
+      fonts: '可用额度 ',
-      money: "",
+      money: '',
       isCheck: false,
     },
     {
-      iconfont: "icon-saomiao",
+      iconfont: 'icon-saomiao',
-      name: "扫码支付",
+      name: '扫码支付',
     },
   ])
   const toPay = async (e, item) => {
-    e.stopPropagation();
+    e.stopPropagation()
 
     setItemObj(item)
     if (item.status !== 10) {
       let res = await infoOneFetch({ id: item.should_collect_order_id })
       payList.map((item) => {
         if (item.id === 3) {
-          item.name = `${res.data.account_period}天账期`;
+          item.name = `${res.data.account_period}天账期`
-          item.fonts = `可用额度${formatPriceDiv(
+          item.fonts = `可用额度${formatPriceDiv(res.data.account_period_credit_available_line).toLocaleString()}`
-            res.data.account_period_credit_available_line
-          ).toLocaleString()}`;
         }
         if (item.id === 2) {
-          item.fonts = `可用额度${formatPriceDiv(
+          item.fonts = `可用额度${formatPriceDiv(res.data.advance_deposit_balance).toLocaleString()}`
-            res.data.advance_deposit_balance
-          ).toLocaleString()}`;
         }
-        return item;
+        return item
-      });
+      })
       setPayList([...payList])
       if (item.is_shipper_picks_up) {
         const obj = payList.filter((item) => {
-          return item.id === 6;
+          return item.id === 6
-        });
+        })
-        console.log(obj, "456456");
+        console.log(obj, '456456')
         if (obj.length === 0) {
           payList.unshift({
             id: 6,
-            iconfont: "icon-xianxiahuizong",
+            iconfont: 'icon-xianxiahuizong',
-            name: "货主自提",
+            name: '货主自提',
-            fonts: "",
+            fonts: '',
-            money: "",
+            money: '',
             isCheck: false,
-          });
+          })
           setPayList([...payList])
         }
       }
     } else {
       let res = await infoTwoFetch({ id: item.pre_collect_order_id })
-      const arr: any = [];
+      const arr: any = []
       arr.push(
         {
           id: 2,
-          iconfont: "icon-xianxiahuizong",
+          iconfont: 'icon-xianxiahuizong',
-          name: "预存款",
+          name: '预存款',
-          fonts: `可用额度${formatPriceDiv(
+          fonts: `可用额度${formatPriceDiv(res.data.advance_deposit_balance).toLocaleString()}`,
-            res.data.advance_deposit_balance
+          money: '',
-          ).toLocaleString()}`,
-          money: "",
           isCheck: false,
         },
         {
-          iconfont: "icon-saomiao",
+          iconfont: 'icon-saomiao',
-          name: "扫码支付",
+          name: '扫码支付',
-        }
+        },
-      );
+      )
       if (item.is_shipper_picks_up) {
         const obj = arr.filter((item) => {
-          return item.id === 6;
+          return item.id === 6
-        });
+        })
         if (obj.length === 0) {
           arr.unshift({
             id: 6,
-            iconfont: "icon-xianxiahuizong",
+            iconfont: 'icon-xianxiahuizong',
-            name: "货主自提",
+            name: '货主自提',
-            fonts: "",
+            fonts: '',
-            money: "",
+            money: '',
             isCheck: false,
-          });
+          })
         }
       }
       setPayList([...arr])
@@ -421,8 +423,10 @@ export default () => {
 
   //选择支付方式
   const clickItem = (item) => {
-    if (item.name === '扫码支付') { handScanpay() }
+    if (item.name === '扫码支付') {
-    payList.map(it => {
+      handScanpay()
+    }
+    payList.map((it) => {
       if (item.id === it.id) {
         it.checked = true
       } else {
@@ -433,14 +437,13 @@ export default () => {
     setPayList([...payList])
   }
 
-
   //扫码支付
   const [showSide, setShowSide] = useState(true)
   const [title, setTitle] = useState('')
   const [picUrl, setPicUrl] = useState('')
   const { fetchData: payFetch } = GetPayCode()
   const handScanpay = async () => {
-    const list: any = [];
+    const list: any = []
     itemObj.product_list.forEach((item) => {
       item.product_colors.forEach((it) => {
         list.push({
@@ -451,18 +454,15 @@ export default () => {
           num: it.roll.toString(),
           weight: formatWeightDiv(it.actual_weight).toString(),
           sale_price: (it.sale_price / 100).toString(),
-          total_price:
+          total_price: it.actual_amount !== 0 ? (it.actual_amount / 100).toString() : (it.estimate_amount / 100).toString(),
-            it.actual_amount !== 0
-              ? (it.actual_amount / 100).toString()
-              : (it.estimate_amount / 100).toString(),
           length: (it.length / 100).toString(),
           weight_error: formatWeightDiv(it.weight_error).toString(),
-        });
+        })
-      });
+      })
-    });
+    })
     const query = {
       list: list,
-      title: "面料销售电子确认单",
+      title: '面料销售电子确认单',
       show_qrcode: true,
       show_barcode: true,
       show_wait_pay_amount: true,
@@ -482,14 +482,10 @@ export default () => {
       client: itemObj.purchaser_name,
       phone: itemObj.target_user_phone,
       order_total_length: (itemObj.total_number / 100).toString(),
-      order_total_price: (
+      order_total_price: (itemObj.bill_total_sale_price / 100).toString(),
-        itemObj.bill_total_sale_price / 100
+      total_weight_error_discount: (itemObj.total_weight_error_discount / 100).toString(),
-      ).toString(),
-      total_weight_error_discount: (
-        itemObj.total_weight_error_discount / 100
-      ).toString(),
       order_total_num: itemObj.total_number.toString(),
-      qrcode: "",
+      qrcode: '',
       order_total_weight: (itemObj.total_weight / 1000).toString(),
       estimate_amount: (itemObj.estimate_amount / 100).toString(),
       total_sale_price: (itemObj.total_sale_price / 100).toString(),
@@ -497,10 +493,8 @@ export default () => {
       show_total_weight_error_discount: true,
       actual_amount: (itemObj.payment_amount / 100).toString(),
       wait_pay_amount: (itemObj.wait_pay_amount / 100).toString(),
-      order_total_weight_error: (
+      order_total_weight_error: (itemObj.total_weight_error / 1000).toString(),
-        itemObj.total_weight_error / 1000
+    }
-      ).toString(),
-    };
     const res = await payFetch(query)
     if (res.data) {
       console.log(res.data.base64)
@@ -510,38 +504,40 @@ export default () => {
     }
   }
 
-
   //确认交易
   const { fetchData: payOneFetch } = orderPaymentorderPaymentSubmission()
   const { fetchData: payTwoFetch } = orderPaymentpreCollectOrderorderPaymentSubmission()
   const handsurePay = (obj) => {
     let arr: any = []
     // if (obj.status !== 10) {
-    arr = payList.filter(item => {
+    arr = payList.filter((item) => {
       return item.checked
     })
     if (!arr.length) {
       Taro.showToast({
         title: '请选择后再提交',
-        icon: 'error'
+        icon: 'error',
       })
       return false
     }
 
     Taro.showModal({
-      content: "确定交易吗？",
+      content: '确定交易吗？',
-      confirmText: "确认",
+      confirmText: '确认',
-      cancelText: "取消",
+      cancelText: '取消',
       success: async function (res) {
         if (res.confirm) {
           Taro.showLoading({
             title: '请稍等...',
-            mask: true
+            mask: true,
           })
-          const restult = await obj.status !== 10 ? payOneFetch({ id: Number(obj.should_collect_order_id), payment_method: Number(arr[0]?.id) }) : payTwoFetch({ id: Number(obj.pre_collect_order_id), payment_method: Number(arr[0]?.id) })
+          const restult =
+            (await obj.status) !== 10
+              ? payOneFetch({ id: Number(obj.should_collect_order_id), payment_method: Number(arr[0]?.id) })
+              : payTwoFetch({ id: Number(obj.pre_collect_order_id), payment_method: Number(arr[0]?.id) })
           if (restult?.msg === 'success') {
             Taro.showToast({
-              title: '交易成功'
+              title: '交易成功',
             })
             Taro.hideLoading()
             setShowPay(false)
@@ -549,12 +545,11 @@ export default () => {
           } else {
             Taro.showToast({
               title: restult?.msg,
-              icon: 'error'
+              icon: 'error',
             })
           }
         }
-
+      },
-      }
     })
 
     // }
@@ -566,14 +561,14 @@ export default () => {
   return (
     <View>
       <View style={{ background: '#FFFFFF', paddingLeft: '20rpx', paddingBottom: '20rpx', position: 'sticky', top: '0', zIndex: '99' }}>
-        <Search placeholder='搜索商品/名称/颜色/订单号' showBtn={false} changeOnSearch={getSearchData} debounceTime={300} >
+        <Search placeholder='搜索商品/名称/颜色/订单号' showBtn={false} changeOnSearch={getSearchData} debounceTime={300}>
           <View className={styles.flexBox} onClick={() => showSelctPopup()}>
             <View className={classnames('iconfont', 'icon-shaixuan', !isDisabled ? styles.icon_shaixuan : styles.activeshaixuan)}></View>
             <View className={classnames(isDisabled ? styles.shaixuan : styles.activeshai)}>筛选</View>
           </View>
         </Search>
       </View>
-      <View style={{ background: '#FFFFFF', }}>
+      <View style={{ background: '#FFFFFF' }}>
         <OrderStatusList list={statusList} onSelect={changeStatus} defaultId={-1} />
       </View>
       <View className={styles.order_list}>
@@ -591,8 +586,7 @@ export default () => {
                   key={index}
                   cancle={(e, item) => cancle(e, item)}
                   nextBuy={(e, item) => nextBuy(e, item)}
-                  toPay={(e, item) => toPay(e, item)}
+                  toPay={(e, item) => toPay(e, item)}></ItemList>
-                ></ItemList>
               </View>
             )
           })}
@@ -620,41 +614,76 @@ export default () => {
           <View className={styles.secondBox}>
             <View className={styles.secondTopfont}>订单单号</View>
             <View className={styles.inputBox}>
-              <Input onInput={(e) => { handInput(e) }} placeholderStyle='color:#000000; font-size:26rpx' className={styles.orderInput} value={searchObj.orderNo} placeholder={'请输入或扫描条形码'}></Input>
+              <Input
-              <View className={classnames('iconfont', 'icon-saomiao', styles.saomiao)} onClick={() => { handScan() }}></View>
+                onInput={(e) => {
+                  handInput(e)
+                }}
+                placeholderStyle='color:#000000; font-size:26rpx'
+                className={styles.orderInput}
+                value={searchObj.orderNo}
+                placeholder={'请输入或扫描条形码'}></Input>
+              <View
+                className={classnames('iconfont', 'icon-saomiao', styles.saomiao)}
+                onClick={() => {
+                  handScan()
+                }}></View>
             </View>
           </View>
           <View className={styles.thirdBox}>
             <View className={styles.thirdTopfont}>订单类型</View>
             <View className={styles.flexModebox}>
-              {
+              {modeList.map((item, index) => {
-                modeList.map((item, index) => {
+                return (
-                  return (
+                  <View
-                    <View onClick={() => { handCheckMode(item) }} className={classnames(item.checked ? styles.activemodeBox : styles.modeBox)} key={index}>{item.name}</View>
+                    onClick={() => {
-                  )
+                      handCheckMode(item)
-                })
+                    }}
-              }
+                    className={classnames(item.checked ? styles.activemodeBox : styles.modeBox)}
+                    key={index}>
+                    {item.name}
+                  </View>
+                )
+              })}
             </View>
           </View>
           <View className={styles.thirdBox}>
             <View className={styles.thirdTopfont}>发货方式</View>
             <View className={styles.flexModebox}>
-              {
+              {deliveryList.map((item, index) => {
-                deliveryList.map((item, index) => {
+                return (
-                  return (
+                  <View
-                    <View onClick={() => { handCheckDelivery(item) }} className={classnames(item.checked ? styles.activemodeBox : styles.modeBox)} key={index}>{item.name}</View>
+                    onClick={() => {
-                  )
+                      handCheckDelivery(item)
-                })
+                    }}
-              }
+                    className={classnames(item.checked ? styles.activemodeBox : styles.modeBox)}
+                    key={index}>
+                    {item.name}
+                  </View>
+                )
+              })}
             </View>
           </View>
           <View>{isDisabled}</View>
           <View style={{ height: '160rpx' }}></View>
 
           <View className={styles.bottomBox}>
-
+            <Button
-            <Button className={styles.resetBox} onClick={() => { handReset() }}> 重置</Button >
+              className={styles.resetBox}
-            <Button className={classnames(isDisabled ? styles.button : styles.activeButton)} disabled={isDisabled} onClick={() => { handSure?.() }}> 确认</Button >
+              onClick={() => {
+                handReset()
+              }}>
+              {' '}
+              重置
+            </Button>
+            <Button
+              className={classnames(isDisabled ? styles.button : styles.activeButton)}
+              disabled={isDisabled}
+              onClick={() => {
+                handSure?.()
+              }}>
+              {' '}
+              确认
+            </Button>
           </View>
           {/* <View className={styles.areaBox}></View> */}
         </View>
@@ -668,8 +697,7 @@ export default () => {
         handsurePay={(obj) => handsurePay(obj)}
         showSide={showSide}
         title={title}
-        picUrl={picUrl}
+        picUrl={picUrl}></PayPopup>
-      ></PayPopup>
+    </View>
-    </View >
   )
 }

src/styles/iconfont.scss

@@ -1,9 +1,6 @@
-/* CDN 服务仅供平台体验和调试使用，平台不承诺服务的稳定性，企业客户需下载字体包自行发布使用并做好备份。 */
 @font-face {
-  font-family: 'iconfont';
+  font-family: "iconfont"; /* Project id 3619513 */
-  /* Project id 3619513 */
+  src: url('/src/styles/iconfont.ttf?t=1663134774880') format('truetype');
-  src: url('iconfont.ttf?t=1663065236955') format('truetype');
-
 }
 
 .iconfont {
@@ -18,6 +15,22 @@
   content: "\e63e";
 }
 
+.icon-jizhumima:before {
+  content: "\e63c";
+}
+
+.icon-a-jizhumima:before {
+  content: "\e63d";
+}
+
+.icon-weixindenglu:before {
+  content: "\e63b";
+}
+
+.icon-kehuxinxi:before {
+  content: "\e63a";
+}
+
 .icon-yewuyuanqizi:before {
   content: "\e639";
 }
@@ -233,3 +246,4 @@
 .icon-gouwu:before {
   content: "\e607";
 }
+