发货易新增弹窗

manifest.json

 {
 	"name": "菜芽-自动约单",
-	"version": "1.0.10",
+	"version": "1.1.1",
 	"description": "辅助手机壳厂家打印发货易的快递单",
 
 	"manifest_version": 2,

src/content/bookingApp.ts

@@ -22,7 +22,11 @@ let domEle = {
     reauthDialogTitle: document.querySelector("#reauthDialog .modal-title") as HTMLDivElement,//店铺授权
     shopName: document.querySelector("#reauthDialog .shopName") as HTMLDivElement,//店铺授权
     reauthDialogClose:document.querySelector("#reauthDialog .btn-default") as HTMLButtonElement,
- }
+    //   电子面单获取失败
+    miandanbootBox:(): any => document.querySelector('.bootbox'),
+    // 发货中弹窗
+    sendProModal:()=>document.querySelector("div#shipDialog") as HTMLDivElement,
+}
 async function booking(wayCompanyId: string, orderNo: string,fhy_type:Number) {
     let checkOptionObj = platformObj
     chrome.storage.local.get({ checkOptionObj: platformObj }, function (res) {
@@ -101,7 +105,7 @@ async function booking(wayCompanyId: string, orderNo: string,fhy_type:Number) {
                     if (rowResult.indexOf("打印失败") > -1) {
                         printReslut.fail++;
                         rowObject.success = 0;
-                        if(domEle.tableResult.rows[rowIter].cells[2].innerText.includes('电子面单余额不足')){
+                        if(domEle.tableResult.rows[rowIter].cells[2].innerText.includes('电子面单账户余额不足')){
                             result.msg = '电子面单余额不足'
                         }
                     } else {
@@ -129,6 +133,13 @@ async function booking(wayCompanyId: string, orderNo: string,fhy_type:Number) {
                        domEle.btnClose.click();
                     }
                 }
+                for (let i = 0; i < 20; i++) {
+                    await delayDate(1000)
+                    if(domEle.sendProModal().style.display==='none'){
+                                                //发货中
+                       return result
+                    }
+                }
                 return result;
             }else{
                 //取消打印
@@ -147,6 +158,7 @@ async function booking(wayCompanyId: string, orderNo: string,fhy_type:Number) {
     result.msg = "未匹配快递单模板";
     result.status = 3;
     result.data=printError
+    domEle.btnDialogCancel.click();
     return result;
 
 }
@@ -219,10 +231,9 @@ async function waitPrintResult() {
         msg: "获取打印结果超时",
         data: [],
     }
-    for (let i = 0; i < 30; i++) {
+    for (let i = 0; i < 100; i++) {
         await delayDate(1000);
         if (domEle.reauthDialog&&domEle.reauthDialog.style.display==='block') {
-            await delayDate(1000)
             console.log('店铺授权',domEle.shopName.innerText);
             result.status = 5;
             result.msg=`获取${domEle.shopName.innerText}店铺授权失败`;
@@ -234,12 +245,18 @@ async function waitPrintResult() {
             result.msg = ""
             return result;
         }
+        if (domEle.miandanbootBox()&&domEle.miandanbootBox().style.display === 'block') {
+            domEle.printErrorConfirm().click();
+            result.msg = '获取电子面单失败'
+            return result
+        }
         if(domEle.printErrorModal() && domEle.printErrorModal().innerText==' 获取电子面单失败，从9月1日起淘宝平台开启付费解密虚拟号方案（查看详情），因此不支持非菜鸟电子面单打印，请尽量使用菜鸟电子面单打印，如需付费解密虚拟号打印非菜鸟电子面单请联系发货易客服咨询'){
             result.msg="获取电子面单失败";
             console.log('获取电子面单失败',domEle.printErrorModal());
             domEle.printErrorConfirm().click();
             return result;
         }
+        
     }
     return result;
 }