Authored by tanling

Merge branch 'test6.9.1' of http://git.yoho.cn/fe/yohobuy-portal-fe2 into test6.9.1

@@ -95,7 +95,7 @@ var g = new common.grid({ @@ -95,7 +95,7 @@ var g = new common.grid({
95 return ""; 95 return "";
96 } 96 }
97 var HtmArr = []; 97 var HtmArr = [];
98 - HtmArr.push('<a href="/promotionInfo/edit/' + items.id + '"" class="btn btn-info btn-xs">编辑</a>'); 98 + HtmArr.push('<a target="_blank" href="/promotionInfo/edit/' + items.id + '"" class="btn btn-info btn-xs">编辑</a>');
99 if(items.isDel==="N"){ 99 if(items.isDel==="N"){
100 HtmArr.push('<a data-index="' + items.__index + '" href="JavaScript:;" class="btn btn-danger btn-xs del-promotion">删除</a>'); 100 HtmArr.push('<a data-index="' + items.__index + '" href="JavaScript:;" class="btn btn-danger btn-xs del-promotion">删除</a>');
101 } 101 }