Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

@@ -1316,3 +1316,29 @@
             ]
     }
 
+
+### 频道选择页
+    {
+        'background' : 'http://img11.static.yhbimg.com/yhb-img01/2015/12/14/03/0189f7499bcb98cbeb4d18d61275606716.png?imageView/2/w/640/h/800',
+        'searchUrl' : 'http://search.dev.yohobuy.com',
+        'channelList' : [
+                {
+                    'href' : '/boys',
+                    'title' : '男生',
+                    'entitle' : 'BOYS',
+                }, {
+                    'href' : '/girls',
+                    'title' : ' 女生',
+                    'entitle' : 'GIRLS',
+                }, {
+                    'href' : '/kids',
+                    'title' : '潮童',
+                    'entitle' : KIDS'',
+                }, {
+                    'href' : '/lifestyle',
+                    'title' : '创意生活',
+                    'entitle' : 'LIFESTYLE',
+                }
+            ],
+        'showYohood' : true/false
+    }

@@ -117,7 +117,7 @@
             overflow: hidden;
             padding: 0 10rem / $pxConvertRem;;
 
-            
+
         }
 
         .index-channel {
@@ -143,7 +143,7 @@
                     font-size: 16px;
                     line-height: 52px;
                     color: #fff;
-                    background: #000;
+                    background-color: #000;
                     border: 4px solid #fff;
                     font-weight: bold;
                     &:last-child {
@@ -162,11 +162,11 @@
                 .homestyle {
                   margin-bottom: 50rem / $pxConvertRem;
                   width: 287.3rem / $pxConvertRem;
-                }    
+                }
            }
         }
     }
-   
+
 }
 
 @import "search","footer", "error";

@@ -19,12 +19,14 @@
         <div class="index-channel">
             <img class="img" src="{{background}}">
             <div class="index-channel-list">
-                <a href="/boys" class="list-item">男生 <span class="lighter">BOYS</span> <span class="iconfont right-icon">&#xe614;</span></a>
-                <a href="/girls" class="list-item">女生 <span class="lighter">GIRLS</span> <span class="iconfont right-icon">&#xe614;</span></a>
-                <a href="/kids" class="list-item">潮童 <span class="lighter">KIDS</span> <span class="iconfont right-icon">&#xe614;</span></a>
-                <a href="/lifestyle" class="list-item">创意生活 <span class="lighter">LIFESTYLE</span> <span class="iconfont right-icon">&#xe614;</span></a>
-            </div> 
+                {{#channelList}}
+                <a href="{{href}}" class="list-item">{{title}} <span class="lighter">{{entitle}}</span> <span class="iconfont right-icon">&#xe614;</span></a>
+                {{/channelList}}
+                {{#showYohood}}
+                <a href="/yohood" id="yohood" class="list-item">  <span class="iconfont right-icon">&#xe614;</span></a>
+                {{/showYohood}}
+            </div>
         </div>
     </div>
 </div>
-{{> layout/footer}}
\ No newline at end of file
+{{> layout/footer}}