Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
lukesyy committed Dec 23, 2021
1 parent 08d85a0 commit 062b68a
Show file tree
Hide file tree
Showing 9 changed files with 799 additions and 876 deletions.
7 changes: 2 additions & 5 deletions config.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"jd_dreamFactory": [4, 6, 8, 10, 12, 14, 16, 18, 20, 22],
"jd_joy": 2,
"jd_big_winner": [6, 9, 12, 15, 18, 21],
"jd_jdtj_winner": [6, 12, 15, 21],
"jd_bean_home": [7],
"jd_cash": [7],
"jd_ccSign": [7],
Expand Down Expand Up @@ -56,15 +57,10 @@
"jd_jump":[3, 21],
"jd_nnfls": [10,20],
"jd_fanli": [10],
"jd_sxLottery": [10],
"jd_lxLottery": [10],
"jd_mofang_ex": [10],
"jd_xqscjd": [10,13],
"jd_jchsign": [10],
"jd_gold_sign": [9],
"jd_gyp": [10],
"jx_sign_xd": [5,13],
"jd_lottery_drew": [10],
"jd_bean_change": [17],
"jd_jdfactory": [6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23],
"jd_speed_sign": [11],
Expand All @@ -73,6 +69,7 @@
"jd_cfd_loop": [8, 16],
"jd_price": [23],
"jd_joy_steal": 3,
"jd_unsubscribe": [23],
"params":
{
"global":
Expand Down
40 changes: 26 additions & 14 deletions jd_bean_change.js
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@ async function showMsg() {
//return
ReturnMessageTitle="";
ReturnMessage = "";

var strsummary="";
if (MessageUserGp2) {
userIndex2 = MessageUserGp2.findIndex((item) => item === $.pt_pin);
}
Expand Down Expand Up @@ -544,44 +544,52 @@ async function showMsg() {
}

ReturnMessage += `【今日京豆】收${$.todayIncomeBean}豆`;

strsummary+= `【今日京豆】收${$.todayIncomeBean}豆`;
if ($.todayOutcomeBean != 0) {
ReturnMessage += `,支${$.todayOutcomeBean}豆`;
strsummary += `,支${$.todayOutcomeBean}豆`;
}
ReturnMessage += `\n`;

strsummary+= `\n`;
ReturnMessage += `【昨日京豆】收${$.incomeBean}豆`;

strsummary+= `【昨日京豆】收${$.incomeBean}豆`;
if ($.expenseBean != 0) {
ReturnMessage += `,支${$.expenseBean}豆`;
strsummary += `,支${$.expenseBean}豆`;
}
ReturnMessage += `\n`;

strsummary += `\n`;
if ($.beanCount){
ReturnMessage += `【当前京豆】${$.beanCount}豆(≈${(($.beanCount-$.beanChangeXi)/ 100).toFixed(2)}元)\n`;
ReturnMessage += `【当前京豆】${$.beanCount}豆(≈${(($.beanCount-$.beanChangeXi)/ 100).toFixed(2)}元)\n`;
strsummary+= `【当前京豆】${$.beanCount}豆(≈${(($.beanCount-$.beanChangeXi)/ 100).toFixed(2)}元)\n`;
} else {
if($.levelName || $.JingXiang)
ReturnMessage += `【当前京豆】获取失败,接口返回空数据\n`;
else
ReturnMessage += `【当前京豆】${$.beanCount}豆(≈${(($.beanCount-$.beanChangeXi)/ 100).toFixed(2)}元)\n`;
else{
ReturnMessage += `【当前京豆】${$.beanCount}豆(≈${(($.beanCount-$.beanChangeXi)/ 100).toFixed(2)}元)\n`;
strsummary += `【当前京豆】${$.beanCount}豆(≈${(($.beanCount-$.beanChangeXi)/ 100).toFixed(2)}元)\n`;
}
}

if (doCheckJxBeans == "true") {
ReturnMessage += `【今日喜豆】收${$.todayinJxBean}豆`;

strsummary+= `【今日喜豆】收${$.todayinJxBean}豆`;
if ($.todayOutJxBean != 0) {
ReturnMessage += `,支${$.todayOutJxBean}豆`;
strsummary += `,支${$.todayOutJxBean}豆`;
}
ReturnMessage += `\n`;

strsummary += `\n`;
ReturnMessage += `【昨日喜豆】收${$.inJxBean}豆`;

strsummary += `【昨日喜豆】收${$.inJxBean}豆`;
if ($.OutJxBean != 0) {
ReturnMessage += `,支${$.OutJxBean}豆`;
strsummary += `,支${$.OutJxBean}豆`;
}
ReturnMessage += `\n`;

strsummary += `\n`;
ReturnMessage += `【当前喜豆】${$.xibeanCount}喜豆(≈${($.xibeanCount/ 100).toFixed(2)}元)\n`;
strsummary += `【当前喜豆】${$.xibeanCount}喜豆(≈${($.xibeanCount/ 100).toFixed(2)}元)\n`;
}


Expand Down Expand Up @@ -803,16 +811,20 @@ async function showMsg() {
console.log(`${ReturnMessageTitle+ReturnMessage}`);

if ($.isNode() && WP_APP_TOKEN_ONE) {
var strTitle="京东资产变动";

if (TempBaipiao) {
strsummary=TempBaipiao + `\n` +strsummary;
TempBaipiao = `【⏰商品白嫖活动提醒⏰】\n` + TempBaipiao;
ReturnMessage = TempBaipiao + `\n` + ReturnMessage;
ReturnMessage = TempBaipiao + `\n` + ReturnMessage;
}
ReturnMessage=`【账号名称】${$.nickName || $.UserName}\n`+ReturnMessage;

ReturnMessage += RemainMessage;
if(strAllNotify)
ReturnMessage=strAllNotify+`\n`+ReturnMessage;

await notify.sendNotifybyWxPucher(`${$.name}`, `${ReturnMessage}`, `${$.UserName}`);
await notify.sendNotifybyWxPucher(strTitle, `${ReturnMessage}`, `${$.UserName}`,'\n\n本通知 By ccwav Mod',strsummary);
}

//$.msg($.name, '', ReturnMessage , {"open-url": "https://bean.m.jd.com/beanDetail/index.action?resourceValue=bean"});
Expand Down
10 changes: 5 additions & 5 deletions jd_cfd_loop.js

Large diffs are not rendered by default.

Loading

0 comments on commit 062b68a

Please sign in to comment.