From cf5f794106bca0aa1bb15692bbfc3a9fedfd7b59 Mon Sep 17 00:00:00 2001 From: czm <2192718639@qq.com> Date: Sat, 10 Dec 2022 20:47:22 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=88=20perf(=E6=9B=B4=E6=94=B9=E5=AD=97?= =?UTF-8?q?=E4=BD=93=E5=BA=93):?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- iconfont.json | 18 +- src/components/iconfont/alipay/alipay.axml | 113 ------------- src/components/iconfont/alipay/alipay.js | 77 --------- src/components/iconfont/h5/IconWeixin.js | 31 ---- src/components/iconfont/h5/index.js | 165 ------------------ src/components/iconfont/index.d.ts | 13 -- src/components/iconfont/qq/qq.js | 31 ---- src/components/iconfont/qq/qq.qml | 113 ------------- src/components/iconfont/rn/IconWeixin.js | 28 ---- src/components/iconfont/rn/index.js | 167 ------------------- src/components/iconfont/swan/swan.js | 64 ------- src/components/iconfont/swan/swan.swan | 113 ------------- src/components/iconfont/tt/tt.js | 64 ------- src/components/iconfont/tt/tt.ttml | 113 ------------- src/components/iconfont/weapp/weapp.js | 63 ------- src/components/iconfont/weapp/weapp.wxml | 113 ------------- src/pages/order/components/payment/index.tsx | 12 +- 17 files changed, 14 insertions(+), 1284 deletions(-) delete mode 100644 src/components/iconfont/alipay/alipay.axml delete mode 100644 src/components/iconfont/alipay/alipay.js delete mode 100644 src/components/iconfont/h5/IconWeixin.js delete mode 100644 src/components/iconfont/h5/index.js delete mode 100644 src/components/iconfont/index.d.ts delete mode 100644 src/components/iconfont/qq/qq.js delete mode 100644 src/components/iconfont/qq/qq.qml delete mode 100644 src/components/iconfont/rn/IconWeixin.js delete mode 100644 src/components/iconfont/rn/index.js delete mode 100644 src/components/iconfont/swan/swan.js delete mode 100644 src/components/iconfont/swan/swan.swan delete mode 100644 src/components/iconfont/tt/tt.js delete mode 100644 src/components/iconfont/tt/tt.ttml delete mode 100644 src/components/iconfont/weapp/weapp.js delete mode 100644 src/components/iconfont/weapp/weapp.wxml diff --git a/iconfont.json b/iconfont.json index 140de0f..a0499e0 100644 --- a/iconfont.json +++ b/iconfont.json @@ -1,10 +1,8 @@ -{ - "symbol_url": "//at.alicdn.com/t/c/font_3786318_rr5yneq8o0a.js", - "save_dir": "./src/components/iconfont", - "use_typescript": false, - "platforms": "*", - "use_rpx": true, - "trim_icon_prefix": "icon", - "default_icon_size": 18, - "design_width": 750 -} +{ + "symbol_url": "//at.alicdn.com/t/c/font_3786318_8mk04nkdxlg.js", + "save_dir": "./src/components/iconfont", + "use_typescript": false, + "use_rpx": true, + "default_icon_size": 36, + "design_width": 750 +} diff --git a/src/components/iconfont/alipay/alipay.axml b/src/components/iconfont/alipay/alipay.axml deleted file mode 100644 index 0421013..0000000 --- a/src/components/iconfont/alipay/alipay.axml +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/components/iconfont/alipay/alipay.js b/src/components/iconfont/alipay/alipay.js deleted file mode 100644 index ab10e17..0000000 --- a/src/components/iconfont/alipay/alipay.js +++ /dev/null @@ -1,77 +0,0 @@ -Component({ - props: { - // weixin | riqi | shuru | a-0tianzhangqi | huodaofukuan | huozhuziti | saomazhifu | xianxiahuikuan | yufukuan | xinzengshoucangjia | qingchusousuo | xuanzechenggong | gongnengtubiao-saomiao | bianjizidingyimadan | zidingyimadanyulan | yuanshimadanyulan | xiala | shangla | qingchuxinxi | sousuo | guanli | bianji | shoucangjia | shezhi | tishi | erweima | dianjishoucang | gouwuche | shoucangchenggong | fenxiangshangpin | kefu | xinzenganniu | jianshaoanniu | daifahuo2 | daishouhuo2 | tuikuan-shouhou | daipeibu2 | daifukuan2 - name: null, - // string | string[] - color: '', - size: 18, - }, - data: { - colors: '', - quot: '"', - svgSize: 18, - isStr: true, - }, - didMount() { - const size = this.props.size; - const color = this.props.color; - - this.setData({ - colors: this.fixColor(color), - isStr: typeof color === 'string', - }); - - if (size !== this.data.svgSize) { - this.setData({ - svgSize: size / 750 * my.getSystemInfoSync().windowWidth, - }); - } - }, - disUpdate(prevProps) { - const size = this.props.size; - const color = this.props.color; - - if (color !== prevProps.color) { - this.setData({ - colors: this.fixColor(color), - isStr: typeof color === 'string', - }); - } - - if (size !== prevProps.size) { - this.setData({ - svgSize: size / 750 * my.getSystemInfoSync().windowWidth, - }); - } - }, - methods: { - fixColor: function() { - var color = this.props.color; - var hex2rgb = this.hex2rgb; - - if (typeof color === 'string') { - return color.indexOf('#') === 0 ? hex2rgb(color) : color; - } - - return color.map(function (item) { - return item.indexOf('#') === 0 ? hex2rgb(item) : item; - }); - }, - hex2rgb: function(hex) { - var rgb = []; - - hex = hex.substr(1); - - if (hex.length === 3) { - hex = hex.replace(/(.)/g, '$1$1'); - } - - hex.replace(/../g, function(color) { - rgb.push(parseInt(color, 0x10)); - return color; - }); - - return 'rgb(' + rgb.join(',') + ')'; - } - } -}); diff --git a/src/components/iconfont/h5/IconWeixin.js b/src/components/iconfont/h5/IconWeixin.js deleted file mode 100644 index 557e47a..0000000 --- a/src/components/iconfont/h5/IconWeixin.js +++ /dev/null @@ -1,31 +0,0 @@ -/* eslint-disable */ - -import React from 'react'; -import { getIconColor } from './helper'; - -const DEFAULT_STYLE = { - display: 'block', -}; - -const IconWeixin = ({ size, color, style: _style, ...rest }) => { - const style = _style ? { ...DEFAULT_STYLE, ..._style } : DEFAULT_STYLE; - - return ( - - - - - ); -}; - -IconWeixin.defaultProps = { - size: 18, -}; - -export default IconWeixin; diff --git a/src/components/iconfont/h5/index.js b/src/components/iconfont/h5/index.js deleted file mode 100644 index 59a7231..0000000 --- a/src/components/iconfont/h5/index.js +++ /dev/null @@ -1,165 +0,0 @@ -/* eslint-disable */ - -import React from 'react'; -import IconWeixin from './IconWeixin'; -import IconRiqi from './IconRiqi'; -import IconShuru from './IconShuru'; -import IconA0Tianzhangqi from './IconA0Tianzhangqi'; -import IconHuodaofukuan from './IconHuodaofukuan'; -import IconHuozhuziti from './IconHuozhuziti'; -import IconSaomazhifu from './IconSaomazhifu'; -import IconXianxiahuikuan from './IconXianxiahuikuan'; -import IconYufukuan from './IconYufukuan'; -import IconXinzengshoucangjia from './IconXinzengshoucangjia'; -import IconQingchusousuo from './IconQingchusousuo'; -import IconXuanzechenggong from './IconXuanzechenggong'; -import IconGongnengtubiaoSaomiao from './IconGongnengtubiaoSaomiao'; -import IconBianjizidingyimadan from './IconBianjizidingyimadan'; -import IconZidingyimadanyulan from './IconZidingyimadanyulan'; -import IconYuanshimadanyulan from './IconYuanshimadanyulan'; -import IconXiala from './IconXiala'; -import IconShangla from './IconShangla'; -import IconQingchuxinxi from './IconQingchuxinxi'; -import IconSousuo from './IconSousuo'; -import IconGuanli from './IconGuanli'; -import IconBianji from './IconBianji'; -import IconShoucangjia from './IconShoucangjia'; -import IconShezhi from './IconShezhi'; -import IconTishi from './IconTishi'; -import IconErweima from './IconErweima'; -import IconDianjishoucang from './IconDianjishoucang'; -import IconGouwuche from './IconGouwuche'; -import IconShoucangchenggong from './IconShoucangchenggong'; -import IconFenxiangshangpin from './IconFenxiangshangpin'; -import IconKefu from './IconKefu'; -import IconXinzenganniu from './IconXinzenganniu'; -import IconJianshaoanniu from './IconJianshaoanniu'; -import IconDaifahuo2 from './IconDaifahuo2'; -import IconDaishouhuo2 from './IconDaishouhuo2'; -import IconTuikuanShouhou from './IconTuikuanShouhou'; -import IconDaipeibu2 from './IconDaipeibu2'; -import IconDaifukuan2 from './IconDaifukuan2'; -export { default as IconWeixin } from './IconWeixin'; -export { default as IconRiqi } from './IconRiqi'; -export { default as IconShuru } from './IconShuru'; -export { default as IconA0Tianzhangqi } from './IconA0Tianzhangqi'; -export { default as IconHuodaofukuan } from './IconHuodaofukuan'; -export { default as IconHuozhuziti } from './IconHuozhuziti'; -export { default as IconSaomazhifu } from './IconSaomazhifu'; -export { default as IconXianxiahuikuan } from './IconXianxiahuikuan'; -export { default as IconYufukuan } from './IconYufukuan'; -export { default as IconXinzengshoucangjia } from './IconXinzengshoucangjia'; -export { default as IconQingchusousuo } from './IconQingchusousuo'; -export { default as IconXuanzechenggong } from './IconXuanzechenggong'; -export { default as IconGongnengtubiaoSaomiao } from './IconGongnengtubiaoSaomiao'; -export { default as IconBianjizidingyimadan } from './IconBianjizidingyimadan'; -export { default as IconZidingyimadanyulan } from './IconZidingyimadanyulan'; -export { default as IconYuanshimadanyulan } from './IconYuanshimadanyulan'; -export { default as IconXiala } from './IconXiala'; -export { default as IconShangla } from './IconShangla'; -export { default as IconQingchuxinxi } from './IconQingchuxinxi'; -export { default as IconSousuo } from './IconSousuo'; -export { default as IconGuanli } from './IconGuanli'; -export { default as IconBianji } from './IconBianji'; -export { default as IconShoucangjia } from './IconShoucangjia'; -export { default as IconShezhi } from './IconShezhi'; -export { default as IconTishi } from './IconTishi'; -export { default as IconErweima } from './IconErweima'; -export { default as IconDianjishoucang } from './IconDianjishoucang'; -export { default as IconGouwuche } from './IconGouwuche'; -export { default as IconShoucangchenggong } from './IconShoucangchenggong'; -export { default as IconFenxiangshangpin } from './IconFenxiangshangpin'; -export { default as IconKefu } from './IconKefu'; -export { default as IconXinzenganniu } from './IconXinzenganniu'; -export { default as IconJianshaoanniu } from './IconJianshaoanniu'; -export { default as IconDaifahuo2 } from './IconDaifahuo2'; -export { default as IconDaishouhuo2 } from './IconDaishouhuo2'; -export { default as IconTuikuanShouhou } from './IconTuikuanShouhou'; -export { default as IconDaipeibu2 } from './IconDaipeibu2'; -export { default as IconDaifukuan2 } from './IconDaifukuan2'; - -const IconFont = ({ name, ...rest }) => { - switch (name) { - case 'weixin': - return ; - case 'riqi': - return ; - case 'shuru': - return ; - case 'a-0tianzhangqi': - return ; - case 'huodaofukuan': - return ; - case 'huozhuziti': - return ; - case 'saomazhifu': - return ; - case 'xianxiahuikuan': - return ; - case 'yufukuan': - return ; - case 'xinzengshoucangjia': - return ; - case 'qingchusousuo': - return ; - case 'xuanzechenggong': - return ; - case 'gongnengtubiao-saomiao': - return ; - case 'bianjizidingyimadan': - return ; - case 'zidingyimadanyulan': - return ; - case 'yuanshimadanyulan': - return ; - case 'xiala': - return ; - case 'shangla': - return ; - case 'qingchuxinxi': - return ; - case 'sousuo': - return ; - case 'guanli': - return ; - case 'bianji': - return ; - case 'shoucangjia': - return ; - case 'shezhi': - return ; - case 'tishi': - return ; - case 'erweima': - return ; - case 'dianjishoucang': - return ; - case 'gouwuche': - return ; - case 'shoucangchenggong': - return ; - case 'fenxiangshangpin': - return ; - case 'kefu': - return ; - case 'xinzenganniu': - return ; - case 'jianshaoanniu': - return ; - case 'daifahuo2': - return ; - case 'daishouhuo2': - return ; - case 'tuikuan-shouhou': - return ; - case 'daipeibu2': - return ; - case 'daifukuan2': - return ; - - } - - return null; -}; - -export default IconFont; diff --git a/src/components/iconfont/index.d.ts b/src/components/iconfont/index.d.ts deleted file mode 100644 index deab643..0000000 --- a/src/components/iconfont/index.d.ts +++ /dev/null @@ -1,13 +0,0 @@ -/* eslint-disable */ -import React, { FunctionComponent } from 'react'; - -interface Props { - name: 'weixin' | 'riqi' | 'shuru' | 'a-0tianzhangqi' | 'huodaofukuan' | 'huozhuziti' | 'saomazhifu' | 'xianxiahuikuan' | 'yufukuan' | 'xinzengshoucangjia' | 'qingchusousuo' | 'xuanzechenggong' | 'gongnengtubiao-saomiao' | 'bianjizidingyimadan' | 'zidingyimadanyulan' | 'yuanshimadanyulan' | 'xiala' | 'shangla' | 'qingchuxinxi' | 'sousuo' | 'guanli' | 'bianji' | 'shoucangjia' | 'shezhi' | 'tishi' | 'erweima' | 'dianjishoucang' | 'gouwuche' | 'shoucangchenggong' | 'fenxiangshangpin' | 'kefu' | 'xinzenganniu' | 'jianshaoanniu' | 'daifahuo2' | 'daishouhuo2' | 'tuikuan-shouhou' | 'daipeibu2' | 'daifukuan2'; - size?: number; - color?: string | string[]; - style?: React.CSSProperties; -} - -declare const IconFont: FunctionComponent; - -export default IconFont; diff --git a/src/components/iconfont/qq/qq.js b/src/components/iconfont/qq/qq.js deleted file mode 100644 index 96c73a1..0000000 --- a/src/components/iconfont/qq/qq.js +++ /dev/null @@ -1,31 +0,0 @@ -Component({ - properties: { - // weixin | riqi | shuru | a-0tianzhangqi | huodaofukuan | huozhuziti | saomazhifu | xianxiahuikuan | yufukuan | xinzengshoucangjia | qingchusousuo | xuanzechenggong | gongnengtubiao-saomiao | bianjizidingyimadan | zidingyimadanyulan | yuanshimadanyulan | xiala | shangla | qingchuxinxi | sousuo | guanli | bianji | shoucangjia | shezhi | tishi | erweima | dianjishoucang | gouwuche | shoucangchenggong | fenxiangshangpin | kefu | xinzenganniu | jianshaoanniu | daifahuo2 | daishouhuo2 | tuikuan-shouhou | daipeibu2 | daifukuan2 - name: { - type: String, - }, - // string | string[] - color: { - type: null, - observer: function(color) { - this.setData({ - isStr: typeof color === 'string', - }); - } - }, - size: { - type: Number, - value: 18, - observer: function(size) { - this.setData({ - svgSize: size / 750 * qq.getSystemInfoSync().windowWidth, - }); - }, - }, - }, - data: { - svgSize: 18 / 750 * qq.getSystemInfoSync().windowWidth, - quot: '"', - isStr: true, - }, -}); diff --git a/src/components/iconfont/qq/qq.qml b/src/components/iconfont/qq/qq.qml deleted file mode 100644 index f20c100..0000000 --- a/src/components/iconfont/qq/qq.qml +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/components/iconfont/rn/IconWeixin.js b/src/components/iconfont/rn/IconWeixin.js deleted file mode 100644 index e85db9c..0000000 --- a/src/components/iconfont/rn/IconWeixin.js +++ /dev/null @@ -1,28 +0,0 @@ -/* eslint-disable */ - -import React from 'react'; -import { Svg, Path } from 'react-native-svg'; -import { getIconColor } from './helper'; - -let IconWeixin = ({ size, color, ...rest }) => { - return ( - - - - - ); -}; - -IconWeixin.defaultProps = { - size: 18, -}; - -IconWeixin = React.memo ? React.memo(IconWeixin) : IconWeixin; - -export default IconWeixin; diff --git a/src/components/iconfont/rn/index.js b/src/components/iconfont/rn/index.js deleted file mode 100644 index 9e9e1e5..0000000 --- a/src/components/iconfont/rn/index.js +++ /dev/null @@ -1,167 +0,0 @@ -/* eslint-disable */ - -import React from 'react'; - -import IconWeixin from './IconWeixin'; -import IconRiqi from './IconRiqi'; -import IconShuru from './IconShuru'; -import IconA0Tianzhangqi from './IconA0Tianzhangqi'; -import IconHuodaofukuan from './IconHuodaofukuan'; -import IconHuozhuziti from './IconHuozhuziti'; -import IconSaomazhifu from './IconSaomazhifu'; -import IconXianxiahuikuan from './IconXianxiahuikuan'; -import IconYufukuan from './IconYufukuan'; -import IconXinzengshoucangjia from './IconXinzengshoucangjia'; -import IconQingchusousuo from './IconQingchusousuo'; -import IconXuanzechenggong from './IconXuanzechenggong'; -import IconGongnengtubiaoSaomiao from './IconGongnengtubiaoSaomiao'; -import IconBianjizidingyimadan from './IconBianjizidingyimadan'; -import IconZidingyimadanyulan from './IconZidingyimadanyulan'; -import IconYuanshimadanyulan from './IconYuanshimadanyulan'; -import IconXiala from './IconXiala'; -import IconShangla from './IconShangla'; -import IconQingchuxinxi from './IconQingchuxinxi'; -import IconSousuo from './IconSousuo'; -import IconGuanli from './IconGuanli'; -import IconBianji from './IconBianji'; -import IconShoucangjia from './IconShoucangjia'; -import IconShezhi from './IconShezhi'; -import IconTishi from './IconTishi'; -import IconErweima from './IconErweima'; -import IconDianjishoucang from './IconDianjishoucang'; -import IconGouwuche from './IconGouwuche'; -import IconShoucangchenggong from './IconShoucangchenggong'; -import IconFenxiangshangpin from './IconFenxiangshangpin'; -import IconKefu from './IconKefu'; -import IconXinzenganniu from './IconXinzenganniu'; -import IconJianshaoanniu from './IconJianshaoanniu'; -import IconDaifahuo2 from './IconDaifahuo2'; -import IconDaishouhuo2 from './IconDaishouhuo2'; -import IconTuikuanShouhou from './IconTuikuanShouhou'; -import IconDaipeibu2 from './IconDaipeibu2'; -import IconDaifukuan2 from './IconDaifukuan2'; -export { default as IconWeixin } from './IconWeixin'; -export { default as IconRiqi } from './IconRiqi'; -export { default as IconShuru } from './IconShuru'; -export { default as IconA0Tianzhangqi } from './IconA0Tianzhangqi'; -export { default as IconHuodaofukuan } from './IconHuodaofukuan'; -export { default as IconHuozhuziti } from './IconHuozhuziti'; -export { default as IconSaomazhifu } from './IconSaomazhifu'; -export { default as IconXianxiahuikuan } from './IconXianxiahuikuan'; -export { default as IconYufukuan } from './IconYufukuan'; -export { default as IconXinzengshoucangjia } from './IconXinzengshoucangjia'; -export { default as IconQingchusousuo } from './IconQingchusousuo'; -export { default as IconXuanzechenggong } from './IconXuanzechenggong'; -export { default as IconGongnengtubiaoSaomiao } from './IconGongnengtubiaoSaomiao'; -export { default as IconBianjizidingyimadan } from './IconBianjizidingyimadan'; -export { default as IconZidingyimadanyulan } from './IconZidingyimadanyulan'; -export { default as IconYuanshimadanyulan } from './IconYuanshimadanyulan'; -export { default as IconXiala } from './IconXiala'; -export { default as IconShangla } from './IconShangla'; -export { default as IconQingchuxinxi } from './IconQingchuxinxi'; -export { default as IconSousuo } from './IconSousuo'; -export { default as IconGuanli } from './IconGuanli'; -export { default as IconBianji } from './IconBianji'; -export { default as IconShoucangjia } from './IconShoucangjia'; -export { default as IconShezhi } from './IconShezhi'; -export { default as IconTishi } from './IconTishi'; -export { default as IconErweima } from './IconErweima'; -export { default as IconDianjishoucang } from './IconDianjishoucang'; -export { default as IconGouwuche } from './IconGouwuche'; -export { default as IconShoucangchenggong } from './IconShoucangchenggong'; -export { default as IconFenxiangshangpin } from './IconFenxiangshangpin'; -export { default as IconKefu } from './IconKefu'; -export { default as IconXinzenganniu } from './IconXinzenganniu'; -export { default as IconJianshaoanniu } from './IconJianshaoanniu'; -export { default as IconDaifahuo2 } from './IconDaifahuo2'; -export { default as IconDaishouhuo2 } from './IconDaishouhuo2'; -export { default as IconTuikuanShouhou } from './IconTuikuanShouhou'; -export { default as IconDaipeibu2 } from './IconDaipeibu2'; -export { default as IconDaifukuan2 } from './IconDaifukuan2'; - -let IconFont = ({ name, ...rest }) => { - switch (name) { - case 'weixin': - return ; - case 'riqi': - return ; - case 'shuru': - return ; - case 'a-0tianzhangqi': - return ; - case 'huodaofukuan': - return ; - case 'huozhuziti': - return ; - case 'saomazhifu': - return ; - case 'xianxiahuikuan': - return ; - case 'yufukuan': - return ; - case 'xinzengshoucangjia': - return ; - case 'qingchusousuo': - return ; - case 'xuanzechenggong': - return ; - case 'gongnengtubiao-saomiao': - return ; - case 'bianjizidingyimadan': - return ; - case 'zidingyimadanyulan': - return ; - case 'yuanshimadanyulan': - return ; - case 'xiala': - return ; - case 'shangla': - return ; - case 'qingchuxinxi': - return ; - case 'sousuo': - return ; - case 'guanli': - return ; - case 'bianji': - return ; - case 'shoucangjia': - return ; - case 'shezhi': - return ; - case 'tishi': - return ; - case 'erweima': - return ; - case 'dianjishoucang': - return ; - case 'gouwuche': - return ; - case 'shoucangchenggong': - return ; - case 'fenxiangshangpin': - return ; - case 'kefu': - return ; - case 'xinzenganniu': - return ; - case 'jianshaoanniu': - return ; - case 'daifahuo2': - return ; - case 'daishouhuo2': - return ; - case 'tuikuan-shouhou': - return ; - case 'daipeibu2': - return ; - case 'daifukuan2': - return ; - } - - return null; -}; - -IconFont = React.memo ? React.memo(IconFont) : IconFont; - -export default IconFont; diff --git a/src/components/iconfont/swan/swan.js b/src/components/iconfont/swan/swan.js deleted file mode 100644 index f88cca8..0000000 --- a/src/components/iconfont/swan/swan.js +++ /dev/null @@ -1,64 +0,0 @@ -Component({ - properties: { - // weixin | riqi | shuru | a-0tianzhangqi | huodaofukuan | huozhuziti | saomazhifu | xianxiahuikuan | yufukuan | xinzengshoucangjia | qingchusousuo | xuanzechenggong | gongnengtubiao-saomiao | bianjizidingyimadan | zidingyimadanyulan | yuanshimadanyulan | xiala | shangla | qingchuxinxi | sousuo | guanli | bianji | shoucangjia | shezhi | tishi | erweima | dianjishoucang | gouwuche | shoucangchenggong | fenxiangshangpin | kefu | xinzenganniu | jianshaoanniu | daifahuo2 | daishouhuo2 | tuikuan-shouhou | daipeibu2 | daifukuan2 - name: { - type: String, - }, - // string | string[] - color: { - type: null, - value: '', - observer: function(color) { - this.setData({ - colors: this.fixColor(color), - isStr: typeof color === 'string', - }); - } - }, - size: { - type: Number, - value: 18, - observer: function(size) { - this.setData({ - svgSize: size / 750 * swan.getSystemInfoSync().windowWidth, - }); - }, - }, - }, - data: { - colors: '', - svgSize: 18 / 750 * swan.getSystemInfoSync().windowWidth, - quot: '"', - isStr: true, - }, - methods: { - fixColor: function() { - var color = this.data.color; - var hex2rgb = this.hex2rgb; - - if (typeof color === 'string') { - return color.indexOf('#') === 0 ? hex2rgb(color) : color; - } - - return color.map(function (item) { - return item.indexOf('#') === 0 ? hex2rgb(item) : item; - }); - }, - hex2rgb: function(hex) { - var rgb = []; - - hex = hex.substr(1); - - if (hex.length === 3) { - hex = hex.replace(/(.)/g, '$1$1'); - } - - hex.replace(/../g, function(color) { - rgb.push(parseInt(color, 0x10)); - return color; - }); - - return 'rgb(' + rgb.join(',') + ')'; - } - } -}); diff --git a/src/components/iconfont/swan/swan.swan b/src/components/iconfont/swan/swan.swan deleted file mode 100644 index 00e8237..0000000 --- a/src/components/iconfont/swan/swan.swan +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/components/iconfont/tt/tt.js b/src/components/iconfont/tt/tt.js deleted file mode 100644 index aca1b52..0000000 --- a/src/components/iconfont/tt/tt.js +++ /dev/null @@ -1,64 +0,0 @@ -Component({ - properties: { - // weixin | riqi | shuru | a-0tianzhangqi | huodaofukuan | huozhuziti | saomazhifu | xianxiahuikuan | yufukuan | xinzengshoucangjia | qingchusousuo | xuanzechenggong | gongnengtubiao-saomiao | bianjizidingyimadan | zidingyimadanyulan | yuanshimadanyulan | xiala | shangla | qingchuxinxi | sousuo | guanli | bianji | shoucangjia | shezhi | tishi | erweima | dianjishoucang | gouwuche | shoucangchenggong | fenxiangshangpin | kefu | xinzenganniu | jianshaoanniu | daifahuo2 | daishouhuo2 | tuikuan-shouhou | daipeibu2 | daifukuan2 - name: { - type: String, - }, - // string | string[] - color: { - type: null, - value: '', - observer: function(color) { - this.setData({ - colors: this.fixColor(), - isStr: typeof color === 'string', - }); - } - }, - size: { - type: Number, - value: 18, - observer: function(size) { - this.setData({ - svgSize: size / 750 * tt.getSystemInfoSync().windowWidth, - }); - }, - }, - }, - data: { - colors: '', - svgSize: 18 / 750 * tt.getSystemInfoSync().windowWidth, - quot: '"', - isStr: true, - }, - methods: { - fixColor: function() { - var color = this.data.color; - var hex2rgb = this.hex2rgb; - - if (typeof color === 'string') { - return color.indexOf('#') === 0 ? hex2rgb(color) : color; - } - - return color.map(function (item) { - return item.indexOf('#') === 0 ? hex2rgb(item) : item; - }); - }, - hex2rgb: function(hex) { - var rgb = []; - - hex = hex.substr(1); - - if (hex.length === 3) { - hex = hex.replace(/(.)/g, '$1$1'); - } - - hex.replace(/../g, function(color) { - rgb.push(parseInt(color, 0x10)); - return color; - }); - - return 'rgb(' + rgb.join(',') + ')'; - } - } -}); diff --git a/src/components/iconfont/tt/tt.ttml b/src/components/iconfont/tt/tt.ttml deleted file mode 100644 index 7d47cf0..0000000 --- a/src/components/iconfont/tt/tt.ttml +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/components/iconfont/weapp/weapp.js b/src/components/iconfont/weapp/weapp.js deleted file mode 100644 index 1a55983..0000000 --- a/src/components/iconfont/weapp/weapp.js +++ /dev/null @@ -1,63 +0,0 @@ -Component({ - properties: { - // weixin | riqi | shuru | a-0tianzhangqi | huodaofukuan | huozhuziti | saomazhifu | xianxiahuikuan | yufukuan | xinzengshoucangjia | qingchusousuo | xuanzechenggong | gongnengtubiao-saomiao | bianjizidingyimadan | zidingyimadanyulan | yuanshimadanyulan | xiala | shangla | qingchuxinxi | sousuo | guanli | bianji | shoucangjia | shezhi | tishi | erweima | dianjishoucang | gouwuche | shoucangchenggong | fenxiangshangpin | kefu | xinzenganniu | jianshaoanniu | daifahuo2 | daishouhuo2 | tuikuan-shouhou | daipeibu2 | daifukuan2 - name: { - type: String, - }, - // string | string[] - color: { - type: null, - observer: function(color) { - this.setData({ - colors: this.fixColor(), - isStr: typeof color === 'string', - }); - } - }, - size: { - type: Number, - value: 18, - observer: function(size) { - this.setData({ - svgSize: size / 750 * wx.getSystemInfoSync().windowWidth, - }); - }, - }, - }, - data: { - colors: '', - svgSize: 18 / 750 * wx.getSystemInfoSync().windowWidth, - quot: '"', - isStr: true, - }, - methods: { - fixColor: function() { - var color = this.data.color; - var hex2rgb = this.hex2rgb; - - if (typeof color === 'string') { - return color.indexOf('#') === 0 ? hex2rgb(color) : color; - } - - return color.map(function (item) { - return item.indexOf('#') === 0 ? hex2rgb(item) : item; - }); - }, - hex2rgb: function(hex) { - var rgb = []; - - hex = hex.substr(1); - - if (hex.length === 3) { - hex = hex.replace(/(.)/g, '$1$1'); - } - - hex.replace(/../g, function(color) { - rgb.push(parseInt(color, 0x10)); - return color; - }); - - return 'rgb(' + rgb.join(',') + ')'; - } - } -}); diff --git a/src/components/iconfont/weapp/weapp.wxml b/src/components/iconfont/weapp/weapp.wxml deleted file mode 100644 index 1f97f3c..0000000 --- a/src/components/iconfont/weapp/weapp.wxml +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/pages/order/components/payment/index.tsx b/src/pages/order/components/payment/index.tsx index 5a6a666..f4c3b8b 100644 --- a/src/pages/order/components/payment/index.tsx +++ b/src/pages/order/components/payment/index.tsx @@ -13,7 +13,7 @@ import { alert } from '@/common/common' import { ORDER_STATUS, PAYMENT_METHOD, SUBSCRIPTION_MESSAGE_SCENE } from '@/common/enum' import { UseSubscriptionMessage } from '@/use/useCommon' import { throttle } from '@/common/util' -import IconFont from '@/components/iconfont' +import IconFont from '@/components/iconfont/iconfont' import usePayBank from '@/use/usePayBank' interface Param { @@ -212,7 +212,7 @@ const Payment = ({ show = false, onClose, orderInfo, onSubmitSuccess }: Param) = - + 预存款 {advance_payment} @@ -227,7 +227,7 @@ const Payment = ({ show = false, onClose, orderInfo, onSubmitSuccess }: Param) = - + 微信支付 @@ -237,7 +237,7 @@ const Payment = ({ show = false, onClose, orderInfo, onSubmitSuccess }: Param) = {show_account_payment && ( - + {payInfo?.account_period}天账期 @@ -253,7 +253,7 @@ const Payment = ({ show = false, onClose, orderInfo, onSubmitSuccess }: Param) = )} - + 线下汇款 @@ -262,7 +262,7 @@ const Payment = ({ show = false, onClose, orderInfo, onSubmitSuccess }: Param) = - + 保存码单支付