Merge branch 'feature/shopImg' into release/newProduct

@@ -6,15 +6,7 @@
         {{> product/shop-header}}
 
         <div class="list-left pull-left">
-            <div class="shop-search">
-                <form action="/shoplist" method="get" id="shop-search-form">
-                    <span>
-                        <input type="hidden" name="shopId" value="{{shopId}}">
-                        <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}}>
-                    </span>
-                    <span class="iconfont shop-query-submit">&#xe611;</span>
-                </form>
-            </div>
+            {{> product/shop-search}}
 
             {{> product/left-content}}
 
@@ -59,19 +51,9 @@
                 {{> product/shop-single-list}}
             </div>
             {{/hotSingle}}
-            {{#allGoods}}
-                <div class="all-goods clearfix">
-                    {{> index/floor-header}}
 
-                    <div class="goods-wrap">
-                        {{> product/goods-list}}
-                    </div>
+            {{> product/goods-all-goods}}
 
-                    <div class="loading">
-                        <a href="{{href}}" target= "_blank">查看更多</a>
-                    </div>
-                </div>
-            {{/allGoods}}
             {{#trendInfo}}
                 <div class="trend-info clearfix">
                     {{> index/floor-header}}

@@ -6,15 +6,8 @@
         {{> product/shop-header}}
 
         <div class="list-left pull-left">
-            <div class="shop-search">
-                <form action="/shoplist" method="get" id="shop-search-form">
-                    <span>
-                        <input type="hidden" name="shopId" value="{{shopId}}">
-                        <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}}>
-                    </span>
-                    <span class="iconfont shop-query-submit">&#xe611;</span>
-                </form>
-            </div>
+            {{> product/shop-search}}
+
             {{> product/left-content}}
 
             {{> product/shop-sidebar}}
@@ -22,7 +15,12 @@
         <div class="list-right pull-right">
             {{> product/shop-entry}}
 
-            {{> product/standard-content}}
+            {{#if searchEmpty}}
+                {{> product/shop-search-empty}}
+                {{> product/goods-all-goods}}
+            {{^}}
+                {{> product/standard-content}}
+            {{/if}}
 
             {{> product/latest-walk}}
         </div>