This commit is contained in:
chfei committed 2026-10-22 09:48:19 +08:00
commit 1803a4e5e9
12 files changed
+146 -55

No files matched your search

+4 -4
View File
@@ -108,7 +108,7 @@ namespace _29WxOrderWpf
string str = GetExceptionMsg(ex, string.Empty);
NaiBa.Util.Helper.LogHelper.WriteWithTime("SystemError:" + str);
//BaseMsgForm.ShowError(str, "系统错误");
BaseMsgWindow.ShowError(str, "系统错误");
BaseMsgWindow.ShowError(str, "系统错误", null, MsgWindowLevel.LARGE);
}
#region 初始化cef
@@ -157,14 +157,14 @@ namespace _29WxOrderWpf
{
string str = GetExceptionMsg(e.Exception, e.ToString());
NaiBa.Util.Helper.LogHelper.WriteWithTime("SystemError:" + str);
BaseMsgWindow.ShowError(str, "系统错误");
BaseMsgWindow.ShowError(str, "系统错误", null, MsgWindowLevel.LARGE);
}
static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
{
string str = GetExceptionMsg(e.ExceptionObject as Exception, e.ToString());
NaiBa.Util.Helper.LogHelper.WriteWithTime("SystemError:" + str);
BaseMsgWindow.ShowError(str, "系统错误");
BaseMsgWindow.ShowError(str, "系统错误", null, MsgWindowLevel.LARGE);
}
/// <summary>
@@ -190,7 +190,7 @@ namespace _29WxOrderWpf
}
sb.AppendLine("***************************************************************");
NaiBa.Util.Helper.LogHelper.WriteWithTime("Error:" + sb);
BaseMsgWindow.ShowError(sb.ToString(), "系统错误");
BaseMsgWindow.ShowError(sb.ToString(), "系统错误", null, MsgWindowLevel.LARGE);
return sb.ToString();
}
@@ -1,6 +1,5 @@
using _29WxOrderWpf.BaseWindows;
using WxOrder.Framework.Commons;
using WxOrder.Framework.Commons;
using _29WxOrderWpf.Ctrls.PDDInvoice;
using _29WxOrderWpf.Ctrls.Statistics;
using _29WxOrderWpf.Services;
@@ -1,6 +1,5 @@
using _29WxOrderWpf.BaseWindows;
using WxOrder.Framework.Commons;
using WxOrder.Framework.Commons;
using _29WxOrderWpf.Ctrls.BuyerCtrls;
using _29WxOrderWpf.Ctrls.Statistics;
using _29WxOrderWpf.Services;
@@ -167,6 +167,7 @@
Grid.Column="6"
Margin="4,8,4,8"
VerticalAlignment="Center"
d:Text="店铺名称"
Background="Transparent"
BorderThickness="0"
Cursor="Hand"
@@ -95,7 +95,15 @@
Cursor="Hand"
MouseDown="imgOrderItem_MouseDown"
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
Grid.Column="1"
@@ -672,9 +672,9 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
if (isAbnormalOrder)
buyOrderForm.AbnormalTransitWarehouseOrderInfo = orderItem.ItemTransitOrder;
buyOrderForm.ShowDialog();
OrderListCtrl.IsAutoBuy = buyOrderForm.IsAutoBuy;
OrderListCtrl.IsAutoBuy = (buyOrderForm?.IsAutoBuy).ParseToBool();
if (buyOrderForm.IsBuySuccess)
if (buyOrderForm?.IsBuySuccess == true)
{
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 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");
imgOrderItem.Source = bImg;
//var imgItem = imgOrderItem;
//Task.Run(() =>
//{
// 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("待采购"))
@@ -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)
{
var orderItem = this.DataContext as oms_wei_order_item_info;
@@ -1590,7 +1605,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
buyOrderForm.pnlMap.Visible = false;
}
buyOrderForm.ShowDialog();
IsBuySuccess = buyOrderForm.IsBuySuccess;
IsBuySuccess = (buyOrderForm?.IsBuySuccess).ParseToBool();
}
else if (GlobalConfig.CurrentBuyPlatform == "tb")
{
+34 -5
View File
@@ -157,10 +157,18 @@
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<DataGridTextColumn
Width="50*"
Header="序号"
HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
<DataGridTextColumn
Width="100*"
Header="AppId"
HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
<DataGridTextColumn
Width="100*"
Header="店铺编号"
HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
<DataGridTextColumn
Width="100*"
Header="店铺名称"
@@ -224,7 +232,9 @@
<Grid x:Name="gridListItem">
<Grid.ColumnDefinitions>
<!--<ColumnDefinition Width="{Binding colShopIdWidth,RelativeSource={RelativeSource AncestorType={x:Type local:ShopListCtrl}}}" ></ColumnDefinition>-->
<ColumnDefinition x:Name="colCheck" Width="100*" />
<ColumnDefinition x:Name="colCheck" Width="50*" />
<ColumnDefinition x:Name="colIndex" Width="50*" />
<ColumnDefinition x:Name="colAppId" Width="100*" />
<ColumnDefinition x:Name="colShopId" Width="100*" />
<ColumnDefinition x:Name="colShopName" Width="100*" />
<ColumnDefinition x:Name="colGroupName" Width="100*" />
@@ -245,8 +255,7 @@
Background="Transparent"
BorderThickness="0"
IsReadOnly="True"
Tag="{Binding ShopId}"
Text="{Binding ShopId}"
Text="{Binding Mode=OneWay, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListBoxItem}}, Converter={StaticResource listBoxIndexConverter}}"
TextWrapping="Wrap" />
<TextBox
Grid.Column="2"
@@ -256,7 +265,7 @@
BorderThickness="0"
IsReadOnly="True"
Tag="{Binding ShopId}"
Text="{Binding ShopAccount}"
Text="{Binding ShopId}"
TextWrapping="Wrap" />
<TextBox
Grid.Column="3"
@@ -265,11 +274,31 @@
Background="Transparent"
BorderThickness="0"
IsReadOnly="True"
Tag="{Binding ErpShopId}"
Text="{Binding ErpShopId}"
TextWrapping="Wrap" />
<TextBox
Grid.Column="4"
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
Background="Transparent"
BorderThickness="0"
IsReadOnly="True"
Tag="{Binding ShopId}"
Text="{Binding ShopAccount}"
TextWrapping="Wrap" />
<TextBox
Grid.Column="5"
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
Background="Transparent"
BorderThickness="0"
IsReadOnly="True"
Tag="{Binding ShopId}"
Text="{Binding GroupName}"
TextWrapping="Wrap" />
<TextBox
Grid.Column="4"
Grid.Column="6"
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
Background="Transparent"
+2 -2
View File
@@ -222,8 +222,8 @@
Background="#7F000000"
Visibility="Hidden">
<Border
Width="500"
Height="600"
Width="850"
Height="650"
Background="White"
CornerRadius="4">
<shopctrls:ShopListCtrl
+1 -1
View File
@@ -37,7 +37,7 @@ namespace AllBase
/// 版本ID
/// </summary>
public static int VersionCount = 351;
public static int VersionCount = 353;
public static string ServerUrl { get; set; } = "http://1.13.195.131:9000";
public static string DebugUrl { get; set; } = "http://localhost:9000";
+11 -4
View File
@@ -28,7 +28,7 @@ namespace AllBase.Model.DBModel
public ShopLoginInfo 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
{
@@ -425,10 +425,17 @@ namespace AllBase.Model.DBModel
}
//public bool is_visible { get; set; } = true;
public long id { get; set; }
public long shop_id { get; set; }
public string shop_name { get; set; }
public long shop_id
{
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>
/// 商户ID
/// </summary>
@@ -1194,6 +1194,17 @@ namespace AllBase.Model.DBModel
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>
public oms_wei_ewaybill_path LatestDirectEWaybill
{
@@ -1521,7 +1532,11 @@ namespace AllBase.Model.DBModel
/// <summary>
/// sku小图
/// </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>
/// sku数量
/// </summary>
+46 -28
View File
@@ -167,7 +167,7 @@ namespace TemuKJD.ToolForms
}));
else
break;
Thread.Sleep(1000);
Thread.Sleep(1400 - i * 100);
}
if (this.Created)
@@ -356,7 +356,7 @@ namespace TemuKJD.ToolForms
sb.Append("(function(){");
sb.Append("CefSharp.BindObjectAsync('shopObj');");
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(表示取消执行)
@@ -603,6 +603,7 @@ namespace TemuKJD.ToolForms
{
Invoke(new Action(() =>
{
if (cefWebBrowser != null)
this.cefWebBrowser.Visible = false;
BaseMsgForm.ShowError(sourceCodeRst);
}));
@@ -781,8 +782,8 @@ namespace TemuKJD.ToolForms
Thread.Sleep(200);
if (host == null || client == null)
{
host = cefWebBrowser.GetBrowser().GetHost();
client = cefWebBrowser.GetDevToolsClient();
host = cefWebBrowser?.GetBrowser().GetHost();
client = cefWebBrowser?.GetDevToolsClient();
}
else
break;
@@ -851,8 +852,8 @@ namespace TemuKJD.ToolForms
Thread.Sleep(200);
if (host == null || client == null)
{
host = cefWebBrowser.GetBrowser().GetHost();
client = cefWebBrowser.GetDevToolsClient();
host = cefWebBrowser?.GetBrowser().GetHost();
client = cefWebBrowser?.GetDevToolsClient();
}
else
break;
@@ -862,35 +863,47 @@ namespace TemuKJD.ToolForms
throw new Exception("页面加载异常");
}
// 点击地址框第一个
// 点击地址框打开地址选择
var jsStr1 = @"(function() {
var element = document.getElementsByClassName('oc-address-info')[0];
element.click();
return 'success';
})();";
string rstStr1 = "";
string rstStr2 = "";
for (int i = 0; i < 50; i++)
{
Thread.Sleep(200);
Thread.Sleep(100);
if (!this.Created) return "窗口已关闭";
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", "修改");
if (ts1.Result.Value is string rst && rst == "success")
Thread.Sleep(50);
// 判断是否点击成功
var ts2 = await EvaluateJsBuyTagNameAndInnerHtml("span", "修改");
if (ts2.Result.Value is string rst && rst == "success")
{
rstStr2 = rst;
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 "窗口已关闭";
var ts1 = await EvaluateJsBuyTagNameAndInnerHtml("span", "修改", true);
@@ -899,11 +912,11 @@ namespace TemuKJD.ToolForms
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 "窗口已关闭";
var ts1 = await EvaluateJsBuyTagNameAndInnerHtml("span", "保存", true);
@@ -913,7 +926,7 @@ namespace TemuKJD.ToolForms
break;
}
}
Thread.Sleep(Randomx.GetId(300, 500));
Thread.Sleep(Randomx.GetId(200, 400));
jsStr1 = @"(function() { var elements = document.getElementsByTagName('div');
for (i = elements.length - 1; i >= 0; i--){
@@ -948,7 +961,7 @@ namespace TemuKJD.ToolForms
break;
}
}
Thread.Sleep(Randomx.GetId(300, 500));
Thread.Sleep(Randomx.GetId(200, 400));
return "";
}
@@ -1016,7 +1029,8 @@ namespace TemuKJD.ToolForms
private void ShopLoginForm_FormClosed(object sender, FormClosedEventArgs e)
{
//OnSaveComplete(shop);
Task.Run(() => {
Task.Run(() =>
{
Thread.Sleep(500);
if (!this.Disposing && !this.IsDisposed)
{
@@ -1090,8 +1104,10 @@ namespace TemuKJD.ToolForms
//var jsStr = "document.getElementById('orderGoodsBlock').getElementsByTagName('div')[0].click();";
var jsStr = sb.ToString();
var host = cefWebBrowser.GetBrowser().GetHost();
var client = cefWebBrowser.GetDevToolsClient();
var host = cefWebBrowser?.GetBrowser().GetHost();
var client = cefWebBrowser?.GetDevToolsClient();
if (host != null && client != null)
{
var rst = await client.Runtime.EvaluateAsync(jsStr, null, true, null, null, true, null, true);
for (int i = 0; i < 80; i++)
{
@@ -1102,10 +1118,12 @@ namespace TemuKJD.ToolForms
await Task.Delay(100);
}
}
}
this.Enabled = false;
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 = "溯源码长度错误!"; });
return;
}
var client = cefWebBrowser.GetDevToolsClient();
var client = cefWebBrowser?.GetDevToolsClient();
if (client == null)
{
if (!IsAutoBuy)
@@ -1641,7 +1659,7 @@ namespace TemuKJD.ToolForms
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)
@@ -1740,7 +1758,7 @@ namespace TemuKJD.ToolForms
var tArr = txt.Split(new string[] { " ", ",", "," }, StringSplitOptions.RemoveEmptyEntries);
tArr = tArr.OrderBy(t => t.Length).ToArray();
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;
@@ -1765,7 +1783,7 @@ namespace TemuKJD.ToolForms
var mapSku = orderItem.PddBuyMapSkus.FirstOrDefault(m => m.map_goods_name + m.map_goods_id == cmbMapSkusProd.Text);
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)));
}