Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressIntoBasket.js =================================================================== diff -u -r25711 -r25721 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressIntoBasket.js (.../expressIntoBasket.js) (revision 25711) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressIntoBasket.js (.../expressIntoBasket.js) (revision 25721) @@ -869,24 +869,6 @@ var payItem = paylist[i]; var repeat = false; for (var j = 0; j < payArr.length; j++) { - if (payItem.tousseName == payArr[j].tousseName && payItem.recyclingAmount == payArr[j].recyclingAmount) { - payArr[j].recyclingAmount = payArr[j].recyclingAmount - repeat = true; - break; - } - } - if (!repeat) { - payArr.push(payItem); - } - } - return payArr; -} -function UniquePays(paylists){ - var payArr = [paylists[0]]; - for(var i = 1; i < paylists.length; i++){ - var payItem = paylists[i]; - var repeat = false; - for (var j = 0; j < payArr.length; j++) { if (payItem.tousseName == payArr[j].tousseName) { payArr[j].recyclingAmount = parseFloat(payArr[j].recyclingAmount)+parseFloat(payItem.recyclingAmount); repeat = true; @@ -904,8 +886,7 @@ */ function showRecyclingDetail(recyclingItems,confirmCallback){ if(recyclingItems && recyclingItems.length > 0){ - var paylists =UniquePay(recyclingItems); - recyclingItems=UniquePays(paylists) + recyclingItems = UniquePay(recyclingItems); var tdStyle = 'font-size:28px;text-align:center;'; var tdLeftStyle = 'font-size:28px;text-align:left;'; var tdRightStyle = 'font-size:28px;text-align:right;';