Merge branch 'portal_dev_4.9' into grey

@@ -55,7 +55,7 @@
         <div class="shopBanner canEdit" data-dialogid="shopTopBanner">
             <img src="[[resources.shopTopBanner.data.shopSrc]]">
             [[if resources.shopTopBanner.data.isShowShopName == "Y"]]
-            <h1>[[shopName]]</h1>
+            <h1 style="color:white;margin-top:70px">[[shopName]]</h1>
             [[/if]]
         </div>
 

@@ -23,6 +23,7 @@
                 <input id="productSKN" type="text" class="form-control" placeholder="SKN" />&nbsp;&nbsp;
                 <input id="factoryCode" type="text" class="form-control" placeholder="商家编码" />&nbsp;&nbsp;
                 <a href="javascript:" class="btn btn-info filter-btn">查询</a>
+                <a id="all-btn" href="" class="btn btn-info">全部</a>
                 <a href="javascript:" class="btn btn-danger cancelAll" style="float: right;display: none">全部取消</a>
             </div>
             <div id="productTable"></div>