Authored by chenchao

with param info

@@ -45,10 +45,11 @@ var g = new common.grid({ @@ -45,10 +45,11 @@ var g = new common.grid({
45 display: '是否启用', 45 display: '是否启用',
46 name: "status", 46 name: "status",
47 render: function(item) { 47 render: function(item) {
  48 + var name;
48 if(item.status==1){ 49 if(item.status==1){
49 - var name ="已启用" ; 50 + name ="已启用" ;
50 }else { 51 }else {
51 - var name ="未启用" ; 52 + name ="未启用" ;
52 } 53 }
53 return name; 54 return name;
54 } 55 }
@@ -56,10 +57,13 @@ var g = new common.grid({ @@ -56,10 +57,13 @@ var g = new common.grid({
56 display: '优惠券限制使用', 57 display: '优惠券限制使用',
57 name: "status", 58 name: "status",
58 render: function(item) { 59 render: function(item) {
59 - if(item.status==1){  
60 - var name ="是" ; 60 + var name="促销条件未设置";
  61 + if(item.promotionParams&&item.promotionParams.limitParam){
  62 + if(item.promotionParams.limitParam==1){
  63 + name ="是" ;
61 }else { 64 }else {
62 - var name ="否" ; 65 + name ="否" ;
  66 + }
63 } 67 }
64 return name; 68 return name;
65 } 69 }