Authored by dongjunjie

Merge branch 'testBLK' into portal_dev_4.9

... ... @@ -127,11 +127,13 @@
<ul>
[[if resources.hotProducts.data.length > 0]]
[[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]]
[[else]]
<li>
... ... @@ -169,7 +171,7 @@
<tbody>
<tr>
<td>
<input type="file" name='shopBannerImg' class="observe" value="[[data.shopSrc]]" data-field="shopSrc" >
<input type="file" fileType='14' name='shopBannerImg' class="observe" value="[[data.shopSrc]]" data-field="shopSrc" >
</td>
<td>
<lable>
... ... @@ -182,7 +184,7 @@
</lable>
</td>
<td>
<input type="file" name='DetailbannerImage' class="observe" value="[[data.detailSrc]]" data-field="detailSrc" >
<input type="file" fileType='15' name='DetailbannerImage' class="observe" value="[[data.detailSrc]]" data-field="detailSrc" >
</td>
</tr>
</tbody>
... ... @@ -200,7 +202,7 @@
<tbody>
<tr>
<td>
<input type="file" name='shopBannerAppImg' class="observe" value="[[data.shopSrc]]" data-field="shopSrc" >
<input type="file" fileType='18' name='shopBannerAppImg' class="observe" value="[[data.shopSrc]]" data-field="shopSrc" >
</td>
</tr>
</tbody>
... ... @@ -230,7 +232,27 @@
</script>
<!--pc端大图资源位-->
<script type="text/template" id="resourceImg">
<script type="text/template" id="largeImg">
<table class="table table-bordered">
<thead>
<tr>
<th>图片</th>
<th>链接</th>
</tr>
</thead>
<tbody>
[[each data as item _index]]
<tr>
<td><input type="file" fileType='16' name='resourceImage' class="observe" value="[[item.src]]" data-field="[[_index]].src"></td>
<td><input type="text" class="form-control observe" name="url" value="[[item.url]]" data-field="[[_index]].url"></td>
</tr>
[[/each]]
</tbody>
</table>
</script>
<!--pc端小图资源位-->
<script type="text/template" id="smallImg">
<table class="table table-bordered">
<thead>
<tr>
... ... @@ -241,7 +263,7 @@
<tbody>
[[each data as item _index]]
<tr>
<td><input type="file" name='resourceImage' class="observe" value="[[item.src]]" data-field="[[_index]].src"></td>
<td><input type="file" fileType='17' name='resourceImage' class="observe" value="[[item.src]]" data-field="[[_index]].src"></td>
<td><input type="text" class="form-control observe" name="url" value="[[item.url]]" data-field="[[_index]].url"></td>
</tr>
[[/each]]
... ...
... ... @@ -84,14 +84,14 @@ var ENUM = {
},
largeSlideImg:{
title:"资源位大图编辑",
template:"resourceImg",
template:"largeImg",
data:"largeSlideImg",
validate: ['url'],
tip:"请上传像素375*400的图片,上传图片大小不能超过500KB"
},
oneRowTwoColImages:{
title:"资源位小图编辑",
template:"resourceImg",
template:"smallImg",
data:"oneRowTwoColImages",
validate: ['url'],
tip:"请上传像素360*190的图片,上传图片大小不能超过500KB"
... ...
... ... @@ -127,11 +127,13 @@
<ul>
[[if resources.hotProducts.data.length > 0]]
[[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]]
[[else]]
<li>
... ... @@ -169,7 +171,7 @@
<tbody>
<tr>
<td>
<input type="file" name='shopBannerImg' class="observe" value="[[data.shopSrc]]" data-field="shopSrc" >
<input type="file" fileType='14' name='shopBannerImg' class="observe" value="[[data.shopSrc]]" data-field="shopSrc" >
</td>
<td>
<lable>
... ... @@ -182,7 +184,7 @@
</lable>
</td>
<td>
<input type="file" name='DetailbannerImage' class="observe" value="[[data.detailSrc]]" data-field="detailSrc" >
<input type="file" fileType='15' name='DetailbannerImage' class="observe" value="[[data.detailSrc]]" data-field="detailSrc" >
</td>
</tr>
</tbody>
... ... @@ -200,7 +202,7 @@
<tbody>
<tr>
<td>
<input type="file" name='shopBannerAppImg' class="observe" value="[[data.shopSrc]]" data-field="shopSrc" >
<input type="file" fileType='18' name='shopBannerAppImg' class="observe" value="[[data.shopSrc]]" data-field="shopSrc" >
</td>
</tr>
</tbody>
... ... @@ -230,7 +232,27 @@
</script>
<!--pc端大图资源位-->
<script type="text/template" id="resourceImg">
<script type="text/template" id="largeImg">
<table class="table table-bordered">
<thead>
<tr>
<th>图片</th>
<th>链接</th>
</tr>
</thead>
<tbody>
[[each data as item _index]]
<tr>
<td><input type="file" fileType='16' name='resourceImage' class="observe" value="[[item.src]]" data-field="[[_index]].src"></td>
<td><input type="text" class="form-control observe" name="url" value="[[item.url]]" data-field="[[_index]].url"></td>
</tr>
[[/each]]
</tbody>
</table>
</script>
<!--pc端小图资源位-->
<script type="text/template" id="smallImg">
<table class="table table-bordered">
<thead>
<tr>
... ... @@ -241,7 +263,7 @@
<tbody>
[[each data as item _index]]
<tr>
<td><input type="file" name='resourceImage' class="observe" value="[[item.src]]" data-field="[[_index]].src"></td>
<td><input type="file" fileType='17' name='resourceImage' class="observe" value="[[item.src]]" data-field="[[_index]].src"></td>
<td><input type="text" class="form-control observe" name="url" value="[[item.url]]" data-field="[[_index]].url"></td>
</tr>
[[/each]]
... ...