优化合并流程

Signed-off-by: caner <5658514@qq.com>

index.js

@@ -3,11 +3,10 @@ const sleep = (ms) => { return new Promise((resolve) => { setTimeout(resolve, ms
 // 参数
 const ID = process.argv[2]
 const PWD = process.argv[3]
-const TIME = process.argv[4] || 100000
+const TIME = process.argv[4] || 10000
 
 // 登录
 const login = async (browser, ID, PWD) => {
-    // login
     const page = await browser.newPage();
     await page.goto('http://git.jdjinsui.com/user/login');
     await page.type('input', ID, { delay: 150 });
@@ -20,7 +19,6 @@ const login = async (browser, ID, PWD) => {
         console.error('账号密码错误:', ID);
         await login(browser, ID, PWD)
     }
-
 }
 
 // 数据获取及同意
@@ -35,19 +33,20 @@ const contrlData = async (browser, page, time) => {
         const el = list[k];
         const newPage = await browser.newPage();
         await newPage.goto(el.href, { timeout: 0 })
-        await newPage.$$eval('.content>.segment button', async (divs) => {
-            const sleepd = (ms) => { return new Promise((resolve) => { setTimeout(resolve, ms) }) }
+        const state = await newPage.$$eval('.content>.segment button', async (divs, item) => {
+            let who = ''
             for (let j = 0; j < divs.length; j++) {
                 const es = divs[j];
                 if (es.textContent.includes('合并请求')) {
                     es.click()
-                    await sleepd(1000)
-                    console.log(el.label, '已合并')
+                    who = item.who + ': 已合并'
                 }
             }
-        })
+            return who
+        }, el)
+        console.log(state);
         await sleep(1000)
-        newPage.close()
+        await newPage.close()
     }
     // reload
     await sleep(1000)
@@ -64,7 +63,7 @@ const contrlData = async (browser, page, time) => {
             headless: true,
             timeout: 0,
             defaultViewport: { width: 1920, height: 1080 },
-            executablePath:'./chrome/chrome.exe'
+            executablePath: './chrome/chrome.exe'
         });
 
         // login