fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by ping
Commit 698a92bf39ffe5d8ff42619a6117a977cbc0bdb9 2 parents 2b52d519 b51725bc

Merge branch 'portal_dev_4.9' into grey

Inline Side-by-side
Showing 2 changed files with 2 additions and 1 deletions
@@ -55,7 +55,7 @@ @@ -55,7 +55,7 @@
55 <div class="shopBanner canEdit" data-dialogid="shopTopBanner"> 55 <div class="shopBanner canEdit" data-dialogid="shopTopBanner">
56 <img src="[[resources.shopTopBanner.data.shopSrc]]"> 56 <img src="[[resources.shopTopBanner.data.shopSrc]]">
57 [[if resources.shopTopBanner.data.isShowShopName == "Y"]] 57 [[if resources.shopTopBanner.data.isShowShopName == "Y"]]
58 - <h1>[[shopName]]</h1> 58 + <h1 style="color:white;margin-top:70px">[[shopName]]</h1>
59 [[/if]] 59 [[/if]]
60 </div> 60 </div>
61 61
@@ -23,6 +23,7 @@ @@ -23,6 +23,7 @@
23 <input id="productSKN" type="text" class="form-control" placeholder="SKN" />&nbsp;&nbsp; 23 <input id="productSKN" type="text" class="form-control" placeholder="SKN" />&nbsp;&nbsp;
24 <input id="factoryCode" type="text" class="form-control" placeholder="商家编码" />&nbsp;&nbsp; 24 <input id="factoryCode" type="text" class="form-control" placeholder="商家编码" />&nbsp;&nbsp;
25 <a href="javascript:" class="btn btn-info filter-btn">查询</a> 25 <a href="javascript:" class="btn btn-info filter-btn">查询</a>
  26 + <a id="all-btn" href="" class="btn btn-info">全部</a>
26 <a href="javascript:" class="btn btn-danger cancelAll" style="float: right;display: none">全部取消</a> 27 <a href="javascript:" class="btn btn-danger cancelAll" style="float: right;display: none">全部取消</a>
27 </div> 28 </div>
28 <div id="productTable"></div> 29 <div id="productTable"></div>