build

@@ -9,7 +9,7 @@ webpackJsonp([132],[
 	$('input[type="file"]').after('<div class="file-name btn btn-default">请选择文件</div>');
 
 	var loadModal = null;
-
+	//导入
 	function batchImport(el, type) {
 	    return {
 	        params: {

@@ -45,7 +45,7 @@ webpackJsonp([133],[
 	    { display: "起购件数", render: function(items) {
 	        return items.minCount;
 	    }},
-	    { display: "促销短语", render: function(items) {
+	    { display: "促销名称", render: function(items) {
 	        return items.promotionPhrase;
 	    }},
 	    { display: "状态", render: function(items) {

 module.exports = function (app) {
-
+    //量贩
     app.get("/product/batch/index", "product.productBatch.Index", function(req, res) {
         this.$extend = {
             moduleName: "营销管理",

@@ -2,7 +2,7 @@
 <%include '../../common/__partail/ListHeader'%>
 
 <div class="data.contentDatapanel">
-    
+    <!-- 量贩 -->
     <form id="add-form" class="form-horizontal form-bordered" type="<%type%>" action="<%action%>">
         <div class="panel-group">
             <div class="panel-group" id="editor-group">

 <%include '../../common/__ui/header'%>
 <%include '../../common/__partail/ListHeader'%>
-
+<!-- 量贩 -->
 <div class="contentpanel">
     <div class="panel panel-default" style="margin-bottom:10px;">
         <div class="panel-body">
@@ -17,7 +17,7 @@
                     <td>说明：</td>
                     <td colspan="2">
                         1、上传文件必须是 .xlsx 文件<br>
-                        2、第一行标题栏：SKN、起购件数、折扣、促销短语<br>
+                        2、第一行标题栏：SKN、起购件数、折扣、促销名称、状态（1：开启，2：关闭）<br>
                         <span style="color: red;">3、折扣只支持 0.01-1 之间的数字，到小数点后 2 位，例如 0.85；</span><br>
                         4、量贩商品不可参加秒杀、限定、预售、定金预售，设定后无法生效<br/>
                         5、<a href="/ajax/link/productBatchImport">下载样例</a>

@@ -2,7 +2,7 @@
 <%include '../../common/__partail/ListHeader'%>
 
 <div class="contentpanel">
-
+    <!-- 量贩 -->
     <div class="panel panel-default" style="margin-bottom: 10px;">
 
         <div class="panel-body" style="padding-bottom: 0px; padding-left: 10px;">