diff --git a/jdCookie.js b/jdCookie.js index 5f3726f..e653733 100644 --- a/jdCookie.js +++ b/jdCookie.js @@ -34,7 +34,7 @@ if (JSON.stringify(process.env).indexOf('GITHUB')>-1) { CookieJDs = [...new Set(CookieJDs.filter(item => !!item))] if (process.env.JD_DEBUG && process.env.JD_DEBUG === 'false') console.log = () => {}; console.log(`\n====================共${CookieJDs.length}个京东账号Cookie=================\n`); -console.log(`============脚本执行时间:${new Date(new Date().getTime() + new Date().getTimezoneOffset()*60*1000 + 8*60*60*1000).toLocaleString('chinese',{hour12:false})}=============\n`) +console.log(`============脚本执行时间:${formatdate(new Date(new Date().getTime() + new Date().getTimezoneOffset()*60*1000 + 8*60*60*1000))}=============\n`) console.log('>>>>>>>>>>>>>>6Dylan6 提示:任务正常运行中>>>>>>>>>>>>>>>\n') for (let i = 0; i < CookieJDs.length; i++) { if (!CookieJDs[i].match(/pt_pin=(.+?);/) || !CookieJDs[i].match(/pt_key=(.+?);/)) console.log(`\n提示:京东cookie 【${CookieJDs[i]}】填写不规范,可能会影响部分脚本正常使用。正确格式为: pt_key=xxx;pt_pin=xxx;(分号;不可少)\n`); @@ -167,3 +167,12 @@ let envName = process.env.ShareCodeEnvName if (nameChinese && nameConfig && envName) { SetShareCodesEnv(nameChinese, nameConfig, envName) } +function formatdate(date) { + const year = date.getFullYear(); + const month = ('0' + (date.getMonth() + 1)).slice(-2); + const day = ('0' + date.getDate()).slice(-2); + const hours = ('0' + date.getHours()).slice(-2); + const minutes = ('0' + date.getMinutes()).slice(-2); + const seconds = ('0' + date.getSeconds()).slice(-2); + return `${year}/${month}/${day} ${hours}:${minutes}:${seconds}`; +} diff --git a/jd_bean_change.js b/jd_bean_change.js index 1adf5b9..57aebb6 100644 --- a/jd_bean_change.js +++ b/jd_bean_change.js @@ -18,13 +18,13 @@ if ($.isNode() && process.env.BEANCHANGE_BEANDETAILMODE){ const fs = require('fs'); const CR = require('crypto-js'); +const moment = require("moment"); let matchtitle="昨日"; let yesterday=""; let TodayDate=""; let startDate=""; let endDate=""; try { - const moment = require("moment"); yesterday = moment().subtract(1, 'days').format('YYYY-MM-DD'); TodayDate = moment().format("YYYY-MM-DD"); startDate = moment().startOf("month").format("YYYY_MM"); @@ -1082,7 +1082,7 @@ async function jdCash() { //console.log(data.data.bizMsg); } } else { - console.log(data.msg) + //console.log(data.msg) } } } @@ -2144,7 +2144,7 @@ function dwappexpire() { } else { data = JSON.parse(data) if (data.code == 200) { - data = data.data.userOperateList.length !== 0 ? new Date(data.data.userOperateList[0].time).toLocaleDateString() : ''; + data = data.data.userOperateList.length !== 0 ? moment(new Date(data.data.userOperateList[0].time)).format('M/D') : ''; } else { //console.log(data.msg); data = '';