merge origin test newest code

+{{> layout/header_hk320}}
+{{> channel/banner320}}
+{{> channel/content320}}
+{{> default/download_hk320}}
+{{> layout/footer_hk320}}
\ No newline at end of file

+{{> layout/header_hk320}}
+{{> channel/banner320}}
+{{> channel/content320}}
+{{> default/download_hk320}}
+{{> layout/footer_hk320}}
\ No newline at end of file

+{{> layout/header_hk320}}
+{{> channel/banner320}}
+{{> channel/content320}}
+{{> default/download_hk320}}
+{{> layout/footer_hk320}}
\ No newline at end of file

+{{> layout/header_hk320}}
+{{> channel/banner320}}
+{{> channel/content320}}
+{{> default/download_hk320}}
+{{> layout/footer_hk320}}
\ No newline at end of file

+{{> layout/header_hk320}}
+{{> channel/banner320}}
+{{> channel/content320}}
+{{> default/download_hk320}}
+{{> layout/footer_hk320}}
\ No newline at end of file

+{{# banner}}
+<div class="scrollPic-content">
+    <a class="arrow arrow-left" href="javascript:;"></a>
+    <a class="arrow arrow-right" href="javascript:;"></a>
+    <div class="swiper-container-banner {{# bannerLength}}swiper-container{{/ bannerLength}}" style="cursor: -webkit-grab;">
+        <div class="swiper-wrapper" style="width: 1080px; height: 507px;background-color: rgb(255, 255, 255);">
+            {{# data}}
+            <div class="swiper-slide" style="width: 992px; height: 504px; background: url(http://cmsres.test.yoho.cn/res/new/boys/images/loading.gif) 50% 50% no-repeat;">
+                <a href="{{link}}" target="_blank" title="{{alt}}">
+                    <img src="{{img}}" alt="{{alt}}">
+                </a>
+            </div>
+            {{/ data}}
+        </div>
+    </div>
+    <div class="pagination pagination-banner {{# channel}}pagination-big-banner-{{.}}{{/ channel}}">
+        {{# data}}
+        <span class=" swiper-pagination swiper-pagination-switch swiper-pagination {{# isChoosen}} swiper-visible-switch{{/isChoosen}}"></span>
+        {{/ data}}
+    </div>
+</div>
+{{/ banner}}
\ No newline at end of file

+<div class="content {{# channel}}content-{{.}}{{/ channel}} clearfix">
+  {{# contentWithNothing}}
+    {{# topItems}}
+      {{> channel/item}}
+    {{/ topItems}}
+  {{/ contentWithNothing}}
+
+  {{# contentWithAdvert}}
+    {{# topItems}}
+      {{> channel/item}}
+    {{/ topItems}}
+    {{> channel/advert}}
+    {{# bottomItems}}
+      {{> channel/item}}
+    {{/ bottomItems}}
+  {{/ contentWithAdvert}}
+
+  {{# contentWithCenterBanner}}
+    {{# topItems}}
+      {{> channel/item}}
+    {{/ topItems}}
+    {{> default/default_advt}}
+    {{# bottomItems}}
+      {{> channel/item}}
+    {{/ bottomItems}}
+  {{/ contentWithCenterBanner}}
+
+  {{# contentWithAll}}
+    {{# topItems1}}
+      {{> channel/item}}
+    {{/ topItems1}}
+    {{> channel/advert}}
+    {{# topItems2}}
+      {{> channel/item}}
+    {{/ topItems2}}
+    {{> default/default_advt}}
+    {{# bottomItems}}
+      {{> channel/item}}
+    {{/ bottomItems}}
+  {{/ contentWithAll}}
+  
+  {{> channel/followus}}
+</div>
\ No newline at end of file