添加授权关闭

manifest.json

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

src/content/bookingApp.ts

@@ -18,6 +18,10 @@ let domEle = {
     unReachAccept:()=>document.querySelector(".bootbox-accept") as HTMLButtonElement,
     printErrorModal:()=>document.querySelector(".bootbox-message") as HTMLDivElement,
     printErrorConfirm:()=>document.querySelector(".bootbox-accept") as HTMLButtonElement,
+    reauthDialog: document.querySelector("#reauthDialog") as HTMLDivElement,//店铺授权
+    reauthDialogTitle: document.querySelector("#reauthDialog modal-title") as HTMLDivElement,//店铺授权
+    shopName: document.querySelector("#reauthDialog shopName") as HTMLDivElement,//店铺授权
+    
  }
 async function booking(wayCompanyId: string, orderNo: string,fhy_type:Number) {
     let checkOptionObj = platformObj
@@ -25,15 +29,20 @@ async function booking(wayCompanyId: string, orderNo: string,fhy_type:Number) {
       console.log('新版V2',res.checkOptionObj);
       checkOptionObj = res.checkOptionObj
     })
-    domEle.inputOrderId.value = orderNo;
-    domEle.checkBoxSelectAll.checked = true;
-    domEle.btnSearch.click();
     let result = {
         status: 0,
         msg: "",
         data: []
     }
     let printError: any = orderNo
+    result = await waitreauthDialog();
+    if (result.status > 0) {
+        result.data=printError
+        return result;
+    }
+    domEle.inputOrderId.value = orderNo;
+    domEle.checkBoxSelectAll.checked = true;
+    domEle.btnSearch.click();
     result = await waitOrder();
     if (result.status > 0) {
         result.data=printError
@@ -90,6 +99,9 @@ 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('电子面单余额不足')){
+                            result.msg = '电子面单余额不足'
+                        }
                     } else {
                         printReslut.success++;
                     }
@@ -137,7 +149,22 @@ async function booking(wayCompanyId: string, orderNo: string,fhy_type:Number) {
 
 }
 
-
+async function waitreauthDialog() {
+    let result = {
+        status: 5,
+        msg: "获取店铺授权",
+        data: [],
+    }
+    for (let i = 0; i < 10; i++) {
+        await delayDate(1000);
+        if (domEle.reauthDialog&&domEle.reauthDialogTitle.innerText=='店铺授权') {
+            console.log('店铺授权',domEle.shopName.innerText)
+            result.msg=`获取${domEle.shopName.innerText}店铺授权失败`
+            return result
+        }
+    }
+    return result;
+}
 async function waitOrder() {
     let result = {
         status: 4,
@@ -187,6 +214,12 @@ async function waitPrintResult() {
     }
     for (let i = 0; i < 30; i++) {
         await delayDate(1000);
+        if (domEle.reauthDialog&&domEle.reauthDialogTitle.innerText=='店铺授权') {
+            console.log('店铺授权',domEle.shopName.innerText);
+            result.status = 5;
+            result.msg=`获取${domEle.shopName.innerText}店铺授权失败`;
+            return result;
+        }
         if (domEle.modalResult.className == 'modal fade sui-modal none in') {
             result.status = 0;
             result.msg = ""

src/content/bookingV2.ts

@@ -22,6 +22,9 @@ let domEle = {
     btnDeliver: ():any=>document.querySelector("div.ant-modal-footer button:nth-child(2)") ,
     deliverResult:():any=>document.querySelector(".ant-modal-body>div.ant-table-wrapper .ant-table-tbody"),
     deliverClose: ():any=>document.querySelector("div.ant-modal-footer button") ,
+    reauthDialog: ():any=>document.querySelector("#reauthDialog") ,
+    reauthDialogTitle: ():any=>document.querySelector("#reauthDialog modal-title") ,
+    shopName: ():any=>document.querySelector("#reauthDialog shopName") ,
 }  
 async function booking(waybillTemplateTitle: string, orderNo: string,shopId:string,fhy_type:number) {
     let checkOptionObj = platformObj
@@ -35,6 +38,11 @@ async function booking(waybillTemplateTitle: string, orderNo: string,shopId:stri
         data: [],
     }
     let printError: any = orderNo
+    result = await waitreauthDialog();
+    if (result.status > 0) {
+        result.data=printError
+        return result;
+    }
     for(let navIter=0;navIter<domEle.divNav.length;navIter++){
         let aNav = domEle.divNav[navIter] as HTMLLinkElement;
         
@@ -89,7 +97,7 @@ async function booking(waybillTemplateTitle: string, orderNo: string,shopId:stri
 
     for (let i = 0; i < waybillTemplateList.childNodes.length; i++) {
         let divItem = waybillTemplateList.childNodes[i] as any;
-        if (divItem.innerText == waybillTemplateTitle) {
+        if (divItem.innerText.includes(waybillTemplateTitle) ) {
 
             simulateMouseClick(divItem);
             
@@ -131,7 +139,9 @@ async function booking(waybillTemplateTitle: string, orderNo: string,shopId:stri
                     if (domEle.tableResult().rows[rowIter].cells[2].innerHTML.indexOf('class="text-error"') > -1) {
                         printReslut.fail++;
                         rowObject.success = 0;
-
+                        if(domEle.tableResult().rows[rowIter].cells[2].innerHTML.includes('电子面单余额不足')){
+                            result.msg = '电子面单余额不足'
+                        }
                     } else {
                         printReslut.success++;
                     }
@@ -179,11 +189,27 @@ async function booking(waybillTemplateTitle: string, orderNo: string,shopId:stri
 
     result.msg = "未匹配快递单模板";
     result.status = 3;
+    result.data=printError
     return result;
 
 }
 
-
+async function waitreauthDialog() {
+    let result = {
+        status: 5,
+        msg: "获取店铺授权",
+        data: [],
+    }
+    for (let i = 0; i < 10; i++) {
+        await delayDate(1000);
+        if (domEle.reauthDialog()&&domEle.reauthDialogTitle().innerText=='店铺授权') {
+            console.log('店铺授权',domEle.shopName().innerText);
+            result.msg=`获取${domEle.shopName().innerText}店铺授权失败`;
+            return result;
+        }
+    }
+    return result;
+}
 async function waitOrder() {
     let result = {
         status: 4,
@@ -241,6 +267,12 @@ async function waitPrintResult() {
             result.msg = ""
             return result;
         }
+        if (domEle.reauthDialog()&&domEle.reauthDialogTitle().innerText=='店铺授权') {
+            console.log('店铺授权',domEle.shopName().innerText)
+            result.status = 5
+            result.msg=`获取${domEle.shopName().innerText}店铺授权失败`
+            return result
+        }
     }
     return result;
 }