Authored by Lixiaodi

Merge branch 'dev6.1' into test6.1

@@ -13,7 +13,8 @@ module.exports={ @@ -13,7 +13,8 @@ module.exports={
13 {name: 'priority', type: 'Number'}, 13 {name: 'priority', type: 'Number'},
14 {name: 'status', type: 'Number'}, 14 {name: 'status', type: 'Number'},
15 {name: 'erpPromotionType', type: 'Number'}, 15 {name: 'erpPromotionType', type: 'Number'},
16 - {name: 'erpPromotionId', type: 'Number'} 16 + {name: 'erpPromotionId', type: 'Number'},
  17 + {name: 'showStatus', type: 'Number'}
17 ] 18 ]
18 }, 19 },
19 updatePromotionInfo:{ 20 updatePromotionInfo:{
@@ -29,7 +30,8 @@ module.exports={ @@ -29,7 +30,8 @@ module.exports={
29 {name: 'priority', type: 'Number'}, 30 {name: 'priority', type: 'Number'},
30 {name: 'status', type: 'Number'}, 31 {name: 'status', type: 'Number'},
31 {name: 'erpPromotionType', type: 'Number'}, 32 {name: 'erpPromotionType', type: 'Number'},
32 - {name: 'erpPromotionId', type: 'Number'} 33 + {name: 'erpPromotionId', type: 'Number'},
  34 + {name: 'showStatus', type: 'Number'}
33 ] 35 ]
34 }, 36 },
35 getPromotionInfo:{ 37 getPromotionInfo:{
@@ -61,6 +61,17 @@ @@ -61,6 +61,17 @@
61 <input type="hidden" id="status" name="status" value="" for="radio" required /> 61 <input type="hidden" id="status" name="status" value="" for="radio" required />
62 </div> 62 </div>
63 </div> 63 </div>
  64 +
  65 + <div class="form-group">
  66 + <label class="col-sm-2 control-label">展示状态 <span class="red">*</span></label>
  67 + <div class="col-sm-4">
  68 + <label class="radio-inline">
  69 + <input type="radio" name="showStatus" value="1">展示</label>
  70 + <label class="radio-inline">
  71 + <input type="radio" name="showStatus" value="0" selected="selected">不展示</label>
  72 + <input type="hidden" id="showStatus" name="showStatus" value="" for="radio" required />
  73 + </div>
  74 + </div>
64 </form> 75 </form>
65 76
66 77
@@ -63,6 +63,16 @@ @@ -63,6 +63,16 @@
63 <input type="hidden" id="status" name="status" value="[[status||'0']]" for="radio" required /> 63 <input type="hidden" id="status" name="status" value="[[status||'0']]" for="radio" required />
64 </div> 64 </div>
65 </div> 65 </div>
  66 + <div class="form-group">
  67 + <label class="col-sm-2 control-label">展示状态 <span class="red">*</span></label>
  68 + <div class="col-sm-4">
  69 + <label class="radio-inline">
  70 + <input type="radio" name="showStatus" value="1">展示</label>
  71 + <label class="radio-inline">
  72 + <input type="radio" name="showStatus" value="0" selected="selected">不展示</label>
  73 + <input type="hidden" id="showStatus" name="showStatus" value="[[showStatus||'0']]" for="radio" required />
  74 + </div>
  75 + </div>
66 76
67 </div> 77 </div>
68 78
@@ -54,6 +54,18 @@ var g = new common.grid({ @@ -54,6 +54,18 @@ var g = new common.grid({
54 return name; 54 return name;
55 } 55 }
56 }, { 56 }, {
  57 + display: '是否展示',
  58 + name: "showStatus",
  59 + render: function(item) {
  60 + var name;
  61 + if(item.showStatus===1){
  62 + name ="展示" ;
  63 + }else {
  64 + name ="不展示" ;
  65 + }
  66 + return name;
  67 + }
  68 + }, {
57 display: '优惠券限制使用', 69 display: '优惠券限制使用',
58 name: "status", 70 name: "status",
59 render: function(item) { 71 render: function(item) {