Squashed commit of the following:

commit 02139431
Author: liuyanfang <1534792876/@qq.com>
Date:   Mon Nov 14 14:38:10 2022 +0800

    bug修改

commit be64338c
Author: liuyanfang <1534792876/@qq.com>
Date:   Mon Nov 14 14:12:51 2022 +0800

    修复bug

src/content/bookingApp.ts

@@ -9,16 +9,20 @@ 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,
-}
-// 发货易订单类型：10淘宝；20拼多多；30分销淘宝；40分销拼多多；50分销抖店；60分销其他代发；
-async function booking(wayCompanyId: string, orderNo: string,fhy_type:number) {
+    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,fhy_type:Number) {
     let checkOptionObj = platformObj
     chrome.storage.local.get({ checkOptionObj: platformObj }, function (res) {
-      console.log('旧版app',res.checkOptionObj);
+      console.log('新版V2',res.checkOptionObj);
       checkOptionObj = res.checkOptionObj
     })
     domEle.inputOrderId.value = orderNo;
@@ -41,10 +45,10 @@ async function booking(wayCompanyId: string, orderNo: string,fhy_type:number) {
 
     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();
@@ -114,7 +118,7 @@ async function booking(wayCompanyId: string, orderNo: string,fhy_type:number) {
             }else{
                 //取消打印
                 await delayDate(1000);
-                document.querySelector("#printWaybillDialog > div > div > div.modal-footer > button.btn.btn-default").click();
+                domEle.btnDialogCancel.click();
                 return result;
             }
 
@@ -185,9 +189,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;
         }
     }

src/content/index.ts

@@ -194,18 +194,17 @@ const printWayBillByNew = function ({ orderNo, wayCompanyId, platform }: Pick<Pa
 // web页面通信
 
 window.addEventListener("message",function(message:any){
-    chrome.storage.local.get({ AutoTime:null,proAutoTime:null }, function (res) {
-        if(res.AutoTime){
-            chrome.runtime.sendMessage(message.data,(ret)=>{
+    if(message.data.action==ACTION.GetTime){
+        chrome.storage.local.get({ AutoTime:null,proAutoTime:null }, function (res) {
+            if(res.AutoTime){
                 window.postMessage({AutoTime:res.AutoTime})
-            })
-        }
-        if(res.proAutoTime){
-            chrome.runtime.sendMessage(message.data,(ret)=>{
+            }
+            if(res.proAutoTime){
                 window.postMessage({proAutoTime:res.proAutoTime})
-            })
-        }
-    })
+            }
+        })
+    }
+
     if(message.data.action == ACTION.BookingApp){
         chrome.runtime.sendMessage(message.data,(ret)=>{
             window.postMessage({isResult:1,...ret},"*")
@@ -213,6 +212,7 @@ window.addEventListener("message",function(message:any){
         })
     }
     if(message.data.action == ACTION.BookingV2){
+
         chrome.runtime.sendMessage(message.data,(ret)=>{
             window.postMessage({isResult:1,...ret},"*")
             console.log("message ret:",ret,message.data);
@@ -222,7 +222,6 @@ window.addEventListener("message",function(message:any){
 //发货易页面
 
 chrome.runtime.onMessage.addListener(function (message: Message, sender, response) {
-
     if (message.action === Print) {
         if (message.value.waybillNo) {
             printWayBillByOld(message.value.waybillNo, message.value.wayCompanyId)

src/popup/components/timer/index.tsx

@@ -3,6 +3,7 @@ import { TimePicker  } from "antd";
 import type { Moment } from 'moment';
 import moment from 'moment';
 const format = 'HH:mm';
+
 const Timer = function () {
     const [value, setValue] = useState<Moment | null>(null);
     const [pro_value, setProValue] = useState<Moment | null>(null);
@@ -15,16 +16,11 @@ const Timer = function () {
       };
     useEffect(() => {
         chrome.storage.local.get({ AutoTime:null,proAutoTime:null }, function (res) {
-            console.log(res.AutoTime,res.proAutoTime);
             if(res.AutoTime){
                 setValue(moment(res.AutoTime, 'HH:mm'))
-                window.postMessage({AutoTime:res.AutoTime})
-                // chrome.runtime.sendMessage({AutoTime:res.AutoTime})
             }
             if(res.proAutoTime){
                 setProValue(moment(res.proAutoTime, 'HH:mm'))
-                window.postMessage({proAutoTime:res.proAutoTime})
-                // chrome.runtime.sendMessage({proAutoTime:res.proAutoTime})
             }
         })
     }, [])
@@ -32,14 +28,10 @@ const Timer = function () {
         if(value){
             let time = moment(value).format('HH:mm')
             chrome.storage.local.set({AutoTime:time})
-            window.postMessage({AutoTime:time})
-            // chrome.runtime.sendMessage({AutoTime:time})
         }
         if(pro_value){
             let pro_time = moment(pro_value).format('HH:mm')
             chrome.storage.local.set({proAutoTime:pro_time})
-            window.postMessage({proAutoTime:pro_time})
-            // chrome.runtime.sendMessage({proAutoTime:pro_time})
         }
     },[value,pro_value])
     return <>

src/popup/popup.tsx

 import React from "react";
-import WayBillModel from "./components/WayBillModel";
+// import WayBillModel from "./components/WayBillModel";
 import IsAutoEmit from "./components/IsAutoEmit";
 import Timer from "./components/timer";
 

src/types/index.ts

@@ -6,7 +6,8 @@
 export enum ACTION{
 
     BookingV2="BookingV2",
-    BookingApp="BookingApp"
+    BookingApp="BookingApp",
+    GetTime="getTime",
 }
 
 export const platformObj ={