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

src/frontend/views/my-member/index.php

@@ -37,7 +37,7 @@ $this->title = '我的会员';
             <div class="user-detail-box">
                 <div class="txt">
                     <p>来自：推广</p>
-                    <p>时间：2016-12-21</p>
+                    <p>时间：<?=date('Y年m月d日', $row['user']['created_at'])?></p>
                 </div>
                 <div class="consume">
                     累计消费 <br/>