Merge remote-tracking branch 'origin/master'

# Conflicts:
#	jd_zoo.js

jd_zoo.js

@@ -104,7 +104,6 @@ if ($.isNode()) {
     })
 
 async function zoo() {
-  try {
   $.signSingle = {};
   $.homeData = {};
   $.secretp = ``;
@@ -120,6 +119,15 @@ async function zoo() {
   await $.wait(1000);
   await takePostRequest('zoo_getHomeData');
   await $.wait(1000);
+  await takePostRequest('zoo_getSignHomeData');
+  await $.wait(1000);
+  if($.signHomeData.todayStatus === 0){
+    console.log(`去签到`);
+    await takePostRequest('zoo_sign');
+    await $.wait(1000);
+  }else{
+    console.log(`已签到`);
+  }
   await takePostRequest('zoo_getFeedDetail');
   await $.wait(1000);
   let raiseInfo = $.homeData.result.homeMainInfo.raiseInfo;
@@ -147,7 +155,7 @@ async function zoo() {
         $.callbackInfo = {};
         console.log(`做任务：${$.oneActivityInfo.title || $.oneActivityInfo.taskName || $.oneActivityInfo.shopName};等待完成`);
         await takePostRequest('zoo_collectScore');
-          if ($.callbackInfo.code === 0 && $.callbackInfo.data && $.callbackInfo.data.result && $.callbackInfo.data.result.taskToken) {
+        if ($.callbackInfo.code === 0 && $.callbackInfo.data.result.taskToken) {
           await $.wait(8000);
           let sendInfo = encodeURIComponent(`{"dataSource":"newshortAward","method":"getTaskAward","reqParams":"{\\"taskToken\\":\\"${$.callbackInfo.data.result.taskToken}\\"}","sdkVersion":"1.0.0","clientLanguage":"zh"}`)
           await callbackResult(sendInfo)
@@ -220,9 +228,7 @@ async function zoo() {
     $.pkInviteId = $.pkInviteList[i];
     await takePostRequest('pkHelp');
   }
-  } catch (e) {
-    $.logErr(e)
-  }
+
 }
 
 async function takePostRequest(type) {
@@ -288,8 +294,16 @@ async function takePostRequest(type) {
       body = getBody(type);
       myRequest = await getPostRequest(`zoo_pk_assistGroup`, body);
       break;
+    case 'zoo_getSignHomeData':
+      body = `functionId=zoo_getSignHomeData&body={"notCount":"1"}&client=wh5&clientVersion=1.0.0`;
+      myRequest = await getPostRequest(`zoo_getSignHomeData`,body);
+      break;
+    case 'zoo_sign':
+      body = `functionId=zoo_sign&body={}&client=wh5&clientVersion=1.0.0`;
+      myRequest = await getPostRequest(`zoo_sign`,body);
+      break;
     default:
-      console.log('111')
+      console.log(`错误${type}`);
   }
   return new Promise(async resolve => {
     $.post(myRequest, (err, resp, data) => {
@@ -388,6 +402,19 @@ async function dealReturn(type, data) {
     case 'zoo_pk_doPkSkill':
       if (data.data.bizCode === 0) console.log(`使用成功`);
       break
+    case 'zoo_getSignHomeData':
+      if(data.code === 0) {
+        $.signHomeData = data.data.result;
+      }
+      break
+    case 'zoo_sign':
+      if(data.code === 0 && data.data.bizCode === 0) {
+        console.log(`签到获得：${data.data.result.redPacketValue} 红包`);
+      }else{
+        console.log(`签到失败`);
+        console.log(data);
+      }
+      break
     default:
       console.log(`未判断的异常${type}`);
   }