From 1617f94b7551160355aa8e89d6858849b0f8b86d Mon Sep 17 00:00:00 2001
From: lxk0301 <778732665@qq.com>
Date: Sat, 27 Feb 2021 15:38:36 +0800
Subject: [PATCH] =?UTF-8?q?update=20jd=5Fjoy.js=20,=E4=BA=91=E7=AB=AF?=
 =?UTF-8?q?=E5=A4=9A=E8=B4=A6=E5=8F=B7=E5=86=85=E5=AE=B9=E5=85=A8=E9=9B=86?=
 =?UTF-8?q?=E4=B8=AD=E5=88=B0=E4=B8=80=E6=AC=A1=E9=80=9A=E7=9F=A5,?=
 =?UTF-8?q?=E6=B3=A8:=E9=83=A8=E5=88=86=E6=8E=A8=E9=80=81=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=E5=8F=AF=E8=83=BD=E4=BC=9A=E5=AF=B9=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E6=9C=89=E9=95=BF=E5=BA=A6=E9=99=90=E5=88=B6=E5=8F=AF=E8=83=BD?=
 =?UTF-8?q?=E4=BC=9A=E5=AF=BC=E8=87=B4=E6=8E=A8=E9=80=81=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E6=88=96=E8=80=85=E6=8E=A8=E9=80=81=E5=86=85=E5=AE=B9=E4=B8=8D?=
 =?UTF-8?q?=E5=AE=8C=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jd_bean_change.js | 2 +-
 jd_joy.js         | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/jd_bean_change.js b/jd_bean_change.js
index 08da6a56..80d20713 100644
--- a/jd_bean_change.js
+++ b/jd_bean_change.js
@@ -73,7 +73,7 @@ if ($.isNode()) {
     }
   }
 
-  if ($.isNode()) {
+  if ($.isNode() && allMessage) {
     await notify.sendNotify(`${$.name}`, `${allMessage}`, { url: `https://bean.m.jd.com/beanDetail/index.action?resourceValue=bean` })
   }
 })()
diff --git a/jd_joy.js b/jd_joy.js
index 561f3198..a254781c 100644
--- a/jd_joy.js
+++ b/jd_joy.js
@@ -35,7 +35,7 @@ const $ = new Env('宠汪汪');
 const notify = $.isNode() ? require('./sendNotify') : '';
 //Node.js用户请在jdCookie.js处填写京东ck;
 const jdCookieNode = $.isNode() ? require('./jdCookie.js') : '';
-
+let allMessage = '';
 //IOS等用户直接用NobyDa的jd cookie
 let cookiesArr = [], cookie = '';
 if ($.isNode()) {
@@ -85,6 +85,7 @@ const weAppUrl = 'https://draw.jdfcloud.com//pet';
       // await joinTwoPeopleRun();
     }
   }
+  if ($.isNode() && joyRunNotify === 'true' && allMessage) await notify.sendNotify(`${$.name}`, `${allMessage}`)
 })()
     .catch((e) => {
       $.log('', `❌ ${$.name}, 失败! 原因: ${e}!`, '')
@@ -182,7 +183,8 @@ async function joinTwoPeopleRun() {
         if ($.receiveJoyRunAwardRes.success) {
           joyRunNotify = $.isNode() ? (process.env.JOY_RUN_NOTIFY ? process.env.JOY_RUN_NOTIFY : `${joyRunNotify}`) : ($.getdata('joyRunNotify') ? $.getdata('joyRunNotify') : `${joyRunNotify}`);
           $.msg($.name, '', `【京东账号${$.index}】${$.nickName}\n太棒了，${$.name}赛跑取得获胜\n恭喜您已获得${winCoin}积分奖励`);
-          if ($.isNode() && joyRunNotify === 'true') await notify.sendNotify(`${$.name} - 京东账号${$.index} - ${$.nickName}`, `京东账号${$.index}${$.nickName}\n太棒了，${$.name}赛跑取得获胜\n恭喜您已获得${winCoin}积分奖励`)
+          allMessage += `京东账号${$.index}${$.nickName}\n太棒了，${$.name}赛跑取得获胜\n恭喜您已获得${winCoin}积分奖励${$.index !== cookiesArr.length ? '\n\n' : ''}`;
+          // if ($.isNode() && joyRunNotify === 'true') await notify.sendNotify(`${$.name} - 京东账号${$.index} - ${$.nickName}`, `京东账号${$.index}${$.nickName}\n太棒了，${$.name}赛跑取得获胜\n恭喜您已获得${winCoin}积分奖励`)
         }
       }
       if (petRaceResult === 'participate') {