fe / yohobuy-portal-fe · Commits

Go to a project

Authored by liuyue
Commit 1e3fa85130dd76ce6687ea42b4c6087a8aec9189 1 parent ec00ddb6

网销

Inline Side-by-side
Showing 6 changed files with 31 additions and 18 deletions
... ... @@ -152,7 +152,7 @@ var g = new common.grid({
render: function(item) {
return '<p><strong>吊牌价：</strong>' + item.retailPrice + '</p>' +
'<p><strong>销售价：</strong>' + item.salesPrice + '</p>' +
'<p><strong>是否VIP：</strong></p>' +
'<p><strong>是否VIP：</strong></p>' + item.isVIP + '</p>' +
'<p style="color: #ccc;"><strong>yoho币：</strong>' + item.returnCoin + '</p>';
}
}, {
... ... @@ -174,10 +174,10 @@ var g = new common.grid({
display: '搜索/标签',
hidden: true,
render: function(item) {
return '关键词：' + '<br>' +
return '关键词：' + item.searchAndLabel + '<br>' +
'风格：' + item.style + '<br>' +
'纹理：' + item.style + '<br>' +
'工艺：' + item.style + '<br>';
'纹理：' + item.pattern + '<br>' +
'工艺：' + item.makeCrafts + '<br>';
}
}, {
display: '操作信息',
... ...
... ... @@ -41,7 +41,9 @@ var basicInfohtml = '',
1: '普通',
2: '赠品'
}
};
},
basicInfo = NETSALEDATA.baseProductInfo.baseProduct || '',
productExtBo = NETSALEDATA.productExtBo || '';
/*
* 基本信息value值转换
... ... @@ -56,7 +58,7 @@ function convert(basicInfo, obj) {
return basicInfo;
}
var basicInfoData = convert(NETSALEDATA.baseProductInfo.baseProduct, convertObj);
var basicInfoData = convert(basicInfo, convertObj);
//基本信息
basicInfoData.renderType = $('.contentpanel').data('type');
... ... @@ -69,9 +71,10 @@ $('#goods-table').html(common.util.__template2($('#goodsList').html(), {
}));
//上架必填
NETSALEDATA.productExtBo.renderType = $('.contentpanel').data('type');
NETSALEDATA.productExtBo.sellChannels = NETSALEDATA.productExtBo.sellChannels.replace(/,/g, "|");
$('#product-ext').html(common.util.__template2($('#productExtBoTemp').html(), NETSALEDATA.productExtBo));
productExtBo.renderType = $('.contentpanel').data('type');
productExtBo.sellChannels = productExtBo.sellChannels ? productExtBo.sellChannels.replace(/,/g, "|") : '';
$('#product-ext').html(common.util.__template2($('#productExtBoTemp').html(), productExtBo));
if ($('.contentpanel').data('type') == 'info') {
... ...
... ... @@ -36,6 +36,10 @@ common.util.__ajax({
}));
};
e.init();
if ($('.contentpanel').data('type') == 'info') {
$('.brand-list').find('input').attr('disabled', true);
}
}, true);
$.each(NETSALEDATA.brandRelationList, function(index, value) {
... ...
... ... @@ -104,16 +104,16 @@
</div>
<div class="panel-col">
<select name="productStatus" id="productStatus" tabindex="-1" title="" class="form-control height40">
<option value="-1">状态</option>
<option value="1">待上架</option>
<option value="0">待审核</option>
<option value="">状态</option>
<option value="-1">待上架</option>
<option value="2">待审核</option>
<option value="3">驳回</option>
<option value="0">通过</option>
<option value="4">通过</option>
<option value="1">再次上架待审核</option>
<option value="0">再次上架驳回</option>
<option value="1">再次上架通过</option>
<option value="0">已上架</option>
<option value="0">已下架</option>
<option value="5">再次上架通过</option>
<option value="6">已上架</option>
<option value="7">已下架</option>
</select>
</div>
... ...
... ... @@ -24,12 +24,19 @@
<div class="col-sm-3">店铺：[[shopName]]</div>
<div class="col-sm-3">品牌：[[brandName]]</div>
<div class="col-sm-3">供应商：[[supplierName]]</div>
[[if renderType=='edit']]
<div class="col-sm-3">厂家编号：[[factoryCode]]</div>
[[else]]
<div class="col-sm-3"><img src="[[productImageUrl]]" alt=""></div>
[[/if]]
</div>
<div class="form-group">
<div class="col-sm-3">品类：</div>
<div class="col-sm-3">货品年：[[goodsYears]]</div>
<div class="col-sm-3">货品季：[[goodsSeason]]</div>
[[if renderType=='info']]
<div class="col-sm-3">厂家编号：[[factoryCode]]</div>
[[/if]]
</div>
<div class="form-group">
<div class="col-sm-3">SKN：[[productSkn]]</div>
... ...
... ... @@ -4,12 +4,11 @@
<div class="panel-btns" style="display: none;">
<a href="" class="panel-minimize tooltips" data-toggle="tooltip" title=""><i class="fa fa-minus"></i></a>
</div>
<h2 class="panel-title">商品关联</h2>
<h2 class="panel-title">（商品）品牌关联</h2>
</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]]
... ...