From db4dce9745f23e1f271c78b6f1ae2006bb23ad6b Mon Sep 17 00:00:00 2001
From: lxk0301 <778732665@qq.com>
Date: Wed, 6 Jan 2021 09:20:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=A0=E4=B8=9C=E4=B8=9C=E8=90=8C=E5=AE=A01.?=
 =?UTF-8?q?6=E6=97=A5=E5=A5=BD=E5=8F=8B=E5=8A=A9=E5=8A=9B=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E4=B8=8B=E7=BA=BF=E3=80=82=E6=95=85=E6=9A=82=E6=97=B6?=
 =?UTF-8?q?=E5=B1=8F=E8=94=BD=E5=A5=BD=E5=8F=8B=E4=BA=92=E5=8A=A9=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E3=80=82=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=BD=BF=E7=94=A8=E8=84=9A=E6=9C=AC=E5=87=BA=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jd_pet.js     | 14 ++++++++++----
 sendNotify.js |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/jd_pet.js b/jd_pet.js
index cde3fd7f..3586c920 100644
--- a/jd_pet.js
+++ b/jd_pet.js
@@ -1,6 +1,6 @@
 /*
 东东萌宠 更新地址： https://raw.githubusercontent.com/lxk0301/jd_scripts/master/jd_pet.js
-更新时间：2020-12-26
+更新时间：2021-01-06
 已支持IOS双京东账号,Node.js支持N个京东账号
 脚本兼容: QuantumultX, Surge, Loon, JSBox, Node.js
 
@@ -231,8 +231,10 @@ async function masterHelpInit() {
       if(!res.result.addedBonusFlag) {
         console.log("开始领取额外奖励");
         let getHelpAddedBonusResult = await request('getHelpAddedBonus');
+        if (getHelpAddedBonusResult.resultCode === '0') {
+          message += `【额外奖励${getHelpAddedBonusResult.result.reward}领取】${getHelpAddedBonusResult.message}\n`;
+        }
         console.log(`领取30g额外奖励结果：【${getHelpAddedBonusResult.message}】`);
-        message += `【额外奖励${getHelpAddedBonusResult.result.reward}领取】${getHelpAddedBonusResult.message}\n`;
       } else {
         console.log("已经领取过5好友助力额外奖励");
         message += `【额外奖励】已领取\n`;
@@ -261,6 +263,8 @@ async function masterHelpInit() {
  * 运行脚本时你自己的shareCode会在控制台输出, 可以将其分享给他人
  */
 async function slaveHelp() {
+  $.log(`\n因1.6日好友助力功能下线。故暂时屏蔽\n`)
+  return
   let helpPeoples = '';
   for (let code of newShareCodes) {
     console.log(`开始助力京东账号${$.index} - ${$.nickName}的好友: ${code}`);
@@ -281,7 +285,7 @@ async function slaveHelp() {
         console.log(`助力其他情况：${JSON.stringify(response)}`);
       }
     } else {
-      console.log(`助理好友结果: ${response.message}`);
+      console.log(`助力好友结果: ${response.message}`);
     }
   }
   if (helpPeoples && helpPeoples.length > 0) {
@@ -467,7 +471,9 @@ function shareCodesFormat() {
       const tempIndex = $.index > shareCodes.length ? (shareCodes.length - 1) : ($.index - 1);
       newShareCodes = shareCodes[tempIndex].split('@');
     }
-    const readShareCodeRes = await readShareCode();
+    //因好友助力功能下线。故暂时屏蔽
+    // const readShareCodeRes = await readShareCode();
+    const readShareCodeRes = null;
     if (readShareCodeRes && readShareCodeRes.code === 200) {
       newShareCodes = [...new Set([...newShareCodes, ...(readShareCodeRes.data || [])])];
     }
diff --git a/sendNotify.js b/sendNotify.js
index b23e2e12..11257565 100644
--- a/sendNotify.js
+++ b/sendNotify.js
@@ -569,7 +569,7 @@ function pushPlusNotify(text, desp) {
         }
       })
     } else {
-      console.log('\n您未提供push+推送所需的PUSH_PLUS_TOKEN，取消push+推送消息通知\n');
+      console.log('您未提供push+推送所需的PUSH_PLUS_TOKEN，取消push+推送消息通知\n');
       resolve()
     }
   })