优化订单读取与拍单逻辑
This commit is contained in:
1 parent
e02047ae57
commit
103b2a1a4a
9 files changed
+109
-47
No files matched your search
@@ -108,7 +108,7 @@ namespace _29WxOrderWpf
|
|||||||
string str = GetExceptionMsg(ex, string.Empty);
|
string str = GetExceptionMsg(ex, string.Empty);
|
||||||
NaiBa.Util.Helper.LogHelper.WriteWithTime("SystemError:" + str);
|
NaiBa.Util.Helper.LogHelper.WriteWithTime("SystemError:" + str);
|
||||||
//BaseMsgForm.ShowError(str, "系统错误");
|
//BaseMsgForm.ShowError(str, "系统错误");
|
||||||
BaseMsgWindow.ShowError(str, "系统错误");
|
BaseMsgWindow.ShowError(str, "系统错误", null, MsgWindowLevel.LARGE);
|
||||||
}
|
}
|
||||||
|
|
||||||
#region 初始化cef
|
#region 初始化cef
|
||||||
@@ -157,14 +157,14 @@ namespace _29WxOrderWpf
|
|||||||
{
|
{
|
||||||
string str = GetExceptionMsg(e.Exception, e.ToString());
|
string str = GetExceptionMsg(e.Exception, e.ToString());
|
||||||
NaiBa.Util.Helper.LogHelper.WriteWithTime("SystemError:" + str);
|
NaiBa.Util.Helper.LogHelper.WriteWithTime("SystemError:" + str);
|
||||||
BaseMsgWindow.ShowError(str, "系统错误");
|
BaseMsgWindow.ShowError(str, "系统错误", null, MsgWindowLevel.LARGE);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
|
static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
|
||||||
{
|
{
|
||||||
string str = GetExceptionMsg(e.ExceptionObject as Exception, e.ToString());
|
string str = GetExceptionMsg(e.ExceptionObject as Exception, e.ToString());
|
||||||
NaiBa.Util.Helper.LogHelper.WriteWithTime("SystemError:" + str);
|
NaiBa.Util.Helper.LogHelper.WriteWithTime("SystemError:" + str);
|
||||||
BaseMsgWindow.ShowError(str, "系统错误");
|
BaseMsgWindow.ShowError(str, "系统错误", null, MsgWindowLevel.LARGE);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -190,7 +190,7 @@ namespace _29WxOrderWpf
|
|||||||
}
|
}
|
||||||
sb.AppendLine("***************************************************************");
|
sb.AppendLine("***************************************************************");
|
||||||
NaiBa.Util.Helper.LogHelper.WriteWithTime("Error:" + sb);
|
NaiBa.Util.Helper.LogHelper.WriteWithTime("Error:" + sb);
|
||||||
BaseMsgWindow.ShowError(sb.ToString(), "系统错误");
|
BaseMsgWindow.ShowError(sb.ToString(), "系统错误", null, MsgWindowLevel.LARGE);
|
||||||
return sb.ToString();
|
return sb.ToString();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
using _29WxOrderWpf.BaseWindows;
|
using _29WxOrderWpf.BaseWindows;
|
||||||
using WxOrder.Framework.Commons;
|
using WxOrder.Framework.Commons;
|
||||||
using WxOrder.Framework.Commons;
|
|
||||||
using _29WxOrderWpf.Ctrls.PDDInvoice;
|
using _29WxOrderWpf.Ctrls.PDDInvoice;
|
||||||
using _29WxOrderWpf.Ctrls.Statistics;
|
using _29WxOrderWpf.Ctrls.Statistics;
|
||||||
using _29WxOrderWpf.Services;
|
using _29WxOrderWpf.Services;
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
using _29WxOrderWpf.BaseWindows;
|
using _29WxOrderWpf.BaseWindows;
|
||||||
using WxOrder.Framework.Commons;
|
using WxOrder.Framework.Commons;
|
||||||
using WxOrder.Framework.Commons;
|
|
||||||
using _29WxOrderWpf.Ctrls.BuyerCtrls;
|
using _29WxOrderWpf.Ctrls.BuyerCtrls;
|
||||||
using _29WxOrderWpf.Ctrls.Statistics;
|
using _29WxOrderWpf.Ctrls.Statistics;
|
||||||
using _29WxOrderWpf.Services;
|
using _29WxOrderWpf.Services;
|
||||||
|
|||||||
@@ -167,6 +167,7 @@
|
|||||||
Grid.Column="6"
|
Grid.Column="6"
|
||||||
Margin="4,8,4,8"
|
Margin="4,8,4,8"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
|
d:Text="店铺名称"
|
||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
BorderThickness="0"
|
BorderThickness="0"
|
||||||
Cursor="Hand"
|
Cursor="Hand"
|
||||||
|
|||||||
@@ -95,7 +95,15 @@
|
|||||||
Cursor="Hand"
|
Cursor="Hand"
|
||||||
MouseDown="imgOrderItem_MouseDown"
|
MouseDown="imgOrderItem_MouseDown"
|
||||||
MouseEnter="imgOrderItem_MouseEnter"
|
MouseEnter="imgOrderItem_MouseEnter"
|
||||||
MouseLeave="imgOrderItem_MouseLeave" />
|
MouseLeave="imgOrderItem_MouseLeave">
|
||||||
|
<Image.Source>
|
||||||
|
<MultiBinding Converter="{StaticResource ImageUrlToBitmapImage}" Mode="OneWay">
|
||||||
|
<Binding IsAsync="True" Path="ThumbImgStr" />
|
||||||
|
<Binding IsAsync="True" Path="IsLoadThumbImg" />
|
||||||
|
<!--<Binding Path="DataContext.IsLoadImage" RelativeSource="{RelativeSource AncestorType=UserControl}" />-->
|
||||||
|
</MultiBinding>
|
||||||
|
</Image.Source>
|
||||||
|
</Image>
|
||||||
|
|
||||||
<wpf:SpacingStackPanel
|
<wpf:SpacingStackPanel
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
|
|||||||
@@ -672,9 +672,9 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
if (isAbnormalOrder)
|
if (isAbnormalOrder)
|
||||||
buyOrderForm.AbnormalTransitWarehouseOrderInfo = orderItem.ItemTransitOrder;
|
buyOrderForm.AbnormalTransitWarehouseOrderInfo = orderItem.ItemTransitOrder;
|
||||||
buyOrderForm.ShowDialog();
|
buyOrderForm.ShowDialog();
|
||||||
OrderListCtrl.IsAutoBuy = buyOrderForm.IsAutoBuy;
|
OrderListCtrl.IsAutoBuy = (buyOrderForm?.IsAutoBuy).ParseToBool();
|
||||||
|
|
||||||
if (buyOrderForm.IsBuySuccess)
|
if (buyOrderForm?.IsBuySuccess == true)
|
||||||
{
|
{
|
||||||
Task.Run(async () =>
|
Task.Run(async () =>
|
||||||
{
|
{
|
||||||
@@ -799,11 +799,18 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
// }));
|
// }));
|
||||||
//});
|
//});
|
||||||
|
|
||||||
//var bImg = await AllBase.ImageBuild.LoadBitmipImageFromUrlAsync(order_item.thumb_img + "?imageView2/1/w/100/format/webp|imageMogr2/auto-orient=");
|
//var imgItem = imgOrderItem;
|
||||||
//var bImg = await AllBase.ImageBuild.LoadBitmipImageFromUrlAsync(order_item.thumb_img + "?imageView2/1/w/100/h/100/format/jpg/q/85|imageMogr2/auto-orient=");
|
//Task.Run(() =>
|
||||||
var bImg = await AllBase.ImageBuild.LoadBitmipImageFromUrlAsync(order_item.thumb_img + "?imageView2/1/w/100/h/100/format/jpg/q/80");
|
//{
|
||||||
imgOrderItem.Source = bImg;
|
// BitmapImage bImg = AllBase.ImageBuild.LoadBitmipImageFromUrl(order_item.thumb_img + "?imageView2/1/w/100/h/100/format/jpg/q/80");
|
||||||
|
// Thread.Sleep(Randomx.GetId(1000));
|
||||||
|
// Dispatcher.Invoke(new Action(() =>
|
||||||
|
// {
|
||||||
|
// imgItem.Source = bImg;
|
||||||
|
// }));
|
||||||
|
//});
|
||||||
|
|
||||||
|
//await UpdateImg(order_item, imgOrderItem);
|
||||||
|
|
||||||
// 待采购不显示所有采购信息状态(否则会显示作废订单状态)
|
// 待采购不显示所有采购信息状态(否则会显示作废订单状态)
|
||||||
if (GlobalConfig.OrderTabHeaderStr.StartsWith("待采购"))
|
if (GlobalConfig.OrderTabHeaderStr.StartsWith("待采购"))
|
||||||
@@ -821,6 +828,14 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async Task UpdateImg(oms_wei_order_item_info order_item, Image imageItem)
|
||||||
|
{
|
||||||
|
//var bImg = await AllBase.ImageBuild.LoadBitmipImageFromUrlAsync(order_item.thumb_img + "?imageView2/1/w/100/format/webp|imageMogr2/auto-orient=");
|
||||||
|
//var bImg = await AllBase.ImageBuild.LoadBitmipImageFromUrlAsync(order_item.thumb_img + "?imageView2/1/w/100/h/100/format/jpg/q/85|imageMogr2/auto-orient=");
|
||||||
|
var bImg = await AllBase.ImageBuild.LoadBitmipImageFromUrlAsync(order_item.thumb_img + "?imageView2/1/w/100/h/100/format/jpg/q/80");
|
||||||
|
Dispatcher.Invoke(new Action(() => { imageItem.Source = bImg; }));
|
||||||
|
}
|
||||||
|
|
||||||
private void TransitOrderBuy_Click(object sender, MouseButtonEventArgs e)
|
private void TransitOrderBuy_Click(object sender, MouseButtonEventArgs e)
|
||||||
{
|
{
|
||||||
var orderItem = this.DataContext as oms_wei_order_item_info;
|
var orderItem = this.DataContext as oms_wei_order_item_info;
|
||||||
@@ -1590,7 +1605,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
buyOrderForm.pnlMap.Visible = false;
|
buyOrderForm.pnlMap.Visible = false;
|
||||||
}
|
}
|
||||||
buyOrderForm.ShowDialog();
|
buyOrderForm.ShowDialog();
|
||||||
IsBuySuccess = buyOrderForm.IsBuySuccess;
|
IsBuySuccess = (buyOrderForm?.IsBuySuccess).ParseToBool();
|
||||||
}
|
}
|
||||||
else if (GlobalConfig.CurrentBuyPlatform == "tb")
|
else if (GlobalConfig.CurrentBuyPlatform == "tb")
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ namespace AllBase.Model.DBModel
|
|||||||
public ShopLoginInfo Shop
|
public ShopLoginInfo Shop
|
||||||
{
|
{
|
||||||
get { return this.GetValue(x => x.Shop); }
|
get { return this.GetValue(x => x.Shop); }
|
||||||
set { this.SetValue(x => x.Shop, value); }
|
set { this.SetValue(x => x.Shop, value); if (!Shop.ShopAccount.IsNullOrEmpty()) shop_name = Shop.ShopAccount; }
|
||||||
}
|
}
|
||||||
public int Index
|
public int Index
|
||||||
{
|
{
|
||||||
@@ -425,10 +425,17 @@ namespace AllBase.Model.DBModel
|
|||||||
}
|
}
|
||||||
//public bool is_visible { get; set; } = true;
|
//public bool is_visible { get; set; } = true;
|
||||||
|
|
||||||
|
|
||||||
public long id { get; set; }
|
public long id { get; set; }
|
||||||
public long shop_id { get; set; }
|
public long shop_id
|
||||||
public string shop_name { get; set; }
|
{
|
||||||
|
get { return this.GetValue(x => x.shop_id); }
|
||||||
|
set { this.SetValue(x => x.shop_id, value); }
|
||||||
|
}
|
||||||
|
public string shop_name
|
||||||
|
{
|
||||||
|
get { return this.GetValue(x => x.shop_name); }
|
||||||
|
set { this.SetValue(x => x.shop_name, value); }
|
||||||
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 商户ID
|
/// 商户ID
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@@ -1194,6 +1194,17 @@ namespace AllBase.Model.DBModel
|
|||||||
DirectOrderBuyTimeStr = DirectPddBuyerOrder != null ? DirectPddBuyerOrder.add_time.ToString("yyyy-MM-dd HH:mm:ss") : "";
|
DirectOrderBuyTimeStr = DirectPddBuyerOrder != null ? DirectPddBuyerOrder.add_time.ToString("yyyy-MM-dd HH:mm:ss") : "";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public string ThumbImgStr
|
||||||
|
{
|
||||||
|
get { return this.GetValue(x => x.ThumbImgStr); }
|
||||||
|
set { this.SetValue(x => x.ThumbImgStr, value); }
|
||||||
|
}
|
||||||
|
public bool IsLoadThumbImg
|
||||||
|
{
|
||||||
|
get { return this.GetValue(x => x.IsLoadThumbImg); }
|
||||||
|
set { this.SetValue(x => x.IsLoadThumbImg, value); }
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary> 直发最后一条物流信息 </summary>
|
/// <summary> 直发最后一条物流信息 </summary>
|
||||||
public oms_wei_ewaybill_path LatestDirectEWaybill
|
public oms_wei_ewaybill_path LatestDirectEWaybill
|
||||||
{
|
{
|
||||||
@@ -1521,7 +1532,11 @@ namespace AllBase.Model.DBModel
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// sku小图
|
/// sku小图
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string thumb_img { get; set; }
|
public string thumb_img
|
||||||
|
{
|
||||||
|
get { return this.GetValue(x => x.thumb_img); }
|
||||||
|
set { this.SetValue(x => x.thumb_img, value); IsLoadThumbImg = !string.IsNullOrEmpty(value); ThumbImgStr = thumb_img + "?imageView2/1/w/100/h/100/format/jpg/q/80"; }
|
||||||
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// sku数量
|
/// sku数量
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@@ -167,7 +167,7 @@ namespace TemuKJD.ToolForms
|
|||||||
}));
|
}));
|
||||||
else
|
else
|
||||||
break;
|
break;
|
||||||
Thread.Sleep(1000);
|
Thread.Sleep(1400 - i * 100);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.Created)
|
if (this.Created)
|
||||||
@@ -356,7 +356,7 @@ namespace TemuKJD.ToolForms
|
|||||||
sb.Append("(function(){");
|
sb.Append("(function(){");
|
||||||
sb.Append("CefSharp.BindObjectAsync('shopObj');");
|
sb.Append("CefSharp.BindObjectAsync('shopObj');");
|
||||||
sb.Append("})();");
|
sb.Append("})();");
|
||||||
cefWebBrowser.GetBrowser().MainFrame.EvaluateScriptAsync(sb.ToString());
|
cefWebBrowser?.GetBrowser().MainFrame.EvaluateScriptAsync(sb.ToString());
|
||||||
}
|
}
|
||||||
|
|
||||||
//public Func<object, string, string, request, bool> BeforeResourceLoadEvent; // sender, requestUrl, postData, request, true(表示取消执行)
|
//public Func<object, string, string, request, bool> BeforeResourceLoadEvent; // sender, requestUrl, postData, request, true(表示取消执行)
|
||||||
@@ -603,6 +603,7 @@ namespace TemuKJD.ToolForms
|
|||||||
{
|
{
|
||||||
Invoke(new Action(() =>
|
Invoke(new Action(() =>
|
||||||
{
|
{
|
||||||
|
if (cefWebBrowser != null)
|
||||||
this.cefWebBrowser.Visible = false;
|
this.cefWebBrowser.Visible = false;
|
||||||
BaseMsgForm.ShowError(sourceCodeRst);
|
BaseMsgForm.ShowError(sourceCodeRst);
|
||||||
}));
|
}));
|
||||||
@@ -781,8 +782,8 @@ namespace TemuKJD.ToolForms
|
|||||||
Thread.Sleep(200);
|
Thread.Sleep(200);
|
||||||
if (host == null || client == null)
|
if (host == null || client == null)
|
||||||
{
|
{
|
||||||
host = cefWebBrowser.GetBrowser().GetHost();
|
host = cefWebBrowser?.GetBrowser().GetHost();
|
||||||
client = cefWebBrowser.GetDevToolsClient();
|
client = cefWebBrowser?.GetDevToolsClient();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
break;
|
break;
|
||||||
@@ -851,8 +852,8 @@ namespace TemuKJD.ToolForms
|
|||||||
Thread.Sleep(200);
|
Thread.Sleep(200);
|
||||||
if (host == null || client == null)
|
if (host == null || client == null)
|
||||||
{
|
{
|
||||||
host = cefWebBrowser.GetBrowser().GetHost();
|
host = cefWebBrowser?.GetBrowser().GetHost();
|
||||||
client = cefWebBrowser.GetDevToolsClient();
|
client = cefWebBrowser?.GetDevToolsClient();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
break;
|
break;
|
||||||
@@ -862,35 +863,47 @@ namespace TemuKJD.ToolForms
|
|||||||
throw new Exception("页面加载异常");
|
throw new Exception("页面加载异常");
|
||||||
}
|
}
|
||||||
|
|
||||||
// 点击地址框第一个
|
// 点击地址框打开地址选择
|
||||||
var jsStr1 = @"(function() {
|
var jsStr1 = @"(function() {
|
||||||
var element = document.getElementsByClassName('oc-address-info')[0];
|
var element = document.getElementsByClassName('oc-address-info')[0];
|
||||||
element.click();
|
element.click();
|
||||||
return 'success';
|
return 'success';
|
||||||
})();";
|
})();";
|
||||||
|
string rstStr1 = "";
|
||||||
|
string rstStr2 = "";
|
||||||
for (int i = 0; i < 50; i++)
|
for (int i = 0; i < 50; i++)
|
||||||
{
|
{
|
||||||
Thread.Sleep(200);
|
Thread.Sleep(100);
|
||||||
if (!this.Created) return "窗口已关闭";
|
if (!this.Created) return "窗口已关闭";
|
||||||
|
|
||||||
var ts1 = await client.Runtime.EvaluateAsync(jsStr1, null, true, null, null, true, null, true);
|
var ts1 = await client.Runtime.EvaluateAsync(jsStr1, null, true, null, null, true, null, true);
|
||||||
if (ts1.Result.Value is string rstStr)
|
rstStr1 = ts1.Result.Value.ParseToString();
|
||||||
|
if (rstStr1 == "success")
|
||||||
{
|
{
|
||||||
if (rstStr == "success")
|
for (int j = 0; j < 5; j++)
|
||||||
{
|
{
|
||||||
ts1 = await EvaluateJsBuyTagNameAndInnerHtml("span", "修改");
|
Thread.Sleep(50);
|
||||||
if (ts1.Result.Value is string rst && rst == "success")
|
|
||||||
|
// 判断是否点击成功
|
||||||
|
var ts2 = await EvaluateJsBuyTagNameAndInnerHtml("span", "修改");
|
||||||
|
if (ts2.Result.Value is string rst && rst == "success")
|
||||||
{
|
{
|
||||||
|
rstStr2 = rst;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (rstStr2 == "success")
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Thread.Sleep(Randomx.GetId(300, 500));
|
if (rstStr1 != "success" || rstStr2 != "success")
|
||||||
|
return "未找到修改按钮";
|
||||||
|
Thread.Sleep(Randomx.GetId(200, 400));
|
||||||
|
|
||||||
for (int i = 0; i < 50; i++)
|
// 点击修改地址框第一个地址
|
||||||
|
for (int i = 0; i < 60; i++)
|
||||||
{
|
{
|
||||||
Thread.Sleep(200);
|
Thread.Sleep(150);
|
||||||
if (!this.Created) return "窗口已关闭";
|
if (!this.Created) return "窗口已关闭";
|
||||||
|
|
||||||
var ts1 = await EvaluateJsBuyTagNameAndInnerHtml("span", "修改", true);
|
var ts1 = await EvaluateJsBuyTagNameAndInnerHtml("span", "修改", true);
|
||||||
@@ -899,11 +912,11 @@ namespace TemuKJD.ToolForms
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Thread.Sleep(Randomx.GetId(300, 500));
|
Thread.Sleep(Randomx.GetId(200, 400));
|
||||||
|
|
||||||
for (int i = 0; i < 50; i++)
|
for (int i = 0; i < 60; i++)
|
||||||
{
|
{
|
||||||
Thread.Sleep(200);
|
Thread.Sleep(150);
|
||||||
if (!this.Created) return "窗口已关闭";
|
if (!this.Created) return "窗口已关闭";
|
||||||
|
|
||||||
var ts1 = await EvaluateJsBuyTagNameAndInnerHtml("span", "保存", true);
|
var ts1 = await EvaluateJsBuyTagNameAndInnerHtml("span", "保存", true);
|
||||||
@@ -913,7 +926,7 @@ namespace TemuKJD.ToolForms
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Thread.Sleep(Randomx.GetId(300, 500));
|
Thread.Sleep(Randomx.GetId(200, 400));
|
||||||
|
|
||||||
jsStr1 = @"(function() { var elements = document.getElementsByTagName('div');
|
jsStr1 = @"(function() { var elements = document.getElementsByTagName('div');
|
||||||
for (i = elements.length - 1; i >= 0; i--){
|
for (i = elements.length - 1; i >= 0; i--){
|
||||||
@@ -948,7 +961,7 @@ namespace TemuKJD.ToolForms
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Thread.Sleep(Randomx.GetId(300, 500));
|
Thread.Sleep(Randomx.GetId(200, 400));
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1016,7 +1029,8 @@ namespace TemuKJD.ToolForms
|
|||||||
private void ShopLoginForm_FormClosed(object sender, FormClosedEventArgs e)
|
private void ShopLoginForm_FormClosed(object sender, FormClosedEventArgs e)
|
||||||
{
|
{
|
||||||
//OnSaveComplete(shop);
|
//OnSaveComplete(shop);
|
||||||
Task.Run(() => {
|
Task.Run(() =>
|
||||||
|
{
|
||||||
Thread.Sleep(500);
|
Thread.Sleep(500);
|
||||||
if (!this.Disposing && !this.IsDisposed)
|
if (!this.Disposing && !this.IsDisposed)
|
||||||
{
|
{
|
||||||
@@ -1090,8 +1104,10 @@ namespace TemuKJD.ToolForms
|
|||||||
//var jsStr = "document.getElementById('orderGoodsBlock').getElementsByTagName('div')[0].click();";
|
//var jsStr = "document.getElementById('orderGoodsBlock').getElementsByTagName('div')[0].click();";
|
||||||
var jsStr = sb.ToString();
|
var jsStr = sb.ToString();
|
||||||
|
|
||||||
var host = cefWebBrowser.GetBrowser().GetHost();
|
var host = cefWebBrowser?.GetBrowser().GetHost();
|
||||||
var client = cefWebBrowser.GetDevToolsClient();
|
var client = cefWebBrowser?.GetDevToolsClient();
|
||||||
|
if (host != null && client != null)
|
||||||
|
{
|
||||||
var rst = await client.Runtime.EvaluateAsync(jsStr, null, true, null, null, true, null, true);
|
var rst = await client.Runtime.EvaluateAsync(jsStr, null, true, null, null, true, null, true);
|
||||||
for (int i = 0; i < 80; i++)
|
for (int i = 0; i < 80; i++)
|
||||||
{
|
{
|
||||||
@@ -1102,10 +1118,12 @@ namespace TemuKJD.ToolForms
|
|||||||
await Task.Delay(100);
|
await Task.Delay(100);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
this.Enabled = false;
|
this.Enabled = false;
|
||||||
if (this.cefWebBrowser != null &&
|
if (this.cefWebBrowser != null &&
|
||||||
!this.cefWebBrowser.Address.StartsWith("https://mobile.yangkeduo.com/order.html?order_sn=") && (this.pddFrontGoodsLite?.goodsId).ParseToString() == txtMapGoodsId.Text.Trim())
|
!this.cefWebBrowser.Address.StartsWith("https://mobile.yangkeduo.com/order.html?order_sn=") &&
|
||||||
|
(this.pddFrontGoodsLite?.goodsId).ParseToString() == txtMapGoodsId.Text.Trim())
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1260,7 +1278,7 @@ namespace TemuKJD.ToolForms
|
|||||||
Invoke(() => { lblErrMsg.Text = "溯源码长度错误!"; });
|
Invoke(() => { lblErrMsg.Text = "溯源码长度错误!"; });
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
var client = cefWebBrowser.GetDevToolsClient();
|
var client = cefWebBrowser?.GetDevToolsClient();
|
||||||
if (client == null)
|
if (client == null)
|
||||||
{
|
{
|
||||||
if (!IsAutoBuy)
|
if (!IsAutoBuy)
|
||||||
@@ -1641,7 +1659,7 @@ namespace TemuKJD.ToolForms
|
|||||||
|
|
||||||
private void btnJumpOrderList_Click(object sender, EventArgs e)
|
private void btnJumpOrderList_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
cefWebBrowser.Load("https://mobile.yangkeduo.com/orders.html");
|
cefWebBrowser?.Load("https://mobile.yangkeduo.com/orders.html");
|
||||||
}
|
}
|
||||||
|
|
||||||
private void btnReMap_Click(object sender, EventArgs e)
|
private void btnReMap_Click(object sender, EventArgs e)
|
||||||
@@ -1740,7 +1758,7 @@ namespace TemuKJD.ToolForms
|
|||||||
var tArr = txt.Split(new string[] { " ", ",", "," }, StringSplitOptions.RemoveEmptyEntries);
|
var tArr = txt.Split(new string[] { " ", ",", "," }, StringSplitOptions.RemoveEmptyEntries);
|
||||||
tArr = tArr.OrderBy(t => t.Length).ToArray();
|
tArr = tArr.OrderBy(t => t.Length).ToArray();
|
||||||
this.orderItem.ItemOrder.user_name = tArr.FirstOrDefault();
|
this.orderItem.ItemOrder.user_name = tArr.FirstOrDefault();
|
||||||
this.orderItem.ItemOrder.detail_info = string.Join("", tArr).Replace(this.orderItem.ItemOrder.user_name, "").Trim(',',',');
|
this.orderItem.ItemOrder.detail_info = string.Join("", tArr).Replace(this.orderItem.ItemOrder.user_name, "").Trim(',', ',');
|
||||||
|
|
||||||
order.AddressStr = order.user_name + "," + order.tel_number + "," + order.province_name + order.city_name + order.county_name + order.detail_info;
|
order.AddressStr = order.user_name + "," + order.tel_number + "," + order.province_name + order.city_name + order.county_name + order.detail_info;
|
||||||
|
|
||||||
@@ -1765,7 +1783,7 @@ namespace TemuKJD.ToolForms
|
|||||||
var mapSku = orderItem.PddBuyMapSkus.FirstOrDefault(m => m.map_goods_name + m.map_goods_id == cmbMapSkusProd.Text);
|
var mapSku = orderItem.PddBuyMapSkus.FirstOrDefault(m => m.map_goods_name + m.map_goods_id == cmbMapSkusProd.Text);
|
||||||
if (mapSku != null)
|
if (mapSku != null)
|
||||||
{
|
{
|
||||||
foreach(var pddsku in mapSku.pdd_front_goods3_Lite.skus)
|
foreach (var pddsku in mapSku.pdd_front_goods3_Lite.skus)
|
||||||
{
|
{
|
||||||
cmbMapSkus.Items.Add(string.Join(";", pddsku.specs.Select(sp => sp.spec_value)));
|
cmbMapSkus.Items.Add(string.Join(";", pddsku.specs.Select(sp => sp.spec_value)));
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user