From b00a74f2223624e71be35ec674f5e79a48aed965 Mon Sep 17 00:00:00 2001 From: lxk0301 <778732665@qq.com> Date: Sat, 27 Feb 2021 16:35:41 +0800 Subject: [PATCH] fix --- jd_blueCoin.js | 11 +++++------ jd_fruit.js | 11 +++++------ jd_joy_reward.js | 11 +++++------ jd_pet.js | 11 +++++------ 4 files changed, 20 insertions(+), 24 deletions(-) diff --git a/jd_blueCoin.js b/jd_blueCoin.js index 310ec10f..30050903 100644 --- a/jd_blueCoin.js +++ b/jd_blueCoin.js @@ -89,7 +89,7 @@ const JD_API_HOST = `https://api.m.jd.com/api?appid=jdsupermarket`; } } } - if ($.isNode() && allMessage) { + if ($.isNode() && allMessage && $.ctrTemp) { await notify.sendNotify(`${$.name}`, `${allMessage}`) } })() @@ -348,16 +348,15 @@ function msgShow() { // $.msg($.name, ``, `【京东账号${$.index}】${$.nickName}\n【收取蓝币】${$.coincount ? `${$.coincount}个` : $.coinerr }${coinToBeans ? `\n【兑换京豆】${ $.beanscount ? `${$.beanscount}个` : $.beanerr}` : ""}`); return new Promise(async resolve => { $.log(`\n【京东账号${$.index}】${$.nickName}\n${coinToBeans ? `【兑换${$.title}】${$.beanscount ? `成功` : $.beanerr}` : "您设置的是不兑换奖品"}\n`); - let ctrTemp; if ($.isNode() && process.env.MARKET_REWARD_NOTIFY) { - ctrTemp = `${process.env.MARKET_REWARD_NOTIFY}` === 'false'; + $.ctrTemp = `${process.env.MARKET_REWARD_NOTIFY}` === 'false'; } else if ($.getdata('jdSuperMarketRewardNotify')) { - ctrTemp = $.getdata('jdSuperMarketRewardNotify') === 'false'; + $.ctrTemp = $.getdata('jdSuperMarketRewardNotify') === 'false'; } else { - ctrTemp = `${jdNotify}` === 'false'; + $.ctrTemp = `${jdNotify}` === 'false'; } //默认只在兑换奖品成功后弹窗提醒。情况情况加，只打印日志，不弹窗 - if ($.beanscount && ctrTemp) { + if ($.beanscount && $.ctrTemp) { $.msg($.name, ``, `【京东账号${$.index}】${$.nickName}\n${coinToBeans ? `【兑换${$.title}】${ $.beanscount ? `成功，数量：${$.beanscount}个` : $.beanerr}` : "您设置的是不兑换奖品"}`); allMessage += `【京东账号${$.index}】${$.nickName}\n${coinToBeans ? `【兑换${$.title}】${$.beanscount ? `成功，数量：${$.beanscount}个` : $.beanerr}` : "您设置的是不兑换奖品"}${$.index !== cookiesArr.length ? '\n\n' : ''}` // if ($.isNode()) { diff --git a/jd_fruit.js b/jd_fruit.js index 9d8eb659..045afdda 100644 --- a/jd_fruit.js +++ b/jd_fruit.js @@ -71,7 +71,7 @@ const urlSchema = `openjd://virtual?params=%7B%20%22category%22:%20%22jump%22,%2 await jdFruit(); } } - if ($.isNode() && allMessage && ctrTemp) { + if ($.isNode() && allMessage && $.ctrTemp) { await notify.sendNotify(`${$.name}`, `${allMessage}`) } })() @@ -1221,15 +1221,14 @@ async function waterFriendForFarm(shareCode) { $.waterFriendForFarmRes = await request('waterFriendForFarm', body); } async function showMsg() { - let ctrTemp; if ($.isNode() && process.env.FRUIT_NOTIFY_CONTROL) { - ctrTemp = `${process.env.FRUIT_NOTIFY_CONTROL}` === 'false'; + $.ctrTemp = `${process.env.FRUIT_NOTIFY_CONTROL}` === 'false'; } else if ($.getdata('jdFruitNotify')) { - ctrTemp = $.getdata('jdFruitNotify') === 'false'; + $.ctrTemp = $.getdata('jdFruitNotify') === 'false'; } else { - ctrTemp = `${jdNotify}` === 'false'; + $.ctrTemp = `${jdNotify}` === 'false'; } - if (ctrTemp) { + if ($.ctrTemp) { $.msg($.name, subTitle, message, option); if ($.isNode()) { allMessage += `${subTitle}\n${message}${$.index !== cookiesArr.length ? '\n\n' : ''}`; diff --git a/jd_joy_reward.js b/jd_joy_reward.js index 08b40bd9..3622acea 100644 --- a/jd_joy_reward.js +++ b/jd_joy_reward.js @@ -81,7 +81,7 @@ const JD_API_HOST = 'https://jdjoy.jd.com'; // $.msg($.name, '兑换脚本暂不能使用', `请停止使用，等待后期更新\n如果新版本兑换您有兑换机会，请抓包兑换\n再把抓包数据发送telegram用户@LXK9301`); } } - if ($.isNode() && allMessage && ctrTemp) { + if ($.isNode() && allMessage && $.ctrTemp) { await notify.sendNotify(`${$.name}`, `${allMessage}`) } })() @@ -138,15 +138,14 @@ async function joyReward() { if ($.exchangeRes && $.exchangeRes.success) { if ($.exchangeRes.errorCode === 'buy_success') { console.log(`兑换${giftValue}成功,【宠物等级】${data.level}\n【消耗积分】${salePrice}个\n【剩余积分】${data.coin - salePrice}个\n`) - let ctrTemp; if ($.isNode() && process.env.JD_JOY_REWARD_NOTIFY) { - ctrTemp = `${process.env.JD_JOY_REWARD_NOTIFY}` === 'false'; + $.ctrTemp = `${process.env.JD_JOY_REWARD_NOTIFY}` === 'false'; } else if ($.getdata('jdJoyRewardNotify')) { - ctrTemp = $.getdata('jdJoyRewardNotify') === 'false'; + $.ctrTemp = $.getdata('jdJoyRewardNotify') === 'false'; } else { - ctrTemp = `${jdNotify}` === 'false'; + $.ctrTemp = `${jdNotify}` === 'false'; } - if (ctrTemp) { + if ($.ctrTemp) { $.msg($.name, ``, `【京东账号${$.index}】${$.nickName}\n【${giftValue}京豆】兑换成功\n【宠物等级】${data.level}\n【积分详情】消耗积分 ${salePrice}, 剩余积分 ${data.coin - salePrice}`); if ($.isNode()) { allMessage += `【京东账号${$.index}】 ${$.nickName}\n【${giftValue}京豆】兑换成功\n【宠物等级】${data.level}\n【积分详情】消耗积分 ${salePrice}, 剩余积分 ${data.coin - salePrice}${$.index !== cookiesArr.length ? '\n\n' : ''}` diff --git a/jd_pet.js b/jd_pet.js index dbaa69be..fbd0fe45 100644 --- a/jd_pet.js +++ b/jd_pet.js @@ -72,7 +72,7 @@ let randomCount = $.isNode() ? 20 : 5; await jdPet(); } } - if ($.isNode() && allMessage && ctrTemp) { + if ($.isNode() && allMessage && $.ctrTemp) { await notify.sendNotify(`${$.name}`, `${allMessage}`) } })() @@ -429,16 +429,15 @@ async function feedReachInitFun() { console.log('投食任务结束...\n'); } async function showMsg() { - let ctrTemp; if ($.isNode() && process.env.PET_NOTIFY_CONTROL) { - ctrTemp = `${process.env.PET_NOTIFY_CONTROL}` === 'false'; + $.ctrTemp = `${process.env.PET_NOTIFY_CONTROL}` === 'false'; } else if ($.getdata('jdPetNotify')) { - ctrTemp = $.getdata('jdPetNotify') === 'false'; + $.ctrTemp = $.getdata('jdPetNotify') === 'false'; } else { - ctrTemp = `${jdNotify}` === 'false'; + $.ctrTemp = `${jdNotify}` === 'false'; } // jdNotify = `${notify.petNotifyControl}` === 'false' && `${jdNotify}` === 'false' && $.getdata('jdPetNotify') === 'false'; - if (ctrTemp) { + if ($.ctrTemp) { $.msg($.name, subTitle, message, option); if ($.isNode()) { allMessage += `${subTitle}\n${message}${$.index !== cookiesArr.length ? '\n\n' : ''}`