Authored by caoyan

Merge branch 'dev_店铺vip设置' into test5.7

... ... @@ -128,6 +128,7 @@ var t = new common.tab2({
batchAuditPlanId = [];
var columnname=t.options.columns[t.options.active].name;
g.options.columns[0].hidden = true;
g.options.columns[10].hidden = true;
g.options.columns[13].hidden = true;
g.options.columns[14].hidden = true;
g.options.columns[15].hidden = true;
... ... @@ -485,6 +486,21 @@ var g = new common.grid({
{display: 'VIP折扣类型', render: function(item) {
return ENUM.vipType[item.vip_discount_type];
}},
{display: '会员价', render: function(item) {
var html = '<p>VIP价:';
if(item.vip_price) html += item.vip_price +'</p>';
else html += '</p>';
html += '<p>白金:';
if(item.vip3_price) html += item.vip3_price +'</p>';
else html += '</p>';
html += '<p>金卡:';
if(item.vip2_price) html += item.vip2_price +'</p>';
else html += '</p>';
html += '<p>银卡:';
if(item.vip1_price) html += item.vip1_price +'</p>';
else html += '</p>';
return html;
}},
{display: '库存成本价', render: function(item) {
return formatFloat(item.storagePerPrice);
}},
... ...