fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by dongjunjie
Commit 4587f90943a65b3b73053eae98bf1db4d8decc2f 2 parents 3d081ac5 505594d1

Merge branch 'testBLK' into portal_dev_4.9

Inline Side-by-side
Showing 3 changed files with 56 additions and 12 deletions
@@ -127,11 +127,13 @@ @@ -127,11 +127,13 @@
127 <ul> 127 <ul>
128 [[if resources.hotProducts.data.length > 0]] 128 [[if resources.hotProducts.data.length > 0]]
129 [[each resources.hotProducts.data as item _index]] 129 [[each resources.hotProducts.data as item _index]]
  130 + [[if _index < 6]]
130 <li> 131 <li>
131 <img src="[[item.src]]"> 132 <img src="[[item.src]]">
132 <div class="shadow"></div> 133 <div class="shadow"></div>
133 <div class="productInfo"><a href="javascript:">[[item.productName]]</a><b>￥[[item.salesPrice]]</b></div> 134 <div class="productInfo"><a href="javascript:">[[item.productName]]</a><b>￥[[item.salesPrice]]</b></div>
134 </li> 135 </li>
  136 + [[/if]]
135 [[/each]] 137 [[/each]]
136 [[else]] 138 [[else]]
137 <li> 139 <li>
@@ -169,7 +171,7 @@ @@ -169,7 +171,7 @@
169 <tbody> 171 <tbody>
170 <tr> 172 <tr>
171 <td> 173 <td>
172 - <input type="file" name='shopBannerImg' class="observe" value="[[data.shopSrc]]" data-field="shopSrc" > 174 + <input type="file" fileType='14' name='shopBannerImg' class="observe" value="[[data.shopSrc]]" data-field="shopSrc" >
173 </td> 175 </td>
174 <td> 176 <td>
175 <lable> 177 <lable>
@@ -182,7 +184,7 @@ @@ -182,7 +184,7 @@
182 </lable> 184 </lable>
183 </td> 185 </td>
184 <td> 186 <td>
185 - <input type="file" name='DetailbannerImage' class="observe" value="[[data.detailSrc]]" data-field="detailSrc" > 187 + <input type="file" fileType='15' name='DetailbannerImage' class="observe" value="[[data.detailSrc]]" data-field="detailSrc" >
186 </td> 188 </td>
187 </tr> 189 </tr>
188 </tbody> 190 </tbody>
@@ -200,7 +202,7 @@ @@ -200,7 +202,7 @@
200 <tbody> 202 <tbody>
201 <tr> 203 <tr>
202 <td> 204 <td>
203 - <input type="file" name='shopBannerAppImg' class="observe" value="[[data.shopSrc]]" data-field="shopSrc" > 205 + <input type="file" fileType='18' name='shopBannerAppImg' class="observe" value="[[data.shopSrc]]" data-field="shopSrc" >
204 </td> 206 </td>
205 </tr> 207 </tr>
206 </tbody> 208 </tbody>
@@ -230,7 +232,27 @@ @@ -230,7 +232,27 @@
230 </script> 232 </script>
231 233
232 <!--pc端大图资源位--> 234 <!--pc端大图资源位-->
233 -<script type="text/template" id="resourceImg"> 235 +<script type="text/template" id="largeImg">
  236 + <table class="table table-bordered">
  237 + <thead>
  238 + <tr>
  239 + <th>图片</th>
  240 + <th>链接</th>
  241 + </tr>
  242 + </thead>
  243 + <tbody>
  244 + [[each data as item _index]]
  245 + <tr>
  246 + <td><input type="file" fileType='16' name='resourceImage' class="observe" value="[[item.src]]" data-field="[[_index]].src"></td>
  247 + <td><input type="text" class="form-control observe" name="url" value="[[item.url]]" data-field="[[_index]].url"></td>
  248 + </tr>
  249 + [[/each]]
  250 + </tbody>
  251 + </table>
  252 +</script>
  253 +
  254 +<!--pc端小图资源位-->
  255 +<script type="text/template" id="smallImg">
234 <table class="table table-bordered"> 256 <table class="table table-bordered">
235 <thead> 257 <thead>
236 <tr> 258 <tr>
@@ -241,7 +263,7 @@ @@ -241,7 +263,7 @@
241 <tbody> 263 <tbody>
242 [[each data as item _index]] 264 [[each data as item _index]]
243 <tr> 265 <tr>
244 - <td><input type="file" name='resourceImage' class="observe" value="[[item.src]]" data-field="[[_index]].src"></td> 266 + <td><input type="file" fileType='17' name='resourceImage' class="observe" value="[[item.src]]" data-field="[[_index]].src"></td>
245 <td><input type="text" class="form-control observe" name="url" value="[[item.url]]" data-field="[[_index]].url"></td> 267 <td><input type="text" class="form-control observe" name="url" value="[[item.url]]" data-field="[[_index]].url"></td>
246 </tr> 268 </tr>
247 [[/each]] 269 [[/each]]
@@ -84,14 +84,14 @@ var ENUM = { @@ -84,14 +84,14 @@ var ENUM = {
84 }, 84 },
85 largeSlideImg:{ 85 largeSlideImg:{
86 title:"资源位大图编辑", 86 title:"资源位大图编辑",
87 - template:"resourceImg", 87 + template:"largeImg",
88 data:"largeSlideImg", 88 data:"largeSlideImg",
89 validate: ['url'], 89 validate: ['url'],
90 tip:"请上传像素375*400的图片，上传图片大小不能超过500KB" 90 tip:"请上传像素375*400的图片，上传图片大小不能超过500KB"
91 }, 91 },
92 oneRowTwoColImages:{ 92 oneRowTwoColImages:{
93 title:"资源位小图编辑", 93 title:"资源位小图编辑",
94 - template:"resourceImg", 94 + template:"smallImg",
95 data:"oneRowTwoColImages", 95 data:"oneRowTwoColImages",
96 validate: ['url'], 96 validate: ['url'],
97 tip:"请上传像素360*190的图片，上传图片大小不能超过500KB" 97 tip:"请上传像素360*190的图片，上传图片大小不能超过500KB"
@@ -127,11 +127,13 @@ @@ -127,11 +127,13 @@
127 <ul> 127 <ul>
128 [[if resources.hotProducts.data.length > 0]] 128 [[if resources.hotProducts.data.length > 0]]
129 [[each resources.hotProducts.data as item _index]] 129 [[each resources.hotProducts.data as item _index]]
  130 + [[if _index < 6]]
130 <li> 131 <li>
131 <img src="[[item.src]]"> 132 <img src="[[item.src]]">
132 <div class="shadow"></div> 133 <div class="shadow"></div>
133 <div class="productInfo"><a href="javascript:">[[item.productName]]</a><b>￥[[item.salesPrice]]</b></div> 134 <div class="productInfo"><a href="javascript:">[[item.productName]]</a><b>￥[[item.salesPrice]]</b></div>
134 </li> 135 </li>
  136 + [[/if]]
135 [[/each]] 137 [[/each]]
136 [[else]] 138 [[else]]
137 <li> 139 <li>
@@ -169,7 +171,7 @@ @@ -169,7 +171,7 @@
169 <tbody> 171 <tbody>
170 <tr> 172 <tr>
171 <td> 173 <td>
172 - <input type="file" name='shopBannerImg' class="observe" value="[[data.shopSrc]]" data-field="shopSrc" > 174 + <input type="file" fileType='14' name='shopBannerImg' class="observe" value="[[data.shopSrc]]" data-field="shopSrc" >
173 </td> 175 </td>
174 <td> 176 <td>
175 <lable> 177 <lable>
@@ -182,7 +184,7 @@ @@ -182,7 +184,7 @@
182 </lable> 184 </lable>
183 </td> 185 </td>
184 <td> 186 <td>
185 - <input type="file" name='DetailbannerImage' class="observe" value="[[data.detailSrc]]" data-field="detailSrc" > 187 + <input type="file" fileType='15' name='DetailbannerImage' class="observe" value="[[data.detailSrc]]" data-field="detailSrc" >
186 </td> 188 </td>
187 </tr> 189 </tr>
188 </tbody> 190 </tbody>
@@ -200,7 +202,7 @@ @@ -200,7 +202,7 @@
200 <tbody> 202 <tbody>
201 <tr> 203 <tr>
202 <td> 204 <td>
203 - <input type="file" name='shopBannerAppImg' class="observe" value="[[data.shopSrc]]" data-field="shopSrc" > 205 + <input type="file" fileType='18' name='shopBannerAppImg' class="observe" value="[[data.shopSrc]]" data-field="shopSrc" >
204 </td> 206 </td>
205 </tr> 207 </tr>
206 </tbody> 208 </tbody>
@@ -230,7 +232,27 @@ @@ -230,7 +232,27 @@
230 </script> 232 </script>
231 233
232 <!--pc端大图资源位--> 234 <!--pc端大图资源位-->
233 -<script type="text/template" id="resourceImg"> 235 +<script type="text/template" id="largeImg">
  236 + <table class="table table-bordered">
  237 + <thead>
  238 + <tr>
  239 + <th>图片</th>
  240 + <th>链接</th>
  241 + </tr>
  242 + </thead>
  243 + <tbody>
  244 + [[each data as item _index]]
  245 + <tr>
  246 + <td><input type="file" fileType='16' name='resourceImage' class="observe" value="[[item.src]]" data-field="[[_index]].src"></td>
  247 + <td><input type="text" class="form-control observe" name="url" value="[[item.url]]" data-field="[[_index]].url"></td>
  248 + </tr>
  249 + [[/each]]
  250 + </tbody>
  251 + </table>
  252 +</script>
  253 +
  254 +<!--pc端小图资源位-->
  255 +<script type="text/template" id="smallImg">
234 <table class="table table-bordered"> 256 <table class="table table-bordered">
235 <thead> 257 <thead>
236 <tr> 258 <tr>
@@ -241,7 +263,7 @@ @@ -241,7 +263,7 @@
241 <tbody> 263 <tbody>
242 [[each data as item _index]] 264 [[each data as item _index]]
243 <tr> 265 <tr>
244 - <td><input type="file" name='resourceImage' class="observe" value="[[item.src]]" data-field="[[_index]].src"></td> 266 + <td><input type="file" fileType='17' name='resourceImage' class="observe" value="[[item.src]]" data-field="[[_index]].src"></td>
245 <td><input type="text" class="form-control observe" name="url" value="[[item.url]]" data-field="[[_index]].url"></td> 267 <td><input type="text" class="form-control observe" name="url" value="[[item.url]]" data-field="[[_index]].url"></td>
246 </tr> 268 </tr>
247 [[/each]] 269 [[/each]]