feats

config/dev.js

@@ -8,6 +8,7 @@ module.exports = {
     WSS_HOST: '"wss://xlk.njyz.tech"',
     OSS_PATH: '"https://zhiyun-image.oss-accelerate.aliyuncs.com/"',
     OSS_FAST_PATH: '"https://zhiyun-image.oss-accelerate.aliyuncs.com/"',
+    ICON_FONT: '"https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/css/iconfont.ttf"',
     Version: '"V3.5.29-20201112"'
   },
   mini: {},

config/index.js

@@ -24,6 +24,7 @@ const config = {
     '@/store': path.resolve(__dirname, '..', 'src/store'),
     '@/services': path.resolve(__dirname, '..', 'src/services'),
     '@/utils': path.resolve(__dirname, '..', 'src/utils'),
+    '@/pages': path.resolve(__dirname, '..', 'src/pages'),
   },
   copy: {
     patterns: [

config/prod.js

@@ -7,6 +7,7 @@ module.exports = {
     WSS_HOST: '"wss://xlk.njyz.tech"',
     OSS_PATH: '"https://zhiyun-image.oss-accelerate.aliyuncs.com/"',
     OSS_FAST_PATH: '"https://zhiyun-image.oss-accelerate.aliyuncs.com/"',
+    ICON_FONT: '"https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/css/iconfont.ttf"',
     Version: '"V3.5.29-20201112"'
   },
   mini: {},

src/app.jsx

@@ -20,8 +20,24 @@ class App extends Component {
   componentDidHide () {}
 
   componentDidCatchError () {}
+
+  loadFontFace() {
+    Taro.loadFontFace({
+      global: true,
+      family: 'iconfont',
+      // eslint-disable-next-line no-undef
+      source: `url("${ICON_FONT}")`,
+      success() {},
+      fail: function(res) {
+        console.error('加载远程字体失败:', res)
+      }
+    });
+  }
   
   onLaunch (options) {
+    // 加载远程字体
+    this.loadFontFace()
+  
     getLocation().then((loc) => {
       getRouterParams(options).then(router => {
         Taro.setStorageSync('router', router)

src/assets/css/iconfont.json

@@ -1,310 +0,0 @@
-{
-  "id": "2603904",
-  "name": "新联康",
-  "font_family": "iconfont",
-  "css_prefix_text": "icon-",
-  "description": "",
-  "glyphs": [
-    {
-      "icon_id": "11930508",
-      "name": "餐饮",
-      "font_class": "canyin",
-      "unicode": "e642",
-      "unicode_decimal": 58946
-    },
-    {
-      "icon_id": "1167166",
-      "name": "交通",
-      "font_class": "jiaotong",
-      "unicode": "e634",
-      "unicode_decimal": 58932
-    },
-    {
-      "icon_id": "3206111",
-      "name": "学校",
-      "font_class": "xuexiao",
-      "unicode": "e63f",
-      "unicode_decimal": 58943
-    },
-    {
-      "icon_id": "10931550",
-      "name": "商业",
-      "font_class": "shangye",
-      "unicode": "e60f",
-      "unicode_decimal": 58895
-    },
-    {
-      "icon_id": "16024449",
-      "name": "银行",
-      "font_class": "yinhang",
-      "unicode": "e64e",
-      "unicode_decimal": 58958
-    },
-    {
-      "icon_id": "19608543",
-      "name": "医院",
-      "font_class": "yiyuan",
-      "unicode": "e604",
-      "unicode_decimal": 58884
-    },
-    {
-      "icon_id": "1682792",
-      "name": "贴心服务",
-      "font_class": "tiexin",
-      "unicode": "e788",
-      "unicode_decimal": 59272
-    },
-    {
-      "icon_id": "3350537",
-      "name": "保障",
-      "font_class": "baozhang",
-      "unicode": "e615",
-      "unicode_decimal": 58901
-    },
-    {
-      "icon_id": "5643542",
-      "name": "咨询",
-      "font_class": "zixun",
-      "unicode": "e610",
-      "unicode_decimal": 58896
-    },
-    {
-      "icon_id": "5743821",
-      "name": "政策解读",
-      "font_class": "jiedu",
-      "unicode": "e789",
-      "unicode_decimal": 59273
-    },
-    {
-      "icon_id": "17169429",
-      "name": "分 享",
-      "font_class": "fenxiang",
-      "unicode": "e60e",
-      "unicode_decimal": 58894
-    },
-    {
-      "icon_id": "8353259",
-      "name": "关  闭",
-      "font_class": "guanbi",
-      "unicode": "e60a",
-      "unicode_decimal": 58890
-    },
-    {
-      "icon_id": "11747664",
-      "name": "人气",
-      "font_class": "renqi",
-      "unicode": "e61e",
-      "unicode_decimal": 58910
-    },
-    {
-      "icon_id": "12542410",
-      "name": "点赞",
-      "font_class": "dianzan",
-      "unicode": "e603",
-      "unicode_decimal": 58883
-    },
-    {
-      "icon_id": "18609904",
-      "name": "编 辑",
-      "font_class": "xiugai",
-      "unicode": "e745",
-      "unicode_decimal": 59205
-    },
-    {
-      "icon_id": "7934584",
-      "name": "女性",
-      "font_class": "nvxing",
-      "unicode": "e6cd",
-      "unicode_decimal": 59085
-    },
-    {
-      "icon_id": "21849876",
-      "name": "男性",
-      "font_class": "nanxing",
-      "unicode": "e713",
-      "unicode_decimal": 59155
-    },
-    {
-      "icon_id": "16036802",
-      "name": "电  话",
-      "font_class": "dianhua",
-      "unicode": "e60d",
-      "unicode_decimal": 58893
-    },
-    {
-      "icon_id": "17197131",
-      "name": "用户",
-      "font_class": "yonghu",
-      "unicode": "e657",
-      "unicode_decimal": 58967
-    },
-    {
-      "icon_id": "7603903",
-      "name": "相机",
-      "font_class": "xiangji",
-      "unicode": "e641",
-      "unicode_decimal": 58945
-    },
-    {
-      "icon_id": "9055670",
-      "name": "勾",
-      "font_class": "gou",
-      "unicode": "e60c",
-      "unicode_decimal": 58892
-    },
-    {
-      "icon_id": "13312722",
-      "name": "帮 助",
-      "font_class": "bangzhu",
-      "unicode": "e712",
-      "unicode_decimal": 59154
-    },
-    {
-      "icon_id": "9664796",
-      "name": "收 藏",
-      "font_class": "shoucang1",
-      "unicode": "e614",
-      "unicode_decimal": 58900
-    },
-    {
-      "icon_id": "1984404",
-      "name": "排序",
-      "font_class": "paixu",
-      "unicode": "e689",
-      "unicode_decimal": 59017
-    },
-    {
-      "icon_id": "12198242",
-      "name": "三角形",
-      "font_class": "sanjiaoxingdown",
-      "unicode": "e602",
-      "unicode_decimal": 58882
-    },
-    {
-      "icon_id": "22258201",
-      "name": "三角形",
-      "font_class": "sanjiaoxingup",
-      "unicode": "e890",
-      "unicode_decimal": 59536
-    },
-    {
-      "icon_id": "11745026",
-      "name": "编辑",
-      "font_class": "bianji",
-      "unicode": "e608",
-      "unicode_decimal": 58888
-    },
-    {
-      "icon_id": "13939045",
-      "name": "地球",
-      "font_class": "diqiu",
-      "unicode": "e88f",
-      "unicode_decimal": 59535
-    },
-    {
-      "icon_id": "6664481",
-      "name": "声明",
-      "font_class": "shengming",
-      "unicode": "e601",
-      "unicode_decimal": 58881
-    },
-    {
-      "icon_id": "7821346",
-      "name": "我 的",
-      "font_class": "wode",
-      "unicode": "e654",
-      "unicode_decimal": 58964
-    },
-    {
-      "icon_id": "4950560",
-      "name": "首页-选中",
-      "font_class": "shouye",
-      "unicode": "e600",
-      "unicode_decimal": 58880
-    },
-    {
-      "icon_id": "1535331",
-      "name": "聊天",
-      "font_class": "liaotian",
-      "unicode": "e69b",
-      "unicode_decimal": 59035
-    },
-    {
-      "icon_id": "10297753",
-      "name": "视频",
-      "font_class": "camera",
-      "unicode": "e61a",
-      "unicode_decimal": 58906
-    },
-    {
-      "icon_id": "731139",
-      "name": "搜索",
-      "font_class": "sousuo",
-      "unicode": "e607",
-      "unicode_decimal": 58887
-    },
-    {
-      "icon_id": "1311980",
-      "name": "定位",
-      "font_class": "dingwei",
-      "unicode": "e63e",
-      "unicode_decimal": 58942
-    },
-    {
-      "icon_id": "14666058",
-      "name": "视频",
-      "font_class": "shipin",
-      "unicode": "e72b",
-      "unicode_decimal": 59179
-    },
-    {
-      "icon_id": "15346626",
-      "name": "音频",
-      "font_class": "yinpin",
-      "unicode": "e6ac",
-      "unicode_decimal": 59052
-    },
-    {
-      "icon_id": "17710127",
-      "name": "箭头",
-      "font_class": "jiantouleft",
-      "unicode": "e7ef",
-      "unicode_decimal": 59375
-    },
-    {
-      "icon_id": "19954259",
-      "name": "收 藏 (1)",
-      "font_class": "shoucang",
-      "unicode": "e629",
-      "unicode_decimal": 58921
-    },
-    {
-      "icon_id": "20587062",
-      "name": "爱心",
-      "font_class": "aixin",
-      "unicode": "e6b6",
-      "unicode_decimal": 59062
-    },
-    {
-      "icon_id": "22166463",
-      "name": "箭头",
-      "font_class": "jiantouup",
-      "unicode": "e7f0",
-      "unicode_decimal": 59376
-    },
-    {
-      "icon_id": "22166464",
-      "name": "箭头",
-      "font_class": "jiantouright",
-      "unicode": "e7f1",
-      "unicode_decimal": 59377
-    },
-    {
-      "icon_id": "22166465",
-      "name": "箭头",
-      "font_class": "jiantoudown",
-      "unicode": "e7f2",
-      "unicode_decimal": 59378
-    }
-  ]
-}

src/assets/css/iconfont.svg

@@ -1,155 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<!--
-2013-9-30: Created.
--->
-<svg>
-<metadata>
-Created by iconfont
-</metadata>
-<defs>
-
-<font id="iconfont" horiz-adv-x="1024" >
-  <font-face
-    font-family="iconfont"
-    font-weight="500"
-    font-stretch="normal"
-    units-per-em="1024"
-    ascent="896"
-    descent="-128"
-  />
-    <missing-glyph />
-    
-    <glyph glyph-name="canyin" unicode="&#58946;" d="M439.34082031 776.89746094c-13.09570313 0-21.84082031-8.72753906-21.84082031-21.82324219v-152.81542969h-0.08789062v-7.25976562c0.00878906-12.05859375-9.76464844-21.83203125-21.81445313-21.84082031-12.05859375-0.00878906-21.83203125 9.76464844-21.84082031 21.81445312V755.07421875c-0.00878906 12.05859375-9.78222656 21.82324219-21.84082031 21.81445313-12.04980469-0.00878906-21.81445313-9.7734375-21.81445313-21.81445313v-160.07519531c0.00878906-12.05859375-9.76464844-21.83203125-21.81445312-21.84082032-12.05859375-0.00878906-21.83203125 9.76464844-21.84082032 21.81445313V755.15332031c0 13.05175781-8.75390625 21.75292969-21.82324218 21.75292969s-21.84082031-8.72753906-21.84082032-21.82324219v-297.59765625c0-43.69921875 58.20996094-88.04003906 58.20996094-88.04003906V42.01757812000005c0-28.125 22.80761719-50.92382813 50.94140625-50.92382812 28.125 0 50.92382813 22.79882813 50.92382813 50.92382813V369.43652344s58.31542969 44.49902344 58.31542968 85.8515625V755.0390625c0.00878906 13.13085938-8.72753906 21.85839844-21.83203125 21.85839844z m341.87695313-356.51953125V737.6015625c0 21.50683594-17.31445313 38.99707031-38.8125 39.21679688-106.75195313 0-150.44238281-145.265625-150.44238282-196.45312501v-285.14355468l87.38964844-85.86035156v-167.34375c0-28.125 22.80761719-50.92382813 50.94140625-50.92382813 28.125 0 50.92382813 22.79882813 50.92382813 50.92382813V420.37792969z"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="jiaotong" unicode="&#58932;" d="M869.76159781 95.83633499999996l-19.94871469 576.56141156c0 51.59190094-44.65868156 93.41186719-99.74453343 93.41186719L271.29248 765.80961281c-55.08681094 0-99.74357344-41.82092531-99.74357344-93.41186719L151.59923187 95.83633499999996l69.13840407 0c-0.50173969-2.63629219-0.81928406-5.34165844-0.81928407-8.12569125l0-18.960585c0-23.93385281 19.40188594-43.33669781 43.33669782-43.33669781l62.29824187 0c23.93673094 0 43.33861687 19.40380406 43.33861688 43.33669781L368.8919075 87.71064375000003c0 2.78307281-0.31754437 5.48843906-0.81928406 8.12569125l285.21750281 0c-0.50173969-2.63629219-0.81928406-5.34165844-0.81928406-8.12569125l0-18.960585c0-23.93385281 19.402845-43.33669781 43.33861687-43.33669781l62.29824188 0c23.93481188 0 43.33861687 19.40380406 43.33861687 43.33669781L801.446315 87.71064375000003c0 2.78307281-0.31754437 5.48843906-0.81928406 8.12569125L869.76159781 95.83633499999996zM274.68953656 186.18020156c-30.24829125 0-54.77118469 24.52289344-54.77118469 54.77310375 0 30.25021031 24.52289344 54.77310375 54.77118469 54.77310375 30.25212937 0 54.77310375-24.52289344 54.77310375-54.77310375C329.46264031 210.70309499999996 304.94166594 186.18020156 274.68953656 186.18020156zM235.89727719 385.01115469l7.4224875 236.69552062c0 52.20204656 19.01047125 72.85012781 67.06716843 72.85012781l400.3212225 0c48.05669719 0 67.06716844-20.64808031 67.06716844-72.85012781l7.68918656-236.69552062L235.89727719 385.01115469zM746.67129313 186.18020156c-30.25021031 0-54.77310375 24.52289344-54.77310376 54.77310375 0 30.25021031 24.52289344 54.77310375 54.77310375 54.77310375 30.25021031 0 54.77310375-24.52289344 54.77310376-54.77310375C801.44439687 210.70309499999996 776.92150344 186.18020156 746.67129313 186.18020156z"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="xuexiao" unicode="&#58943;" d="M987.009 549.331c-24.672 11.415-414.621 187.426-414.621 187.426S529.674 757.011 512 757.011c-17.675 0-60.388-20.254-60.388-20.254S61.661 560.745 36.991 549.331c-24.672-11.415 0-25.775 0-25.775s333.612-151.341 394.367-178.221c49.711-22.095 60.756-21.725 80.641-21.725 19.884 0 30.93-0.369 80.641 21.725 41.979 18.78 213.571 96.476 315.936 142.871v-129.983l-33.509-33.509 46.765-46.765 46.765 46.765-33.509 33.509V500.357c31.668 14.361 51.92 23.568 51.92 23.568s24.672 14.361 0 25.408zM512 280.896c-19.884 0-30.93-0.369-80.641 21.725-30.195 13.625-127.774 57.442-218.356 98.684v-298.997c90.583-40.873 188.162-85.059 218.356-98.684 49.711-22.095 60.756-21.725 80.641-21.725 19.884 0 30.93-0.369 80.641 21.725 30.195 13.625 127.774 57.442 218.356 98.684V401.305c-90.583-40.873-188.162-85.059-218.356-98.684-49.711-22.462-60.756-21.725-80.641-21.725z"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="shangye" unicode="&#58895;" d="M195.59375 348.84374973h632.8125v-281.32031196a35.015625 35.015625 0 0 0-34.91015625-35.08593804H230.50390625A34.98046848 34.98046848 0 0 0 195.59375 67.52343776999999V348.84374973zM195.59375 700.47656223C195.59375 719.84765652 211.23828152 735.56250027 230.50390625 735.56250027h562.9921875c19.26562473 0 34.91015625-15.67968723 34.91015625-35.08593804V419.15625027H195.59375V700.47656223zM406.53125 630.09375027v-70.31250054h210.9375V630.09375027H406.53125z m0-386.71875054v-70.31249973h210.9375v70.31249973H406.53125z"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="yinhang" unicode="&#58958;" d="M918.9376 151.7568V510.3616H105.1648v-356.6592c-1.9456-12.4928 0.9216-25.3952 8.192-35.84 7.0656-10.1376 18.0224-16.9984 30.3104-18.8416h736.8704c24.8832 4.4032 41.7792 27.648 38.4 52.736zM188.2112 380.7232h-27.8528v66.048h27.8528v-66.048z m72.9088 0h-28.0576v66.048H261.12v-66.048z m74.1376 0H307.2v66.048h28.0576v-66.048z m505.1392-162.5088h-128l31.3344 98.304h127.7952l-31.1296-98.304zM105.1648 617.6768c-2.6624 24.576 14.1312 47.0016 38.5024 51.3024h736.8704c24.064-4.608 40.6528-26.9312 38.0928-51.3024v-53.1456H105.1648v53.1456z"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="yiyuan" unicode="&#58884;" d="M698.045 654.585l-134.37 134.355c-11.055-20.16-32.19-34.005-56.835-34.005-24.63 0-45.78 13.845-56.835 34.005l-134.355-134.355c-15.06-15.06-15.06-39.705 0-54.765l126.15-126.165L441.8 611.7c0 8.55 6.915 15.48 15.495 15.48l99.105 0c8.55 0 15.465-6.93 15.465-15.48l0-138.06 126.18 126.165C713.105 614.865 713.105 639.51 698.045 654.585M777.98 192.22500000000002l134.37 134.37c-20.175 11.055-34.02 32.19-34.02 56.835 0 24.615 13.845 45.795 34.02 56.85l-134.37 134.355c-15.06 15.045-39.705 15.045-54.75 0l-126.135-126.165 138.015 0c8.55 0 15.495-6.93 15.495-15.48l0-99.105c0-8.565-6.945-15.48-15.495-15.48l-138.015 0 126.135-126.165C738.275 177.16499999999996 762.935 177.16499999999996 777.98 192.22500000000002M315.65 112.28999999999996l134.355-134.37c11.055 20.16 32.205 34.005 56.835 34.005 24.645 0 45.78-13.845 56.835-34.005l134.37 134.37c15.06 15.06 15.06 39.69 0 54.75l-126.18 126.135 0-138.03c0-8.535-6.915-15.495-15.465-15.495l-99.105 0c-8.565 0-15.495 6.96-15.495 15.495l0 138.03-126.15-126.135C300.59 151.98000000000002 300.59 127.35000000000002 315.65 112.28999999999996M235.7 574.62l-134.37-134.355c20.175-11.07 34.005-32.235 34.005-56.85 0-24.63-13.83-45.765-34.005-56.835l134.37-134.37c15.06-15.06 39.72-15.06 54.765 0l126.15 126.165-138.045 0c-8.55 0-15.48 6.915-15.48 15.48l0 99.09c0 8.565 6.93 15.495 15.48 15.495l138.045 0-126.15 126.165C275.42 589.6800000000001 250.76 589.6800000000001 235.7 574.62"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="tiexin" unicode="&#59272;" d="M511.08021414 136.02579943c97.20294314 0 176.04696592 78.84402279 176.04696593 176.04696594-152.90515958-34.767896-352.09393186 0-352.09393187 0 0-97.20294314 78.82562705-176.04696592 176.04696593-176.04696594m362.94740241 205.79283274a30.53688243 30.53688243 0 0 1-35.79805635-23.73046875C806.82807992 163.36182786999996 669.26494339 51.037609119999956 511.06181839 51.037609119999956 327.01271824 51.037609119999956 177.19803817 200.81549769000003 177.19803817 384.91978586S327.01271824 718.80196183 511.08021414 718.80196183c157.96398104 0 295.47192956-112.14026127 327.07576307-266.57226562a30.22415549 30.22415549 0 0 1 35.83484785-23.63849002 30.35292494 30.35292494 0 0 1 23.62009426 35.81645212C860.28601896 647.00349744 697.72311013 779.5078125 511.08021414 779.5078125 293.49573002 779.5078125 116.4921875 602.48587423 116.4921875 384.91978586S293.49573002-9.668241540000054 511.08021414-9.668241540000054c186.93722721 0 349.55532326 132.74345902 386.6962669 315.67042161a30.44490369 30.44490369 0 0 1-23.73046875 35.8164521m-107.98283068 126.50731276c0 21.08148642-64.01707838 67.47547208-101.23160425 67.47547208-37.26971312 0-67.51226357-43.76339908-67.51226435-67.47547208 0-23.74886451 30.24255123 0 67.51226435 0 37.23292162 0 101.2132085-21.11827792 101.2132085 0m-408.71593417 1.71080072c-37.23292162 0-101.2132085-21.09988217-101.21320851 0 0 21.08148642 63.98028688 67.51226357 101.21320851 67.51226433 37.28810887 0 67.51226357-43.80019057 67.51226358-67.51226433 0-23.73046875-30.22415549 0-67.51226358 0"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="baozhang" unicode="&#58901;" d="M895.7890625 668.3278124999999c0 12.9215625-8.62124999 21.538125-21.538125 25.8478125L533.9215625 788.953125c-12.9309375 4.310625-30.1584375 4.310625-38.775 0L154.80875001 694.175625c-12.92624999-4.305-17.236875-12.9215625-21.53718752-25.84687499 0-4.31156249-17.236875-137.86125001 17.22656251-288.64406251 21.538125-90.4753125 56.00625001-168.01875001 107.7028125-232.6275 60.316875-77.548125 142.171875-133.554375 241.2525-168.02343751 8.62124999-4.3059375 17.236875-4.3059375 30.159375 0 99.0853125 34.45875001 180.935625 90.4753125 241.2525 168.02343751 47.390625 64.60875001 86.16 142.153125 107.6971875 232.6275 34.4540625 150.7921875 17.2275 284.338125 17.2275 288.643125zM818.24375001 392.62124999C775.16 211.6846875 671.778125 91.04999999999995 512.375 39.35531249999997c-159.3984375 56.0109375-262.790625 172.329375-305.8696875 353.26593751-25.84874998 112.0078125-21.538125 211.089375-17.2321875 254.17406249L512.375 737.26125001l323.1075-90.46593751c4.30124999-43.0846875 8.6109375-146.4815625-17.236875-254.175zM460.6784375 267.6909375l-107.7028125 103.3875c-12.92624999 12.9215625-12.92624999 30.1584375 0 43.08 12.9215625 12.92624999 30.159375 12.92624999 43.08562499 0l86.15437501-81.849375L658.84624999 496.0125c12.9309375 12.92624999 30.159375 12.92624999 43.08937501 0 12.9215625-12.9215625 12.9215625-30.1584375 0-43.08l-198.1725-185.240625c-4.310625-4.3059375-12.9215625-8.62124999-21.5371875-8.62125-8.62124999 0-17.2415625 4.310625-21.5475 8.6203125z"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="zixun" unicode="&#58896;" d="M817.956 495.533h-36.287v13.471c0 72.697-28.521 141.145-80.221 192.967-51.7 51.7-120.271 80.221-192.967 80.221s-141.145-28.521-192.967-80.221c-51.7-51.7-80.221-120.271-80.221-192.967v-13.471h-35.195c-52.914 0-89.808-36.895-89.808-89.808v-154.01c0-49.516 40.292-89.808 89.808-89.808h46.239v-0.242c0-69.541 56.676-126.218 126.218-126.218h41.991c1.942-24.88 22.938-44.661 48.423-44.661h92.479c26.7 0 48.545 21.845 48.545 48.545v31.312c0 26.7-21.845 48.545-48.545 48.545h-92.479c-25.486 0-46.482-19.903-48.423-44.905h-41.991c-48.181 0-87.381 39.2-87.381 87.381v8.738l0.85 0.85c0.485 0.485 0.971 1.092 1.334 1.578 0.122 0.122 0.122 0.242 0.242 0.364 0.485 0.607 0.85 1.092 1.214 1.699 0 0.122 0.122 0.122 0.122 0.242 0.364 0.607 0.729 1.092 1.092 1.699 0 0.122 0.122 0.122 0.122 0.242 0.364 0.607 0.607 1.214 0.971 1.942 0 0.122 0.122 0.242 0.122 0.364 0.242 0.607 0.485 1.334 0.729 1.942 0 0.122 0.122 0.242 0.122 0.242 0.242 0.607 0.485 1.334 0.607 2.063v0.122c0.242 0.729 0.364 1.456 0.485 2.185 0 0.122 0 0.242 0.122 0.364 0.122 0.729 0.242 1.456 0.242 2.185v0.364c0 0.729 0.122 1.578 0.122 2.306v317.85c0 118.45 96.362 214.813 214.813 214.813s214.813-96.362 214.813-214.813v-317.971a29.057 29.057 0 0 1 29.127-29.127h65.294c49.516 0 89.808 40.292 89.808 89.808v154.01c0.242 52.914-36.652 89.808-89.566 89.808zM168.543 251.714v154.01c0 26.093 17.113 31.554 31.554 31.554h35.316v-217.119h-35.316c-17.476 0-31.554 14.199-31.554 31.554z m680.967 0c0-17.355-14.199-31.554-31.554-31.554h-36.287V437.279h36.287c14.442 0 31.554-5.461 31.554-31.554v-154.01z"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="jiedu" unicode="&#59273;" d="M407.25800822 449.81038805l-9.59114324-76.49049407a22.23589263 22.23589263 0 0 1 5.4889756-17.46287113 22.24246948 22.24246948 0 0 1 16.57497617-7.42073387h0.16818275c3.14568452 0 6.34398471 0.69716209 9.30081578 2.04074924l69.92664952 32.78070021 69.88530814-32.39735503a22.08556103 22.08556103 0 0 1 9.42859726-2.09806312 22.12972118 22.12972118 0 0 1 12.79789973 4.05425016 22.27347591 22.27347591 0 0 1 9.32618391 20.27594748l-9.61557204 76.71787013 52.62350562 56.14126024a22.2180407 22.2180407 0 0 1 5.00979394 22.12220421 22.2142826 22.2142826 0 0 1-16.98181002 14.9889798L555.87280873 557.6252468800001l-37.23802613 67.44242323c-3.90109981 7.12570822-11.39981746 11.55296783-19.56938976 11.55296783a22.19549135 22.19549135 0 0 1-19.47637205-11.52384086l-37.25306006-67.4715502-75.70501248-14.55771638a22.21146384 22.21146384 0 0 1-17.00060205-14.99273789c-2.50771575-7.73924821-0.59568807-16.20948292 4.97221143-22.08650113l52.65545059-56.17790343z m138.70890103 5.25596126l5.87419945-47.37318188-42.97222973 19.8343491c-5.78493983 2.71442109-13.10513978 2.71442109-18.8863215 0l-42.83035444-20.09461024 5.85352876 47.20593846c0.84843301 6.57793839-1.2618445 13.14084364-5.79903365 18.01627771l-32.24890365 34.41555493 45.99764974 8.93720198a22.16824379 22.16824379 0 0 1 15.33004349 11.10385249l22.77144882 41.21711051 22.86352643-41.85038187c3.20863592-5.82346244 8.80378222-9.87583317 15.37608308-11.1217044l45.90839012-8.44956402-31.45872385-33.89221313c-4.51745856-4.85664359-6.62303787-11.40733443-5.77930307-17.94862964zM419.73081675 353.13414545zM669.30536475 777.62866992v0.10335266H242.53801756C209.06297326 777.73202258 181.82950108 750.49855042 181.82950108 717.02350688v-667.07020714c0-33.47504354 27.23347217-60.70851571 60.70851648-60.70851571h538.78960655c33.47504354 0 60.70851571 27.23347217 60.7085157 60.70851571V605.00124753h0.13435911L669.30536475 777.62866992z m44.44641712-128.18100527v34.24455266l34.24455265-34.24455266h-34.24455265zM226.2796763 717.02350688c0 4.34457761 1.69122848 8.427954 4.76080788 11.49753339A16.15122972 16.15122972 0 0 0 242.53707747 733.28090804h421.624135l5.14415228-5.14415305V605.00124753h123.1373869l5.14415227-5.14321295v-549.90473485c0-4.34457761-1.69122848-8.427954-4.75986776-11.49753262a16.15498782 16.15498782 0 0 0-11.49847272-4.76456597H242.53801756a16.15404847 16.15404847 0 0 0-11.49659405 4.76362588 16.15686725 16.15686725 0 0 0-4.76174721 11.49847271V717.02350688zM322.94182586 264.60116693h352.32417842v-44.45017523H322.94182586zM322.94182586 161.97461975h352.32417842v-44.45017522H322.94182586z"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="fenxiang" unicode="&#58894;" d="M857.03473144 234.56598896000003a145.69076425 145.69076425 0 0 1-135.99176748-84.51247763L422.04630781 277.24671973a176.12554658 176.12554658 0 0 1 27.0131212 95.83226191 180.47337276 180.47337276 0 0 1-5.14535625 43.55544112l190.86699198 148.13480829a153.56315918 153.56315918 0 0 1 93.28531026-30.48623613 149.85850253 149.85850253 0 1 1-149.88422901 149.80704873 159.50604551 159.50604551 0 0 1 11.31978341-59.17159775l-176.09982012-135.03987598a191.38152832 191.38152832 0 1 1-157.78235128-297.96758437 203.03576016 203.03576016 0 0 1 108.05248302 29.58579843l343.42680674-146.35966025a150.09004336 150.09004336 0 1 1 149.93568368 159.50604551z"  horiz-adv-x="1075" />
-
-    
-    <glyph glyph-name="guanbi" unicode="&#58890;" d="M512-37.875C278.95608521-37.875 90.125 150.95608520999997 90.125 384S278.95608521 805.875 512 805.875s421.875-188.83108521 421.875-421.875-188.83108521-421.875-421.875-421.875z m0 803.56311035C301.73815917 765.68811036 130.31188964 594.2626647899999 130.31188964 384S301.73733521 2.311889640000004 512 2.311889640000004c210.26184083 0 381.68811036 171.42544555 381.68811036 381.68811036S722.26266479 765.68811036 512 765.68811036zM542.80841065 384l163.39910888 163.39828492c8.02716065 8.02798462 8.02716065 21.43157959 0 30.80841063l-1.35049438 1.32659913a21.02124023 21.02124023 0 0 1-29.45874023 0L512 414.80841065 348.60171508 578.20751953a21.02124023 21.02124023 0 0 1-29.45874023 0l-1.35049438-1.35049438c-8.02716065-8.02716065-8.02716065-21.43157959 0-30.80841065L481.19158935 384 317.79248047 220.60171507999996c-8.02716065-8.02798462-8.02716065-21.43157959 0-30.80841063l1.35049438-1.35049439a21.02124023 21.02124023 0 0 1 29.45874023 0L512 353.16687011l163.39828492-163.3982849a21.02124023 21.02124023 0 0 1 29.45874023 0l1.35049438 1.35049438c8.02716065 8.02716065 8.02716065 21.43157959 0 30.80841064L542.80841065 384z"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="renqi" unicode="&#58910;" d="M857.11662529 451.5c-22.5 45-52.49999971 90-90 127.50000029-22.5 15.00000029-37.50000029 29.99999971-37.50000029 29.99999971s0-74.99999971-67.5-119.99999971h-7.49999971-7.50000058v7.49999971C654.61662529 646.50000029 579.61662471 781.50000029 437.116625 834 414.616625 654 242.11662471 609 174.61662471 466.50000029 129.61662471 368.99999971 122.116625 256.49999971 167.116625 159c37.50000029-90 112.5-157.5 202.5-195.00000029 45-22.5 90-29.99999971 142.49999971-29.99999971s97.49999971 7.49999971 142.50000058 29.99999971c45 15.00000029 82.50000029 45 119.99999971 82.50000029 74.99999971 67.5 112.5 157.5 112.5 254.99999971 0 52.49999971-7.49999971 105.00000029-29.99999971 150.00000029z"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="dianzan" unicode="&#58883;" d="M861.57115063 467.30320031L638.53484937 467.30320031c86.42396437 319.18519219-59.5468275 335.48741906-59.5468275 335.48741907-61.86845344 0-49.04290875-48.92107125-53.72165625-57.07650188 0-156.0957675-165.79671-278.41091719-165.79671-278.41091719l0-442.66115531c0-43.694535 59.5468275-59.43170531 82.90602938-59.43170531l335.11135406 0c31.53861656 0 57.22136438 82.7103225 57.22136438 82.7103225 82.90698937 281.91158438 82.90698937 365.79135375 82.90698937 365.79135375C917.61635188 471.95700469 861.57115063 467.30320031 861.57115063 467.30320031L861.57115063 467.30320031 861.57115063 467.30320031zM861.57115063 467.30320031M267.94195156 467.15641969L134.38898 467.15641969c-27.58129969 0-28.00629187-27.0901125-28.00629187-27.0901125l27.58129968-446.44003406c0-28.41497437 28.46390156-28.41497437 28.46390157-28.41497438L278.01895906-34.78870125000003c24.08063344 0 23.86765781 18.79653563 23.86765782 18.79653563L301.88661687 433.30193344C301.88661687 467.59004625 267.94195156 467.15641969 267.94195156 467.15641969L267.94195156 467.15641969 267.94195156 467.15641969zM267.94195156 467.15641969"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="xiugai" unicode="&#59205;" d="M368.13359375 247.74492186999998c15.89238281-15.89150391 40.98515625-15.89150391 56.04082031 0L861.62890625 685.19853516c15.89238281 15.89238281 15.89238281 40.98515625 0 56.87753906s-40.98515625 15.89238281-56.04082031 0L368.13359375 304.62246094c-15.89238281-15.89238281-15.89238281-40.98515625 0-56.87753907zM852.42675781 444.30703125c-21.74677734 0-40.1484375-17.56582031-40.1484375-40.1484375v-320.35341797h-600.55664062v600.55664063h320.35253906c21.74765625 0 39.31259766 17.56582031 40.1484375 40.1493164 0 21.74765625-17.56494141 40.1484375-39.31171875 40.1484375H171.57236328c-21.74677734 0-40.1484375-17.56494141-40.1484375-40.1484375v-680.85527343c0-10.87294922 4.18183594-20.9109375 11.70966797-28.43876954 7.52783203-7.52783203 17.56494141-11.70966797 28.43876953-11.70966796h680.85527344c10.87382813 0 20.9109375 4.18183594 28.43876953 11.70966796 7.52783203 7.52783203 11.70966797 17.56582031 11.70966797 28.43876954V404.15771484c0 22.58349609-18.40166016 40.1484375-40.1484375 40.1484375z"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="nvxing" unicode="&#59085;" d="M614.18956259 266.02997974000004v11.30058352h152.88075247v300.27264835a256.84612042 256.84612042 0 0 1-510.46350375 0v-300.27264835h152.96147067v-11.21986533L111.63646805 70.28772838999998v-108.2434466h801.04993753V69.07695127z m8.07184561-188.71974564c-72.64660886-70.54792905-110.66500086 36.80761487-110.66500085 36.80761487s-37.69551837-107.35554392-110.74571823-36.80761487c0 0-32.28738162 20.74464267-35.51612036 159.82253916L511.51568914 114.11784896999995l146.1811204 123.01492429c-3.63233057-138.99717746-35.75827497-159.82253916-35.75827497-159.82253916z"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="nanxing" unicode="&#59155;" d="M578.83748281 808.30321687c12.78209812-3.9071325 29.1222375-19.03888125 49.02041907-45.39524532 23.56363594-4.40391563 40.88391563-14.78937094 51.97426593-31.14964968 28.96783219-48.49006969 30.54545437-119.50321687 4.72615407-213.09986063 2.64503531 0.91972031 5.22293719 1.07412562 7.61958 0.34237781 12.4128675-3.79972031 15.44055938-29.86741219 6.76699312-58.21762218-7.49202844-24.51692343-21.28111875-42.71664375-32.89510499-44.76419625-6.10909125-26.40335625-16.25958-50.32279689-30.65286656-70.48951032a183.89034937 183.89034937 0 0 0-38.61482532-39.91048968c0.20811188-24.94657313 4.63888125-47.8724475 13.0573425-65.74992938-29.10209813-25.42993031-62.43356625-39.87020999-97.83944063-39.87021-35.41258781 0-68.73062906 14.44027969-97.83944063 39.87021 8.94881156 18.99860156 13.39300687 43.71020999 13.04391657 70.48951031-12.62769188 10.84195781-23.82545437 23.54349657-33.23748282 37.09090875-13.62797156 19.60951031-23.295105 42.63608438-29.20951031 67.93846125l-0.6981825-0.30881062-0.8324475-0.28867124c-12.40615406-3.80643375-29.49818156 16.125315-38.17174781 44.5023778-8.67356625 28.34349655-5.63916094 54.41118844 6.76699312 58.21090876 3.14853187 0.97342687 6.5924475 0.40279687 10.13034938-1.43664376-33.86853188 93.38181844-1.64475562 202.76139844-0.98013938 202.76139938 0.81902063 4.95440531 24.80559469 43.5826575 37.32587344 54.14937 56.52587438 47.6777625 135.83664375 55.09594406 200.53930125 35.325315zM245.93902063 171.48083905c48.59748281 33.33818156 111.43384594 54.12923062 166.17398624 65.81034938l52.65902157-204.83580375c1.40979001-5.504895 6.37762219-9.35832187 12.07048875-9.35832189l10.4324475 74.18853189a38.89006969 38.89006969 0 1 0 49.45007062 0l10.43916094-74.18853187c5.68615406 0 10.65398625 3.84671344 12.07048875 9.35832187l52.65902156 204.83580375c54.73342687-11.68111875 117.57650345-32.47216781 166.16727281-65.81034938 100.14881156-68.71048969 97.04727281-157.634685 96.08727282-185.11216781-0.07384594-2.114685-0.13426594-3.87356625-0.13426594-5.22293719v-10.43916093H149.98601375v10.43916093c0 1.34937094-0.0671325 3.10825219-0.13426594 5.22293719-0.96 27.47748281-4.06153875 116.40167812 96.08727282 185.11216781z"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="dianhua" unicode="&#58893;" d="M598.308571 219.538286l24.064 14.994285c9.398857 5.632 17.115429 9.947429 24.868572 13.385143 54.637714 24.868571 102.765714 7.314286 166.4-67.035428 39.424-46.08 51.053714-86.930286 35.84-123.355429-11.337143-27.172571-33.133714-45.933714-71.972572-69.12-2.523429-1.462857-24.868571-14.518857-30.610285-18.066286-90.404571-55.771429-297.691429 71.936-446.646857 290.157715-149.577143 218.806857-188.196571 452.059429-96.585143 508.708571l12.068571 7.68 13.165714 8.484572c46.299429 29.952 75.958857 41.910857 111.104 35.986285 35.108571-5.997714 64.950857-31.963429 90.221715-79.286857 53.284571-100.096 41.545143-147.565714-26.953143-190.756571-4.973714-3.181714-22.454857-13.714286-24.137143-14.738286-16.749714-10.386286 11.702857-80.018286 77.860571-176.859429 66.889143-97.901714 122.88-151.478857 141.165715-140.178285h0.146285z"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="yonghu" unicode="&#58967;" d="M728.732 575.724c-3.4 6.6-8.3 12.4-14.3 16.9 2.7 29.3 2.1 58.8-2 87.9-10.9 86.4-78.1 152.4-197.4 151.5-60.7-0.4-51.3-32.1-97-32.8-81.2-2-100.9-76.1-107.5-118.7-4.3-29.1-5-58.6-2-87.9-5.8-4.6-10.6-10.4-14-16.9-8.9-20.7-9.1-44.1-0.7-64.9a123.3 123.3 0 0 1 40.1-60c20.5-98.1 116.6-161 214.7-140.5 70.6 14.8 125.7 69.9 140.5 140.5 19.1 15.6 33.1 36.5 40.4 60 8.3 20.9 8 44.2-0.8 64.9zM895.232 195.024c-25 41.7-103.5 81-180.9 100.4a371.75 371.75 0 0 0-88.1-46.6c-16.6-69.8-38.1-138.3-64.5-205-4.7-10.3-11.6-8-13.4 4.2l-12.5 89.5c-1.3 13.8 1 27.8 6.9 40.4l10.1 18.7c5.3 11.6 5.9 24.8 1.8 36.8-28.2-3.3-56.6-3.4-84.8-0.4-3.7-12-3-24.9 2-36.4l10.3-18.7c5.7-12.6 8.1-26.6 6.9-40.4l-12.5-89.5c-1.8-12.3-8.7-14.5-13.8-4.2-27.2 66.2-48.7 134.6-64.3 204.5-32.6 8.7-62.7 24.9-87.9 47.3-77.4-19.4-156.2-58.5-180.9-100.4-24.6-45.7-39-96.2-42.2-148.1 0-31.7 190.3-110.7 425-110.7s424.6 79 424.6 110.7c-3.1 51.7-17.4 102.2-41.8 147.9z"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="xiangji" unicode="&#58945;" d="M903.73688889 667.53422222h-194.56l-45.51111111 57.68533333c-8.64711111 10.92266667-21.504 17.18044445-35.38488889 17.18044445H395.83288889c-13.88088889 0-26.85155555-6.25777778-35.38488889-17.18044445l-45.51111111-57.68533333h-194.56c-24.91733333 0-45.16977778-20.25244445-45.16977778-45.16977777v-551.82222223c0-24.91733333 20.25244445-45.16977778 45.16977778-45.16977777h783.58755556c24.91733333 0 45.16977778 20.25244445 45.16977777 45.16977777v551.82222223c-0.22755555 25.03111111-20.48 45.16977778-45.39733333 45.16977777z m-12.40177778-584.36266667H132.66488889v526.79111112H320.85333333c13.88088889 0 26.85155555 6.25777778 35.38488889 17.18044444l45.51111111 57.68533334h220.38755556l45.51111111-57.68533334c8.64711111-10.92266667 21.504-17.18044445 35.38488889-17.18044444h188.18844444v-526.79111112zM512 541.24088889c-108.88533333 0-197.51822222-88.63288889-197.51822222-197.51822222S403.11466667 146.09066667000002 512 146.09066667000002s197.51822222 88.63288889 197.51822222 197.51822222S620.88533333 541.24088889 512 541.24088889z m0-337.46488889c-77.14133333 0-139.94666667 62.80533333-139.94666667 139.94666667s62.80533333 139.94666667 139.94666667 139.94666666 139.94666667-62.80533333 139.94666667-139.94666666c0-77.25511111-62.80533333-139.94666667-139.94666667-139.94666667z m287.97155555 279.89333333c15.92888889 0 28.78577778 12.85688889 28.78577778 28.78577778s-12.85688889 28.78577778-28.78577778 28.78577778-28.78577778-12.85688889-28.78577777-28.78577778c-0.11377778-15.92888889 12.85688889-28.78577778 28.78577777-28.78577778z"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="gou" unicode="&#58892;" d="M511.9990625 821.8303125C270.6059375 821.8303125 74.1696875 625.4034375 74.1696875 384c0-241.404375 196.4353125-437.8303125 437.829375-437.8303125 241.41374999 0 437.83125001 196.4259375 437.83125 437.8303125 0 241.4034375-196.4175 437.8303125-437.83125 437.8303125m0-807.4275c-203.7675 0-369.598125 165.808125-369.598125 369.5971875 0 203.788125 165.8315625 369.59625001 369.598125 369.59625001 203.8115625 0 369.59625001-165.808125 369.59625-369.59625001 0-203.7890625-165.7846875-369.5971875-369.59625-369.5971875M646.55375001 510.62624999L442.0325 308.65874999000005l-55.726875 63.68062501c-12.3946875 14.17125001-33.9628125 15.646875-48.1546875 3.2325-14.1703125-12.41625001-15.6140625-33.9834375-3.219375-48.15375l79.603125-90.9778125a34.284375 34.284375 0 0 1 24.4771875-11.6184375c0.40124999-0.0215625 0.79874999-0.0215625 1.220625-0.0215625 8.9521875 0 17.56875001 3.4978125 23.968125 9.8278125l230.2875 227.445c13.415625 13.2609375 13.5478125 34.8375 0.309375 48.2540625-13.2365625 13.404375-34.8271875 13.5375-48.24375001 0.29906249"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="bangzhu" unicode="&#59154;" d="M512-37.875A421.875 421.875 0 1 0 512 805.875a421.875 421.875 0 0 0 0-843.75z m0 56.20660401a365.66839599 365.66839599 0 1 1 0 731.33679198 365.66839599 365.66839599 0 0 1 0-731.33679198z m10.90365601 571.86804198c38.42358398 0 69.64233398-10.125 93.591156-31.80294799 24.01473999-20.96438599 36.021698-49.78125 36.021698-85.802948 0-29.33679199-7.788208-53.93490601-22.78125-73.146698-5.38632202-6.61981201-22.26132202-22.197052-50.42971801-46.79598999a101.444458 101.444458 0 0 1-25.18313599-31.153656 80.740448 80.740448 0 0 1-9.67016602-39.65625v-10.190094h-64.25518799v10.190094c0 22.19787598 3.56945801 41.40884399 11.94268799 56.98608398 7.788208 16.74481201 30.634552 41.40802002 67.82382202 74.38018798l10.190094 11.35766602c10.83938599 13.88891602 16.74563599 28.16839599 16.74563598 43.80990601 0 21.02865601-6.03643799 37.19009399-17.46002197 49.13195801-11.94186401 12.00778198-29.33596802 17.97912598-51.01391601 17.97912597-27 0-46.79516602-8.37322998-58.73785401-25.76733398-10.83856201-14.40884399-16.225708-34.85412598-16.225708-61.20483398h-62.95660401c0 43.81072998 12.59033203 77.94964599 37.70837402 103.19787598 25.44268799 25.896698 60.29598999 38.48785401 104.625 38.48785399z m-10.70919801-350.934906c12.59197998 0 23.365448-3.57028198 31.80294801-11.94268799 8.4375-7.788208 12.65625-17.978302 12.65625-30.634552a42.51214599 42.51214599 0 0 0-13.17535401-31.15447998 44.913208 44.913208 0 0 0-31.15447997-11.94186401 43.09634399 43.09634399 0 0 0-43.80908204 43.225708c0 12.59197998 4.21875 22.71697998 12.59033204 30.56945801a42.1875 42.1875 0 0 0 31.08938597 11.87841797z"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="shoucang1" unicode="&#58900;" d="M737-16.5c-9 0-19.5 3-28.5 7.5l-195 97.5-196.5-97.5c-19.5-10.5-45-9-63 4.5-18 13.5-28.5 37.5-24 60l40.5 210L116 409.5C99.5 426 93.5 451.5 99.5 472.5c7.5 22.5 25.5 39 49.5 42l214.5 39 96 195c10.5 21 31.5 34.5 54 34.5s45-13.5 54-34.5l96-195 214.5-37.5c22.5-3 42-19.5 48-42 7.5-22.5 1.5-46.5-15-63L756.5 265.5l39-210c4.5-24-6-46.5-24-60-9-7.5-21-12-34.5-12z"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="paixu" unicode="&#59017;" d="M403.4375 741.9375c-11.25 4.59375-24.1875 1.96875-32.71875-6.65625L101.75 462.5625c-11.625-11.8125-11.53125-30.75 0.28125-42.46875 11.8125-11.625 30.75-11.53125 42.46875 0.28125l217.59375 220.59375v-585.84375c0-16.59375 13.40625-30 30-30s30 13.40625 30 30v659.0625c0 12.1875-7.40625 23.15625-18.65625 27.75zM922.15625 349.3125c-11.8125 11.625-30.75 11.53125-42.46875-0.28125l-217.5-220.6875V714.1875c0 16.59375-13.40625 30-30 30s-30-13.40625-30-30v-658.96875c0-12.1875 7.3125-23.15625 18.65625-27.75 3.65625-1.5 7.5-2.25 11.34375-2.25 7.875 0 15.65625 3.09375 21.375 8.90625l268.96875 272.71875c11.625 11.8125 11.4375 30.75-0.375 42.46875z"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="sanjiaoxingdown" unicode="&#58882;" d="M146.21177467 616.92168889L856.79806105 616.92168889a28.25055836 28.25055836 0 0 0 21.69642846-46.33091529l-355.30726831-426.35742188a28.25055836 28.25055836 0 0 0-43.3928577-1e-8L124.51534619 570.59077359A28.25055836 28.25055836 0 0 0 146.21177467 616.92168889z"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="sanjiaoxingup" unicode="&#59536;" d="M877.78822533 151.07831110999996L167.20193895 151.07831110999996a28.25055836 28.25055836 0 0 0-21.69642846 46.33091529l355.30726831 426.35742188a28.25055836 28.25055836 0 0 0 43.3928577 1e-8L899.48465381 197.40922640999997A28.25055836 28.25055836 0 0 0 877.78822533 151.07831110999996z"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="bianji" unicode="&#58888;" d="M797.86880407 541.08664501L669.1300934 669.86880407 717.1844352 718.05349239a45.66465922 45.66465922 0 0 0 64.95591337-0.08689746l63.82624636-63.78279729a45.62121016 45.62121016 0 0 0 0.0434484-64.95591405l-48.0977902-48.14123858z m-64.39107954-64.43452859L362.94659898 106.07754179999995c-8.77665177-8.77665177-25.46098003-19.55194721-36.71421252-23.89682438l-103.36462809-39.712178c-47.01157089-18.074689-70.3870105 5.64834045-52.39921895 52.39921896l39.7556264 103.32117968c4.38832623 11.5139242 15.5112115 28.32859899 23.89682436 36.71421184l370.6180237 370.61802303 128.78215905-128.86905651z"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="diqiu" unicode="&#59535;" d="M727.61173333 538.5152h147.71093334c19.78346667-44.016 31.6416-92.23466667 33.6288-143.13066667h-169.48266667c-0.7168 53.8048-5.1648 101.20106667-11.85706667 143.13066667z m-64.55146666 202.5216c84.72853333-32.93226667 154.26986667-95.24266667 197.86346666-173.89866667H722.77866667c-15.6768 80.11626667-39.47306667 137.056-59.7184 173.89866667zM539.3408 567.1392000000001V766.93333333c30.46826667-1.33546667 60.01813333-6.15466667 88.29866667-14.07786666 21.4656-36.06613333 49.1232-96.31146667 66.59413333-185.71626667H539.3408zM351.392 223.62986666999996c-6.69013333 41.96053333-11.328 89.0848-12.0192 143.13066666H510.70933333v-143.1296H351.392z m-0.27946667 314.88533333h159.59466667v-143.13066667H339.21066667c0.72213333 53.84746667 5.20533333 101.184 11.90186666 143.13066667z m71.6704 214.96853333c28.21866667 7.57653333 57.5488 12.42666667 87.92533334 13.4016v-199.74613333H355.82933333c17.5744 89.9072 45.43786667 150.35626667 66.95253334 186.34453333z m-237.86666666-186.34453333c44.30506667 79.94453333 116.0288 142.59946667 202.69013333 175.07733333-20.3776-36.82346667-44.5216-94.0992-60.35946667-175.07733333H184.91733333z m125.6608-171.75466667h-173.088c1.90933333 50.86186667 13.34506667 99.20106667 33.0912 143.13066667h151.86453333c-6.6944-41.9392-11.14773333-89.32906667-11.86773333-143.13066667z m12.1984-171.75466666H171.66826667c-19.82506667 44.0736-32.51626667 92.064-34.39146667 143.13066666h173.4368c0.68906667-54.048 5.36426667-101.1328 12.06186667-143.1296z m4.69546666-28.62293334c15.9552-81.78666667 40.4352-139.00053333 60.94293334-175.3952-86.97493333 32.36693333-158.7296 95.24266667-203.08906667 175.3952h142.14613333z m183.23626667 0v-199.74826666c-30.0352 0.96426667-59.05173333 5.712-86.98133333 13.1328-21.552 35.3248-49.57866667 96.05226667-67.31733334 186.61546666h154.29866667z m182.94826667 0c-17.632-90.02026667-45.43146667-150.54293333-66.9376-185.952-27.9552-7.75893333-57.2928-11.9424-87.37706667-13.27573333V195.00693333000004h154.31466667z m-154.31466667 171.7536h171.3344c-0.6912-54.05226667-5.33226667-101.16693333-12.02346667-143.1296H539.3408V366.76053333000004z m171.49653333 28.624H539.3408V538.5152h159.59466667c6.69546667-41.94346667 11.17866667-89.28106667 11.90186666-143.13066667z m28.50133334-28.624h169.30453333C906.752 315.73333333000005 894.15253333 267.72266666999997 874.4256 223.63093332999995H727.2768c6.6944 41.99253333 11.37066667 89.07306667 12.0608 143.1296z m121.3792-171.75466666c-43.48053333-78.98133333-113.34933333-141.32693333-198.44373334-174.18666667 20.3808 36.4416 44.5472 93.24586667 60.336 174.18666667h138.10773334z"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="shengming" unicode="&#58881;" d="M873.58203125 658.5703125c-5.9765625 17.84179688-17.84179688 23.73046875-35.59570313 23.73046875C665.72070313 670.43554688 582.57617188 771.421875 541.00390625 818.8828125 529.05078125 830.8359375 523.07421875 830.8359375 511.20898437 830.8359375s-23.73046875-5.9765625-29.70703124-11.86523438c-41.57226563-47.54882813-118.828125-148.53515625-296.98242188-136.58203124-17.84179688 0-29.70703125-5.9765625-35.68359375-23.73046876 0-5.9765625-184.13085938-498.95507813 350.41992188-718.76953125h23.73046874c534.7265625 219.7265625 350.59570313 712.70507813 350.59570313 718.68164063zM511.03320312 56.16796875C156.5703125 207.33984375 213.875 509.68359375 239.97851562 587.90625c140.71289063 0 224.12109375 67.76367188 271.05468751 114.69726563C557.96679688 655.66992188 636.18945313 587.90625 776.90234375 587.90625h5.18554688c20.91796875-78.22265625 83.40820313-375.38085938-271.05468751-531.73828125zM463.66015625 551.60742188h106.96289063v-95.00976563H463.66015625V551.60742188z m0-154.42382813h106.96289063v-213.83789063H463.66015625V397.18359375z m0 0"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="wode" unicode="&#58964;" d="M512 804h233.34375001v-233.34375001c0-128.90625001-104.4375-233.34375001-233.34375001-233.34374999S278.65624999 441.75 278.65624999 570.65625001 383.09374999 804 512 804zM302 290.625h420c90.1875 0 163.3125-73.125 163.3125-163.3125v-23.34375001c0-77.34375001-62.71875001-139.96875001-139.96875001-139.96874999H278.65624999c-77.34375001 0-139.96875001 62.71875001-139.96874999 139.96875001v23.34374999c-0.09375001 90.1875 73.03125001 163.3125 163.3125 163.3125z"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="shouye" unicode="&#58880;" d="M556.65283203 763.07446289a63.39990234 63.39990234 0 0 1-85.19238281 0L126.97314453 435.96972656a31.77905273 31.77905273 0 0 1 42.55664063-47.20385742l5.4777832 5.20092774V52.56445312000005a63.55810547 63.55810547 0 0 1 63.55810547-63.63720703h184.95922851v191.34667969a44.75170898 44.75170898 0 0 0 44.77148438 44.81103516h87.03149414a44.75170898 44.75170898 0 0 0 44.77148437-44.81103516v-191.34667969h189.34936524a63.55810547 63.55810547 0 0 1 63.57788086 63.63720704V389.79418945c14.11962891-12.77490234 34.15209961-11.8059082 45.89868164 1.28540039a31.77905273 31.77905273 0 0 1-2.29394531 44.89013672L556.65283203 763.0546875z"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="liaotian" unicode="&#59035;" d="M880.64624023 384c0 203.85131836-165.28930664 369.140625-369.140625 369.140625s-369.140625-165.28930664-369.140625-369.140625 165.28930664-369.140625 369.140625-369.140625H828.40625L745.102417 98.16320800000005c82.72705078 67.64831543 135.54382325 170.56274414 135.54382323 285.836792zM301.0625 331.265625c-29.08630372 0-52.734375 23.64807129-52.734375 52.734375s23.64807129 52.734375 52.734375 52.734375 52.734375-23.64807129 52.734375-52.734375-23.64807129-52.734375-52.734375-52.734375z m209.94873047 0c-29.08630372 0-52.734375 23.64807129-52.734375 52.734375s23.64807129 52.734375 52.734375 52.734375 52.734375-23.64807129 52.734375-52.734375-23.56567383-52.734375-52.734375-52.734375zM670.203125 384c0 29.08630372 23.64807129 52.734375 52.734375 52.734375s52.734375-23.64807129 52.734375-52.734375-23.64807129-52.734375-52.734375-52.734375-52.734375 23.64807129-52.734375 52.734375z"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="camera" unicode="&#58906;" d="M761.325714 515.730286l90.441143 59.922285A63.817143 63.817143 0 0 0 950.857143 522.441143v-276.882286a63.817143 63.817143 0 0 0-99.108572-53.211428l-90.422857 59.904a1326.08 1326.08 0 0 0-3.437714-30.445715 136.228571 136.228571 0 0 0-119.826286-118.509714c-69.723429-7.917714-141.988571-11.867429-216.813714-11.867429-75.081143 0-147.803429 3.986286-218.148571 11.958858a136.228571 136.228571 0 0 0-119.862858 118.509714A1309.878857 1309.878857 0 0 0 73.142857 384c0 54.016 3.364571 108.032 10.093714 162.066286a136.228571 136.228571 0 0 0 119.862858 118.528c70.546286 7.990857 143.268571 11.977143 218.148571 11.977143 74.624 0 146.907429-3.968 216.832-11.885715a136.228571 136.228571 0 0 0 119.808-118.528c1.28-10.148571 2.413714-20.297143 3.437714-30.427428zM219.428571 475.428571a54.857143 54.857143 0 1 1 0 109.714286 54.857143 54.857143 0 0 1 0-109.714286z"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="sousuo" unicode="&#58887;" d="M931.55522188 72.77261250000004L766.76391031 205.19355094000002c33.62616188 55.1434125 53.34942937 119.69516625 53.34942938 189.00817219 0 201.0288225-162.96471 363.99641063-363.99449156 363.99641062S92.12435563 595.2305456199999 92.12435563 394.20172313s162.96471-363.99641063 363.99449156-363.99641063c115.22459812 0 217.7550825 53.68807969 284.45290125 137.24454844l162.2902875-130.39863L931.55522188 72.77261250000004zM456.11884719 76.04303436999999c-175.4314575 0-318.15676969 142.72531219-318.15676969 318.15772875s142.72531219 318.15772875 318.15676969 318.15772875 318.15676969-142.72531219 318.15676968-318.15772874S631.55030469 76.04303436999999 456.11884719 76.04303436999999z"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="dingwei" unicode="&#58942;" d="M516.320553 830.086277C327.473365 829.240951 174.512778 674.914838 175.350878 486.045975c0.787526-177.21493 282.974557-496.596289 315.154731-532.417865a39.737529 39.737529 0 0 1 59.440119 0.2601c31.862273 36.110576 311.202653 357.991787 310.415127 535.213942-0.838101 188.861638-155.178664 341.822225-344.040302 340.984125z m2.196402-492.860961c-76.483906-0.339575-139.009102 61.614845-139.348677 138.105976-0.339575 76.491131 61.629295 139.001877 138.105976 139.334227 76.512806 0.3468 139.023552-61.60762 139.363127-138.091526 0.339575-76.498356-61.614845-139.001877-138.120426-139.348677z"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="shipin" unicode="&#59179;" d="M128 384c0 212.08 171.92 384 384 384s384-171.92 384-384-171.92-384-384-384c-211.98 0.24-383.76 172.02-384 384z m59.05 0c0-179.46 145.48-324.95 324.95-324.95S836.95 204.53999999999996 836.95 384 691.46 708.95 512 708.95c-179.39-0.19-324.76-145.56-324.95-324.95z m226.48-77.95v155.9c0 23.56 19.1 42.67 42.66 42.67 7.11 0 14.11-1.78 20.36-5.17l143.62-77.95c20.72-11.21 28.43-37.11 17.22-57.83a42.676 42.676 0 0 0-17.22-17.22l-143.62-77.91c-20.71-11.24-46.61-3.56-57.85 17.15a42.484 42.484 0 0 0-5.17 20.36z"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="yinpin" unicode="&#59052;" d="M182 414a30 30 0 0 0 29.79-26.49L212 384v-330.96a30 30 0 0 0-59.79-3.51L152 53.039999999999964V384a30 30 0 0 0 30 30z m219.99 330.75a30 30 0 0 0 29.82-26.49l0.18-3.51V53.700000000000045a30 30 0 0 0-59.79-3.48l-0.21 3.48V714.75a30 30 0 0 0 30 30z m220.02-254.22a30 30 0 0 0 29.79-26.49l0.21-3.51v-406.86a30 30 0 0 0-59.82-3.48l-0.18 3.48V460.53a30 30 0 0 0 30 30zM842 603.24a30 30 0 0 0 29.79-26.52l0.21-3.48v-519.57a30 30 0 0 0-59.79-3.48L812 53.66999999999996V573.24a30 30 0 0 0 30 30z"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="jiantouleft" unicode="&#59375;" d="M622.88853333 698.7114666699999c14.1632 14.16213333 37.1264 14.16213333 51.2896 0 14.02133333-14.02133333 14.16106667-36.66773333 0.42026667-50.86186667l-0.42026667-0.42666667L409.68853333 382.93333333l264.4896-264.48853333c14.02133333-14.02133333 14.16106667-36.66773333 0.42026667-50.86186667l-0.42026667-0.42666666c-14.02133333-14.0224-36.66773333-14.16213333-50.86186666-0.42133334l-0.42666667 0.42026667-290.13333333 290.13333333c-14.0224 14.02133333-14.16213333 36.66773333-0.42133334 50.86186667l0.42026667 0.42666667 290.13333333 290.13333333z"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="shoucang" unicode="&#58921;" d="M727.43475342-22.573791509999978c-11.8677063 0-25.20703125 3.40466308-37.57241821 9.58941651L513.29116821 75.33087158000001 335.62658691-12.841003419999993c-11.25137329-5.99029541-24.13092041-9.13787842-37.2642517-9.13787842a79.23669434 79.23669434 0 0 0-47.4189148 15.5253296c-24.86508179 18.65478516-37.60620117 50.96282959-31.72467041 80.38778686l36.3364563 188.50231934L116.28125 392.243042a85.74197388 85.74197388 0 0 0-21.65487671 82.94128417l0.27850342 0.9574585c10.125 30.34533691 35.243042 51.60800171 65.6987915 55.6875l193.5013733 35.18371582L440.95608521 743.40866089c13.95153808 27.92861938 42.32757568 45.87478638 72.335083 45.87478638 31.30279541 0 60.41217041-18.62182617 72.61688233-46.38153076l86.57336425-175.83618164L866.01245117 533.23004151a78.83129883 78.83129883 0 0 0 64.48754883-56.33761597 81.54876709 81.54876709 0 0 0-20.16595459-83.2230835l-0.47625733-0.4770813-138.8809204-130.78125L806.07653809 73.57168578999995c5.65246583-30.19784546-6.35778808-60.70385742-31.36212158-79.71295166a74.49472046 74.49472046 0 0 0-47.27966309-16.43252564z m-214.07684326 161.54434205l187.59182739-93.81198121c5.50909424-2.77679443 11.85864258-4.52279663 16.20346069-4.52279662 6.68737792 0 12.89685058 2.05911255 17.45755005 5.86422729l0.84869385 0.70037842c10.65975953 7.99832153 15.85739136 20.70977783 13.52471924 33.15509033l-37.74957276 203.36022949 149.31408692 140.61126709c9.16754151 9.29443359 12.30194092 22.60409546 8.23562621 34.84259033l-0.40951537 1.28704835a30.74249268 30.74249268 0 0 1-25.51931763 22.24978637l-0.85198974 0.13430786L635.3984375 518.95880127 542.41290283 707.83026123c-4.51373291 10.55099487-16.76541138 18.20819092-29.13491821 18.20819091-12.15362549 0-23.7807312-7.61022949-29.67050171-19.36010742L391.21685791 519.0420227100001l-207.69268799-37.72814942c-12.61505127-1.58203125-22.4145813-9.96020508-26.9414978-23.02597046-3.21432495-11.93939209 0.59490967-26.32516479 9.37023926-35.29412842l149.48712158-139.29867553-39.22943116-203.46652222c-2.3590393-11.76635742 3.21350098-25.30755615 13.52059937-33.04138184 5.16796875-3.88504028 11.86276245-6.02819824 18.88302612-6.02819824 5.41268921 0 10.60125732 1.26150513 15.07379151 3.66668701l0.64517212 0.37902832 189.02554321 93.76583863z"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="aixin" unicode="&#59062;" d="M665.1 681.6c9.2 0 18.7-0.7 28-2.2 72-11.3 131.7-72 141.8-144.4 7.3-52.5-9.2-104.5-45.3-142.7l-6.1-6.5-271.4-271.5-270.4 270.4-7.2 7.6c-36.1 38.2-52.7 90.2-45.3 142.6C199.3 607.3 259 668.1 331 679.4c9.4 1.5 18.8 2.2 28 2.2 40.7 0 80.3-14.7 111.4-41.3l41.7-35.7 41.7 35.7c31.1 26.7 70.6 41.3 111.3 41.3M359 745.7c-12.5 0-25.1-1-38-3-100.4-15.7-181.2-98.2-195.3-198.9-10.6-75.9 15.2-145.9 62.3-195.6l-0.2-0.2 311.7-311.7c3.5-3.5 8-5.2 12.6-5.2s9.1 1.7 12.6 5.2L836.4 348l-0.2 0.2c47 49.7 72.9 119.7 62.2 195.6-14.1 100.7-95 183.1-195.4 198.9-12.8 2-25.5 3-37.9 3-58.5 0-111.9-21.4-153-56.7-41.2 35.3-94.6 56.7-153.1 56.7z"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="jiantouup" unicode="&#59376;" d="M826.71146667 273.11146667c14.16213333-14.1632 14.16213332-37.1264 0-51.2896-14.02133333-14.02133333-36.66773333-14.16106667-50.86186667-0.42026667l-0.42666667 0.42026667L510.93333333 486.31146667l-264.48853333-264.4896c-14.02133333-14.02133333-36.66773333-14.16106667-50.86186668-0.42026667l-0.42666665 0.42026667c-14.0224 14.02133333-14.16213333 36.66773333-0.42133334 50.86186667l0.42026667 0.42666666 290.13333333 290.13333333c14.02133333 14.0224 36.66773333 14.16213333 50.86186667 0.42133334l0.42666667-0.42026667 290.13333333-290.13333333z"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="jiantouright" unicode="&#59377;" d="M401.11146667 69.28853332999995c-14.1632-14.16213333-37.1264-14.16213332-51.2896 0-14.02133333 14.02133333-14.16106667 36.66773333-0.42026667 50.86186667l0.42026667 0.42666667L614.31146667 385.06666667l-264.4896 264.48853333c-14.02133333 14.02133333-14.16106667 36.66773333-0.42026667 50.86186668l0.42026667 0.42666665c14.02133333 14.0224 36.66773333 14.16213333 50.86186667 0.42133334l0.42666666-0.42026667 290.13333333-290.13333333c14.0224-14.02133333 14.16213333-36.66773333 0.42133334-50.86186667l-0.42026667-0.42666667-290.13333333-290.13333333z"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="jiantoudown" unicode="&#59378;" d="M197.28853333 494.88853333c-14.16213333 14.1632-14.16213332 37.1264 0 51.2896 14.02133333 14.02133333 36.66773333 14.16106667 50.86186667 0.42026667l0.42666667-0.42026667L513.06666667 281.68853333000004l264.48853333 264.4896c14.02133333 14.02133333 36.66773333 14.16106667 50.86186668 0.42026667l0.42666665-0.42026667c14.0224-14.02133333 14.16213333-36.66773333 0.42133334-50.86186667l-0.42026667-0.42666666-290.13333333-290.13333333c-14.02133333-14.0224-36.66773333-14.16213333-50.86186667-0.42133334l-0.42666667 0.42026667-290.13333333 290.13333333z"  horiz-adv-x="1024" />
-
-    
-
-
-  </font>
-</defs></svg>

src/components/Modal/index.jsx

@@ -0,0 +1,22 @@
+import React from 'react'
+import { View } from '@tarojs/components'
+import Overlay from '@/components/Overlay'
+import './style.scss'
+
+export default (props) => {
+  const { visible, title, onClose } = props
+
+  return (
+    <Overlay visible={visible} onClose={onClose}>
+      <View className='yz-modal'>
+        <View className='yz-modal-header'>
+          <View className='yz-modal-header-title'>{title}</View>
+          <View className='yz-modal-header-action' onClose={onClose}>X</View>
+        </View>
+        <View className='yz-modal-body'>
+          {props.children}
+        </View>
+      </View>
+    </Overlay>
+  )
+}

src/components/Modal/style.scss

@@ -0,0 +1,27 @@
+.yz-modal {
+  border-radius: 24rpx;
+  background: #FFFFFF;
+  overflow: hidden;
+
+  &-header {
+    display: flex;
+    line-height: 60rpx;
+    border-bottom: 1rpx solid rgba(0, 0, 0, .1);
+    box-sizing: border-box;
+    padding: 0.5em 1em;
+
+    &-title {
+      flex: auto;
+    }
+
+    &-action {
+      flex: none;
+      width: 48rpx;
+      text-align: right;
+    }
+  }
+
+  &-body {
+    //
+  }
+}

src/components/Overlay/index.jsx

@@ -1,27 +1,60 @@
-import React, { useMemo } from 'react'
+import React, { useEffect, useRef, useState } from 'react'
 import { View } from '@tarojs/components'
+import classNames from 'classnames'
 import './style.scss'
 
 export default (props) => {
   const { visible = false, closeOnClick = false, onClose, style = {}, aligin = 'center' } = props
 
+  const mounted = useRef(false)
+  const [show, setShow] = useState(false)
+  const [addonClass, setAddonClass] = useState('')
+  
+  const layStyle = {
+    ...style,
+    alignItems: aligin === 'top' ? 'flex-start' : ( aligin === 'bottom' ? 'flex-end' : 'center' )
+  }
+
   const handleClick = () => {
     if (closeOnClick) {
       onClose && onClose()
     }
   }
 
-  const classNames = useMemo(() => `overlay-warpper${visible ? ' visible' : ''}`, [visible])
-  const layStyle = {
-    ...style,
-    alignItems: aligin === 'top' ? 'flex-start' : ( aligin === 'bottom' ? 'flex-end' : 'center' )
-  }
+  useEffect(() => {
+    if (visible) {
+      setShow(true)
+
+      // 异步触发动效
+      const t = setTimeout(() => {
+        setAddonClass('show')
+        clearTimeout(t)          
+      });
+    } else {
+      if (mounted.current) {
+        setAddonClass('hide')
+
+        // 如果监听动画事件会有闪屏
+        const t = setTimeout(() => {
+          setShow(false)
+          clearTimeout(t)          
+        }, 500);
+      }
+    }
+
+    mounted.current = true
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [visible])
 
-  return visible && (
-    <View className={classNames} style={layStyle} onClick={handleClick}>
+  return show ? (
+    <View
+      className={classNames('overlay-warpper', addonClass)}
+      style={layStyle}
+      onClick={handleClick}
+    >
       <View>
         {props.children}
       </View>
     </View>
-  )
+  ) : null
 }

src/components/Overlay/style.scss

@@ -9,14 +9,34 @@
   display: flex;
   justify-content: center;
   align-items: center;
-  transition: opacity 0.5s ease;
-  opacity: 0;
 
   & > view {
     flex: none;
   }
 
-  &.visible {
+  &.show {
+    animation: overlay-in 0.5s ease;
+  }
+
+  &.hide {
+    animation: overlay-out 0.5s ease;
+  }
+}
+
+@keyframes overlay-in {
+  from {
+    opacity: 0;
+  }
+  to {
     opacity: 1;
   }
 }
+
+@keyframes overlay-out {
+  from {
+    opacity: 1;
+  }
+  to {
+    opacity: 0;
+  }
+}

src/layout/Basic/index.jsx

@@ -1,4 +1,4 @@
-import React from 'react'
+import React, { useEffect, useState } from 'react'
 import { connect } from 'react-redux'
 import Loading from '@/components/Loading'
 import Overlay from '@/components/Overlay'
@@ -11,12 +11,14 @@ const BasicLayout = (props) => {
     onProps({person, ...leftProps})
   }
 
-  return loading ?
-  (
-    <Overlay visible={loading} style={{ background: 'rgba(255, 255, 255, .9)' }}>
-      <Loading />
-    </Overlay>
-  ) : children || null
+  return (
+    <>
+      <Overlay visible={loading} style={{background: '#fff'}}>
+        <Loading />
+      </Overlay>
+      {children}
+    </>
+  )
 }
 
 export default connect(({ user }) => ({...user.userInfo || {}}))(BasicLayout)

src/layout/index.js

@@ -10,7 +10,6 @@ import useAuth from './useAuth'
 import './style.scss'
 
 export default (Child) => (props) => {
-  const [ready, setReady] = useState(false)
   // ext 里面包含的人员等基本信息
   const [info, setInfo] = useState({})
   // 路由信息
@@ -21,15 +20,11 @@ export default (Child) => (props) => {
   // 是否完成登录
   const isLoged = !!info?.person?.personId
 
-  useEffect(() => {
-    setReady(isLoged)
-  }, [isLoged])
-
   return (
     <>
       <BasicLayout onProps={setInfo} />
       {
-        ready && (
+        isLoged && (
           <>
             <Overlay visible={authPhone} aligin='bottom'>
               <View className='auth-wrapper'>

src/pages/chat/index.jsx

@@ -3,6 +3,8 @@ import withLayout from '@/layout'
 import './index.scss'
 import { ScrollView, Image } from '@tarojs/components'
 
+const defaultRuleImage = 'https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/index-icon18.jpg'
+
 export default withLayout((props) => {
 
   // const [PageProps] = useState(props)
@@ -33,7 +35,7 @@ export default withLayout((props) => {
               <view className='ListItem flex-h' key={`ListItem-${index}`}>
                 <view className='Icon'>
                   <view>
-                    <Image mode='aspectFill' className='centerLabel' src={item.img || require('../../assets/mine-icon18.png')} />
+                    <Image mode='aspectFill' className='centerLabel' src={item.img || defaultRuleImage} />
                   </view>
                   <text className='Num'>99</text>
                 </view>

src/pages/index/buildingDetail/components/BasicInfo/index.jsx

@@ -1,14 +1,19 @@
+import { useState } from 'react'
 import { ScrollView, Image } from '@tarojs/components'
 import classNames from 'classnames'
+import Modal from '@/components/Modal'
+import BuildingInfo from '@/pages/index/buildingInfo'
 import useFavor from '@/utils/hooks/useFavor'
 import '@/assets/css/iconfont.css'
 import './index.scss'
 
+
 export default function BasicInfo (props) {
   const { Info = {} } = props
   const { buildingId, isSave } = Info
 
   const [isSaved, handleFavor] = useFavor(isSave)
+  const [showMore, setShowMore] = useState(false)
 
   return (
     <view className='components BasicInfo'>
@@ -155,7 +160,7 @@ export default function BasicInfo (props) {
 
       {/* 互动 */}
       <view className='Interact flex-h'>
-        <text className='flex-item'>更多楼盘信息</text>
+        <text className='flex-item' onClick={() => setShowMore(true)}>更多楼盘信息</text>
         <text className='flex-item active'>订阅活动通知</text>
       </view>
 
@@ -165,6 +170,9 @@ export default function BasicInfo (props) {
         <text>查看报备规则？</text>
       </view>
 
+      <Modal title='楼盘信息' visible={showMore} onClose={() => setShowMore(false)}>
+        <BuildingInfo />
+      </Modal>
     </view>
   )
 }

src/pages/index/buildingInfo/index.config.js

@@ -1,3 +0,0 @@
-export default {
-  navigationBarTitleText: '楼盘信息'
-}

src/pages/index/buildingInfo/index.jsx

@@ -1,10 +1,9 @@
 import { useState, useEffect } from 'react'
-import withLayout from '@/layout'
 import { ScrollView } from '@tarojs/components'
 import '@/assets/css/iconfont.css'
 import './index.scss'
 
-export default withLayout((props) => {
+export default (props) => {
 
   const [InfoList, setInfoList] = useState([
     [
@@ -59,4 +58,4 @@ export default withLayout((props) => {
       </ScrollView>
     </view>
   )
-})
+}

src/pages/index/buildingInfo/index.scss

@@ -1,7 +1,8 @@
 .Page.buildingInfo {
   background: #f8f8f8;
-  width: 100%;
-  height: 100%;
+  width: 90vw;
+  height: 90vh;
+  max-height: 90vh;
   > scroll-view {
     width: 100%;
     height: 100%;

src/pages/index/buildingRules/index.jsx

@@ -4,13 +4,15 @@ import { ScrollView, Image } from '@tarojs/components'
 import '@/assets/css/iconfont.css'
 import './index.scss'
 
+const defaultRuleImage = 'https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/index-icon18.jpg'
+
 export default withLayout(() => {
 
   return (
     <view className='Page buildingRules'>
       <ScrollView scroll-y>
         <view className='Content'>
-          <Image mode='widthFix' src={require(`@/assets/index-icon18.jpg`)}></Image>
+          <Image mode='widthFix' src={defaultRuleImage}></Image>
 
           <view className='Title'>
             <view>

src/pages/mine/addCustomer/index.jsx

@@ -4,6 +4,8 @@ import './index.scss'
 import { ScrollView, Input, Image } from '@tarojs/components'
 import '../../../assets/css/iconfont.css'
 
+const defaultSpecialImage = 'https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/index-icon19.jpg'
+
 export default withLayout((props) => {
 
   // const [PageProps] = useState(props)
@@ -48,7 +50,7 @@ export default withLayout((props) => {
             <view className='flex-item'>
               <text>请选择</text>
             </view>
-            <Image mode='heightFix' src={require('../../../assets/mine-icon19.png')}></Image>
+            <Image mode='heightFix' src={defaultSpecialImage}></Image>
             <text>选择</text>
           </view>
 

src/pages/mine/index.jsx

@@ -8,6 +8,8 @@ import NeedLogin from './components/NeedLogin'
 import '../../assets/css/iconfont.css'
 import MineMenuList from './tabData'
 
+const defaultRuleImage = 'https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/index-icon18.jpg'
+
 export default withLayout(() => {
 
   const user = useSelector(state => state.user)
@@ -72,7 +74,7 @@ export default withLayout(() => {
               {/* 用户信息 */}
               <view className='UserInfo'>
                 <view className='UserIcon'>
-                  <Image mode='aspectFill' className='centerLabel' src={user?.userInfo?.person?.avatarurl || require('../../assets/mine-icon18.png')} />
+                  <Image mode='aspectFill' className='centerLabel' src={user?.userInfo?.person?.avatarurl || defaultRuleImage } />
                 </view>
                 <view className='OtherInfo'>
                   <view className='Name'>

src/pages/mine/recommendUser/index.jsx

@@ -4,6 +4,8 @@ import './index.scss'
 import { ScrollView, Input, Image } from '@tarojs/components'
 import '../../../assets/css/iconfont.css'
 
+const defaultSpecialImage = 'https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/index-icon19.jpg'
+
 export default withLayout((props) => {
 
   // const [PageProps] = useState(props)
@@ -48,7 +50,7 @@ export default withLayout((props) => {
             <view className='flex-item'>
               <text>请选择</text>
             </view>
-            <Image mode='heightFix' src={require('../../../assets/mine-icon19.png')}></Image>
+            <Image mode='heightFix' src={defaultSpecialImage}></Image>
             <text>选择</text>
           </view>
 

src/pages/mine/reportUser/index.jsx

@@ -4,6 +4,8 @@ import './index.scss'
 import { ScrollView, Input, Image } from '@tarojs/components'
 import '../../../assets/css/iconfont.css'
 
+const defaultSpecialImage = 'https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/index-icon19.jpg'
+
 export default withLayout((props) => {
 
   // const [PageProps] = useState(props)
@@ -48,7 +50,7 @@ export default withLayout((props) => {
             <view className='flex-item'>
               <text>请选择</text>
             </view>
-            <Image mode='heightFix' src={require('../../../assets/mine-icon19.png')}></Image>
+            <Image mode='heightFix' src={defaultSpecialImage}></Image>
             <text>选择</text>
           </view>
 

src/routes.js

@@ -67,12 +67,12 @@ const routes = [
     pkg: 'main',
     type: 'building',
   },
-  {
-    name: '楼盘信息',
-    page: 'pages/index/buildingInfo/index',
-    pkg: 'main',
-    type: 'building',
-  },
+  // {
+  //   name: '楼盘信息',
+  //   page: 'pages/index/buildingInfo/index',
+  //   pkg: 'main',
+  //   type: 'building',
+  // },
   {
     name: '围观记录',
     page: 'pages/index/buildingViewsRecords/index',