build

@@ -481,10 +481,11 @@ webpackJsonp([51],[
 	                else html += '</p>';
 	            return html;
 	        }},
-	        {display: '当前售价', render: function(item) {
+	        {display: '售价', render: function(item) {
 	            var html = '<p>吊牌价:'+item.retail_price +'</p>';
 	                html += '<p>销售价:'+item.sales_price +'</p>';
-	                if (item.student_price) {html += '<p>学生价:'+item.student_price +'</p>';}                                  
+	                if (item.student_price) {html += '<p>学生价:'+item.student_price +'</p>';} 
+	                else if (item.currentPrice) {html += '<p>当前价:'+item.currentPrice +'</p>';}
 	            return html;
 	        }},
 	        {display: 'VIP折扣类型', render: function(item) {    

@@ -329,11 +329,13 @@
             <tr>
                 <th>吊牌价</th>
                 <th>销售价</th>
+                <th>当前价</th>
                 <th>价格生效-<font color="green">开始时间</font></th>
                 <th>价格生效-<font color="red">结束时间</font></th>
                 <th>状态</th>
                 <th>变价申请时间</th>
                 <th>变价人</th>
+                <th>变价类型</th>
                 <th>操作</th>
             </tr>
             </thead>
@@ -343,6 +345,7 @@
             <tr>
                 <td>[[item.retailPrice]]</td>
                 <td>[[item.salesPrice]]</td>
+                <td>[[item.currentPrice]]</td>
                 <td>[[item.effectiveTime]]</td>
                 <td>[[item.changePriceEndTime]]</td>
                 <td>
@@ -356,6 +359,7 @@
                 </td>
                 <td>[[item.createTime]]</td>
                 <td>[[item.founderName]]</td>
+                <td>[[item.changePriceType]]</td>
                 <td>
                     [[if item.flag && item.flag == 1]]
                     <a data-planid="[[item.planId]]" data-skn="[[productSkn]]" href="javascript:;" class="btn btn-danger btn-xs deleteHistory">删除</a>