Merge branch 'feature/shopImg' into release/newProduct
Showing
2 changed files
with
10 additions
and
30 deletions
| @@ -6,15 +6,7 @@ | @@ -6,15 +6,7 @@ | ||
| 6 | {{> product/shop-header}} | 6 | {{> product/shop-header}} |
| 7 | 7 | ||
| 8 | <div class="list-left pull-left"> | 8 | <div class="list-left pull-left"> |
| 9 | - <div class="shop-search"> | ||
| 10 | - <form action="/shoplist" method="get" id="shop-search-form"> | ||
| 11 | - <span> | ||
| 12 | - <input type="hidden" name="shopId" value="{{shopId}}"> | ||
| 13 | - <input id="shop-query-key" type="text" name="query" class="shop-query-key" autocomplete="off" x-webkit-speech="" lang="zh-CN" placeholder="关键词搜索" {{# shopQueryKey}}value="{{.}}"{{/ shopQueryKey}}> | ||
| 14 | - </span> | ||
| 15 | - <span class="iconfont shop-query-submit"></span> | ||
| 16 | - </form> | ||
| 17 | - </div> | 9 | + {{> product/shop-search}} |
| 18 | 10 | ||
| 19 | {{> product/left-content}} | 11 | {{> product/left-content}} |
| 20 | 12 | ||
| @@ -59,19 +51,9 @@ | @@ -59,19 +51,9 @@ | ||
| 59 | {{> product/shop-single-list}} | 51 | {{> product/shop-single-list}} |
| 60 | </div> | 52 | </div> |
| 61 | {{/hotSingle}} | 53 | {{/hotSingle}} |
| 62 | - {{#allGoods}} | ||
| 63 | - <div class="all-goods clearfix"> | ||
| 64 | - {{> index/floor-header}} | ||
| 65 | 54 | ||
| 66 | - <div class="goods-wrap"> | ||
| 67 | - {{> product/goods-list}} | ||
| 68 | - </div> | 55 | + {{> product/goods-all-goods}} |
| 69 | 56 | ||
| 70 | - <div class="loading"> | ||
| 71 | - <a href="{{href}}" target= "_blank">查看更多</a> | ||
| 72 | - </div> | ||
| 73 | - </div> | ||
| 74 | - {{/allGoods}} | ||
| 75 | {{#trendInfo}} | 57 | {{#trendInfo}} |
| 76 | <div class="trend-info clearfix"> | 58 | <div class="trend-info clearfix"> |
| 77 | {{> index/floor-header}} | 59 | {{> index/floor-header}} |
| @@ -6,15 +6,8 @@ | @@ -6,15 +6,8 @@ | ||
| 6 | {{> product/shop-header}} | 6 | {{> product/shop-header}} |
| 7 | 7 | ||
| 8 | <div class="list-left pull-left"> | 8 | <div class="list-left pull-left"> |
| 9 | - <div class="shop-search"> | ||
| 10 | - <form action="/shoplist" method="get" id="shop-search-form"> | ||
| 11 | - <span> | ||
| 12 | - <input type="hidden" name="shopId" value="{{shopId}}"> | ||
| 13 | - <input id="shop-query-key" type="text" name="query" class="shop-query-key" autocomplete="off" x-webkit-speech="" lang="zh-CN" placeholder="关键词搜索" {{# shopQueryKey}}value="{{.}}"{{/ shopQueryKey}}> | ||
| 14 | - </span> | ||
| 15 | - <span class="iconfont shop-query-submit"></span> | ||
| 16 | - </form> | ||
| 17 | - </div> | 9 | + {{> product/shop-search}} |
| 10 | + | ||
| 18 | {{> product/left-content}} | 11 | {{> product/left-content}} |
| 19 | 12 | ||
| 20 | {{> product/shop-sidebar}} | 13 | {{> product/shop-sidebar}} |
| @@ -22,7 +15,12 @@ | @@ -22,7 +15,12 @@ | ||
| 22 | <div class="list-right pull-right"> | 15 | <div class="list-right pull-right"> |
| 23 | {{> product/shop-entry}} | 16 | {{> product/shop-entry}} |
| 24 | 17 | ||
| 25 | - {{> product/standard-content}} | 18 | + {{#if searchEmpty}} |
| 19 | + {{> product/shop-search-empty}} | ||
| 20 | + {{> product/goods-all-goods}} | ||
| 21 | + {{^}} | ||
| 22 | + {{> product/standard-content}} | ||
| 23 | + {{/if}} | ||
| 26 | 24 | ||
| 27 | {{> product/latest-walk}} | 25 | {{> product/latest-walk}} |
| 28 | </div> | 26 | </div> |
-
Please register or login to post a comment