From 84a39c8fa08a4d94338058b7f292da45dd7b3a36 Mon Sep 17 00:00:00 2001
From: Allenice <994298628@qq.com>
Date: Fri, 14 Sep 2018 16:45:57 +0800
Subject: [PATCH] update svgo config

---
 default/svgo.js                        | 14 ++++--
 src/assets/svg/gift.svg                | 64 ++++++++++++++++++++++++++
 src/assets/svg/setting.svg             | 22 ---------
 src/common/codeMap.ts                  |  7 +--
 src/components/icons/gift.ts           | 13 ++++++
 src/components/icons/index.ts          |  2 +-
 src/components/icons/setting.ts        | 13 ------
 src/components/icons/sora/arrow.ts     |  2 +-
 src/components/icons/sora/fit/arrow.ts |  2 +-
 9 files changed, 95 insertions(+), 44 deletions(-)
 create mode 100644 src/assets/svg/gift.svg
 delete mode 100644 src/assets/svg/setting.svg
 create mode 100644 src/components/icons/gift.ts
 delete mode 100644 src/components/icons/setting.ts

diff --git a/default/svgo.js b/default/svgo.js
index 9bc0684b..fc590a91 100644
--- a/default/svgo.js
+++ b/default/svgo.js
@@ -6,6 +6,17 @@ module.exports = {
         {
             removeTitle: true
         },
+        {
+            inlineStyles: {
+                onlyMatchedOnce: false
+            }
+        },
+        {
+            convertStyleToAttrs: true
+        },
+        {
+            removeStyleElement: true
+        },
         {
             removeComments: true
         },
@@ -15,9 +26,6 @@ module.exports = {
         {
             removeUselessDefs: true
         },
-        {
-            convertStyleToAttrs: true
-        },
         {
             cleanupIDs: {
                 remove: true,
diff --git a/src/assets/svg/gift.svg b/src/assets/svg/gift.svg
new file mode 100644
index 00000000..4384279d
--- /dev/null
+++ b/src/assets/svg/gift.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1"
+     id="图层_1"
+     xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
+     x="0px"
+     y="0px"
+     viewBox="0 0 16 17"
+     style="enable-background:new 0 0 16 17;"
+     xml:space="preserve">
+    <style type="text/css">
+        .st0 {
+            fill: #FF3465;
+        }
+
+        .st1 {
+            fill: url(#Rectangle-14_1_);
+        }
+    </style>
+    <title>icon/红色左侧导航/服务与商品(选中)</title>
+    <desc>Created with Sketch.</desc>
+    <g id="icon_x2F_蓝色左侧导航_x2F_服务与商品_x28_正常_x29_">
+        <g id="服务商品">
+            <path id="Rectangle-13"
+                  class="st0"
+                  d="M8.2,3.4L9.6,2L11,3.4L10.3,4L11,4.7l0.6-0.6c0.4-0.4,0.4-1,0-1.4l-1.4-1.4
+			c-0.4-0.4-1-0.4-1.4,0L7.2,2.9L8.2,3.4z M9.6,2L11,3.4L10.3,4L11,4.7l0.6-0.6c0.4-0.4,0.4-1,0-1.4l-1.4-1.4c-0.4-0.4-1-0.4-1.4,0
+			L7.2,2.9l1,0.4L9.6,2z" />
+            <path id="Rectangle-13_1_"
+                  class="st0"
+                  d="M8.8,4.8L5.9,2L4.5,3.4l0.7,0.7L4.5,4.8L3.8,4.1c-0.4-0.4-0.4-1,0-1.4l1.4-1.4
+			c0.4-0.4,1-0.4,1.4,0l3.5,3.5L8.8,4.8z M8.8,4.8L5.9,2L4.5,3.4l0.7,0.7L4.5,4.8L3.8,4.1c-0.4-0.4-0.4-1,0-1.4l1.4-1.4
+			c0.4-0.4,1-0.4,1.4,0l3.5,3.5L8.8,4.8z" />
+            <path id="Rectangle-13-Copy"
+                  class="st0"
+                  d="M2,10v6h12v-6H2z M2,9h12c0.6,0,1,0.4,1,1v6c0,0.6-0.4,1-1,1H2c-0.6,0-1-0.4-1-1v-6
+			C1,9.4,1.4,9,2,9z" />
+            <path id="Rectangle-13_2_"
+                  class="st0"
+                  d="M1,5v4h14V5H1z M1,4h14c0.6,0,1,0.4,1,1v4c0,0.6-0.4,1-1,1H1c-0.6,0-1-0.4-1-1V5
+			C0,4.4,0.4,4,1,4z" />
+
+            <linearGradient id="Rectangle-14_1_"
+                            gradientUnits="userSpaceOnUse"
+                            x1="-216.25"
+                            y1="391.4352"
+                            x2="-216.25"
+                            y2="392.4352"
+                            gradientTransform="matrix(4 0 0 -11 873 4321.7876)">
+                <stop offset="0"
+                      style="stop-color:#FFD5E0" />
+                <stop offset="1"
+                      style="stop-color:#FF3465" />
+            </linearGradient>
+            <rect id="Rectangle-14"
+                  x="6"
+                  y="5"
+                  class="st1"
+                  width="4"
+                  height="11" />
+        </g>
+    </g>
+</svg>
diff --git a/src/assets/svg/setting.svg b/src/assets/svg/setting.svg
deleted file mode 100644
index d160793e..00000000
--- a/src/assets/svg/setting.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="17px" height="16px" viewBox="0 0 17 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 51.2 (57519) - http://www.bohemiancoding.com/sketch -->
-    <title>icon/蓝色左侧导航/设置(正常)</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <linearGradient x1="50%" y1="100%" x2="50%" y2="0%" id="linearGradient-1">
-            <stop stop-color="#CAE9FF" offset="0%"></stop>
-            <stop stop-color="#20A0FF" offset="100%"></stop>
-        </linearGradient>
-    </defs>
-    <g id="icon/蓝色左侧导航/设置(正常)" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="icon" fill-rule="nonzero">
-            <g id="icon/左侧导航/设置(正常)" fill="url(#linearGradient-1)">
-                <g id="设置" transform="translate(4.000000, 4.000000)">
-                    <path d="M4,8 C1.790861,8 0,6.209139 0,4 C0,1.790861 1.790861,0 4,0 C6.209139,0 8,1.790861 8,4 C8,6.209139 6.209139,8 4,8 Z M4,5.33333333 C4.73637967,5.33333333 5.33333333,4.73637967 5.33333333,4 C5.33333333,3.26362033 4.73637967,2.66666667 4,2.66666667 C3.26362033,2.66666667 2.66666667,3.26362033 2.66666667,4 C2.66666667,4.73637967 3.26362033,5.33333333 4,5.33333333 Z" id="Combined-Shape"></path>
-                </g>
-            </g>
-            <path d="M6.1260599,14.9927579 C6.1261804,14.9928166 6.38482549,14.4634198 6.90199518,13.4045676 C7.07579912,13.0484842 7.44345638,12.8286067 7.83939528,12.8439552 C7.89779455,12.8462191 7.95636723,12.8473541 8.01509638,12.8473541 C8.07393356,12.8473541 8.13261369,12.8462149 8.19111973,12.8439427 C8.58702072,12.8285673 8.95466594,13.0483767 9.1285153,13.4043969 L9.90413286,14.9927579 C9.90419164,14.9928784 10.6475334,14.6311566 12.1341583,13.9075925 L11.3483164,12.296378 C11.1748382,11.9406949 11.2274284,11.5161683 11.4824544,11.2135682 C11.5738112,11.1051692 11.6604266,10.9925622 11.742003,10.8761067 C11.9758402,10.5422893 12.3888709,10.3837872 12.7859957,10.4754707 L14.4717599,10.86466 L15.0299711,8.44678179 L13.3076772,8.04915893 C12.9145508,7.95839853 12.6144765,7.64028267 12.5467976,7.2425322 C12.5211672,7.09190226 12.4886043,6.94308275 12.4492628,6.79644625 C12.3468898,6.41487322 12.4787604,6.00879607 12.7857854,5.76017211 L14.1920432,4.62140699 L12.6303983,2.6929361 L11.2977966,3.77205568 C10.9808582,4.02870731 10.5398199,4.06718187 10.1832285,3.86928649 C10.0729146,3.80806621 9.96023853,3.75155278 9.84546126,3.69990155 C9.48661574,3.53841651 9.25583556,3.18149108 9.25583556,2.78798438 L9.25583556,1 L6.7743572,1 L6.7743572,2.78798438 C6.7743572,3.18149108 6.54357702,3.53841651 6.1847315,3.69990155 C6.06995423,3.75155278 5.95727819,3.80806621 5.84696423,3.86928649 C5.49037285,4.06718187 5.04933457,4.02870731 4.7323962,3.77205568 L3.3997945,2.6929361 L1.83814956,4.62140699 L3.24440737,5.76017211 C3.55143239,6.00879607 3.68330301,6.41487322 3.58092992,6.79644625 C3.54158849,6.94308275 3.50902552,7.09190226 3.48339518,7.2425322 C3.41571623,7.64028267 3.11564201,7.95839853 2.72251554,8.04915893 L1.0002217,8.44678179 L1.55843288,10.86466 L3.24419707,10.4754707 C3.64132183,10.3837872 4.05435256,10.5422893 4.28818979,10.8761067 C4.36974153,10.992527 4.45632921,11.1051011 4.54765555,11.21347 C4.80270744,11.5161173 4.85526323,11.9407137 4.68170047,12.2964142 L3.89582645,13.9069886 L6.1260599,14.9927579 Z M5.36171659,2.99490972 C5.49606369,2.92035192 5.63370479,2.85127974 5.7743572,2.78798438 L5.7743572,2.48534101 L5.7743572,2.04229993 L5.7743572,1 C5.7743572,0.44771525 6.22207245,0 6.7743572,0 L9.25583556,0 C9.80812031,0 10.2558356,0.44771525 10.2558356,1 L10.2558356,2.04229993 L10.2558356,2.48534101 L10.2558356,2.78798438 C10.396488,2.85127974 10.5341291,2.92035192 10.6684762,2.99490972 L10.9240077,2.78798438 L11.2558356,2.51927547 L12.0010779,1.91579014 C12.4302837,1.56822609 13.0599802,1.63440985 13.4075442,2.06361571 L14.9691892,3.9920866 C15.3167532,4.42129246 15.2505695,5.0509889 14.8213636,5.39855295 L13.9109155,6.13581925 L13.7122688,6.29668019 L13.4151058,6.53731807 C13.4623058,6.71324574 13.5016188,6.89254567 13.5326283,7.07478887 L13.9233965,7.16500482 L14.1611965,7.21990528 L15.2549221,7.47241173 C15.7930518,7.59664877 16.1285782,8.13360312 16.0043411,8.67173285 L15.4461299,11.0896111 C15.3218929,11.6277408 14.7849386,11.9632671 14.2468088,11.8390301 L13.2367187,11.6058324 L12.9159707,11.5317819 L12.5610446,11.4498408 C12.4622988,11.5908067 12.3575244,11.7269956 12.2471105,11.8580068 L12.3962275,12.1637421 L12.547017,12.4729063 L13.0329524,13.4692216 C13.2754642,13.9654138 13.0693258,14.564083 12.5729356,14.8061887 L10.3423896,15.8923488 C9.84583198,16.1335174 9.24753055,15.9274261 9.00543266,15.4313214 L8.57175313,14.5432038 L8.36426764,14.1183013 L8.22992691,13.8431894 C8.15864953,13.8459576 8.0870313,13.8473541 8.01509638,13.8473541 C7.94329388,13.8473541 7.8718069,13.8459627 7.80065947,13.8432047 L7.66633832,14.1183972 L7.45894362,14.5433002 L7.02535878,15.4316136 C6.78266221,15.9274261 6.18436079,16.1335174 5.68809496,15.89175 L3.45786124,14.8059806 C2.96116377,14.5645054 2.7547549,13.9659294 2.99663626,13.4694298 L3.4828494,12.4729817 L3.63389344,12.1634311 L3.78298211,11.8578879 C3.67260501,11.7269132 3.56786408,11.590764 3.46914812,11.4498408 L3.11451832,11.5317135 L2.79325089,11.6058839 L1.78338393,11.8390301 C1.24525421,11.9632671 0.708299851,11.6277408 0.584062814,11.0896111 L0.0258516401,8.67173285 C-0.0983853967,8.13360312 0.237140923,7.59664877 0.775270651,7.47241173 L1.86899625,7.21990528 L2.10679628,7.16500482 L2.49756448,7.07478887 C2.52857395,6.89254567 2.56788695,6.71324574 2.61508698,6.53731807 L2.31792394,6.29668019 L2.11927723,6.13581925 L1.20882917,5.39855295 C0.779623308,5.0509889 0.713439545,4.42129246 1.0610036,3.9920866 L2.62264853,2.06361571 C2.97021259,1.63440985 3.59990902,1.56822609 4.02911489,1.91579014 L4.7743572,2.51927547 L5.10618507,2.78798438 L5.36171659,2.99490972 Z" id="Combined-Shape" fill="#475669"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/src/common/codeMap.ts b/src/common/codeMap.ts
index 43448cc6..a52e55ca 100644
--- a/src/common/codeMap.ts
+++ b/src/common/codeMap.ts
@@ -59,10 +59,11 @@ export default {
     ],
     'original-color': [
         `
-        <icon name="colorwheel" width="100" height="100" :original="true"></icon>
+        <icon name="colorwheel" width="100" height="100" original></icon>
         <!-- overwrite original color -->
-        <icon name="colorwheel" width="100" height="100" :original="true" color="_ black _ black _"></icon>
-        <icon name="colorwheel" width="100" height="100" :original="true" color="_ r-black _ r-red _"></icon>
+        <icon name="colorwheel" width="100" height="100" original color="_ black _ black _"></icon>
+        <icon name="colorwheel" width="100" height="100" original color="_ r-black _ r-red _"></icon>
+        <icon name="gift" width="100" height="100" original></icon>
       `
     ],
     gradient: [
diff --git a/src/components/icons/gift.ts b/src/components/icons/gift.ts
new file mode 100644
index 00000000..6c50f220
--- /dev/null
+++ b/src/components/icons/gift.ts
@@ -0,0 +1,13 @@
+
+/* eslint-disable */
+/* tslint:disable */
+// @ts-ignore
+import icon from 'vue-svgicon'
+icon.register({
+  'gift': {
+    width: 16,
+    height: 16,
+    viewBox: '0 0 16 17',
+    data: '<path pid="0" d="M8.2 3.4L9.6 2 11 3.4l-.7.6.7.7.6-.6c.4-.4.4-1 0-1.4l-1.4-1.4c-.4-.4-1-.4-1.4 0L7.2 2.9l1 .5zM9.6 2L11 3.4l-.7.6.7.7.6-.6c.4-.4.4-1 0-1.4l-1.4-1.4c-.4-.4-1-.4-1.4 0L7.2 2.9l1 .4L9.6 2z" _fill="#ff3465"/><path pid="1" d="M8.8 4.8L5.9 2 4.5 3.4l.7.7-.7.7-.7-.7c-.4-.4-.4-1 0-1.4l1.4-1.4c.4-.4 1-.4 1.4 0l3.5 3.5H8.8zm0 0L5.9 2 4.5 3.4l.7.7-.7.7-.7-.7c-.4-.4-.4-1 0-1.4l1.4-1.4c.4-.4 1-.4 1.4 0l3.5 3.5H8.8zM2 10v6h12v-6H2zm0-1h12c.6 0 1 .4 1 1v6c0 .6-.4 1-1 1H2c-.6 0-1-.4-1-1v-6c0-.6.4-1 1-1z" _fill="#ff3465"/><path pid="2" d="M1 5v4h14V5H1zm0-1h14c.6 0 1 .4 1 1v4c0 .6-.4 1-1 1H1c-.6 0-1-.4-1-1V5c0-.6.4-1 1-1z" _fill="#ff3465"/><linearGradient id="svgicon_gift_a" gradientUnits="userSpaceOnUse" x1="-216.25" y1="391.435" x2="-216.25" y2="392.435" gradientTransform="matrix(4 0 0 -11 873 4321.788)"><stop offset="0" stop-color="#ffd5e0"/><stop offset="1" stop-color="#ff3465"/></linearGradient><path pid="3" _fill="url(#svgicon_gift_a)" d="M6 5h4v11H6z"/>'
+  }
+})
diff --git a/src/components/icons/index.ts b/src/components/icons/index.ts
index 67098c24..de7f8260 100644
--- a/src/components/icons/index.ts
+++ b/src/components/icons/index.ts
@@ -3,7 +3,7 @@ import './arrow'
 import './check'
 import './clock'
 import './colorwheel'
+import './gift'
 import './mask'
-import './setting'
 import './sora'
 import './vue'
diff --git a/src/components/icons/setting.ts b/src/components/icons/setting.ts
deleted file mode 100644
index 3db4c920..00000000
--- a/src/components/icons/setting.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/* eslint-disable */
-/* tslint:disable */
-// @ts-ignore
-import icon from 'vue-svgicon'
-icon.register({
-    setting: {
-        width: 17,
-        height: 16,
-        viewBox: '0 0 17 16',
-        data:
-            '<defs><linearGradient x1="50%" y1="100%" x2="50%" y2="0%" id="svgicon_setting_a"><stop stop-color="#CAE9FF" offset="0%"/><stop stop-color="#20A0FF" offset="100%"/></linearGradient></defs><g fill-rule="nonzero" _fill="none"><path pid="0" d="M4 8a4 4 0 1 1 0-8 4 4 0 0 1 0 8zm0-2.667a1.333 1.333 0 1 0 0-2.666 1.333 1.333 0 0 0 0 2.666z" transform="translate(4 4)" _fill="url(#svgicon_setting_a)"/><path pid="1" d="M6.126 14.993l.776-1.588a1 1 0 0 1 .937-.561 4.536 4.536 0 0 0 .352 0 1 1 0 0 1 .938.56l.775 1.589 2.23-1.085-.786-1.612a1 1 0 0 1 .134-1.082c.092-.109.178-.221.26-.338a1 1 0 0 1 1.044-.4l1.686.389.558-2.418-1.722-.398a1 1 0 0 1-.761-.806 4.88 4.88 0 0 0-.098-.447 1 1 0 0 1 .337-1.036l1.406-1.139-1.562-1.928-1.332 1.08a1 1 0 0 1-1.115.096 4.511 4.511 0 0 0-.338-.17 1 1 0 0 1-.59-.911V1h-2.48v1.788a1 1 0 0 1-.59.912 4.511 4.511 0 0 0-.338.17 1 1 0 0 1-1.115-.098L3.4 2.692l-1.562 1.93L3.244 5.76a1 1 0 0 1 .337 1.036 4.88 4.88 0 0 0-.098.447 1 1 0 0 1-.76.806L1 8.447l.558 2.418 1.686-.39a1 1 0 0 1 1.044.401c.082.117.168.23.26.337a1 1 0 0 1 .134 1.083l-.786 1.611 2.23 1.086zM5.362 2.995c.134-.075.272-.144.412-.207V1a1 1 0 0 1 1-1h2.482a1 1 0 0 1 1 1v1.788c.14.063.278.132.412.207l.256-.207.332-.269.745-.603a1 1 0 0 1 1.407.148l1.561 1.928a1 1 0 0 1-.148 1.407l-.91.737-.199.16-.297.241c.047.176.087.356.118.538l.39.09.238.055 1.094.252a1 1 0 0 1 .75 1.2l-.559 2.418a1 1 0 0 1-1.2.749l-1.01-.233-.32-.074-.355-.082a5.773 5.773 0 0 1-.314.408l.15.306.15.309.486.996a1 1 0 0 1-.46 1.337l-2.23 1.086a1.001 1.001 0 0 1-1.338-.46l-.433-.889-.208-.425-.134-.275a5.536 5.536 0 0 1-.43 0l-.134.275-.207.425-.434.889a1.001 1.001 0 0 1-1.337.46l-2.23-1.086a1 1 0 0 1-.461-1.337l.486-.996.15-.31.15-.305a5.773 5.773 0 0 1-.314-.408l-.354.082-.322.074-1.01.233a1 1 0 0 1-1.199-.75L.026 8.673a1 1 0 0 1 .75-1.2l1.093-.252.238-.055.39-.09a5.88 5.88 0 0 1 .118-.538l-.297-.24-.199-.161-.91-.737a1 1 0 0 1-.148-1.407l1.562-1.928a1 1 0 0 1 1.406-.148l.745.603.332.269.256.207z" _fill="#475669"/></g>'
-    }
-})
diff --git a/src/components/icons/sora/arrow.ts b/src/components/icons/sora/arrow.ts
index 9c957ca6..3b971c7c 100644
--- a/src/components/icons/sora/arrow.ts
+++ b/src/components/icons/sora/arrow.ts
@@ -8,6 +8,6 @@ icon.register({
     width: 200,
     height: 200,
     viewBox: '0 0 1024 1024',
-    data: '<defs><style/></defs><path pid="0" d="M165.39 594.774h287.782v263.292l430.622-359.694-430.62-359.706v230.242H165.39v225.866z"/>'
+    data: '<defs/><path pid="0" d="M165.39 594.774h287.782v263.292l430.622-359.694-430.62-359.706v230.242H165.39v225.866z"/>'
   }
 })
diff --git a/src/components/icons/sora/fit/arrow.ts b/src/components/icons/sora/fit/arrow.ts
index fbdcd6bd..cd3636ea 100644
--- a/src/components/icons/sora/fit/arrow.ts
+++ b/src/components/icons/sora/fit/arrow.ts
@@ -8,6 +8,6 @@ icon.register({
     width: 254.688,
     height: 200,
     viewBox: '0 0 1304 1024',
-    data: '<defs><style/></defs><path pid="0" d="M552.588 0h88.622c137.03 128.838 268.102 264.378 401.408 396.94v20.852C913.036 557.056 778.985 691.107 638.976 819.2h-87.878C654.615 689.617 764.09 564.503 881.012 446.836c-293.422 1.49-587.59-.744-881.012.745v-75.217c293.423 0 586.845-1.49 880.268 0C763.345 255.44 655.36 129.583 552.588 0z"/>'
+    data: '<defs/><path pid="0" d="M552.588 0h88.622c137.03 128.838 268.102 264.378 401.408 396.94v20.852C913.036 557.056 778.985 691.107 638.976 819.2h-87.878C654.615 689.617 764.09 564.503 881.012 446.836c-293.422 1.49-587.59-.744-881.012.745v-75.217c293.423 0 586.845-1.49 880.268 0C763.345 255.44 655.36 129.583 552.588 0z"/>'
   }
 })