变价记录优化

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