Commit e3c28819 authored by 刘燕芳's avatar 刘燕芳

1

parent 03c0e03d
{ {
"name": "菜芽-自动约单", "name": "菜芽-自动约单",
"version": "1.1.2", "version": "1.1.5",
"description": "辅助手机壳厂家打印发货易的快递单", "description": "辅助手机壳厂家打印发货易的快递单",
"manifest_version": 2, "manifest_version": 2,
......
...@@ -106,7 +106,7 @@ async function booking(wayCompanyId: string, orderNo: string,fhy_type:Number) { ...@@ -106,7 +106,7 @@ async function booking(wayCompanyId: string, orderNo: string,fhy_type:Number) {
if (rowResult.indexOf("打印失败") > -1) { if (rowResult.indexOf("打印失败") > -1) {
printReslut.fail++; printReslut.fail++;
rowObject.success = 0; rowObject.success = 0;
if(domEle.tableResult.rows[rowIter].cells[2].innerText.includes('电子面单账户余额不足')){ if(domEle.tableResult.rows[rowIter].cells[2].innerText.includes('余额不足')&&domEle.tableResult.rows[rowIter].cells[2].innerText.includes('电子面单')){
result.msg = '电子面单余额不足' result.msg = '电子面单余额不足'
} }
} else { } else {
...@@ -136,7 +136,7 @@ async function booking(wayCompanyId: string, orderNo: string,fhy_type:Number) { ...@@ -136,7 +136,7 @@ async function booking(wayCompanyId: string, orderNo: string,fhy_type:Number) {
} }
for (let i = 0; i < 20; i++) { for (let i = 0; i < 20; i++) {
await delayDate(1000) await delayDate(1000)
if(domEle.sendProModal().style.display==='none'){ if(domEle.sendProModal().style.display!=='block'){
                        //发货中                         //发货中
return result return result
} }
......
...@@ -107,13 +107,8 @@ async function booking( ...@@ -107,13 +107,8 @@ async function booking(
result.data = printError result.data = printError
return result return result
} }
result = await waitOrder() await delayDate(2000)
if (result.status > 0) {
result.data = printError
return result
}
changeReactInputValue(document.querySelector(domEle.inputOrderId), orderNo) changeReactInputValue(document.querySelector(domEle.inputOrderId), orderNo)
simulateMouseClick(document.querySelector(domEle.btnSearch)) simulateMouseClick(document.querySelector(domEle.btnSearch))
result = await waitOrder() result = await waitOrder()
if (result.status > 0) { if (result.status > 0) {
...@@ -124,7 +119,6 @@ async function booking( ...@@ -124,7 +119,6 @@ async function booking(
simulateMouseClick(document.querySelector(domEle.checkBoxSelectAll)) simulateMouseClick(document.querySelector(domEle.checkBoxSelectAll))
simulateMouseClick(document.querySelector(domEle.btnPrint)) simulateMouseClick(document.querySelector(domEle.btnPrint))
await delayDate(500) await delayDate(500)
if (document.getElementsByClassName(domEle.modalTips).length > 0) { if (document.getElementsByClassName(domEle.modalTips).length > 0) {
simulateMouseClick(document.querySelector(domEle.btnTipsConfirm)) simulateMouseClick(document.querySelector(domEle.btnTipsConfirm))
} }
...@@ -199,7 +193,9 @@ async function booking( ...@@ -199,7 +193,9 @@ async function booking(
if ( if (
domEle domEle
.tableResult() .tableResult()
.rows[rowIter].cells[2].innerHTML.includes('电子面单账户余额不足') .rows[rowIter].cells[2].innerHTML.includes('余额不足')&& domEle
.tableResult()
.rows[rowIter].cells[2].innerHTML.includes('电子面单')
) { ) {
result.msg = '电子面单余额不足' result.msg = '电子面单余额不足'
} }
...@@ -238,7 +234,7 @@ async function booking( ...@@ -238,7 +234,7 @@ async function booking(
simulateMouseClick(domEle.btnClose()) simulateMouseClick(domEle.btnClose())
} }
} }
for (let i = 0; i < 20; i++) { for (let i = 0; i < 30; i++) {
await delayDate(1000) await delayDate(1000)
if(!domEle.sendProModal()){ if(!domEle.sendProModal()){
                        //发货中                         //发货中
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment