图标

@@ -42,11 +42,13 @@ const _processTabData = (list) => {
 
 const _getResources = () => {
     return api.get('', {
+
         // method: 'web.brand.series'
     }).then((result) => {
         if (result && result.code === 200) {
             return _processTabData(result.data);
         } else {
+
             // logger.error('品牌页Tab数据返回 code 不是 200');
             // return {};
         }

@@ -2,11 +2,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
 <svg xmlns="http://www.w3.org/2000/svg">
 <metadata>
-<<<<<<< HEAD
-Created by FontForge 20120731 at Thu Jul  7 17:43:49 2016
-=======
-Created by FontForge 20120731 at Fri Jul  8 14:37:44 2016
->>>>>>> feature/product
+Created by FontForge 20120731 at Wed Jul 13 10:51:38 2016
  By admin
 </metadata>
 <defs>
@@ -23,11 +19,7 @@ Created by FontForge 20120731 at Fri Jul  8 14:37:44 2016
     bbox="0 -224 1303 896.303"
     underline-thickness="50"
     underline-position="-100"
-<<<<<<< HEAD
-    unicode-range="U+0078-E638"
-=======
-    unicode-range="U+0078-E63B"
->>>>>>> feature/product
+    unicode-range="U+0078-E63F"
   />
 <missing-glyph horiz-adv-x="374" 
 d="M34 0v682h272v-682h-272zM68 34h204v614h-204v-614z" />
@@ -138,11 +130,8 @@ d="M361 194q45 -63 81 -152h143q42 68 75 152l82 -29q-32 -69 -70 -123h202v-71h-724
     <glyph glyph-name="uniE624" unicode="&#xe624;" 
 d="M897 -212h-770q-44 0 -71 34.5t-21 82.5l89 598q3 31 30 52.5t61 21.5h51q4 111 73 173t171.5 62t171 -62t73.5 -173h54q34 0 61 -21.5t30 -52.5l89 -598q6 -48 -21 -82.5t-71 -34.5zM230 406q0 -25 18 -43t43 -18t42.5 18t17.5 43t-17.5 42.5t-42.5 17.5t-43 -17.5
 t-18 -42.5zM510 767q-87 0 -144.5 -49t-61.5 -141h412q-4 92 -61.5 141t-144.5 49zM736 466q-25 0 -42.5 -17.5t-17.5 -42.5t17.5 -43t42.5 -18t43 18t18 43t-18 42.5t-43 17.5z" />
-<<<<<<< HEAD
-=======
     <glyph glyph-name="uniE625" unicode="&#xe625;" 
 d="M43 0h938l-469 811zM555 128h-86v85h86v-85zM555 299h-86v170h86v-170z" />
->>>>>>> feature/product
     <glyph glyph-name="uniE626" unicode="&#xe626;" 
 d="M139 233q-24 -59 -27.5 -108t15.5 -60q13 -7 32.5 7.5t38.5 45.5q16 -66 72 -116q-29 -11 -45.5 -28.5t-16.5 -37.5q0 -34 43.5 -57.5t105.5 -23.5q56 0 97.5 19.5t50.5 48.5h18q8 -29 50 -48.5t98 -19.5q62 0 105.5 23.5t43.5 57.5q0 20 -16.5 37.5t-45.5 28.5
 q56 50 71 116q20 -31 39 -45.5t32 -7.5q19 11 16 60t-27 108q-19 46 -42 78t-43 40q1 7 1 12q0 35 -17 64v4q0 16 -7 30q-5 125 -77.5 207t-190 82t-189.5 -82t-77 -207q-7 -14 -7 -30v-4q-17 -29 -17 -64q0 -5 1 -12q-20 -8 -43.5 -40t-41.5 -78z" />
@@ -178,16 +167,16 @@ q18 2 30 7q5 0 16.5 1.5t31 -3.5t39 -12.5t40.5 -25t35 -41.5q25 -57 10 -109q-6 -17
     <glyph glyph-name="uniE62F" unicode="&#xe62f;" 
 d="M756 -133h-488q-21 0 -36.5 13t-15.5 32v780q0 19 15.5 32t36.5 13h488q21 0 36.5 -13t15.5 -32v-780q0 -19 -15.5 -32t-36.5 -13zM512 -88q14 0 24.5 9t10.5 21t-10.5 21t-24.5 9t-24.5 -9t-10.5 -21t10.5 -21t24.5 -9zM756 647h-488v-630h488v630z" />
     <glyph glyph-name="uniE630" unicode="&#xe630;" 
-d="M513 857q98 0 184.5 -37t151 -102t102 -151.5t37.5 -185.5t-37.5 -185t-102 -151t-151 -102t-184.5 -37q-100 0 -186.5 37t-151 102t-102 151t-37.5 185t37.5 185.5t102 151.5t151 102t186.5 37zM784 316q28 0 47.5 20t19.5 48t-19.5 47t-47.5 19h-202v203q0 28 -20 48
-t-48 20t-47.5 -20t-19.5 -48v-203h-203q-28 0 -47.5 -19t-19.5 -47t19.5 -48t47.5 -20h203v-202q0 -28 19.5 -48t47.5 -20t48 20t20 48v202h202z" />
+d="M512 812q-139 0 -257 -68.5t-186.5 -186.5t-68.5 -257t68.5 -257t186.5 -186.5t257 -68.5t257 68.5t186.5 186.5t68.5 257t-68.5 257t-186.5 186.5t-257 68.5zM768 215h-512v170h512v-170z" />
     <glyph glyph-name="uniE631" unicode="&#xe631;" 
 d="M831 612q-2 12 -11 20t-21 8h-160v32q0 66 -47 113t-113 47t-112.5 -47t-46.5 -113v-32h-160q-12 0 -21.5 -8t-10.5 -20l-64 -576q-1 -15 8.5 -25.5t23.5 -10.5h767q14 0 23.5 10.5t7.5 25.5zM351.5 448q-13.5 0 -23 9.5t-9.5 22.5t9.5 22.5t23 9.5t22.5 -9.5t9 -22.5
 t-9 -22.5t-22.5 -9.5zM575 640h-192v32q0 40 28.5 68t68 28t67.5 -28t28 -68v-32zM607.5 448q-13.5 0 -23 9.5t-9.5 22.5t9.5 22.5t23 9.5t22.5 -9.5t9 -22.5t-9 -22.5t-22.5 -9.5z" />
     <glyph glyph-name="uniE632" unicode="&#xe632;" 
 d="M684 670q-23 96 -68.5 153t-103.5 57t-103.5 -57t-68.5 -153h-178l-69 -798h838l-69 798h-178zM406 670q18 67 47 107t59 40t59 -40t47 -107h-212z" />
     <glyph glyph-name="uniE633" unicode="&#xe633;" 
-d="M512 764q-94 0 -180 -36.5t-148.5 -99t-99 -148.5t-36.5 -180t36.5 -180t99 -148.5t148.5 -99t180 -36.5t180 36.5t148.5 99t99 148.5t36.5 180t-36.5 180t-99 148.5t-148.5 99t-180 36.5zM724 244h-424q-23 0 -39.5 16.5t-16.5 39.5t16.5 39.5t39.5 16.5h424
-q23 0 39 -16.5t16 -39.5t-16 -39.5t-39 -16.5z" />
+d="M512 832q-122 0 -225 -60t-163 -163t-60 -225t60 -225t163 -163t225 -60t225 60t163 163t60 225t-60 225t-163 163t-225 60zM512 24q-149 0 -254.5 105.5t-105.5 254.5t105.5 254.5t254.5 105.5t254.5 -105.5t105.5 -254.5t-105.5 -254.5t-254.5 -105.5zM635 409
+q-25 17 -53 27t-53 20.5t-41 25.5q-16 14 -16 39q0 17 10 31t32 14q19 0 28.5 -16t9.5 -38v-11h126q0 75 -32.5 111.5t-105.5 43.5v42h-66v-42q-133 -22 -133 -157q0 -44 15.5 -71.5t39 -44.5t51.5 -28q27 -10 51 -21q24 -10 39.5 -24.5t15.5 -39.5q0 -20 -11 -33
+q-12 -14 -33 -14q-20 0 -32.5 12t-12.5 45v14h-130v-20q0 -69 35.5 -100t104.5 -39v-65h67v65q74 8 113 44q38 35 38 109q0 47 -16 75q-17 29 -41 46z" />
     <glyph glyph-name="uniE634" unicode="&#xe634;" 
 d="M500 775l-348 -298q-16 -14 -16 -35v-386q0 -25 17.5 -42.5t42.5 -17.5h197v257h238v-257h197q25 0 42.5 17.5t17.5 42.5v386q0 21 -16 35l-348 298q-12 10 -24 0z" />
     <glyph glyph-name="uniE635" unicode="&#xe635;" 
@@ -199,12 +188,24 @@ d="M512 -212q-104 0 -199 40.5t-163.5 109t-109 163.5t-40.5 199t40.5 199t109 163.5
 t271.5 -112.5t271.5 112.5t112.5 271.5t-112.5 271.5t-271.5 112.5z" />
     <glyph glyph-name="uniE638" unicode="&#xe638;" 
 d="M511 833q-91 0 -174 -35.5t-143 -95.5t-95.5 -143t-35.5 -174t35.5 -174t95.5 -143t143 -95t174 -35t174 35t143 95t95.5 143t35.5 174t-35.5 174t-95.5 143t-143 95.5t-174 35.5z" />
-<<<<<<< HEAD
-=======
+    <glyph glyph-name="uniE639" unicode="&#xe639;" 
+d="M512 -212q-139 0 -257 68.5t-186.5 186.5t-68.5 257t68.5 257t186.5 186.5t257 68.5t257 -68.5t186.5 -186.5t68.5 -257t-68.5 -257t-186.5 -186.5t-257 -68.5zM585 373v293h-146v-293h-293v-146h293v-293h146v293h293v146h-293z" />
     <glyph glyph-name="uniE63A" unicode="&#xe63a;" 
 d="M963 564l-117 -190h92v-43h-107v-58h107v-42h-107v-85h-55v85h-112v42h112v58h-112v43h95l-115 190h62q81 -142 98 -180h1q6 16 33 63l66 117h59z" />
     <glyph glyph-name="uniE63B" unicode="&#xe63b;" 
 d="M0 -128h1024v1024zM826 301l-250 -282l-122 122q-9 9 -9 22t9.5 22.5t22.5 9.5t22 -9l77 -77l198 230q10 10 23 10t22 -10q10 -5 13 -16.5t-6 -21.5z" />
->>>>>>> feature/product
+    <glyph glyph-name="uniE63C" unicode="&#xe63c;" 
+d="M956 596q-50 -51 -622 -616q-5 -6 -13 -8.5t-26.5 -8t-43 -13.5t-51.5 -16.5t-53.5 -17t-47 -15.5t-34.5 -11l-14 -4q-4 -2 -9 -2q-13 0 -23 9q-13 14 -8 32q71 232 83 275q2 8 8 14q601 602 619 620q53 53 121 53q60 0 112 -50q58 -56 59 -118q1 -63 -57 -123zM86 -39
+q32 10 105.5 35t93.5 31q-14 45 -47 79q-42 42 -90 54q-7 -24 -30.5 -97t-31.5 -102zM282 151q35 -34 54 -80q389 385 518 513q-10 53 -51 94q-43 44 -92 56q-185 -186 -520 -521q50 -20 91 -62zM910 791q-33 32 -68 32q-42 0 -77 -35q0 -1 -1 -2l-3 -3q48 -20 87 -59
+q37 -38 57 -89l6 6q39 41 39 77q-1 35 -40 73z" />
+    <glyph glyph-name="uniE63D" unicode="&#xe63d;" 
+d="M799 456l127 127v313h-830v-609l421 -413l409 404v181l-414 -401l-288 284v426h575v-312zM671 518l-107 22l-53 100l-52 -100l-108 -22l75 -83l-14 -114l99 49l99 -49l-14 114z" />
+    <glyph glyph-name="uniE63E" unicode="&#xe63e;" 
+d="M898 225q-224 69 -271 86q46 79 69 173h-170v58h209v36h-209v96h-80q-7 0 -11 -3.5t-5 -6.5l-1 -3v-83h-196v-36h196v-58h-160v-32h325q-18 -61 -47 -114q-8 3 -29 10l-28 10q-8 2 -25 7t-27.5 7.5t-27 6t-32.5 5.5t-35 4q-49 4 -87.5 -3t-61 -21t-38 -34.5t-21.5 -38.5
+t-8 -38q-7 -66 45.5 -112t137.5 -46q83 0 145 35.5t121 106.5q94 -45 320 -143zM298 150q-43 0 -73.5 12t-43 30.5t-17 35.5t-1.5 31q5 28 34 51t75 23q107 0 232 -61q-94 -122 -206 -122z" />
+    <glyph glyph-name="uniE63F" unicode="&#xe63f;" 
+d="M647 284q29 54 52 113t31 91l8 32h-12h-104h-109v85h267v37h-267v127h-121v-127h-242v-37h242v-85h-206v-36h418q0 -6 -6 -12q0 -43 -54 -152q-45 18 -86.5 31t-74 21t-63 12t-52.5 5t-43.5 -1t-34.5 -4t-27 -7t-20 -7.5t-14.5 -7.5t-9.5 -5q-42 -30 -65 -64t-26.5 -65
+t3 -61t22 -54t32 -42t31.5 -27.5t21 -8.5q272 -60 455 158q6 -6 18 -6q30 -16 127 -63t179 -86l82 -39v182q-7 0 -19.5 2t-30 6.5t-34 8.5t-41.5 12t-42.5 13.5t-47.5 15t-45.5 15t-47.5 16.5zM489 229q-43 -54 -93.5 -87t-91 -43t-82 -8.5t-61.5 6.5t-36 11
+q-26 7 -43.5 32.5t-21 55.5t11.5 60.5t47 45.5q54 17 108.5 19t105 -10.5t87.5 -27t81 -35.5zM489 229z" />
   </font>
 </defs></svg>