Authored by caoyan

变价记录优化

@@ -484,8 +484,10 @@ var g = new common.grid({ @@ -484,8 +484,10 @@ var g = new common.grid({
484 if (item.currentPrice) {html += '<p>当前价:'+item.currentPrice +'</p>';} 484 if (item.currentPrice) {html += '<p>当前价:'+item.currentPrice +'</p>';}
485 return html; 485 return html;
486 }}, 486 }},
487 - {display: 'VIP折扣类型', render: function(item) {  
488 - return ENUM.vipType[item.vip_discount_type]; 487 + {display: 'VIP折扣类型', render: function(item) {
  488 + var html = '<p>商品折扣类型:'+ENUM.vipType[item.vip_discount_type];
  489 + html += '<p>当前折扣类型:'+ENUM.vipType[item.current_vip_discount_type];
  490 + return html;
489 }}, 491 }},
490 {display: '会员价', render: function(item) { 492 {display: '会员价', render: function(item) {
491 var html = '<p>VIP价:'; 493 var html = '<p>VIP价:';