From 4c5c9d512bfe2eb98701f7106b9ccb12ac241d85 Mon Sep 17 00:00:00 2001
From: lxk0301 <778732665@qq.com>
Date: Sat, 16 Jan 2021 16:04:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=90=8C=E5=AE=A0=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E7=A7=8D=E8=B1=86=E8=84=9A=E6=9C=AC=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E7=81=AB=E7=88=86=E6=88=96=E8=80=85=E9=A3=8E?=
 =?UTF-8?q?=E6=8E=A7=E5=AF=BC=E8=87=B4=E8=84=9A=E6=9C=AC=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E4=B8=AD=E6=96=AD=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jd_pet.js       | 104 +++++++++++++++++++++++++-----------------------
 jd_plantBean.js |  58 ++++++++++++++-------------
 2 files changed, 85 insertions(+), 77 deletions(-)

diff --git a/jd_pet.js b/jd_pet.js
index 22880358..db83e2ea 100644
--- a/jd_pet.js
+++ b/jd_pet.js
@@ -1,6 +1,6 @@
 /*
 东东萌宠 更新地址： https://raw.githubusercontent.com/lxk0301/jd_scripts/master/jd_pet.js
-更新时间：2021-01-10
+更新时间：2021-01-16
 已支持IOS双京东账号,Node.js支持N个京东账号
 脚本兼容: QuantumultX, Surge, Loon, JSBox, Node.js
 
@@ -79,58 +79,62 @@ let randomCount = $.isNode() ? 20 : 5;
       $.done();
     })
 async function jdPet() {
-  //查询jd宠物信息
-  const initPetTownRes = await request('initPetTown');
-  message = `【京东账号${$.index}】${$.nickName}\n`;
-  if (initPetTownRes.code === '0' && initPetTownRes.resultCode === '0' && initPetTownRes.message === 'success') {
-    $.petInfo = initPetTownRes.result;
-    if ($.petInfo.userStatus === 0) {
-      $.msg($.name, '', `【提示】京东账号${$.index}${$.nickName}\n萌宠活动未开启\n请手动去京东APP开启活动\n入口：我的->游戏与互动->查看更多开启`, { "open-url": "openapp.jdmoble://" });
-      return
-    }
-    if (!$.petInfo.goodsInfo) {
-      $.msg($.name, '', `【提示】京东账号${$.index}${$.nickName}\n暂未选购新的商品`, { "open-url": "openapp.jdmoble://" });
-      if ($.isNode()) await notify.sendNotify(`${$.name} - ${$.index} - ${$.nickName}`, `【提示】京东账号${$.index}${$.nickName}\n暂未选购新的商品`);
-      return
-    }
-    goodsUrl = $.petInfo.goodsInfo && $.petInfo.goodsInfo.goodsUrl;
-    // option['media-url'] = goodsUrl;
-    // console.log(`初始化萌宠信息完成: ${JSON.stringify(petInfo)}`);
-    if ($.petInfo.petStatus === 5) {
-      await slaveHelp();//可以兑换而没有去兑换,也能继续助力好友
-      option['open-url'] = "openApp.jdMobile://";
-      $.msg($.name, `【提醒⏰】${$.petInfo.goodsInfo.goodsName}已可领取`, '请去京东APP或微信小程序查看', option);
-      if ($.isNode()) {
-        await notify.sendNotify(`${$.name} - 账号${$.index} - ${$.nickName || $.UserName}奖品已可领取`, `京东账号${$.index} ${$.nickName}\n${$.petInfo.goodsInfo.goodsName}已可领取`);
+  try {
+    //查询jd宠物信息
+    const initPetTownRes = await request('initPetTown');
+    message = `【京东账号${$.index}】${$.nickName}\n`;
+    if (initPetTownRes.code === '0' && initPetTownRes.resultCode === '0' && initPetTownRes.message === 'success') {
+      $.petInfo = initPetTownRes.result;
+      if ($.petInfo.userStatus === 0) {
+        $.msg($.name, '', `【提示】京东账号${$.index}${$.nickName}\n萌宠活动未开启\n请手动去京东APP开启活动\n入口：我的->游戏与互动->查看更多开启`, { "open-url": "openapp.jdmoble://" });
+        return
       }
-      return
-    } else if ($.petInfo.petStatus === 6) {
-      await slaveHelp();//已领取红包,但未领养新的,也能继续助力好友
-      option['open-url'] = "openApp.jdMobile://";
-      $.msg($.name, `【提醒⏰】已领取红包,但未继续领养新的物品`, '请去京东APP或微信小程序继续领养', option);
-      if ($.isNode()) {
-        await notify.sendNotify(`${$.name} - 账号${$.index} - ${$.nickName || $.UserName}奖品已可领取`, `京东账号${$.index} ${$.nickName}\n已领取红包,但未继续领养新的物品`);
+      if (!$.petInfo.goodsInfo) {
+        $.msg($.name, '', `【提示】京东账号${$.index}${$.nickName}\n暂未选购新的商品`, { "open-url": "openapp.jdmoble://" });
+        if ($.isNode()) await notify.sendNotify(`${$.name} - ${$.index} - ${$.nickName}`, `【提示】京东账号${$.index}${$.nickName}\n暂未选购新的商品`);
+        return
       }
-      return
-    }
-    console.log(`\n【京东账号${$.index}（${$.nickName || $.UserName}）的${$.name}好友互助码】${$.petInfo.shareCode}\n`);
-    await taskInit();
-    if ($.taskInit.resultCode === '9999' || !$.taskInit.result) {
-      console.log('初始化任务异常, 请稍后再试');
-      return
-    }
-    $.taskInfo = $.taskInit.result;
+      goodsUrl = $.petInfo.goodsInfo && $.petInfo.goodsInfo.goodsUrl;
+      // option['media-url'] = goodsUrl;
+      // console.log(`初始化萌宠信息完成: ${JSON.stringify(petInfo)}`);
+      if ($.petInfo.petStatus === 5) {
+        await slaveHelp();//可以兑换而没有去兑换,也能继续助力好友
+        option['open-url'] = "openApp.jdMobile://";
+        $.msg($.name, `【提醒⏰】${$.petInfo.goodsInfo.goodsName}已可领取`, '请去京东APP或微信小程序查看', option);
+        if ($.isNode()) {
+          await notify.sendNotify(`${$.name} - 账号${$.index} - ${$.nickName || $.UserName}奖品已可领取`, `京东账号${$.index} ${$.nickName}\n${$.petInfo.goodsInfo.goodsName}已可领取`);
+        }
+        return
+      } else if ($.petInfo.petStatus === 6) {
+        await slaveHelp();//已领取红包,但未领养新的,也能继续助力好友
+        option['open-url'] = "openApp.jdMobile://";
+        $.msg($.name, `【提醒⏰】已领取红包,但未继续领养新的物品`, '请去京东APP或微信小程序继续领养', option);
+        if ($.isNode()) {
+          await notify.sendNotify(`${$.name} - 账号${$.index} - ${$.nickName || $.UserName}奖品已可领取`, `京东账号${$.index} ${$.nickName}\n已领取红包,但未继续领养新的物品`);
+        }
+        return
+      }
+      console.log(`\n【京东账号${$.index}（${$.nickName || $.UserName}）的${$.name}好友互助码】${$.petInfo.shareCode}\n`);
+      await taskInit();
+      if ($.taskInit.resultCode === '9999' || !$.taskInit.result) {
+        console.log('初始化任务异常, 请稍后再试');
+        return
+      }
+      $.taskInfo = $.taskInit.result;
 
-    await petSport();//遛弯
-    await slaveHelp();//助力好友
-    await masterHelpInit();//获取助力的信息
-    await doTask();//做日常任务
-    await feedPetsAgain();//再次投食
-    await energyCollect();//收集好感度
-    await showMsg();
-    console.log('全部任务完成, 如果帮助到您可以点下🌟STAR鼓励我一下, 明天见~');
-  } else if (initPetTownRes.code === '0'){
-    console.log(`初始化萌宠失败:  ${initPetTownRes.message}`);
+      await petSport();//遛弯
+      await slaveHelp();//助力好友
+      await masterHelpInit();//获取助力的信息
+      await doTask();//做日常任务
+      await feedPetsAgain();//再次投食
+      await energyCollect();//收集好感度
+      await showMsg();
+      console.log('全部任务完成, 如果帮助到您可以点下🌟STAR鼓励我一下, 明天见~');
+    } else if (initPetTownRes.code === '0'){
+      console.log(`初始化萌宠失败:  ${initPetTownRes.message}`);
+    }
+  } catch (e) {
+    $.logErr(e)
   }
 }
 // 收取所有好感度
diff --git a/jd_plantBean.js b/jd_plantBean.js
index 8d132b7b..874a0b76 100644
--- a/jd_plantBean.js
+++ b/jd_plantBean.js
@@ -1,6 +1,6 @@
 /*
 种豆得豆 脚本更新地址：https://raw.githubusercontent.com/lxk0301/jd_scripts/master/jd_plantBean.js
-更新时间：2020-12-31
+更新时间：2021-1-16
 已支持IOS京东双账号,云端N个京东账号
 脚本兼容: QuantumultX, Surge, Loon, JSBox, Node.js
 注：会自动关注任务中的店铺跟商品，介意者勿使用。
@@ -81,32 +81,36 @@ let randomCount = $.isNode() ? 20 : 5;
 })
 
 async function jdPlantBean() {
-  console.log(`获取任务及基本信息`)
-  await plantBeanIndex();
-  // console.log(plantBeanIndexResult.data.taskList);
-  if ($.plantBeanIndexResult.code === '0') {
-    const shareUrl = $.plantBeanIndexResult.data.jwordShareInfo.shareUrl
-    $.myPlantUuid = getParam(shareUrl, 'plantUuid')
-    console.log(`\n【京东账号${$.index}（${$.nickName || $.UserName}）的${$.name}好友互助码】${$.myPlantUuid}\n`);
-    roundList = $.plantBeanIndexResult.data.roundList;
-    currentRoundId = roundList[1].roundId;//本期的roundId
-    lastRoundId = roundList[0].roundId;//上期的roundId
-    awardState = roundList[0].awardState;
-    $.taskList = $.plantBeanIndexResult.data.taskList;
-    subTitle = `【京东昵称】${$.plantBeanIndexResult.data.plantUserInfo.plantNickName}`;
-    message += `【上期时间】${roundList[0].dateDesc.replace('上期 ', '')}\n`;
-    message += `【上期成长值】${roundList[0].growth}\n`;
-    await receiveNutrients();//定时领取营养液
-    await doHelp();//助力
-    await doTask();//做日常任务
-    await doEgg();
-    await stealFriendWater();
-    await doCultureBean();
-    await doGetReward();
-    await showTaskProcess();
-    await plantShareSupportList();
-  } else {
-    console.log(`种豆得豆-初始失败:  ${JSON.stringify($.plantBeanIndexResult)}`);
+  try {
+    console.log(`获取任务及基本信息`)
+    await plantBeanIndex();
+    // console.log(plantBeanIndexResult.data.taskList);
+    if ($.plantBeanIndexResult.code === '0') {
+      const shareUrl = $.plantBeanIndexResult.data.jwordShareInfo.shareUrl
+      $.myPlantUuid = getParam(shareUrl, 'plantUuid')
+      console.log(`\n【京东账号${$.index}（${$.nickName || $.UserName}）的${$.name}好友互助码】${$.myPlantUuid}\n`);
+      roundList = $.plantBeanIndexResult.data.roundList;
+      currentRoundId = roundList[1].roundId;//本期的roundId
+      lastRoundId = roundList[0].roundId;//上期的roundId
+      awardState = roundList[0].awardState;
+      $.taskList = $.plantBeanIndexResult.data.taskList;
+      subTitle = `【京东昵称】${$.plantBeanIndexResult.data.plantUserInfo.plantNickName}`;
+      message += `【上期时间】${roundList[0].dateDesc.replace('上期 ', '')}\n`;
+      message += `【上期成长值】${roundList[0].growth}\n`;
+      await receiveNutrients();//定时领取营养液
+      await doHelp();//助力
+      await doTask();//做日常任务
+      await doEgg();
+      await stealFriendWater();
+      await doCultureBean();
+      await doGetReward();
+      await showTaskProcess();
+      await plantShareSupportList();
+    } else {
+      console.log(`种豆得豆-初始失败:  ${JSON.stringify($.plantBeanIndexResult)}`);
+    }
+  } catch (e) {
+    $.logErr(e);
   }
 }
 async function doGetReward() {