liuloulou / yohobuy-portal-fe2 · Commits

Go to a project

Authored by dongjunjie
Commit f05b68e7b182d6f59b3e0dc879cb6fd5bdda292b 2 parents 8d7466f6 454b95c5

Merge branch 'testBLK' into portal_dev_4.9 

# Conflicts:
#	code/apps/shop/views/DecorationBLK.html
#	server/views/shop/DecorationBLK.html
Inline Side-by-side
Showing 2 changed files with 160 additions and 160 deletions
... ... @@ -100,30 +100,30 @@
<div class="productList canEdit" data-dialogid="newProducts">
<ul>
[[if resources.newProducts.data.length > 0]]
[[if resources.hotProducts.data.length > 4 && resources.newProducts.data.length < 8]]
[[each resources.newProducts.data as item _index]]
[[if _index < 4]]
<li>
<img src="[[item.src]]">
<div class="productInfo"><a href="javascript:">[[item.productName]]</a><b>￥[[item.salesPrice]]</b></div>
</li>
[[/if]]
[[/each]]
[[else]]
[[each resources.newProducts.data as item _index]]
[[if _index < 8]]
<li>
<img src="[[item.src]]">
<div class="productInfo"><a href="javascript:">[[item.productName]]</a><b>￥[[item.salesPrice]]</b></div>
</li>
[[/if]]
[[/each]]
[[/if]]
[[if resources.hotProducts.data.length > 4 && resources.newProducts.data.length < 8]]
[[each resources.newProducts.data as item _index]]
[[if _index < 4]]
<li>
<img src="[[item.src]]">
<div class="productInfo"><a href="javascript:">[[item.productName]]</a><b>￥[[item.salesPrice]]</b></div>
</li>
[[/if]]
[[/each]]
[[else]]
[[each resources.newProducts.data as item _index]]
[[if _index < 8]]
<li>
<img src="[[item.src]]">
<div class="productInfo"><a href="javascript:">[[item.productName]]</a><b>￥[[item.salesPrice]]</b></div>
</li>
[[/if]]
[[/each]]
[[/if]]
[[else]]
<li>
<img src="http://img01.yohoboys.com/staticimg/2016/05/19/15/01091c21f2317a64f123f1649fbbccf7ba.png">
<div class="productInfo"><a href="javascript:">商品展示样例</a><b>￥商品价格</b></div>
</li>
<li>
<img src="http://img01.yohoboys.com/staticimg/2016/05/19/15/01091c21f2317a64f123f1649fbbccf7ba.png">
<div class="productInfo"><a href="javascript:">商品展示样例</a><b>￥商品价格</b></div>
</li>
[[/if]]
<div class="clearfix"></div>
</ul>
... ... @@ -139,33 +139,33 @@
<div class="productList canEdit" data-dialogid="hotProducts">
<ul>
[[if resources.hotProducts.data.length > 0]]
[[if resources.hotProducts.data.length > 3 && resources.hotProducts.data.length < 6]]
[[each resources.hotProducts.data as item _index]]
[[if _index < 3]]
<li>
<img src="[[item.src]]">
<div class="shadow"></div>
<div class="productInfo"><a href="javascript:">[[item.productName]]</a><b>￥[[item.salesPrice]]</b></div>
</li>
[[/if]]
[[/each]]
[[else]]
[[each resources.hotProducts.data as item _index]]
[[if _index < 6]]
<li>
<img src="[[item.src]]">
<div class="shadow"></div>
<div class="productInfo"><a href="javascript:">[[item.productName]]</a><b>￥[[item.salesPrice]]</b></div>
</li>
[[/if]]
[[/each]]
[[/if]]
[[if resources.hotProducts.data.length > 3 && resources.hotProducts.data.length < 6]]
[[each resources.hotProducts.data as item _index]]
[[if _index < 3]]
<li>
<img src="[[item.src]]">
<div class="shadow"></div>
<div class="productInfo"><a href="javascript:">[[item.productName]]</a><b>￥[[item.salesPrice]]</b></div>
</li>
[[/if]]
[[/each]]
[[else]]
[[each resources.hotProducts.data as item _index]]
[[if _index < 6]]
<li>
<img src="[[item.src]]">
<div class="shadow"></div>
<div class="productInfo"><a href="javascript:">[[item.productName]]</a><b>￥[[item.salesPrice]]</b></div>
</li>
[[/if]]
[[/each]]
[[/if]]
[[else]]
<li>
<img src="http://img01.yohoboys.com/staticimg/2016/05/19/15/01091c21f2317a64f123f1649fbbccf7ba.png">
<div class="shadow"></div>
<div class="productInfo"><a href="javascript:">商品展示样例</a><b>￥商品价格</b></div>
</li>
<li>
<img src="http://img01.yohoboys.com/staticimg/2016/05/19/15/01091c21f2317a64f123f1649fbbccf7ba.png">
<div class="shadow"></div>
<div class="productInfo"><a href="javascript:">商品展示样例</a><b>￥商品价格</b></div>
</li>
[[/if]]
<div class="clearfix"></div>
</ul>
... ... @@ -187,31 +187,31 @@
<script type="text/template" id="shopTopBanner">
<table class="table table-bordered">
<thead>
<tr>
<th>PC端店铺banner图片</th>
<th>PC端是否展示店铺名称</th>
<th>PC端商品详情页banner图片</th>
</tr>
<tr>
<th>PC端店铺banner图片</th>
<th>PC端是否展示店铺名称</th>
<th>PC端商品详情页banner图片</th>
</tr>
</thead>
<tbody>
<tr>
<td>
<input type="file" fileType='14' name='shopBannerImg' class="observe" value="[[data.shopSrc]]" data-field="shopSrc" >
</td>
<td>
<lable>
<input type='radio' name='isShowShopName' class="observe" value='Y' [[data.isShowShopName=='Y'?'checked':'']] data-field="isShowShopName">
&nbsp;&nbsp;显示店铺名称
</lable><br>
<lable>
<input type='radio' name='isShowShopName' class="observe" value='N' [[data.isShowShopName=='N'?'checked':'']] data-field="isShowShopName">
&nbsp;&nbsp;不显示店铺名称
</lable>
</td>
<td>
<input type="file" fileType='15' name='DetailbannerImage' class="observe" value="[[data.detailSrc]]" data-field="detailSrc" >
</td>
</tr>
<tr>
<td>
<input type="file" fileType='14' name='shopBannerImg' class="observe" value="[[data.shopSrc]]" data-field="shopSrc" >
</td>
<td>
<lable>
<input type='radio' name='isShowShopName' class="observe" value='Y' [[data.isShowShopName=='Y'?'checked':'']] data-field="isShowShopName">
&nbsp;&nbsp;显示店铺名称
</lable><br>
<lable>
<input type='radio' name='isShowShopName' class="observe" value='N' [[data.isShowShopName=='N'?'checked':'']] data-field="isShowShopName">
&nbsp;&nbsp;不显示店铺名称
</lable>
</td>
<td>
<input type="file" fileType='15' name='DetailbannerImage' class="observe" value="[[data.detailSrc]]" data-field="detailSrc" >
</td>
</tr>
</tbody>
</table>
</script>
... ... @@ -220,16 +220,16 @@
<script type="text/template" id="shopTopBanner_app">
<table class="table table-bordered">
<thead>
<tr>
<th>APP端店铺banner图片</th>
</tr>
<tr>
<th>APP端店铺banner图片</th>
</tr>
</thead>
<tbody>
<tr>
<td>
<input type="file" fileType='18' name='shopBannerAppImg' class="observe" value="[[data.shopSrc]]" data-field="shopSrc" >
</td>
</tr>
<tr>
<td>
<input type="file" fileType='18' name='shopBannerAppImg' class="observe" value="[[data.shopSrc]]" data-field="shopSrc" >
</td>
</tr>
</tbody>
</table>
</script>
... ...
... ... @@ -100,30 +100,30 @@
<div class="productList canEdit" data-dialogid="newProducts">
<ul>
[[if resources.newProducts.data.length > 0]]
[[if resources.hotProducts.data.length > 4 && resources.newProducts.data.length < 8]]
[[each resources.newProducts.data as item _index]]
[[if _index < 4]]
<li>
<img src="[[item.src]]">
<div class="productInfo"><a href="javascript:">[[item.productName]]</a><b>￥[[item.salesPrice]]</b></div>
</li>
[[/if]]
[[/each]]
[[else]]
[[each resources.newProducts.data as item _index]]
[[if _index < 8]]
<li>
<img src="[[item.src]]">
<div class="productInfo"><a href="javascript:">[[item.productName]]</a><b>￥[[item.salesPrice]]</b></div>
</li>
[[/if]]
[[/each]]
[[/if]]
[[if resources.hotProducts.data.length > 4 && resources.newProducts.data.length < 8]]
[[each resources.newProducts.data as item _index]]
[[if _index < 4]]
<li>
<img src="[[item.src]]">
<div class="productInfo"><a href="javascript:">[[item.productName]]</a><b>￥[[item.salesPrice]]</b></div>
</li>
[[/if]]
[[/each]]
[[else]]
[[each resources.newProducts.data as item _index]]
[[if _index < 8]]
<li>
<img src="[[item.src]]">
<div class="productInfo"><a href="javascript:">[[item.productName]]</a><b>￥[[item.salesPrice]]</b></div>
</li>
[[/if]]
[[/each]]
[[/if]]
[[else]]
<li>
<img src="http://img01.yohoboys.com/staticimg/2016/05/19/15/01091c21f2317a64f123f1649fbbccf7ba.png">
<div class="productInfo"><a href="javascript:">商品展示样例</a><b>￥商品价格</b></div>
</li>
<li>
<img src="http://img01.yohoboys.com/staticimg/2016/05/19/15/01091c21f2317a64f123f1649fbbccf7ba.png">
<div class="productInfo"><a href="javascript:">商品展示样例</a><b>￥商品价格</b></div>
</li>
[[/if]]
<div class="clearfix"></div>
</ul>
... ... @@ -139,33 +139,33 @@
<div class="productList canEdit" data-dialogid="hotProducts">
<ul>
[[if resources.hotProducts.data.length > 0]]
[[if resources.hotProducts.data.length > 3 && resources.hotProducts.data.length < 6]]
[[each resources.hotProducts.data as item _index]]
[[if _index < 3]]
<li>
<img src="[[item.src]]">
<div class="shadow"></div>
<div class="productInfo"><a href="javascript:">[[item.productName]]</a><b>￥[[item.salesPrice]]</b></div>
</li>
[[/if]]
[[/each]]
[[else]]
[[each resources.hotProducts.data as item _index]]
[[if _index < 6]]
<li>
<img src="[[item.src]]">
<div class="shadow"></div>
<div class="productInfo"><a href="javascript:">[[item.productName]]</a><b>￥[[item.salesPrice]]</b></div>
</li>
[[/if]]
[[/each]]
[[/if]]
[[if resources.hotProducts.data.length > 3 && resources.hotProducts.data.length < 6]]
[[each resources.hotProducts.data as item _index]]
[[if _index < 3]]
<li>
<img src="[[item.src]]">
<div class="shadow"></div>
<div class="productInfo"><a href="javascript:">[[item.productName]]</a><b>￥[[item.salesPrice]]</b></div>
</li>
[[/if]]
[[/each]]
[[else]]
[[each resources.hotProducts.data as item _index]]
[[if _index < 6]]
<li>
<img src="[[item.src]]">
<div class="shadow"></div>
<div class="productInfo"><a href="javascript:">[[item.productName]]</a><b>￥[[item.salesPrice]]</b></div>
</li>
[[/if]]
[[/each]]
[[/if]]
[[else]]
<li>
<img src="http://img01.yohoboys.com/staticimg/2016/05/19/15/01091c21f2317a64f123f1649fbbccf7ba.png">
<div class="shadow"></div>
<div class="productInfo"><a href="javascript:">商品展示样例</a><b>￥商品价格</b></div>
</li>
<li>
<img src="http://img01.yohoboys.com/staticimg/2016/05/19/15/01091c21f2317a64f123f1649fbbccf7ba.png">
<div class="shadow"></div>
<div class="productInfo"><a href="javascript:">商品展示样例</a><b>￥商品价格</b></div>
</li>
[[/if]]
<div class="clearfix"></div>
</ul>
... ... @@ -187,31 +187,31 @@
<script type="text/template" id="shopTopBanner">
<table class="table table-bordered">
<thead>
<tr>
<th>PC端店铺banner图片</th>
<th>PC端是否展示店铺名称</th>
<th>PC端商品详情页banner图片</th>
</tr>
<tr>
<th>PC端店铺banner图片</th>
<th>PC端是否展示店铺名称</th>
<th>PC端商品详情页banner图片</th>
</tr>
</thead>
<tbody>
<tr>
<td>
<input type="file" fileType='14' name='shopBannerImg' class="observe" value="[[data.shopSrc]]" data-field="shopSrc" >
</td>
<td>
<lable>
<input type='radio' name='isShowShopName' class="observe" value='Y' [[data.isShowShopName=='Y'?'checked':'']] data-field="isShowShopName">
&nbsp;&nbsp;显示店铺名称
</lable><br>
<lable>
<input type='radio' name='isShowShopName' class="observe" value='N' [[data.isShowShopName=='N'?'checked':'']] data-field="isShowShopName">
&nbsp;&nbsp;不显示店铺名称
</lable>
</td>
<td>
<input type="file" fileType='15' name='DetailbannerImage' class="observe" value="[[data.detailSrc]]" data-field="detailSrc" >
</td>
</tr>
<tr>
<td>
<input type="file" fileType='14' name='shopBannerImg' class="observe" value="[[data.shopSrc]]" data-field="shopSrc" >
</td>
<td>
<lable>
<input type='radio' name='isShowShopName' class="observe" value='Y' [[data.isShowShopName=='Y'?'checked':'']] data-field="isShowShopName">
&nbsp;&nbsp;显示店铺名称
</lable><br>
<lable>
<input type='radio' name='isShowShopName' class="observe" value='N' [[data.isShowShopName=='N'?'checked':'']] data-field="isShowShopName">
&nbsp;&nbsp;不显示店铺名称
</lable>
</td>
<td>
<input type="file" fileType='15' name='DetailbannerImage' class="observe" value="[[data.detailSrc]]" data-field="detailSrc" >
</td>
</tr>
</tbody>
</table>
</script>
... ... @@ -220,16 +220,16 @@
<script type="text/template" id="shopTopBanner_app">
<table class="table table-bordered">
<thead>
<tr>
<th>APP端店铺banner图片</th>
</tr>
<tr>
<th>APP端店铺banner图片</th>
</tr>
</thead>
<tbody>
<tr>
<td>
<input type="file" fileType='18' name='shopBannerAppImg' class="observe" value="[[data.shopSrc]]" data-field="shopSrc" >
</td>
</tr>
<tr>
<td>
<input type="file" fileType='18' name='shopBannerAppImg' class="observe" value="[[data.shopSrc]]" data-field="shopSrc" >
</td>
</tr>
</tbody>
</table>
</script>
... ...