fix

@@ -7,7 +7,7 @@ var $ = require('jquery'),
  */
 window.NETSALEDATA= window.ViewModel.data;
 console.log(window.NETSALEDATA);
-
+require("../fragement/_edit_promotions");
 var ENUM = {   
     status: {
         '0': '已下架',
@@ -28,8 +28,7 @@ var ENUM = {
         '3': 0,
         '4': 0,
         '5': 0
-    },
-	
+    },	
 	tabName:[
 		{en:"baseinfo",cn:"基本信息"},
 		{en:"condition",cn:"促销条件"},
@@ -91,60 +90,4 @@ var t = new common.tab2({
     }]
 }).init(ENUM.tab);
 
-//促销列表
-var grid_promotions = new common.grid({
-    el: '#basicTable_promotion',
-    size: 10,
-    parms: function() {
-        return {           
-            startTime: common.util.__input('startTime'),
-            endTime:common.util.__input("endTime")            
-        };
-    },
-    columns: [{
-       display: "ID",
-        name: "id"
-    }, {
-        display: "促销名称",
-        name: "title"        
-    }, {
-        display: '优先级',
-        name: "priority"
-    }, {
-        display: '开始时间',
-        name: "startTime",
-        render: function(item) {
-            var date = new Date(item.startTime * 1000);
-            return date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate() + ' ' + date.getHours() + ':' + date.getMinutes() + ':' + date.getSeconds();
-        }
-    }, {
-        display: '结束时间',
-        name: "endTime",
-        render: function(item) {
-            var date = new Date(item.endTime * 1000);
-            return date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate() + ' ' + date.getHours() + ':' + date.getMinutes() + ':' + date.getSeconds();
-        }
-    }, {
-        display: '是否启用',
-        name: "status",
-        render: function(item) {
-            if(item.status==1){
-                var name ="已启用" ;
-            }else {
-                var name ="未启用" ;
-            }
-            return name;
-        }
-    },  {
-        display: '优惠券限制使用',
-        name: "status",
-        render: function(item) {
-            if(item.status==1){
-                var name ="是" ;
-            }else {
-                var name ="否" ;
-            }
-            return name;
-        }
-    }]
-})
+

+'use strict';
+var $ = require('jquery'),
+	common = require('../../../../common/common');
+
+var grid_promotions = new common.grid({
+    el: '#basicTable_promotion',
+    size: 10,
+    parms: function() {
+        return {           
+            startTime: common.util.__input('startTime'),
+            endTime:common.util.__input("endTime")            
+        };
+    },
+    columns: [{
+       display: "ID",
+        name: "id"
+    }, {
+        display: "促销名称",
+        name: "title"        
+    }, {
+        display: '优先级',
+        name: "priority"
+    }, {
+        display: '开始时间',
+        name: "startTime",
+        render: function(item) {
+            var date = new Date(item.startTime * 1000);
+            return date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate() + ' ' + date.getHours() + ':' + date.getMinutes() + ':' + date.getSeconds();
+        }
+    }, {
+        display: '结束时间',
+        name: "endTime",
+        render: function(item) {
+            var date = new Date(item.endTime * 1000);
+            return date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate() + ' ' + date.getHours() + ':' + date.getMinutes() + ':' + date.getSeconds();
+        }
+    }, {
+        display: '是否启用',
+        name: "status",
+        render: function(item) {
+            if(item.status==1){
+                var name ="已启用" ;
+            }else {
+                var name ="未启用" ;
+            }
+            return name;
+        }
+    },  {
+        display: '优惠券限制使用',
+        name: "status",
+        render: function(item) {
+            if(item.status==1){
+                var name ="是" ;
+            }else {
+                var name ="否" ;
+            }
+            return name;
+        }
+    }]
+})
\ No newline at end of file