|
|
@@ -258,7 +258,7 @@ function getCombinationGoodsList(combination) {
|
|
|
function getCombinationGoodsLstText(combination) {
|
|
|
let text = '';
|
|
|
for (let item of combination) {
|
|
|
- text += `#${item.ver},`;
|
|
|
+ text += `${item.title}#${item.ver},`;
|
|
|
}
|
|
|
return text.substring(0, text.length - 1);
|
|
|
}
|
|
|
@@ -283,8 +283,10 @@ function getSynthesizeCombination(retCvtData) {
|
|
|
magicJS.logger.info(`limitCount:${limitCount}`);
|
|
|
if (oneData && oneData.verList && limitCount <= oneData.verList.length) {
|
|
|
let oneListSub = oneData.verList.splice(oneData.verList.length - limitCount, limitCount);
|
|
|
- magicJS.logger.info(`oneListSub:${JSON.stringify(oneListSub)}`);
|
|
|
- retOneList = retOneList.concat(oneListSub);
|
|
|
+ for (let j = 0; j < oneListSub.length; j++) {
|
|
|
+ oneListSub[j].title = oneData.name;
|
|
|
+ retOneList.push(oneListSub[j]);
|
|
|
+ }
|
|
|
} else {
|
|
|
isContinus = false;
|
|
|
break;
|
shawenguan