Merge branch 'develop' into test

-{{> layout/header }}
-{{> default/channel_banner }}
-<div class="content {{# channel}}content-{{.}}{{/ channel}} clearfix">
-    {{# topItems}}
-        {{> channel/item}}
-    {{/ topItems}}
-</div>
+{{> layout/header }}
+{{> default/channel_banner }}
+<div class="content {{# channel}}content-{{.}}{{/ channel}} clearfix">
+    {{# topItems}}
+        {{> channel/item}}
+    {{/ topItems}}
+</div>
+{{> channel/pager}}
 {{> layout/footer }}
\ No newline at end of file

-{{> layout/header }}
-{{> default/channel_banner }}
-<div class="content {{# channel}}content-{{.}}{{/ channel}} clearfix">
-    {{# topItems}}
-        {{> channel/item}}
-    {{/ topItems}}
-    {{> default/default_advt}}
-    {{# bottomItems}}
-        {{> channel/item}}
-    {{/ bottomItems}}
-</div>
+{{> layout/header }}
+{{> default/channel_banner }}
+<div class="content {{# channel}}content-{{.}}{{/ channel}} clearfix">
+    {{# topItems}}
+        {{> channel/item}}
+    {{/ topItems}}
+    {{> default/default_advt}}
+    {{# bottomItems}}
+        {{> channel/item}}
+    {{/ bottomItems}}
+</div>
+{{> channel/pager}}
 {{> layout/footer }}
\ No newline at end of file

-<!--
-    JSON数据组成说明（有广告无通栏）：
-    topItem1    //广告之前的两个碎片
-    topItem2    //广告与通栏之间的碎片
-    advert      //广告的结构体
-    pager       //分页结构体
--->
-{{> layout/header }}
-{{> default/channel_banner }}
-<div class="content {{# channel}}content-{{.}}{{/ channel}} clearfix">
-    {{# topItems1}}
-        {{> channel/item}}
-    {{/ topItems1}}
-    {{> channel/advert}}
-    {{# topItems2}}
-        {{> channel/item}}
-    {{/ topItems2}}
-</div>
+<!--
+    JSON数据组成说明（有广告无通栏）：
+    topItem1    //广告之前的两个碎片
+    topItem2    //广告与通栏之间的碎片
+    advert      //广告的结构体
+    pager       //分页结构体
+-->
+{{> layout/header }}
+{{> default/channel_banner }}
+<div class="content {{# channel}}content-{{.}}{{/ channel}} clearfix">
+    {{# topItems1}}
+        {{> channel/item}}
+    {{/ topItems1}}
+    {{> channel/advert}}
+    {{# topItems2}}
+        {{> channel/item}}
+    {{/ topItems2}}
+</div>
+{{> channel/pager}}
 {{> layout/footer }}
\ No newline at end of file

-{{> layout/header }}
-{{> default/channel_banner }}
-<div class="content {{# channel}}content-{{.}}{{/ channel}} clearfix">
-    {{# topItems}}
-        {{> channel/item}}
-    {{/ topItems}}
-</div>
+{{> layout/header }}
+{{> default/channel_banner }}
+<div class="content {{# channel}}content-{{.}}{{/ channel}} clearfix">
+    {{# topItems}}
+        {{> channel/item}}
+    {{/ topItems}}
+</div>
+{{> channel/pager}}
 {{> layout/footer }}
\ No newline at end of file

-{{> layout/header }}
-{{> default/channel_banner }}
-<div class="content {{# channel}}content-{{.}}{{/ channel}} clearfix">
-    {{# topItems}}
-        {{> channel/item}}
-    {{/ topItems}}
-    {{> default/default_advt}}
-    {{# bottomItems}}
-        {{> channel/item}}
-    {{/ bottomItems}}
-</div>
+{{> layout/header }}
+{{> default/channel_banner }}
+<div class="content {{# channel}}content-{{.}}{{/ channel}} clearfix">
+    {{# topItems}}
+        {{> channel/item}}
+    {{/ topItems}}
+    {{> default/default_advt}}
+    {{# bottomItems}}
+        {{> channel/item}}
+    {{/ bottomItems}}
+</div>
+{{> channel/pager}}
 {{> layout/footer }}
\ No newline at end of file

-<!--
-    JSON数据组成说明（有广告无通栏）：
-    topItem1    //广告之前的两个碎片
-    topItem2    //广告与通栏之间的碎片
-    advert      //广告的结构体
-    pager       //分页结构体
--->
-{{> layout/header }}
-{{> default/channel_banner }}
-<div class="content {{# channel}}content-{{.}}{{/ channel}} clearfix">
-    {{# topItems1}}
-        {{> channel/item}}
-    {{/ topItems1}}
-    {{> channel/advert}}
-    {{# topItems2}}
-        {{> channel/item}}
-    {{/ topItems2}}
-</div>
+<!--
+    JSON数据组成说明（有广告无通栏）：
+    topItem1    //广告之前的两个碎片
+    topItem2    //广告与通栏之间的碎片
+    advert      //广告的结构体
+    pager       //分页结构体
+-->
+{{> layout/header }}
+{{> default/channel_banner }}
+<div class="content {{# channel}}content-{{.}}{{/ channel}} clearfix">
+    {{# topItems1}}
+        {{> channel/item}}
+    {{/ topItems1}}
+    {{> channel/advert}}
+    {{# topItems2}}
+        {{> channel/item}}
+    {{/ topItems2}}
+</div>
+{{> channel/pager}}
 {{> layout/footer }}
\ No newline at end of file

-{{> layout/header }}
-{{> default/channel_banner }}
-<div class="content {{# channel}}content-{{.}}{{/ channel}} clearfix">
-    {{# topItems}}
-        {{> channel/item}}
-    {{/ topItems}}
-</div>
+{{> layout/header }}
+{{> default/channel_banner }}
+<div class="content {{# channel}}content-{{.}}{{/ channel}} clearfix">
+    {{# topItems}}
+        {{> channel/item}}
+    {{/ topItems}}
+</div>
+{{> channel/pager}}
 {{> layout/footer }}
\ No newline at end of file

-{{> layout/header }}
-{{> default/channel_banner }}
-<div class="content {{# channel}}content-{{.}}{{/ channel}} clearfix">
-    {{# topItems}}
-        {{> channel/item}}
-    {{/ topItems}}
-    {{> default/default_advt}}
-    {{# bottomItems}}
-        {{> channel/item}}
-    {{/ bottomItems}}
-</div>
+{{> layout/header }}
+{{> default/channel_banner }}
+<div class="content {{# channel}}content-{{.}}{{/ channel}} clearfix">
+    {{# topItems}}
+        {{> channel/item}}
+    {{/ topItems}}
+    {{> default/default_advt}}
+    {{# bottomItems}}
+        {{> channel/item}}
+    {{/ bottomItems}}
+</div>
+{{> channel/pager}}
 {{> layout/footer }}
\ No newline at end of file

-<!--
-    JSON数据组成说明（有广告无通栏）：
-    topItem1    //广告之前的两个碎片
-    topItem2    //广告与通栏之间的碎片
-    advert      //广告的结构体
-    pager       //分页结构体
--->
-{{> layout/header }}
-{{> default/channel_banner }}
-<div class="content {{# channel}}content-{{.}}{{/ channel}} clearfix">
-    {{# topItems1}}
-        {{> channel/item}}
-    {{/ topItems1}}
-    {{> channel/advert}}
-    {{# topItems2}}
-        {{> channel/item}}
-    {{/ topItems2}}
-</div>
+<!--
+    JSON数据组成说明（有广告无通栏）：
+    topItem1    //广告之前的两个碎片
+    topItem2    //广告与通栏之间的碎片
+    advert      //广告的结构体
+    pager       //分页结构体
+-->
+{{> layout/header }}
+{{> default/channel_banner }}
+<div class="content {{# channel}}content-{{.}}{{/ channel}} clearfix">
+    {{# topItems1}}
+        {{> channel/item}}
+    {{/ topItems1}}
+    {{> channel/advert}}
+    {{# topItems2}}
+        {{> channel/item}}
+    {{/ topItems2}}
+</div>
+{{> channel/pager}}
 {{> layout/footer }}
\ No newline at end of file

-{{> layout/header }}
-{{> default/channel_banner }}
-<div class="content {{# channel}}content-{{.}}{{/ channel}} clearfix">
-    {{# topItems}}
-        {{> channel/item}}
-    {{/ topItems}}
-</div>
+{{> layout/header }}
+{{> default/channel_banner }}
+<div class="content {{# channel}}content-{{.}}{{/ channel}} clearfix">
+    {{# topItems}}
+        {{> channel/item}}
+    {{/ topItems}}
+</div>
+{{> channel/pager}}
 {{> layout/footer }}
\ No newline at end of file

-{{> layout/header }}
-{{> default/channel_banner }}
-<div class="content {{# channel}}content-{{.}}{{/ channel}} clearfix">
-    {{# topItems}}
-        {{> channel/item}}
-    {{/ topItems}}
-    {{> default/default_advt}}
-    {{# bottomItems}}
-        {{> channel/item}}
-    {{/ bottomItems}}
-</div>
+{{> layout/header }}
+{{> default/channel_banner }}
+<div class="content {{# channel}}content-{{.}}{{/ channel}} clearfix">
+    {{# topItems}}
+        {{> channel/item}}
+    {{/ topItems}}
+    {{> default/default_advt}}
+    {{# bottomItems}}
+        {{> channel/item}}
+    {{/ bottomItems}}
+</div>
+{{> channel/pager}}
 {{> layout/footer }}
\ No newline at end of file

-<!--
-    JSON数据组成说明（有广告无通栏）：
-    topItem1    //广告之前的两个碎片
-    topItem2    //广告与通栏之间的碎片
-    advert      //广告的结构体
-    pager       //分页结构体
--->
-{{> layout/header }}
-{{> default/channel_banner }}
-<div class="content {{# channel}}content-{{.}}{{/ channel}} clearfix">
-    {{# topItems1}}
-        {{> channel/item}}
-    {{/ topItems1}}
-    {{> channel/advert}}
-    {{# topItems2}}
-        {{> channel/item}}
-    {{/ topItems2}}
-</div>
+<!--
+    JSON数据组成说明（有广告无通栏）：
+    topItem1    //广告之前的两个碎片
+    topItem2    //广告与通栏之间的碎片
+    advert      //广告的结构体
+    pager       //分页结构体
+-->
+{{> layout/header }}
+{{> default/channel_banner }}
+<div class="content {{# channel}}content-{{.}}{{/ channel}} clearfix">
+    {{# topItems1}}
+        {{> channel/item}}
+    {{/ topItems1}}
+    {{> channel/advert}}
+    {{# topItems2}}
+        {{> channel/item}}
+    {{/ topItems2}}
+</div>
+{{> channel/pager}}
 {{> layout/footer }}
\ No newline at end of file

-{{> layout/header }}
-{{> default/channel_banner }}
-<div class="content {{# channel}}content-{{.}}{{/ channel}} clearfix">
-    {{# topItems}}
-        {{> channel/item}}
-    {{/ topItems}}
-</div>
+{{> layout/header }}
+{{> default/channel_banner }}
+<div class="content {{# channel}}content-{{.}}{{/ channel}} clearfix">
+    {{# topItems}}
+        {{> channel/item}}
+    {{/ topItems}}
+</div>
+{{> channel/pager}}
 {{> layout/footer }}
\ No newline at end of file

-{{> layout/header }}
-{{> default/channel_banner }}
-<div class="content {{# channel}}content-{{.}}{{/ channel}} clearfix">
-    {{# topItems}}
-        {{> channel/item}}
-    {{/ topItems}}
-    {{> default/default_advt}}
-    {{# bottomItems}}
-        {{> channel/item}}
-    {{/ bottomItems}}
-</div>
+{{> layout/header }}
+{{> default/channel_banner }}
+<div class="content {{# channel}}content-{{.}}{{/ channel}} clearfix">
+    {{# topItems}}
+        {{> channel/item}}
+    {{/ topItems}}
+    {{> default/default_advt}}
+    {{# bottomItems}}
+        {{> channel/item}}
+    {{/ bottomItems}}
+</div>
+{{> channel/pager}}
 {{> layout/footer }}
\ No newline at end of file

-<!--
-    JSON数据组成说明（有广告无通栏）：
-    topItem1    //广告之前的两个碎片
-    topItem2    //广告与通栏之间的碎片
-    advert      //广告的结构体
-    pager       //分页结构体
--->
-{{> layout/header }}
-{{> default/channel_banner }}
-<div class="content {{# channel}}content-{{.}}{{/ channel}} clearfix">
-    {{# topItems1}}
-        {{> channel/item}}
-    {{/ topItems1}}
-    {{> channel/advert}}
-    {{# topItems2}}
-        {{> channel/item}}
-    {{/ topItems2}}
-</div>
+<!--
+    JSON数据组成说明（有广告无通栏）：
+    topItem1    //广告之前的两个碎片
+    topItem2    //广告与通栏之间的碎片
+    advert      //广告的结构体
+    pager       //分页结构体
+-->
+{{> layout/header }}
+{{> default/channel_banner }}
+<div class="content {{# channel}}content-{{.}}{{/ channel}} clearfix">
+    {{# topItems1}}
+        {{> channel/item}}
+    {{/ topItems1}}
+    {{> channel/advert}}
+    {{# topItems2}}
+        {{> channel/item}}
+    {{/ topItems2}}
+</div>
+{{> channel/pager}}
 {{> layout/footer }}
\ No newline at end of file