fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by 马力
Commit 11fafea85841089a329aa7c35b7092bfad39caab 2 parents 07f4d477 dc2ee9cf

Merge branch 'hotfix_13965' into grey

Inline Side-by-side
Showing 2 changed files with 5 additions and 2 deletions
... ... @@ -458,7 +458,9 @@ grid.prototype = {
window.batchOperateShelve.push(g.rows[$(this).attr("data-index")]['productSkn']);
}
}else{
window.batchOperateShelve.splice($.inArray(g.rows[$(this).attr("data-index")]['productSkn'],window.batchOperateShelve),1);
if($.inArray(g.rows[$(this).attr("data-index")]['productSkn'], window.batchOperateShelve) != -1 ){
window.batchOperateShelve.splice($.inArray(g.rows[$(this).attr("data-index")]['productSkn'],window.batchOperateShelve),1);
}
}
}
/********************************************/
... ...
... ... @@ -83,6 +83,7 @@ var t = new common.tab2({
} else {
sortFlag = 1;
}
batchOperateShelve = [];
g.init("/goods/netsale/getList");
},
columns: [{
... ... @@ -476,7 +477,7 @@ $('#onshelve').on('click', function () {
}
skns = skns + value+",";
});
htmlContent += "<div class=\"alert alert-danger\" style=\"margin-top:5px;width:100% \">"+skns+"</div>"
htmlContent += "<div class=\"alert alert-danger\" style=\"margin-top:5px;width:100% \">"+skns.substr(0,skns.length-1)+"</div>"
}
htmlContent +="<div class=\"form-group\" style=\"float:right \">"+
"<div style=\"margin-right:10% \" class=\"col-sm-1\"><a id = \"confirmSkn\" class=\"btn btn-info\" href=\"javascript:;\">确定</a></div>"
... ...