Merge branch 'master' into develop

public/static/index/default/css/common.css

@@ -202,7 +202,7 @@ color: #F5F5F2;font-size: 14px;cursor:pointer;border-radius:0px 0px; position: a
     .category-content .category-list li.last .c-category-list{ border-bottom: none; }
     .category-content .category-list a:hover{ text-decoration: none; color: #D2364C; }
     .category-content .category-name{ overflow:hidden; position: relative;}
-    .category-content .category-name i img{ position: absolute; top: 6px; width: 25px; height: 25px; left: 6px; display:block;}
+    .category-content .category-name img{ position: absolute; top: 6px; width: 25px; height: 25px; left: 6px; display:block;}
     .category-content .category-name .ml-22{font-size:14px ;margin-left: 35px;}
     .category-content .category-list .bd-b{ height: 1px;  margin: -1px 10px 0 10px;  background: #eee; line-height: 1; font-size: 0; }
     .category-content .b-category-name {line-height:32px;padding-top:3px ;padding-left:5px ;}

public/static/index/default/css/index.css

@@ -232,7 +232,7 @@ text-align: center;float:none}
 
     .category-content .category-list.navTwo li { height:36px;}
     .category-content .category-list.navTwo .b-category-name {line-height: 28px;}
-    .category-content .category-list.navTwo .category-name img {width: 22px; height: 22px;border-radius: 22px;}
+    .category-content .category-list.navTwo .category-name i img {width: 22px; height: 22px;border-radius: 22px;}
 
 
     /*标题*/