Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0

@@ -118,7 +118,8 @@ const helpers = {
                 return {
                     id: c.colorId,
                     title: c.colorName,
-                    rgb: c.colorValue ? `url(${c.colorValue})` : '#' + c.colorCode
+                    rgb: c.colorValue ? `url(${c.colorValue})` : '#' + c.colorCode,
+                    bgImg: c.colorValue || ''
                 };
             });
         } else {

@@ -21,6 +21,7 @@
         img {
             width: 100%;
             height: 100%;
+            margin-top: -1px;
         }
     }