diff --git a/jd_dreamFactory.js b/jd_dreamFactory.js index 87e8339c..6bce9e33 100644 --- a/jd_dreamFactory.js +++ b/jd_dreamFactory.js @@ -1352,7 +1352,7 @@ function requireConfig() { }) } else { if ($.getdata('jd_jxFactory')) $.shareCodesArr = $.getdata('jd_jxFactory').split('\n').filter(item => item !== "" && item !== null && item !== undefined); - console.log(`\nBoxJs设置的京喜工厂邀请码:${$.getdata('jd_jxFactory')}\n`); + console.log(`\nBoxJs设置的${$.name}好友邀请码:${$.getdata('jd_jxFactory')}\n`); } // console.log(`\n种豆得豆助力码::${JSON.stringify($.shareCodesArr)}`); console.log(`您提供了${$.shareCodesArr.length}个账号的${$.name}助力码\n`); diff --git a/jd_fruit.js b/jd_fruit.js index ee6ad7b5..e996715f 100644 --- a/jd_fruit.js +++ b/jd_fruit.js @@ -1,6 +1,6 @@ /* 东东水果:脚本更新地址 https://gitee.com/lxk0301/jd_scripts/raw/master/jd_fruit.js -更新时间:2021-2-27 +更新时间:2021-4-9 活动入口:京东APP我的-更多工具-东东农场 东东农场活动链接:https://h5.m.jd.com/babelDiy/Zeus/3KSjXqQabiTuD1cJ28QskrpWoBKT/index.html 已支持IOS双京东账号,Node.js支持N个京东账号 @@ -1274,10 +1274,10 @@ function readShareCode() { } function shareCodesFormat() { return new Promise(async resolve => { - // console.log(`第${$.index}个京东账号的助力码:::${jdFruitShareArr[$.index - 1]}`) + // console.log(`第${$.index}个京东账号的助力码:::${$.shareCodesArr[$.index - 1]}`) newShareCodes = []; - if (jdFruitShareArr[$.index - 1]) { - newShareCodes = jdFruitShareArr[$.index - 1].split('@'); + if ($.shareCodesArr[$.index - 1]) { + newShareCodes = $.shareCodesArr[$.index - 1].split('@'); } else { console.log(`由于您第${$.index}个京东账号未提供shareCode,将采纳本脚本自带的助力码\n`) const tempIndex = $.index > shareCodes.length ? (shareCodes.length - 1) : ($.index - 1); @@ -1311,46 +1311,20 @@ function requireConfig() { cookiesArr = [$.getdata('CookieJD'), $.getdata('CookieJD2'), ...jsonParse($.getdata('CookiesJD') || "[]").map(item => item.cookie)].filter(item => !!item); } console.log(`共${cookiesArr.length}个京东账号\n`) + $.shareCodesArr = []; if ($.isNode()) { Object.keys(jdFruitShareCodes).forEach((item) => { if (jdFruitShareCodes[item]) { - jdFruitShareArr.push(jdFruitShareCodes[item]) + $.shareCodesArr.push(jdFruitShareCodes[item]) } }) } else { - const boxShareCodeArr = ['jd_fruit1', 'jd_fruit2', 'jd_fruit3', 'jd_fruit4']; - const boxShareCodeArr2 = ['jd2_fruit1', 'jd2_fruit2', 'jd2_fruit3', 'jd2_fruit4']; - const isBox1 = boxShareCodeArr.some((item) => { - const boxShareCode = $.getdata(item); - return (boxShareCode !== undefined && boxShareCode !== null && boxShareCode !== ''); - }); - const isBox2 = boxShareCodeArr2.some((item) => { - const boxShareCode = $.getdata(item); - return (boxShareCode !== undefined && boxShareCode !== null && boxShareCode !== ''); - }); - isBox = isBox1 ? isBox1 : isBox2; - if (isBox1) { - let temp = []; - for (const item of boxShareCodeArr) { - if ($.getdata(item)) { - temp.push($.getdata(item)) - } - } - jdFruitShareArr.push(temp.join('@')); - } - if (isBox2) { - let temp = []; - for (const item of boxShareCodeArr2) { - if ($.getdata(item)) { - temp.push($.getdata(item)) - } - } - jdFruitShareArr.push(temp.join('@')); - } + if ($.getdata('jd_fruit_inviter')) $.shareCodesArr = $.getdata('jd_fruit_inviter').split('\n').filter(item => !!item); + console.log(`\nBoxJs设置的${$.name}好友邀请码:${$.getdata('jd_fruit_inviter')}\n`); } - // console.log(`jdFruitShareArr::${JSON.stringify(jdFruitShareArr)}`) - // console.log(`jdFruitShareArr账号长度::${jdFruitShareArr.length}`) - console.log(`您提供了${jdFruitShareArr.length}个账号的农场助力码\n`); + // console.log(`$.shareCodesArr::${JSON.stringify($.shareCodesArr)}`) + // console.log(`jdFruitShareArr账号长度::${$.shareCodesArr.length}`) + console.log(`您提供了${$.shareCodesArr.length}个账号的农场助力码\n`); resolve() }) } diff --git a/jd_pet.js b/jd_pet.js index 3a161545..70b5b4d6 100644 --- a/jd_pet.js +++ b/jd_pet.js @@ -1,6 +1,6 @@ /* 东东萌宠 更新地址: https://gitee.com/lxk0301/jd_scripts/raw/master/jd_pet.js -更新时间:2021-02-27 +更新时间:2021-04-9 活动入口:京东APP我的-更多工具-东东萌宠 已支持IOS双京东账号,Node.js支持N个京东账号 脚本兼容: QuantumultX, Surge, Loon, JSBox, Node.js @@ -475,10 +475,10 @@ function readShareCode() { } function shareCodesFormat() { return new Promise(async resolve => { - // console.log(`第${$.index}个京东账号的助力码:::${jdPetShareArr[$.index - 1]}`) + // console.log(`第${$.index}个京东账号的助力码:::${$.shareCodesArr[$.index - 1]}`) newShareCodes = []; - if (jdPetShareArr[$.index - 1]) { - newShareCodes = jdPetShareArr[$.index - 1].split('@'); + if ($.shareCodesArr[$.index - 1]) { + newShareCodes = $.shareCodesArr[$.index - 1].split('@'); } else { console.log(`由于您第${$.index}个京东账号未提供shareCode,将采纳本脚本自带的助力码\n`) const tempIndex = $.index > shareCodes.length ? (shareCodes.length - 1) : ($.index - 1); @@ -513,46 +513,20 @@ function requireConfig() { cookiesArr = [$.getdata('CookieJD'), $.getdata('CookieJD2'), ...jsonParse($.getdata('CookiesJD') || "[]").map(item => item.cookie)].filter(item => !!item); } console.log(`共${cookiesArr.length}个京东账号\n`) + $.shareCodesArr = []; if ($.isNode()) { Object.keys(jdPetShareCodes).forEach((item) => { if (jdPetShareCodes[item]) { - jdPetShareArr.push(jdPetShareCodes[item]) + $.shareCodesArr.push(jdPetShareCodes[item]) } }) } else { - const boxShareCodeArr = ['jd_pet1', 'jd_pet2', 'jd_pet3', 'jd_pet4', 'jd_pet5']; - const boxShareCodeArr2 = ['jd2_pet1', 'jd2_pet2', 'jd2_pet3', 'jd2_pet4', 'jd2_pet5']; - const isBox1 = boxShareCodeArr.some((item) => { - const boxShareCode = $.getdata(item); - return (boxShareCode !== undefined && boxShareCode !== null && boxShareCode !== ''); - }); - const isBox2 = boxShareCodeArr2.some((item) => { - const boxShareCode = $.getdata(item); - return (boxShareCode !== undefined && boxShareCode !== null && boxShareCode !== ''); - }); - isBox = isBox1 ? isBox1 : isBox2; - if (isBox1) { - let temp = []; - for (const item of boxShareCodeArr) { - if ($.getdata(item)) { - temp.push($.getdata(item)) - } - } - jdPetShareArr.push(temp.join('@')); - } - if (isBox2) { - let temp = []; - for (const item of boxShareCodeArr2) { - if ($.getdata(item)) { - temp.push($.getdata(item)) - } - } - jdPetShareArr.push(temp.join('@')); - } + if ($.getdata('jd_pet_inviter')) $.shareCodesArr = $.getdata('jd_pet_inviter').split('\n').filter(item => !!item); + console.log(`\nBoxJs设置的${$.name}好友邀请码:${$.getdata('jd_pet_inviter')}\n`); } - // console.log(`jdPetShareArr::${JSON.stringify(jdPetShareArr)}`) - // console.log(`jdPetShareArr账号长度::${jdPetShareArr.length}`) - console.log(`您提供了${jdPetShareArr.length}个账号的东东萌宠助力码\n`); + // console.log(`$.shareCodesArr::${JSON.stringify($.shareCodesArr)}`) + // console.log(`jdPetShareArr账号长度::${$.shareCodesArr.length}`) + console.log(`您提供了${$.shareCodesArr.length}个账号的东东萌宠助力码\n`); resolve() }) } diff --git a/jd_plantBean.js b/jd_plantBean.js index 78eb94c8..e256c9a1 100644 --- a/jd_plantBean.js +++ b/jd_plantBean.js @@ -1,6 +1,6 @@ /* 种豆得豆 脚本更新地址:https://gitee.com/lxk0301/jd_scripts/raw/master/jd_plantBean.js -更新时间:2021-3-30 +更新时间:2021-04-9 活动入口:京东APP我的-更多工具-种豆得豆 已支持IOS京东双账号,云端N个京东账号 脚本兼容: QuantumultX, Surge, Loon, JSBox, Node.js @@ -555,10 +555,10 @@ function readShareCode() { //格式化助力码 function shareCodesFormat() { return new Promise(async resolve => { - // console.log(`第${$.index}个京东账号的助力码:::${jdPlantBeanShareArr[$.index - 1]}`) + // console.log(`第${$.index}个京东账号的助力码:::${$.shareCodesArr[$.index - 1]}`) newShareCodes = []; - if (jdPlantBeanShareArr[$.index - 1]) { - newShareCodes = jdPlantBeanShareArr[$.index - 1].split('@'); + if ($.shareCodesArr[$.index - 1]) { + newShareCodes = $.shareCodesArr[$.index - 1].split('@'); } else { console.log(`由于您第${$.index}个京东账号未提供shareCode,将采纳本脚本自带的助力码\n`) const tempIndex = $.index > shareCodes.length ? (shareCodes.length - 1) : ($.index - 1); @@ -591,45 +591,19 @@ function requireConfig() { cookiesArr = [$.getdata('CookieJD'), $.getdata('CookieJD2'), ...jsonParse($.getdata('CookiesJD') || "[]").map(item => item.cookie)].filter(item => !!item); } console.log(`共${cookiesArr.length}个京东账号\n`) + $.shareCodesArr = []; if ($.isNode()) { Object.keys(jdPlantBeanShareCodes).forEach((item) => { if (jdPlantBeanShareCodes[item]) { - jdPlantBeanShareArr.push(jdPlantBeanShareCodes[item]) + $.shareCodesArr.push(jdPlantBeanShareCodes[item]) } }) } else { - const boxShareCodeArr = ['jd_plantBean1', 'jd_plantBean2', 'jd_plantBean3']; - const boxShareCodeArr2 = ['jd2_plantBean1', 'jd2_plantBean2', 'jd2_plantBean3']; - const isBox1 = boxShareCodeArr.some((item) => { - const boxShareCode = $.getdata(item); - return (boxShareCode !== undefined && boxShareCode !== null && boxShareCode !== ''); - }); - const isBox2 = boxShareCodeArr2.some((item) => { - const boxShareCode = $.getdata(item); - return (boxShareCode !== undefined && boxShareCode !== null && boxShareCode !== ''); - }); - isBox = isBox1 ? isBox1 : isBox2; - if (isBox1) { - let temp = []; - for (const item of boxShareCodeArr) { - if ($.getdata(item)) { - temp.push($.getdata(item)) - } - } - jdPlantBeanShareArr.push(temp.join('@')); - } - if (isBox2) { - let temp = []; - for (const item of boxShareCodeArr2) { - if ($.getdata(item)) { - temp.push($.getdata(item)) - } - } - jdPlantBeanShareArr.push(temp.join('@')); - } + if ($.getdata('jd_plantbean_inviter')) $.shareCodesArr = $.getdata('jd_plantbean_inviter').split('\n').filter(item => !!item); + console.log(`\nBoxJs设置的${$.name}好友邀请码:${$.getdata('jd_plantbean_inviter')}\n`); } - // console.log(`\n种豆得豆助力码::${JSON.stringify(jdPlantBeanShareArr)}`); - console.log(`您提供了${jdPlantBeanShareArr.length}个账号的种豆得豆助力码\n`); + // console.log(`\n种豆得豆助力码::${JSON.stringify($.shareCodesArr)}`); + console.log(`您提供了${$.shareCodesArr.length}个账号的种豆得豆助力码\n`); resolve() }) } diff --git a/lxk0301.boxjs.json b/lxk0301.boxjs.json index 460813d2..4dc36973 100644 --- a/lxk0301.boxjs.json +++ b/lxk0301.boxjs.json @@ -90,18 +90,11 @@ { "id": "jd_fruit", "name": "东东农场", - "keys": [ - "jd_fruit_name", - "jd_fruit1", - "jd_fruit2", - "jd_fruit3", - "jd2_fruit_name", - "jd2_fruit1", - "jd2_fruit2", - "jd2_fruit3" - ], + "keys": ["jd_fruit_inviter"], "descs_html": [ - "