fe / yohobuy-portal-fe · Commits

Go to a project

Authored by liuyue
Commit fdf574ff2c0697e27d7c12f91a9cfd2e3f685bce 1 parent 1e3fa851

网销

Inline Side-by-side
Showing 4 changed files with 19 additions and 11 deletions
... ... @@ -190,6 +190,7 @@ var g = new common.grid({
if (item.editTime) {
html += '<p>' + item.editTime + '</p>';
}
return html;
}
}, {
... ... @@ -201,6 +202,9 @@ var g = new common.grid({
if (item.shelveTime) {
html += '<br>上架时间：' + item.shelveTime;
}
if (item.status == 3) {
html += '<p style="color:red;">(' + item.rejectReason + ')</p>'
}
return html;
}
}, {
... ...
... ... @@ -30,7 +30,7 @@ common.util.__ajax({
}));
if (NETSALEDATA.brandRelationList) {
$('#brandWrap').html(common.util.__template2($('#brandWrap').html(), {
$('.selected-brand').html(common.util.__template2($('#brandShowTemp').html(), {
brandRelationList: NETSALEDATA.brandRelationList,
brandRelation: brandSelectArr.join('|')
}));
... ...
... ... @@ -57,16 +57,16 @@
</div>
<div class="panel-col">
<select name="isScreen" id="isScreen" tabindex="-1" title="" class="form-control height40">
<option value="-1">拍摄状态</option>
<option value="1">已拍摄</option>
<option value="0">未拍摄</option>
<option value="">拍摄状态</option>
<option value="Y">已拍摄</option>
<option value="N">未拍摄</option>
</select>
</div>
<div class="panel-col">
<select name="isMeasure" id="isMeasure" tabindex="-1" title="" class="form-control height40">
<option value="-1">测量状态</option>
<option value="1">已测量</option>
<option value="0">未测量</option>
<option value="">测量状态</option>
<option value="Y">已测量</option>
<option value="N">未测量</option>
</select>
</div>
<div class="panel-col">
... ...
... ... @@ -8,10 +8,8 @@
</div>
<div id="brandWrap" class="panel-body">
<div class="form-group selected-brand" style="min-height: 60px;">
<input id="brandRelationList" type="hidden" value="[[brandRelation]]" for="checkbox">
[[each brandRelationList as a index]]
<div class="col-sm-2" data-id="[[a.brandId]]">[[a.brandName]]</div>
[[/each]]
</div>
<div class="form-group brand-list">
</div>
... ... @@ -35,4 +33,10 @@
</div>
</div>
[[/each]]
</script>
<script type="text/template" id="brandShowTemp">
<input id="brandRelationList" type="hidden" value="[[brandRelation]]" for="checkbox">
[[each brandRelationList as a index]]
<div class="col-sm-2" data-id="[[a.brandId]]">[[a.brandName]]</div>
[[/each]]
</script>
\ No newline at end of file
... ...