From 23b1b6ab6e6d9f9b65b7a96c8f3a3caad5771579 Mon Sep 17 00:00:00 2001 From: youfak Date: Mon, 4 Nov 2024 15:45:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=AF=A6=E6=83=85=E8=BE=93?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bear.js | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/bear.js b/bear.js index 55e6e8c..718ad20 100644 --- a/bear.js +++ b/bear.js @@ -3924,17 +3924,21 @@ class Iii1iI1i { } if (IlIIlIli.activity.prizedata) { let info = IlIIlIli.activity.prizedata; - let match = info.match(/3、.*?(?=\n\d+|$)/s); - let info1 = match[0].trim(); - let match1 = info1.match(/（1）.*?(?=\n\d+|$)/s); - let prizedata = match1[0].trim(); - lIliI1Ii += "活动规则:\n" + prizedata + "\n"; + let match = info.match(/符合.*?(?=\n\d+|$)/s); + if (match) { + let info1 = match[0].trim(); + let match1 = info1.match(/（1）.*?(?=\n\d+|$)/s); + let prizedata = match1[0].trim(); + lIliI1Ii += "活动规则:\n" + prizedata + "\n"; + } } if (IlIIlIli.activity.hdbprizedata) { let info = IlIIlIli.activity.hdbprizedata; - let match = info.match(/5\..*?:\s*(.*?)\n\s*\d+\./s); - let prizedata = match[1].trim(); - lIliI1Ii += "活动规则:\n" + prizedata + "\n"; + let match = info.match(/奖项设置.*?:\s*(.*?)\n\s*\d+\./s); + if (match) { + let prizedata = match[1].trim(); + lIliI1Ii += "活动规则:\n" + prizedata + "\n"; + } } IlIIlIli.activity.drawTimeStr && (lIliI1Ii += "开奖时间:" + IlIIlIli.activity.drawTimeStr + "\n"), this.activity.activityUrl && !i1ilIi1?.["noPushUrl"] && (lIliI1Ii += prize += "export " + Iii1iI1i.envInfo.env + "=\"" + this.activity.activityUrl + "\"\n\n"), IlIIlIli.activity.shopId && (lIliI1Ii += "https://shop.m.jd.com/shop/home?shopId=" + IlIIlIli.activity.shopId + "\n\n"), lIliI1Ii += "时间:" + i1I1IlI1(Date.now(), "yyyy-MM-dd HH:mm:ss.SSS") + " 时长:" + I1lili1i + "s\n小熊京东活动通知", await liIliiiI.sendNotify(lIIllllI, lIliI1Ii), lIliI1Ii; }