diff --git a/jd_cash.js b/jd_cash.js index 4c2dc340..854d5792 100644 --- a/jd_cash.js +++ b/jd_cash.js @@ -83,6 +83,7 @@ async function jdCash() { await helpFriends() await index(true) await getReward() + await getReward('2') await showMsg() } function index(info=false) { @@ -214,9 +215,9 @@ function doTask(type,taskInfo) { }) }) } -function getReward() { +function getReward(source = 1) { return new Promise((resolve) => { - $.get(taskUrl("cash_mob_reward",{"source":1,"rewardNode":""}), (err, resp, data) => { + $.get(taskUrl("cash_mob_reward",{"source": Number(source),"rewardNode":""}), (err, resp, data) => { try { if (err) { console.log(`${JSON.stringify(err)}`) diff --git a/jd_joy.js b/jd_joy.js index bc1e436d..9d1b38c4 100644 --- a/jd_joy.js +++ b/jd_joy.js @@ -94,27 +94,31 @@ const weAppUrl = 'https://draw.jdfcloud.com//pet'; $.done(); }) async function jdJoy() { - await getPetTaskConfig(); - if ($.getPetTaskConfigRes.success) { - if ($.isNode()) { - if (process.env.JOY_FEED_COUNT) { - if ([10, 20, 40, 80].indexOf(process.env.JOY_FEED_COUNT * 1) > -1) { - FEED_NUM = process.env.JOY_FEED_COUNT ? process.env.JOY_FEED_COUNT * 1 : FEED_NUM; - } else { - console.log(`您输入的 JOY_FEED_COUNT 为非法数字,请重新输入`); + try { + await getPetTaskConfig(); + if ($.getPetTaskConfigRes.success) { + if ($.isNode()) { + if (process.env.JOY_FEED_COUNT) { + if ([10, 20, 40, 80].indexOf(process.env.JOY_FEED_COUNT * 1) > -1) { + FEED_NUM = process.env.JOY_FEED_COUNT ? process.env.JOY_FEED_COUNT * 1 : FEED_NUM; + } else { + console.log(`您输入的 JOY_FEED_COUNT 为非法数字,请重新输入`); + } } } + await feedPets(FEED_NUM);//喂食 + await Promise.all([ + petTask(), + appPetTask() + ]) + await deskGoodsTask();//限时货柜 + await enterRoom(); + await joinTwoPeopleRun()//参加双人赛跑 + } else { + message += `${$.getPetTaskConfigRes.errorMessage}`; } - await feedPets(FEED_NUM);//喂食 - await Promise.all([ - petTask(), - appPetTask() - ]) - await deskGoodsTask();//限时货柜 - await enterRoom(); - await joinTwoPeopleRun()//参加双人赛跑 - } else { - message += `${$.getPetTaskConfigRes.errorMessage}`; + } catch (e) { + $.logErr(e) } } //逛商品得100积分奖励任务