bug修改

src/content/bookingApp.ts

@@ -8,11 +8,16 @@ let domEle = {
     radioGetNewWaybill: document.querySelector("#printWaybillDialog > div > div > div.modal-body > form > div.form-group.get-waybill-no-method-radios > div > label:nth-child(1) > input[type=radio]") as HTMLInputElement,
     inputWaybillNoOnly: document.querySelector("#printWaybillDialog > div > div > div.modal-body > form > div:nth-child(4) > div > div > label > input[type=checkbox]") as HTMLInputElement,
     btnDialogPrint: document.querySelector("#printWaybillDialog > div > div > div.modal-footer > button.btn.btn-primary.print-button") as HTMLButtonElement,
+    btnDialogCancel:document.querySelector("#printWaybillDialog > div > div > div.modal-footer > button.btn.btn-default") as HTMLButtonElement,
     modalResult: document.querySelector("#printEwaybillResultDialog") as HTMLDivElement,
     tableResult: document.querySelector("#printEwaybillResultDialog > div > div > div.modal-body > div.result-table-container > table") as HTMLTableElement,
     btnClose: document.querySelector("#printEwaybillResultDialog > div > div > div.modal-footer > button.btn.btn-default") as HTMLButtonElement,
     btnDeliver: document.querySelector("#printEwaybillResultDialog > div > div > div.modal-footer > button.btn.ship-now-btn") as HTMLButtonElement,
-}
+    unReachModal:()=>document.querySelector(".bootbox-message") as HTMLDivElement,
+    unReachAccept:()=>document.querySelector(".bootbox-accept") as HTMLButtonElement,
+    printErrorModal:()=>document.querySelector(".bootbox-message") as HTMLDivElement,
+    printErrorConfirm:()=>document.querySelector(".bootbox-accept") as HTMLButtonElement,
+ }
 async function booking(wayCompanyId: string, orderNo: string) {
 
     domEle.inputOrderId.value = orderNo;
@@ -33,10 +38,10 @@ async function booking(wayCompanyId: string, orderNo: string) {
 
     domEle.btnPrint.click();
     await delayDate(500);
-
-    if(document.querySelector(".bootbox-message")?.innerText==' 所选订单中部分订单地址不可达，是否继续打印？'){
+    console.log(domEle.unReachModal);
+    if(domEle.unReachModal() && domEle.unReachModal().innerText==' 所选订单中部分订单地址不可达，是否继续打印？'){
  
-        document.querySelector(".bootbox-accept").click();
+        domEle.unReachAccept().click();
     }
 
     result = await waitDialog();
@@ -100,7 +105,7 @@ async function booking(wayCompanyId: string, orderNo: string) {
             }else{
                 //取消打印
                 await delayDate(1000);
-                document.querySelector("#printWaybillDialog > div > div > div.modal-footer > button.btn.btn-default").click();
+                domEle.btnDialogCancel.click();
                 return result;
             }
 
@@ -171,9 +176,10 @@ async function waitPrintResult() {
             result.msg = ""
             return result;
         }
-        if(document.querySelector(".bootbox-message")?.innerText==' 获取电子面单失败，从9月1日起淘宝平台开启付费解密虚拟号方案（查看详情），因此不支持非菜鸟电子面单打印，请尽量使用菜鸟电子面单打印，如需付费解密虚拟号打印非菜鸟电子面单请联系发货易客服咨询'){
+        if(domEle.printErrorModal() && domEle.printErrorModal().innerText==' 获取电子面单失败，从9月1日起淘宝平台开启付费解密虚拟号方案（查看详情），因此不支持非菜鸟电子面单打印，请尽量使用菜鸟电子面单打印，如需付费解密虚拟号打印非菜鸟电子面单请联系发货易客服咨询'){
             result.msg="获取电子面单失败";
-            document.querySelector(".bootbox-accept").click();
+
+            domEle.printErrorConfirm().click();
             return result;
         }
     }