Commit dfb2ea96 authored by 汪波's avatar 汪波

Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev

# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
parent cd67bdbd
...@@ -67,7 +67,7 @@ $this->registerCss('[v-cloak] {display:none;}'); ...@@ -67,7 +67,7 @@ $this->registerCss('[v-cloak] {display:none;}');
<div class="foot navbar-fixed-bottom"> <div class="foot navbar-fixed-bottom">
<p><a href="javascript:;">隐私权政策</a> - <a href="javascript:;">服务条款</a> - <a href="javascript:;">地图条款</a></p> <p><a href="javascript:;">隐私权政策</a> - <a href="javascript:;">服务条款</a> - <a href="javascript:;">地图条款</a></p>
<p>©2016 Zuiketang.com</p> <p>©2016 c.pp.cc</p>
</div> </div>
<?php $this->endBody(); ?> <?php $this->endBody(); ?>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment