Commit 0672bf7e 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 f6452886
...@@ -23,8 +23,7 @@ ...@@ -23,8 +23,7 @@
<div class="v-foot"> <div class="v-foot">
<div class="v-price"> <div class="v-price">
<small>¥</small> 售价:<small>¥</small>{{item.price}}
{{item.price}}
</div> </div>
<div class="v-detail"> <div class="v-detail">
<span><i class="icon-comment-full"></i> {{item.comment_count}}</span> <span><i class="icon-comment-full"></i> {{item.comment_count}}</span>
......
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