From 9ac0a96d422b3bf492f0aecf2d2dc8ed14ba9f49 Mon Sep 17 00:00:00 2001
From: lxk0301 <778732665@qq.com>
Date: Sun, 14 Mar 2021 16:09:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E9=A2=86=E7=8E=B0=E9=87=91,?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=A8=E9=80=81=E5=BC=80=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
githubAction.md | 1 +
jd_cash.js | 10 +++++++---
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/githubAction.md b/githubAction.md
index c5d2da7b..ce71428e 100644
--- a/githubAction.md
+++ b/githubAction.md
@@ -61,6 +61,7 @@
| `JD_BEAN_SIGN_NOTIFY_SIMPLE` | 京东多合一签到 | 非必须 | `jd_bean_sign.js`脚本运行后推送签到结果简洁版通知，
默认推送签到简洁结果，填`true`表示推送简洁通知，[效果图](./icon/bean_sign_simple.jpg) |
| `PET_NOTIFY_CONTROL` | 东东萌宠
推送开关 | 非必须 | 控制京东萌宠是否静默运行,
`false`为否(发送推送通知消息),`true`为是(即：不发送推送通知消息) |
| `FRUIT_NOTIFY_CONTROL` | 东东农场
推送开关 | 非必须 | 控制京东农场是否静默运行,
`false`为否(发送推送通知消息),`true`为是(即：不发送推送通知消息) |
+| `CASH_NOTIFY_CONTROL` | 京东领现金
推送开关 | 非必须 | 控制京东领现金是否静默运行,
`false`为否(发送推送通知消息),`true`为是(即：不发送推送通知消息) |
| `JD_JOY_REWARD_NOTIFY` | 宠汪汪
兑换京豆推送开关 | 非必须 | 控制`jd_joy_reward.js`脚本是否静默运行,
`false`为否(发送推送通知消息),`true`为是(即：不发送推送通知消息) |
| `JOY_FEED_COUNT` | 宠汪汪喂食数量 | 非必须 | 控制`jd_joy_feedPets.js`脚本喂食数量,可以填的数字10,20,40,80,其他数字不可. |
| `JOY_HELP_FEED` | 宠汪汪帮好友喂食 | 非必须 | 控制`jd_joy_steal.js`脚本是否给好友喂食,`false`为否,`true`为是(给好友喂食) |
diff --git a/jd_cash.js b/jd_cash.js
index 780b5de9..d844fc3d 100644
--- a/jd_cash.js
+++ b/jd_cash.js
@@ -72,7 +72,7 @@ let allMessage = '';
}
}
if (allMessage) {
- if ($.isNode()) await notify.sendNotify($.name, allMessage);
+ if ($.isNode() && (process.env.CASH_NOTIFY_CONTROL ? process.env.CASH_NOTIFY_CONTROL === 'false' : !!1)) await notify.sendNotify($.name, allMessage);
$.msg($.name, '', allMessage);
}
})()
@@ -103,7 +103,11 @@ function index(info=false) {
data = JSON.parse(data);
if(data.code===0 && data.data.result){
if(info){
- message += `当前现金：${data.data.result.signMoney}元`
+ if (message) {
+ message += `当前现金：${data.data.result.signMoney}元\n`;
+ allMessage += `京东账号${$.index}${$.nickName}\n${message}${$.index !== cookiesArr.length ? '\n\n' : ''}`;
+ }
+ message += `当前现金：${data.data.result.signMoney}元\n`;
return
}
// console.log(`您的助力码为${data.data.result.inviteCode}`)
@@ -233,7 +237,7 @@ function getReward(source = 1) {
data = JSON.parse(data);
if (data.code === 0 && data.data.bizCode === 0) {
console.log(`领奖成功，${data.data.result.shareRewardTip}【${data.data.result.shareRewardAmount}】`)
- allMessage += `京东账号${$.index}${$.nickName}\n领奖成功，${data.data.result.shareRewardTip}【${data.data.result.shareRewardAmount}】\n${message}${$.index !== cookiesArr.length ? '\n\n' : ''}`;
+ message += `领奖成功，${data.data.result.shareRewardTip}【${data.data.result.shareRewardAmount}元】`
// console.log(data.data.result.taskInfos)
} else {
// console.log(`领奖失败，${data.data.bizMsg}`)