编码错误修复
This commit is contained in:
1 parent
330ccf3983
commit
b42c17c013
1 file changed
+19
-19
@@ -23,14 +23,14 @@ namespace _29WxOrderWpf.Ctrls.PDDInvoice.ViewModels;
|
||||
public partial class PDDInvoiceViewModel
|
||||
{
|
||||
/// <summary>
|
||||
/// 霈W��𡑒”瘚讛��?
|
||||
/// 订单列表浏览器
|
||||
/// </summary>
|
||||
public ChromiumWebBrowser Browser { get; private set; }
|
||||
/// <summary>
|
||||
/// ��捆瘚讛��?
|
||||
/// 霈W�霂行�
|
||||
/// �𤑳巨霂行�
|
||||
/// �唾窈�𤑳巨
|
||||
/// 内容浏览器
|
||||
/// 订单详情
|
||||
/// 发票详情
|
||||
/// 申请发票
|
||||
/// </summary>
|
||||
public ChromiumWebBrowser BrowserDetail { get; private set; }
|
||||
|
||||
@@ -89,7 +89,7 @@ public partial class PDDInvoiceViewModel
|
||||
}
|
||||
else
|
||||
{
|
||||
// 憿菟𢒰撘�虜嚗�𧊋皜脫��箏�蟡刻”�𤏪��嗥凒�亙ế摰𡁜仃韐伐��踹��寥�撘�蟡券鵭�園𡢿蝑匧�
|
||||
// 页面异常(未渲染出发票表单)时直接判定失败,避免批量开票长时间等待
|
||||
_currentInvoiceTcs?.TrySetResult(false);
|
||||
}
|
||||
}
|
||||
@@ -98,23 +98,23 @@ public partial class PDDInvoiceViewModel
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 瘜典��𤑳巨憛怠��𡁏𧋦撟嗆�銵䎚�?
|
||||
/// �訫��唾窈璅∪�靽脲����銵䔶蛹嚗𥟇鸌�誩�蟡冽芋撘譍�頧株砭�𡁏𧋦�坔��?
|
||||
/// <c>window.__invoiceApplyResult</c>嚗���𣂼��朞� <see cref="_currentInvoiceTcs"/> �硺�蝏𤘪��?
|
||||
/// 注入发票填写脚本并执行。
|
||||
/// 单张申请模式保持原有行为;批量开票模式下轮询脚本写入的
|
||||
/// <c>window.__invoiceApplyResult</c>,完成后通过 <see cref="_currentInvoiceTcs"/> 回传结果。
|
||||
/// </summary>
|
||||
private async Task ExecuteInvoiceApplyScriptAsync(ChromiumWebBrowser b)
|
||||
{
|
||||
string content = ResourceHelper.GetResourceText("/Ctrls/PDDInvoice/Resources/invoice.js", "29WxFindOrder");
|
||||
content = content.Replace("{�砍虬}", InvoiceTitle);
|
||||
content = content.Replace("{蝔𤾸噡}", TaxNo);
|
||||
content = content.Replace("{公司}", InvoiceTitle);
|
||||
content = content.Replace("{税号}", TaxNo);
|
||||
if (string.IsNullOrEmpty(content)) return;
|
||||
|
||||
await b.EvaluateScriptAsync(content);
|
||||
|
||||
if (_currentInvoiceTcs == null) return; // �訫��唾窈璅∪�嚗帋�����㕑�銝?
|
||||
if (_currentInvoiceTcs == null) return; // 单张申请模式:保持原有行为
|
||||
|
||||
// �寥�璅∪�嚗𡁶�敺��甇亥��祆�銵���?
|
||||
// �閗繮敶枏� TCS嚗屸��齿鸌�誩儐�航��嗉��乩�銝�銝芾恥�訫�嚗諹��啁�頧株砭霂航圻�烐鰵霈W�����?
|
||||
// 批量模式:等待异步脚本执行完成
|
||||
// 捕获当前 TCS,避免批量循环超时进入下一个订单后,迟到的轮询误触发新订单的结果
|
||||
var tcs = _currentInvoiceTcs;
|
||||
for (int i = 0; i < 120; i++)
|
||||
{
|
||||
@@ -148,7 +148,7 @@ public partial class PDDInvoiceViewModel
|
||||
set => SetValue(value);
|
||||
}
|
||||
/// <summary>
|
||||
/// �曄內銝餅�閫�膥
|
||||
/// 显示主浏览器
|
||||
/// </summary>
|
||||
public void ShowOrderBrowser()
|
||||
{
|
||||
@@ -156,7 +156,7 @@ public partial class PDDInvoiceViewModel
|
||||
BrowserDetailZIndex = -1;
|
||||
}
|
||||
/// <summary>
|
||||
/// �曄內摮鞉�閫�膥
|
||||
/// 显示子浏览器
|
||||
/// </summary>
|
||||
public void ShowOrderBrowserDetail()
|
||||
{
|
||||
@@ -200,12 +200,12 @@ public partial class PDDInvoiceViewModel
|
||||
public void StartAutoScroll()
|
||||
{
|
||||
if (IsReadOrder) return;
|
||||
|
||||
|
||||
IsReadOrder = true;
|
||||
_ = autoScroll(_cancellationTokenSource.Token);
|
||||
}
|
||||
|
||||
// �𨀣迫皛𡁜𢆡
|
||||
// 停止滚动
|
||||
public void StopAutoScroll()
|
||||
{
|
||||
IsReadOrder = false;
|
||||
@@ -224,7 +224,7 @@ public partial class PDDInvoiceViewModel
|
||||
var jsStr = @"window.scroll({
|
||||
top: " + top + @",
|
||||
left: 0,
|
||||
behavior: 'smooth' // �舫�㚁�雿踵��典像皛?
|
||||
behavior: 'smooth' // 可选,使滚动平滑
|
||||
});";
|
||||
|
||||
var client = Browser.GetDevToolsClient();
|
||||
|
||||
Reference in new issue
Block a user