Authored by 姜敏

优惠券管理-界面bug修复

@@ -138,10 +138,17 @@ var g = new common.grid({ @@ -138,10 +138,17 @@ var g = new common.grid({
138 { 138 {
139 display: '状态', render: function (item) { 139 display: '状态', render: function (item) {
140 var html = ENUM.status[item.status] || '全部'; 140 var html = ENUM.status[item.status] || '全部';
141 - if (item.reason) {  
142 - if (item.status == 2 || item.status == 4) {  
143 - html += '<p style="color:red;word-wrap: break-word;">(' + item.reason + ')</p>'; 141 + if (item.status == 2) {
  142 + if (item.rejectReason.length > 10) {
  143 + item.rejectReason = item.rejectReason.substring(0, 10) + "......";
144 } 144 }
  145 + html += '<p style="color:red;word-wrap: break-word;">(' + item.rejectReason + ')</p>';
  146 + }
  147 + if (item.status == 3) {
  148 + if (item.invalidReason.length > 10) {
  149 + item.invalidReason = item.invalidReason.substring(0, 10) + "......";
  150 + }
  151 + html += '<p style="color:red;word-wrap: break-word;">(' + item.invalidReason + ')</p>';
145 } 152 }
146 return html; 153 return html;
147 } 154 }
@@ -172,7 +179,7 @@ var Bll = { @@ -172,7 +179,7 @@ var Bll = {
172 data: data() 179 data: data()
173 }, function () { 180 }, function () {
174 g.reload(); 181 g.reload();
175 - },true); 182 + }, true);
176 }); 183 });
177 }, 184 },
178 toastPass: function (content, url, data) { 185 toastPass: function (content, url, data) {
@@ -182,7 +189,7 @@ var Bll = { @@ -182,7 +189,7 @@ var Bll = {
182 data: data 189 data: data
183 }, function () { 190 }, function () {
184 g.reload(); 191 g.reload();
185 - },true); 192 + }, true);
186 }); 193 });
187 }, 194 },
188 toastInfo: function (item, hint) { 195 toastInfo: function (item, hint) {
@@ -256,7 +263,7 @@ $(document).on('click', '.apply-cancel', function () { @@ -256,7 +263,7 @@ $(document).on('click', '.apply-cancel', function () {
256 invalidReason: reason 263 invalidReason: reason
257 }; 264 };
258 }; 265 };
259 - Bll.toast(common.util.__template2($("#template").html(), {name: "你确定要作废此限购码吗?"}), "/coupon/invalid", data); 266 + Bll.toast(common.util.__template2($("#template").html(), {name: "你确定要作废此优惠券吗?"}), "/coupon/invalid", data);
260 }); 267 });
261 /** 268 /**
262 * 查看详情 269 * 查看详情
@@ -283,8 +290,8 @@ $(document).on('click', '.coupon-info', function () { @@ -283,8 +290,8 @@ $(document).on('click', '.coupon-info', function () {
283 } 290 }
284 item1.customType = types.join(","); 291 item1.customType = types.join(",");
285 } 292 }
286 - }else {  
287 - item1.customType="无"; 293 + } else {
  294 + item1.customType = "无";
288 } 295 }
289 Bll.toastInfo(item1, '优惠券详情'); 296 Bll.toastInfo(item1, '优惠券详情');
290 }); 297 });
@@ -12,9 +12,8 @@ var config = { @@ -12,9 +12,8 @@ var config = {
12 'development': { 12 'development': {
13 redis: null, 13 redis: null,
14 apiKey: 'sd4H1ecAqlp', 14 apiKey: 'sd4H1ecAqlp',
15 - // domain:'http://192.168.102.210:8088/platform',//联调  
16 - yohoSearch: 'http://192.168.102.216:8087/yohosearch',  
17 - domain: 'http://192.168.102.202:8088/platform',//测试 15 + domain:'http://192.168.102.210:8088/platform',//联调
  16 + // domain: 'http://192.168.102.202:8088/platform',//测试
18 17
19 loggers: { 18 loggers: {
20 api: { 19 api: {
@@ -69,7 +69,6 @@ @@ -69,7 +69,6 @@
69 <option value="2">B</option> 69 <option value="2">B</option>
70 <option value="3">公开券</option> 70 <option value="3">公开券</option>
71 <option value="4">生日券</option> 71 <option value="4">生日券</option>
72 - <option value="5">免邮券</option>  
73 </select> 72 </select>
74 </div> 73 </div>
75 </div> 74 </div>