处理马上发货流程

src/config.ts

 export const factoryContentUrls = ["http://localhost:8082/*", "http://localhost:8083/*", "*://admin.rtxmdz.com/*", "*://*.rtxmdz.com/*"]
 export const bookingV2Urls=["https://v2.fahuoyi.com/order/list","https://v2.fahuoyi.com/order/list*"]
-export const bookingAppUrls=["https://app.fahuoyi.com/order/index"]
+export const bookingAppUrls=["https://app.fahuoyi.com/order/index","https://*.fahuoyi.com/order/index"]

src/content/bookingApp.ts

@@ -11,6 +11,7 @@ let domEle = {
     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,
 }
 async function booking(wayCompanyId: string, orderNo: string) {
 
@@ -55,6 +56,8 @@ async function booking(wayCompanyId: string, orderNo: string) {
                     fail: 0,
                     list: []
                 }
+                let chooseIndex = 0
+                let rowResultList:any = []
                 for (let rowIter = 0; rowIter < domEle.tableResult.rows.length; rowIter++) {
                     let rowResult = domEle.tableResult.rows[rowIter].cells[2].innerText;
                     let rowInfo = domEle.tableResult.rows[rowIter].cells[1].innerText;
@@ -63,18 +66,30 @@ async function booking(wayCompanyId: string, orderNo: string) {
                         msg: rowResult,
                         success: 1,
                     }
+                    rowResultList.push(rowResult)
                     if (rowResult.indexOf("打印失败") > -1) {
                         printReslut.fail++;
                         rowObject.success = 0;
-
                     } else {
                         printReslut.success++;
                     }
                     printReslut.list.push(rowObject)
                 }
                 result.data = printReslut;
+                // 如果所有的订单都打印失败则，等会再发货，关闭弹窗
+                if(rowResultList.every((item:any)=>item.includes('打印失败'))){
+                    chooseIndex = -1
+                }
                 console.log(result);
-                domEle.btnClose.click();
+                // 等会再发货
+                if(chooseIndex===-1){
+                    console.log('等会再发货');
+                    domEle.btnClose.click();
+                }else{
+                    // 马上发货
+                    console.log('马上发货');
+                    domEle.btnDeliver.click()
+                }
                 return result;
             }
 

src/content/bookingV2.ts

@@ -17,6 +17,7 @@ let domEle = {
     modalResult: "#printEwaybillResultDialog",
     tableResult: ():any=>document.querySelector("#ewaybill-result-table > div > div.ant-table-body > table"),
     btnClose: ():any=>document.querySelector("div.ant-modal-footer button:nth-child(3)") ,
+    btnDeliver: ():any=>document.querySelector("div.ant-modal-footer button:nth-child(2)") ,
 }
 async function booking(waybillTemplateTitle: string, orderNo: string,shopId:string) {
     let result = {
@@ -99,14 +100,18 @@ async function booking(waybillTemplateTitle: string, orderNo: string,shopId:stri
                     fail: 0,
                     list: []
                 }
+                let chooseIndex = 0
+                let rowResultList:any = []
                 for (let rowIter = 1; rowIter < domEle.tableResult().rows.length; rowIter++) {
                     let rowResult = domEle.tableResult().rows[rowIter].cells[2].innerText;
+                    let rowResultHTML = domEle.tableResult().rows[rowIter].cells[2].innerHTML
                     let rowInfo = domEle.tableResult().rows[rowIter].cells[1].childNodes[0].childNodes[0].childNodes[1].textContent;
                     let rowObject = {
                         info: rowInfo,
                         msg: rowResult,
                         success: 1,
                     }
+                    rowResultList.push(rowResultHTML)
                     if (domEle.tableResult().rows[rowIter].cells[2].innerHTML.indexOf('class="text-error"') > -1) {
                         printReslut.fail++;
                         rowObject.success = 0;
@@ -117,9 +122,20 @@ async function booking(waybillTemplateTitle: string, orderNo: string,shopId:stri
                     printReslut.list.push(rowObject)
                 }
                 result.data = printReslut;
-                console.log(result);
-
-                simulateMouseClick(domEle.btnClose());
+                console.log(result,rowResultList);
+                  // 如果所有的订单都打印失败则，等会再发货，关闭弹窗
+                if(rowResultList.every((item:any)=>item.includes('class="text-error"'))){
+                   chooseIndex = -1
+                }
+                // 等会再发货
+                if(chooseIndex===-1){
+                    console.log('等会再发货');
+                    simulateMouseClick(domEle.btnClose());
+                }else{
+                  // 马上发货
+                  console.log('马上发货');
+                  simulateMouseClick(domEle.btnDeliver());
+                }
                 return result;
             }
 

src/popup/components/IsAutoEmit/index.tsx

 import React,{ useCallback, useContext, useEffect, useState } from "react";
 import { Checkbox } from "antd";
 const IsAutoEmit = function () {
-     const [checked, setChecked] = useState<boolean>(false)
+     const [checked, setChecked] = useState<boolean>(true)
     
 
     const changeRadio = useCallback((e) => {