Update jd_redrain.js
合并冲突
This commit is contained in:
parent
7f31a33670
commit
573c06ea73
@ -177,17 +177,10 @@ function doInteractiveAssignment(encryptProjectId, encryptAssignmentId) {
|
||||
} else {
|
||||
if (safeGet(data)) {
|
||||
data = JSON.parse(data);
|
||||
<<<<<<< HEAD
|
||||
console.log(data);
|
||||
if (data.subCode == "0") {
|
||||
console.log(`${data.rewardsInfo.successRewards[3][0].quantity}京豆`);
|
||||
allMessage += `京东账号${$.index}${$.nickName || $.UserName}\n领取成功,获得【${data.rewardsInfo.successRewards[3][0].quantity}】京豆${$.index !== cookiesArr.length ? '\n\n' : ''}`;
|
||||
=======
|
||||
if (data.subCode == "0") {
|
||||
//console.log(`${data.rewardsInfo.successRewards[3][0].rewardName}`);
|
||||
message += `领取成功,获得 ${data.rewardsInfo.successRewards[3][0].rewardName}`
|
||||
allMessage += `京东账号${$.index}${$.nickName || $.UserName}\n领取成功,获得 ${data.rewardsInfo.successRewards[3][0].rewardName}${$.index !== cookiesArr.length ? '\n\n' : ''}`;
|
||||
>>>>>>> 69e2454bc59e9c82e511b6f469b90a55e18e21fd
|
||||
} else {
|
||||
console.log(data);
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user