Authored by happyhour7@163.com

Merge branch 'develop' into test

... ... @@ -4,6 +4,7 @@
{{# topItems}}
{{> channel/item}}
{{/ topItems}}
{{> channel/followus}}
</div>
{{> channel/pager}}
{{> layout/footer }}
\ No newline at end of file
... ...
... ... @@ -8,6 +8,7 @@
{{# bottomItems}}
{{> channel/item}}
{{/ bottomItems}}
{{> channel/followus}}
</div>
{{> channel/pager}}
{{> layout/footer }}
\ No newline at end of file
... ...
... ... @@ -15,6 +15,7 @@
{{# topItems2}}
{{> channel/item}}
{{/ topItems2}}
{{> channel/followus}}
</div>
{{> channel/pager}}
{{> layout/footer }}
\ No newline at end of file
... ...
... ... @@ -4,6 +4,7 @@
{{# topItems}}
{{> channel/item}}
{{/ topItems}}
{{> channel/followus}}
</div>
{{> channel/pager}}
{{> layout/footer }}
\ No newline at end of file
... ...
... ... @@ -8,6 +8,7 @@
{{# bottomItems}}
{{> channel/item}}
{{/ bottomItems}}
{{> channel/followus}}
</div>
{{> channel/pager}}
{{> layout/footer }}
\ No newline at end of file
... ...
... ... @@ -15,6 +15,7 @@
{{# topItems2}}
{{> channel/item}}
{{/ topItems2}}
{{> channel/followus}}
</div>
{{> channel/pager}}
{{> layout/footer }}
\ No newline at end of file
... ...
... ... @@ -4,6 +4,7 @@
{{# topItems}}
{{> channel/item}}
{{/ topItems}}
{{> channel/followus}}
</div>
{{> channel/pager}}
{{> layout/footer }}
\ No newline at end of file
... ...
... ... @@ -8,6 +8,7 @@
{{# bottomItems}}
{{> channel/item}}
{{/ bottomItems}}
{{> channel/followus}}
</div>
{{> channel/pager}}
{{> layout/footer }}
\ No newline at end of file
... ...
... ... @@ -15,6 +15,7 @@
{{# topItems2}}
{{> channel/item}}
{{/ topItems2}}
{{> channel/followus}}
</div>
{{> channel/pager}}
{{> layout/footer }}
\ No newline at end of file
... ...
... ... @@ -4,6 +4,7 @@
{{# topItems}}
{{> channel/item}}
{{/ topItems}}
{{> channel/followus}}
</div>
{{> channel/pager}}
{{> layout/footer }}
\ No newline at end of file
... ...
... ... @@ -8,6 +8,7 @@
{{# bottomItems}}
{{> channel/item}}
{{/ bottomItems}}
{{> channel/followus}}
</div>
{{> channel/pager}}
{{> layout/footer }}
\ No newline at end of file
... ...
... ... @@ -15,6 +15,7 @@
{{# topItems2}}
{{> channel/item}}
{{/ topItems2}}
{{> channel/followus}}
</div>
{{> channel/pager}}
{{> layout/footer }}
\ No newline at end of file
... ...
... ... @@ -4,6 +4,7 @@
{{# topItems}}
{{> channel/item}}
{{/ topItems}}
{{> channel/followus}}
</div>
{{> channel/pager}}
{{> layout/footer }}
\ No newline at end of file
... ...
... ... @@ -8,6 +8,7 @@
{{# bottomItems}}
{{> channel/item}}
{{/ bottomItems}}
{{> channel/followus}}
</div>
{{> channel/pager}}
{{> layout/footer }}
\ No newline at end of file
... ...
... ... @@ -15,6 +15,7 @@
{{# topItems2}}
{{> channel/item}}
{{/ topItems2}}
{{> channel/followus}}
</div>
{{> channel/pager}}
{{> layout/footer }}
\ No newline at end of file
... ...