diff --git a/apps/setu.js b/apps/setu.js index 00652ac..cf4a606 100644 --- a/apps/setu.js +++ b/apps/setu.js @@ -346,7 +346,7 @@ export class sese extends plugin { let over = (temp[e.user_id + e.group_id] - present) - return Config.getsecond(over) + return getsecond(over) } else return false @@ -355,7 +355,7 @@ export class sese extends plugin { let over = (temp[e.user_id] - present) - return Config.getsecond(over) + return getsecond(over) } else return false } @@ -390,3 +390,24 @@ export class sese extends plugin { } } +// 秒转换 +function getsecond(value) { + let time = Config.getsecond(value) + + let { second, minute, hour, day } = time + // 处理返回消息 + let result = '' + if (second != 0) { + result = parseInt(second) + '秒' + } + if (minute > 0) { + result = parseInt(minute) + '分' + result + } + if (hour > 0) { + result = parseInt(hour) + '小时' + result + } + if (day > 0) { + result = parseInt(day) + '天' + result + } + return result +} \ No newline at end of file diff --git a/model/Browser.js b/model/Browser.js index a04b1c1..62aa2b8 100644 --- a/model/Browser.js +++ b/model/Browser.js @@ -56,7 +56,7 @@ class Browser { }, scrollStep, max_height_px, height_limit); - await sleep(800); + await this.sleep(800); } try { @@ -77,6 +77,13 @@ class Browser { } + /** + * @description: 截图不滚动不等待加载 + * @param {String} url 网页链接 + * @param {Number} width 页面的宽度 + * @param {Number} height 页面的高度 + * @return {img} 图片 + */ async webPreview(url, width = 1920, height = 1080) { const browser = await puppeteer.launch({ @@ -105,18 +112,19 @@ class Browser { await browser.close(); return res } + //延时函数 + sleep(delay) { + return new Promise((resolve, reject) => { + setTimeout(() => { + try { + resolve(1) + } catch (e) { + reject(0) + } + }, delay) + }) + } } -//延时函数 -function sleep(delay) { - return new Promise((resolve, reject) => { - setTimeout(() => { - try { - resolve(1) - } catch (e) { - reject(0) - } - }, delay) - }) -} + export default new Browser(); \ No newline at end of file