Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy.git into develop

@@ -34,31 +34,7 @@
                     {{> product/left-content}}
                 </div>
                 <div class="list-right pull-right">
-                    {{# shopEntry}}
-                        <div class="shop-entry clearfix">
-                            <a class="pull-left" href="{{home}}">
-                                <img class="logo" src="{{logo}}">
-                            </a>
-
-                            <div class="name pull-left">
-                                <a class="shop-name" href="{{home}}">{{shopName}}</a>
-                                <p class="sorts">
-                                    {{#each sort}}
-                                        <a href="{{href}}">{{name}}</a>
-
-                                        {{#unless @last}}
-                                            /
-                                        {{/unless}}
-                                    {{/each}}
-                                </p>
-                            </div>
-
-                            <a class="entry-btn pull-right" href="{{home}}">
-                                进入品牌店铺
-                                <span class="iconfont">&#xe601;</span>
-                            </a>
-                        </div>
-                    {{/ shopEntry}}
+                    {{> product/shop-entry}}
 
                     {{> product/standard-content}}
 
@@ -68,4 +44,4 @@
         </div>
     {{/ list}}
 </div>
-{{> layout/footer}}
\ No newline at end of file
+{{> layout/footer}}

@@ -3,9 +3,11 @@
     {{# search}}
     {{> layout/path-nav}}
 
+    {{> product/shop-entry}}
+    
     {{> product/standard-content}}
 
     {{> product/latest-walk}}
     {{/ search}}
 </div>
-{{> layout/footer}}
\ No newline at end of file
+{{> layout/footer}}

+{{# shopEntry}}
+    <div class="shop-entry clearfix">
+        <a class="pull-left" href="{{home}}">
+            <img class="logo" src="{{logo}}">
+        </a>
+
+        <div class="name pull-left">
+            <a class="shop-name" href="{{home}}">{{shopName}}</a>
+            <p class="sorts">
+                {{#each sort}}
+                    <a href="{{href}}">{{name}}</a>
+
+                    {{#unless @last}}
+                        /
+                    {{/unless}}
+                {{/each}}
+            </p>
+        </div>
+
+        <a class="entry-btn pull-right" href="{{home}}">
+            进入品牌店铺
+            <span class="iconfont">&#xe601;</span>
+        </a>
+    </div>
+{{/ shopEntry}}

@@ -149,66 +149,5 @@
         }
     }
 
-    .shop-entry {
-        position: relative;
-        background: #f5f7f6;
-        border: 1px solid #eaeceb;
-        padding: 12px 15px;
-        margin-bottom: 10px;
-
-        .logo {
-            width: 80px;
-            height: 50px;
-        }
-
-        .name {
-            margin-left: 10px;
-        }
-
-        .shop-name {
-            font-size: 16px;
-            color: #222;
-            line-height: 26px;
-        }
-
-        .sorts {
-            color: #999;
-            font-size: 12px;
-            line-height: 18px;
-
-            a {
-                color: #999;
-            }
-        }
-
-        .entry-btn {
-            position: absolute;
-            right: 15px;
-            top: 50%;
-            width: 110px;
-            height: 32px;
-            line-height: 32px;
-            margin-top: -16px;
-            background: #222;
-            text-align: center;
-            color: #fff;
-            font-size: 12px;
-
-            .iconfont {
-                font-size: 12px;
-            }
-        }
-    }
-
-    .goods-container {
-        height: auto;
-        padding: 25px 0 0 0;
-        position: relative;
-        width: 970px + 10px;//每列增加右边距
-
-        .good-info {
-            width: 235px;
-
-        }
-    }
-}
\ No newline at end of file
+    @import "shop-entry";
+}

@@ -13,6 +13,8 @@
         position: relative;
         width: 1150px + 10px;//每列增加右边距
     }
+
+    @import "shop-entry";
 }
 
 
@@ -40,4 +42,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}

+.shop-entry {
+    position: relative;
+    background: #f5f7f6;
+    border: 1px solid #eaeceb;
+    padding: 12px 15px;
+    margin-bottom: 10px;
+
+    .logo {
+        width: 80px;
+        height: 50px;
+    }
+
+    .name {
+        margin-left: 10px;
+    }
+
+    .shop-name {
+        font-size: 16px;
+        color: #222;
+        line-height: 26px;
+    }
+
+    .sorts {
+        color: #999;
+        font-size: 12px;
+        line-height: 18px;
+
+        a {
+            color: #999;
+        }
+    }
+
+    .entry-btn {
+        position: absolute;
+        right: 15px;
+        top: 50%;
+        width: 110px;
+        height: 32px;
+        line-height: 32px;
+        margin-top: -16px;
+        background: #222;
+        text-align: center;
+        color: #fff;
+        font-size: 12px;
+
+        .iconfont {
+            font-size: 12px;
+        }
+    }
+}
+
+.goods-container {
+    height: auto;
+    padding: 25px 0 0 0;
+    position: relative;
+    width: 970px + 10px;//每列增加右边距
+
+    .good-info {
+        width: 235px;
+
+    }
+}