|
@@ -104,10 +104,11 @@ async function all() {
|
|
|
const outActivityCode = cateActivityData.outActivityCode;
|
|
const outActivityCode = cateActivityData.outActivityCode;
|
|
|
cateItemDict[outActivityCode] = cateActivityData;
|
|
cateItemDict[outActivityCode] = cateActivityData;
|
|
|
}
|
|
}
|
|
|
- let allBuyDict = getWillMarketBuyListAll();
|
|
|
|
|
|
|
+ let allBuyEntries = getWillMarketBuyListAll();
|
|
|
let allRetList = [];
|
|
let allRetList = [];
|
|
|
- for (let cateType in allBuyDict) {
|
|
|
|
|
- const buyList = allBuyDict[cateType];
|
|
|
|
|
|
|
+ for (let i in allBuyEntries) {
|
|
|
|
|
+ const cateType = allBuyEntries[i][0];
|
|
|
|
|
+ const buyList = allBuyEntries[i][1];
|
|
|
if (!buyList) {
|
|
if (!buyList) {
|
|
|
continue;
|
|
continue;
|
|
|
}
|
|
}
|
|
@@ -259,6 +260,7 @@ function getWillMarketBuyListAll() {
|
|
|
let defVal = 'eSupermarket#京东E卡|eTravel#滴滴快车|eCoffee#|eFood#|eTea#喜茶+霸王茶姬|eMovie#|eBicycle#|eOffice#';
|
|
let defVal = 'eSupermarket#京东E卡|eTravel#滴滴快车|eCoffee#|eFood#|eTea#喜茶+霸王茶姬|eMovie#|eBicycle#|eOffice#';
|
|
|
let buyRetDict = {};
|
|
let buyRetDict = {};
|
|
|
let buyConfStr = lk.getVal(key, defVal);
|
|
let buyConfStr = lk.getVal(key, defVal);
|
|
|
|
|
+ let keySortArr = [];
|
|
|
if (!lk.isEmpty(buyConfStr)) {
|
|
if (!lk.isEmpty(buyConfStr)) {
|
|
|
buyRetDict = {};
|
|
buyRetDict = {};
|
|
|
let items = buyConfStr.trim().split('|');
|
|
let items = buyConfStr.trim().split('|');
|
|
@@ -266,6 +268,7 @@ function getWillMarketBuyListAll() {
|
|
|
if (!lk.isEmpty(vstr)) {
|
|
if (!lk.isEmpty(vstr)) {
|
|
|
let cateItem = vstr.trim().split('#');
|
|
let cateItem = vstr.trim().split('#');
|
|
|
let cateTypeKey = cateItem[0];
|
|
let cateTypeKey = cateItem[0];
|
|
|
|
|
+ keySortArr.push(cateTypeKey);
|
|
|
let cateItemVal = cateItem[1];
|
|
let cateItemVal = cateItem[1];
|
|
|
if (cateItemVal && cateItemVal.length > 0) {
|
|
if (cateItemVal && cateItemVal.length > 0) {
|
|
|
const vlist = cateItemVal.trim().split('+');
|
|
const vlist = cateItemVal.trim().split('+');
|
|
@@ -274,7 +277,11 @@ function getWillMarketBuyListAll() {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- return buyRetDict;
|
|
|
|
|
|
|
+ let buyRetEntries = [];
|
|
|
|
|
+ for (let key of keySortArr) {
|
|
|
|
|
+ buyRetEntries.push([key, buyRetDict[cateTypeKey]])
|
|
|
|
|
+ }
|
|
|
|
|
+ return buyRetEntries;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
function divideCategoryBy(outActivityCode) {
|
|
function divideCategoryBy(outActivityCode) {
|