Commit e0c011c4 authored by liuyanfang's avatar liuyanfang

1

parent c34a0ae1
{ {
"name": "菜芽-自动约单", "name": "菜芽-自动约单",
"version": "1.0.7", "version": "1.0.8",
"description": "辅助手机壳厂家打印发货易的快递单", "description": "辅助手机壳厂家打印发货易的快递单",
"manifest_version": 2, "manifest_version": 2,
......
...@@ -157,11 +157,14 @@ async function waitreauthDialog() { ...@@ -157,11 +157,14 @@ async function waitreauthDialog() {
} }
for (let i = 0; i < 10; i++) { for (let i = 0; i < 10; i++) {
await delayDate(1000); await delayDate(1000);
if (domEle.reauthDialog&&domEle.reauthDialogTitle.innerText=='店铺授权') { if (domEle.reauthDialog&&domEle.reauthDialog.style.display==='block') {
console.log('店铺授权',domEle.shopName.innerText)
result.msg=`获取${domEle.shopName.innerText}店铺授权失败` result.msg=`获取${domEle.shopName.innerText}店铺授权失败`
document.reauthDialogClose.click() domEle.reauthDialogClose.click()
return result return result
}else {
result.status = 0;
result.msg = ""
return result;
} }
} }
return result; return result;
...@@ -215,11 +218,11 @@ async function waitPrintResult() { ...@@ -215,11 +218,11 @@ async function waitPrintResult() {
} }
for (let i = 0; i < 30; i++) { for (let i = 0; i < 30; i++) {
await delayDate(1000); await delayDate(1000);
if (domEle.reauthDialog&&domEle.reauthDialogTitle.innerText=='店铺授权') { if (domEle.reauthDialog&&domEle.reauthDialog.style.display==='block') {
console.log('店铺授权',domEle.shopName.innerText); console.log('店铺授权',domEle.shopName.innerText);
result.status = 5; result.status = 5;
result.msg=`获取${domEle.shopName.innerText}店铺授权失败`; result.msg=`获取${domEle.shopName.innerText}店铺授权失败`;
document.reauthDialogClose.click() domEle.reauthDialogClose.click()
return result; return result;
} }
if (domEle.modalResult.className == 'modal fade sui-modal none in') { if (domEle.modalResult.className == 'modal fade sui-modal none in') {
...@@ -229,6 +232,7 @@ async function waitPrintResult() { ...@@ -229,6 +232,7 @@ async function waitPrintResult() {
} }
if(domEle.printErrorModal() && domEle.printErrorModal().innerText==' 获取电子面单失败,从9月1日起淘宝平台开启付费解密虚拟号方案(查看详情),因此不支持非菜鸟电子面单打印,请尽量使用菜鸟电子面单打印,如需付费解密虚拟号打印非菜鸟电子面单请联系发货易客服咨询'){ if(domEle.printErrorModal() && domEle.printErrorModal().innerText==' 获取电子面单失败,从9月1日起淘宝平台开启付费解密虚拟号方案(查看详情),因此不支持非菜鸟电子面单打印,请尽量使用菜鸟电子面单打印,如需付费解密虚拟号打印非菜鸟电子面单请联系发货易客服咨询'){
result.msg="获取电子面单失败"; result.msg="获取电子面单失败";
console.log('获取电子面单失败',domEle.printErrorModal());
domEle.printErrorConfirm().click(); domEle.printErrorConfirm().click();
return result; return result;
} }
......
...@@ -202,10 +202,13 @@ async function waitreauthDialog() { ...@@ -202,10 +202,13 @@ async function waitreauthDialog() {
} }
for (let i = 0; i < 10; i++) { for (let i = 0; i < 10; i++) {
await delayDate(1000); await delayDate(1000);
if (domEle.reauthDialog()&&domEle.reauthDialogTitle().innerText=='店铺授权') { if (domEle.reauthDialog()&&domEle.reauthDialog().style.display) {
console.log('店铺授权',domEle.shopName().innerText);
result.msg=`获取${domEle.shopName().innerText}店铺授权失败`; result.msg=`获取${domEle.shopName().innerText}店铺授权失败`;
return result; return result;
}else {
result.status = 0;
result.msg = ""
return result;
} }
} }
return result; return result;
...@@ -267,8 +270,7 @@ async function waitPrintResult() { ...@@ -267,8 +270,7 @@ async function waitPrintResult() {
result.msg = "" result.msg = ""
return result; return result;
} }
if (domEle.reauthDialog()&&domEle.reauthDialogTitle().innerText=='店铺授权') { if (domEle.reauthDialog()&&domEle.reauthDialog().style.display) {
console.log('店铺授权',domEle.shopName().innerText)
result.status = 5 result.status = 5
result.msg=`获取${domEle.shopName().innerText}店铺授权失败` result.msg=`获取${domEle.shopName().innerText}店铺授权失败`
return result return result
......
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