From 862ad088f5b2b61c86095839e7b326980b84df10 Mon Sep 17 00:00:00 2001 From: wule Date: Tue, 1 Jul 2025 18:58:51 +0800 Subject: [PATCH] =?UTF-8?q?1=E5=BA=97=E9=93=BA=E7=99=BB=E5=BD=95=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BC=98=E5=8C=96=202=E5=A4=87=E8=B4=A7=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AllBase/AllBase.csproj | 5 +- AllBase/BaseRegex.cs | 40 + AllBase/Helper/GlobalConfig.cs | 4 +- AllBase/Model/Result/DouShopLoginInfo.cs | 4 +- AllBase/Model/Result/StockInfo.cs | 48 + TEMUKJD/BoundObject.cs | 2 +- TEMUKJD/ChangeForm.cs | 18 +- TEMUKJD/ChangeForm.designer.cs | 37 +- TEMUKJD/ChatForms/ChatForm.cs | 44 +- TEMUKJD/ChatForms/ChatForm.designer.cs | 20 +- TEMUKJD/ChatForms/ChatHelper/ChatConfig.cs | 4 +- TEMUKJD/ChatForms/ChatMessageForm.Designer.cs | 2 +- TEMUKJD/ChatForms/ChatMessageForm.cs | 4 +- .../ChatForms/ChatModel/ChatSettingsParam.cs | 2 +- TEMUKJD/CookieVisitor.cs | 2 +- .../DashBoardForms/DashBoardForm.Designer.cs | 18 +- TEMUKJD/DashBoardForms/DashBoardForm.cs | 16 +- TEMUKJD/Extension/DataGridViewExtension.cs | 2 +- .../CustomResourceRequestHandlerLocal.cs | 2 +- TEMUKJD/Helper/LifeSpanHandlerLocal.cs | 4 +- TEMUKJD/InitForm.Designer.cs | 4 +- TEMUKJD/InitForm.cs | 4 +- TEMUKJD/KJD.csproj | 13 +- TEMUKJD/KJDForms/BaseForms/BaseMsgForm.cs | 8 +- .../BaseForms/BaseMsgForm.designer.cs | 2 +- TEMUKJD/KJDForms/BaseForms/LRBaseForm.cs | 20 +- .../KJDForms/BaseForms/LRBaseForm.designer.cs | 12 +- .../CaiNiXiHuanCollectForm.Designer.cs | 20 +- .../CollectForms/CaiNiXiHuanCollectForm.cs | 6 +- .../CollectForms/CollectForm.Designer.cs | 4 +- TEMUKJD/KJDForms/CollectForms/CollectForm.cs | 2 +- .../FriendShopCollectForm.Designer.cs | 20 +- .../CollectForms/FriendShopCollectForm.cs | 8 +- .../CollectForms/HaoWuCollectForm.Designer.cs | 16 +- .../KJDForms/CollectForms/HaoWuCollectForm.cs | 4 +- .../KeywordCollectForm.Designer.cs | 20 +- .../CollectForms/KeywordCollectForm.cs | 6 +- .../ShopProductCollectForm.Designer.cs | 20 +- .../CollectForms/ShopProductCollectForm.cs | 4 +- .../KJDForms/OrderForms/OrderForm.Designer.cs | 4 +- TEMUKJD/KJDForms/OrderForms/OrderForm.cs | 2 +- .../SalesCenterForms/CouponForm.Designer.cs | 26 +- .../KJDForms/SalesCenterForms/CouponForm.cs | 34 +- .../CouponMulitAddForm.Designer.cs | 6 +- .../SalesCenterForms/CouponMulitAddForm.cs | 4 +- .../CouponShopForm.Designer.cs | 6 +- .../SalesCenterForms/CouponShopForm.cs | 6 +- ...uctProPromotionListSkuInfoForm.Designer.cs | 2 +- .../DouProductProPromotionListSkuInfoForm.cs | 4 +- ...ctPromotionListSkuInfoEditForm.Designer.cs | 4 +- .../DouProductPromotionListSkuInfoEditForm.cs | 4 +- .../FullMinusActiveForm.Designer.cs | 6 +- .../SalesCenterForms/FullMinusActiveForm.cs | 4 +- .../FullMinusForm.Designer.cs | 26 +- .../SalesCenterForms/FullMinusForm.cs | 52 +- .../FullMinusShopForm.Designer.cs | 6 +- .../SalesCenterForms/FullMinusShopForm.cs | 4 +- ...GroupBuyCustomActivityNameForm.Designer.cs | 2 +- .../GroupBuyCustomActivityNameForm.cs | 4 +- .../SalesCenterForms/GroupBuyForm.Designer.cs | 26 +- .../KJDForms/SalesCenterForms/GroupBuyForm.cs | 40 +- .../GroupBuyMonitorForm.Designer.cs | 16 +- .../SalesCenterForms/GroupBuyMonitorForm.cs | 2 +- .../GroupBuyShopForm.Designer.cs | 6 +- .../SalesCenterForms/GroupBuyShopForm.cs | 6 +- .../LimitedSalesActivityNameForm.Designer.cs | 2 +- .../LimitedSalesActivityNameForm.cs | 4 +- .../LimitedSalesManagerActiveForm.Designer.cs | 6 +- .../LimitedSalesManagerActiveForm.cs | 6 +- .../SalesCenterForm.Designer.cs | 4 +- .../SalesCenterForms/SalesCenterForm.cs | 2 +- .../SeckillingAndLimitedSalesForm.Designer.cs | 18 +- .../SeckillingAndLimitedSalesForm.cs | 52 +- ...killingAndLimitedSalesShopForm.Designer.cs | 6 +- .../SeckillingAndLimitedSalesShopForm.cs | 6 +- .../UcCouponAddParam.Designer.cs | 2 +- .../SalesCenterForms/UcCouponAddParam.cs | 2 +- .../FreightTemplateAddForm.Designer.cs | 12 +- .../ShopForms/FreightTemplateAddForm.cs | 20 +- .../ShopForms/FreightTemplateForm.Designer.cs | 172 +-- .../KJDForms/ShopForms/FreightTemplateForm.cs | 40 +- .../FreightTemplateListForm.Designer.cs | 6 +- .../ShopForms/FreightTemplateListForm.cs | 2 +- .../FreightTemplateNameForm.Designer.cs | 2 +- .../ShopForms/FreightTemplateNameForm.cs | 2 +- ...FreightTemplateNotSendAreaForm.Designer.cs | 2 +- .../FreightTemplateNotSendAreaForm.cs | 2 +- .../ShopForms/MaterialManageForm.Designer.cs | 18 +- .../KJDForms/ShopForms/MaterialManageForm.cs | 24 +- .../ShopForms/ShopAddEditForm.Designer.cs | 4 +- TEMUKJD/KJDForms/ShopForms/ShopAddEditForm.cs | 6 +- .../ShopForms/ShopAuthForm.Designer.cs | 14 +- TEMUKJD/KJDForms/ShopForms/ShopAuthForm.cs | 12 +- .../KJDForms/ShopForms/ShopForm.Designer.cs | 4 +- TEMUKJD/KJDForms/ShopForms/ShopForm.cs | 2 +- .../ShopForms/ShopListForm.Designer.cs | 31 +- TEMUKJD/KJDForms/ShopForms/ShopListForm.cs | 284 ++-- TEMUKJD/KJDForms/ShopForms/ShopListForm.resx | 3 + .../ShopForms/ShopLoginForm.Designer.cs | 10 +- TEMUKJD/KJDForms/ShopForms/ShopLoginForm.cs | 142 +- .../ShopForms/SubAccountListForm.Designer.cs | 10 +- .../KJDForms/ShopForms/SubAccountListForm.cs | 4 +- .../SubAccountShopEditForm.Designer.cs | 8 +- .../ShopForms/SubAccountShopEditForm.cs | 8 +- .../ShopForms/UcSubAccount.Designer.cs | 2 +- TEMUKJD/KJDForms/ShopForms/UcSubAccount.cs | 2 +- .../ClearNoVisitorForm.Designer.cs | 22 +- .../ShopOptimizeForms/ClearNoVisitorForm.cs | 40 +- .../ClearNoVisitorShopForm.Designer.cs | 6 +- .../ClearNoVisitorShopForm.cs | 10 +- .../OptimizeForm.Designer.cs | 4 +- .../ShopOptimizeForms/OptimizeForm.cs | 2 +- .../SystemForms/SystemForm.Designer.cs | 4 +- TEMUKJD/KJDForms/SystemForms/SystemForm.cs | 2 +- .../SystemRemoveRestrictionsForm.Designer.cs | 14 +- .../SystemRemoveRestrictionsForm.cs | 4 +- .../KJDForms/ToolForms/CefForm.Designer.cs | 2 +- TEMUKJD/KJDForms/ToolForms/CefForm.cs | 6 +- TEMUKJD/KJDForms/ToolForms/ChangeIPForm.cs | 4 +- .../ToolForms/ChangeIPForm.designer.cs | 10 +- .../ToolForms/DouUserLoginForm.Designer.cs | 4 +- .../KJDForms/ToolForms/DouUserLoginForm.cs | 4 +- TEMUKJD/KJDForms/ToolForms/IeForm.cs | 4 +- TEMUKJD/KJDForms/ToolForms/IeForm.designer.cs | 4 +- .../JDVerifyForm/CollectVerifyForm.cs | 4 +- .../CollectVerifyForm.designer.cs | 2 +- .../KeywordsCatchFrom.Designer.cs | 12 +- .../KeywordsForms/KeywordsCatchFrom.cs | 8 +- .../KJDForms/ToolForms/MeituMessageDialog.cs | 2 +- .../ToolForms/MeituMessageDialog.designer.cs | 2 +- .../ToolForms/PinDuoDuoCaptchaForm.cs | 4 +- .../PinDuoDuoCaptchaForm.designer.cs | 2 +- .../KJDForms/ToolForms/PinDuoDuoLoginForm.cs | 4 +- .../ToolForms/PinDuoDuoLoginForm.designer.cs | 2 +- TEMUKJD/KJDForms/ToolForms/ProxyForm.cs | 4 +- .../KJDForms/ToolForms/ProxyForm.designer.cs | 6 +- TEMUKJD/KJDForms/ToolForms/TextForm.cs | 4 +- .../KJDForms/ToolForms/TextForm.designer.cs | 6 +- TEMUKJD/KJDForms/ToolForms/TokenNewForm.cs | 4 +- .../ToolForms/TokenNewForm.designer.cs | 10 +- TEMUKJD/KJDForms/UploadForms/CatForm.cs | 4 +- .../KJDForms/UploadForms/CatForm.designer.cs | 4 +- .../UploadForms/CleanDataForm.Designer.cs | 6 +- TEMUKJD/KJDForms/UploadForms/CleanDataForm.cs | 4 +- .../UploadForms/CommissionForm.Designer.cs | 18 +- .../KJDForms/UploadForms/CommissionForm.cs | 40 +- .../UploadForms/FilterForm.Designer.cs | 4 +- TEMUKJD/KJDForms/UploadForms/FilterForm.cs | 4 +- TEMUKJD/KJDForms/UploadForms/Fission.cs | 36 +- .../KJDForms/UploadForms/Fission.designer.cs | 30 +- .../UploadForms/FissionBrowserObject.cs | 6 +- .../FissionDataBaseForm.Designer.cs | 6 +- .../UploadForms/FissionDataBaseForm.cs | 14 +- .../UploadForms/FissionShowBigImgForm.cs | 4 +- .../FissionShowBigImgForm.designer.cs | 2 +- .../UcCategoryProp.Designer.cs | 6 +- .../FissionUserControl/UcCategoryProp.cs | 4 +- .../UcQualifiaction.Designer.cs | 6 +- .../FissionUserControl/UcQualifiaction.cs | 6 +- .../UploadForms/GetUpProductForm.Designer.cs | 6 +- .../KJDForms/UploadForms/GetUpProductForm.cs | 4 +- TEMUKJD/KJDForms/UploadForms/IeForm.cs | 4 +- .../KJDForms/UploadForms/IeForm.designer.cs | 6 +- .../UploadForms/ShopProductForm.Designer.cs | 36 +- .../KJDForms/UploadForms/ShopProductForm.cs | 120 +- .../SpecialDelaySendForm.Designer.cs | 20 +- .../UploadForms/SpecialDelaySendForm.cs | 40 +- .../UploadForms/StockSyncForm.Designer.cs | 28 +- TEMUKJD/KJDForms/UploadForms/StockSyncForm.cs | 48 +- .../UploadForms/StockUpForm.Designer.cs | 1277 +++++++++++++++++ TEMUKJD/KJDForms/UploadForms/StockUpForm.cs | 347 +++++ TEMUKJD/KJDForms/UploadForms/StockUpForm.resx | 174 +++ .../KJDForms/UploadForms/TbSettleSlideForm.cs | 4 +- .../UploadForms/TbSettleSlideForm.designer.cs | 2 +- .../UploadForms/UploadForm.Designer.cs | 86 +- TEMUKJD/KJDForms/UploadForms/UploadForm.cs | 13 +- .../UploadForms/UploadProductCefForm.cs | 4 +- .../UploadProductErrorForm.Designer.cs | 20 +- .../UploadForms/UploadProductErrorForm.cs | 8 +- .../UploadForms/UploadProductForm.Designer.cs | 254 ++-- .../KJDForms/UploadForms/UploadProductForm.cs | 36 +- ...UploadProductViolateSelectForm.Designer.cs | 2 +- .../UploadProductViolateSelectForm.cs | 4 +- .../UploadForms/ViolateManageForm.Designer.cs | 32 +- .../KJDForms/UploadForms/ViolateManageForm.cs | 46 +- TEMUKJD/MainForm.cs | 34 +- TEMUKJD/MainForm.designer.cs | 8 +- TEMUKJD/Program.cs | 4 +- TEMUKJD/Properties/Resources.Designer.cs | 8 +- TEMUKJD/Properties/Settings.Designer.cs | 4 +- TEMUKJD/StartUp.cs | 84 +- TEMUKJD/TaobaoLoginForm.cs | 4 +- TEMUKJD/TaobaoLoginForm.designer.cs | 2 +- TEMUKJD/UserComponent/ButtonLc.cs | 2 +- TEMUKJD/UserComponent/DataGridViewEx.cs | 2 +- TEMUKJD/UserComponent/DataGridViewXEx.cs | 2 +- TEMUKJD/UserComponent/UcComboBoxBase.cs | 2 +- .../UserComponent/UcGroupBoxEx.Designer.cs | 2 +- TEMUKJD/UserComponent/UcGroupBoxEx.cs | 2 +- TEMUKJD/UserComponent/UcTabControl.cs | 2 +- .../UserComponent/UcTabControl.designer.cs | 2 +- TEMUKJD/UserComponent/UcTreeView.Designer.cs | 2 +- TEMUKJD/UserComponent/UcTreeView.cs | 2 +- TEMUKJD/UserControls/ButtonEx.cs | 2 +- .../CustomDataGridViewTextBoxCell.cs | 2 +- TEMUKJD/UserControls/StatusBarUserControl.cs | 2 +- .../StatusBarUserControl.designer.cs | 2 +- TEMUKJD/UserForm/LoginForm.Designer.cs | 12 +- TEMUKJD/UserForm/LoginForm.cs | 4 +- TEMUKJD/UserForm/RegeditForm.Designer.cs | 10 +- TEMUKJD/UserForm/RegeditForm.cs | 4 +- .../UserForm/ResetPasswordForm.Designer.cs | 10 +- TEMUKJD/UserForm/ResetPasswordForm.cs | 4 +- .../UserForm/SupportQrCodeForm.Designer.cs | 4 +- TEMUKJD/UserForm/SupportQrCodeForm.cs | 4 +- Work/BLL/Upload/UploadProductBLL.cs | 18 +- 216 files changed, 3481 insertions(+), 1543 deletions(-) create mode 100644 AllBase/Model/Result/StockInfo.cs create mode 100644 TEMUKJD/KJDForms/UploadForms/StockUpForm.Designer.cs create mode 100644 TEMUKJD/KJDForms/UploadForms/StockUpForm.cs create mode 100644 TEMUKJD/KJDForms/UploadForms/StockUpForm.resx diff --git a/AllBase/AllBase.csproj b/AllBase/AllBase.csproj index ef53180..7513a76 100644 --- a/AllBase/AllBase.csproj +++ b/AllBase/AllBase.csproj @@ -179,6 +179,7 @@ + @@ -224,7 +225,9 @@ - + + + diff --git a/AllBase/BaseRegex.cs b/AllBase/BaseRegex.cs index dcc6537..26244b1 100644 --- a/AllBase/BaseRegex.cs +++ b/AllBase/BaseRegex.cs @@ -638,6 +638,46 @@ namespace AllBase return temp; } + /// + /// 获取值 + /// + /// + /// + /// + public static string GetStringQuery(ref string querString, string key) + { + int nIndex = querString.IndexOf(key + "="); + if (nIndex == -1) + return null; + + string temp = querString.Substring(nIndex).Replace(key + "=", ""); + nIndex = temp.IndexOf('&'); + if (nIndex > -1) + temp = temp.Substring(0, nIndex); + + return temp; + } + + /// + /// 获取值 + /// + /// + /// + /// + public static string GetStringCookie(ref string cookieStr, string key) + { + int nIndex = cookieStr.IndexOf(key + "="); + if (nIndex == -1) + return null; + + string temp = cookieStr.Substring(nIndex).Replace(key + "=", ""); + nIndex = temp.IndexOf(';'); + if (nIndex > -1) + temp = temp.Substring(0, nIndex); + + return temp; + } + public static string FliterHtmlTag(string htmlStr) { if (String.IsNullOrEmpty(htmlStr)) diff --git a/AllBase/Helper/GlobalConfig.cs b/AllBase/Helper/GlobalConfig.cs index c3276ff..41e30ed 100644 --- a/AllBase/Helper/GlobalConfig.cs +++ b/AllBase/Helper/GlobalConfig.cs @@ -16,11 +16,11 @@ namespace AllBase.Helper /// /// 店铺列表 /// - public static ConcurrentList DouShopLoginList { get; set; } = new ConcurrentList(); + public static ConcurrentList ShopLoginList { get; set; } = new ConcurrentList(); /// /// 非当前账户下的店铺列表 /// - public static ConcurrentList DouShopLoginOtherAccountList { get; set; } + public static ConcurrentList DouShopLoginOtherUserShopList { get; set; } /// /// 店铺设置参数 /// diff --git a/AllBase/Model/Result/DouShopLoginInfo.cs b/AllBase/Model/Result/DouShopLoginInfo.cs index e95e57e..2347bb6 100644 --- a/AllBase/Model/Result/DouShopLoginInfo.cs +++ b/AllBase/Model/Result/DouShopLoginInfo.cs @@ -17,8 +17,8 @@ namespace AllBase.Model.Result public string DbId { get; set; } public string LoginName { get; set; } public string Password { get; set; } - public string ShopAccountId { get; set; } - public string ShopAccount { get; set; } + public string ShopId { get; set; } = ""; + public string ShopAccount { get; set; } = ""; public string Mobile { get; set; } public string ShopToken { get; set; } public string Signature { get; set; } diff --git a/AllBase/Model/Result/StockInfo.cs b/AllBase/Model/Result/StockInfo.cs new file mode 100644 index 0000000..f6ce499 --- /dev/null +++ b/AllBase/Model/Result/StockInfo.cs @@ -0,0 +1,48 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AllBase.Model.Result +{ + public class StockInfo + { + /// + /// 卖家店铺id + /// + public long supplierId { get; set; } + /// + /// 卖家店铺名称 + /// + public string supplierName { get; set; } + /// + /// 备货母单号 + /// + public string originalPurchaseOrderSn { get; set; } + /// + /// 备货单号 + /// + public string subPurchaseOrderSn { get; set; } + /// + /// 商品名 + /// + public string productName { get; set; } + /// + /// 商品Id + /// + public long productId { get; set; } + /// + /// 商品Skc + /// + public long productSkcId { get; set; } + /// + /// 货号 + /// + public string productSn { get; set; } + /// + /// skc图片 + /// + public string productSkcPicture { get; set; } + } +} diff --git a/TEMUKJD/BoundObject.cs b/TEMUKJD/BoundObject.cs index 0d72062..ee3706c 100644 --- a/TEMUKJD/BoundObject.cs +++ b/TEMUKJD/BoundObject.cs @@ -5,7 +5,7 @@ using System.Text; using AllBase; using NaiBa.CefHelper; -namespace LittleRabbit +namespace TemuKJD { public class BoundObject { diff --git a/TEMUKJD/ChangeForm.cs b/TEMUKJD/ChangeForm.cs index 8912fc8..edd7680 100644 --- a/TEMUKJD/ChangeForm.cs +++ b/TEMUKJD/ChangeForm.cs @@ -9,12 +9,12 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; using AllBase; -using LittleRabbit.ChatForms; -using LittleRabbit.DashBoardForms; -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.ChatForms; +using TemuKJD.DashBoardForms; +using TemuKJD.KJDForms.BaseForms; using Work; -namespace LittleRabbit +namespace TemuKJD { public partial class ChangeForm : LRBaseForm { @@ -84,6 +84,16 @@ namespace LittleRabbit Text += " - " + BaseClass.ToolName; pnlExtend.Visible = BaseClass.DarenYaoyue; + + //直接登录上货工具 + Task.Run(() => + { + System.Threading.Thread.Sleep(100); + Invoke(new Action(() => + { + panel2_Click(this.panel2, null); + })); + }); } private void pnlChat_Click(object sender, EventArgs e) diff --git a/TEMUKJD/ChangeForm.designer.cs b/TEMUKJD/ChangeForm.designer.cs index 915fba4..23185bb 100644 --- a/TEMUKJD/ChangeForm.designer.cs +++ b/TEMUKJD/ChangeForm.designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit +namespace TemuKJD { partial class ChangeForm { @@ -31,6 +31,7 @@ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ChangeForm)); this.panel4 = new DevComponents.DotNetBar.PanelEx(); this.panel3 = new DevComponents.DotNetBar.PanelEx(); + this.label1 = new System.Windows.Forms.Label(); this.panel2 = new DevComponents.DotNetBar.PanelEx(); this.panel1 = new DevComponents.DotNetBar.PanelEx(); this.panel5 = new DevComponents.DotNetBar.PanelEx(); @@ -46,7 +47,7 @@ this.panel4.Location = new System.Drawing.Point(234, 215); this.panel4.Name = "panel4"; this.panel4.Size = new System.Drawing.Size(172, 65); - this.panel4.Style.BackgroundImage = global::LittleRabbit.Properties.Resources.choice_order; + this.panel4.Style.BackgroundImage = global::TemuKJD.Properties.Resources.choice_order; this.panel4.StyleMouseOver.Border = DevComponents.DotNetBar.eBorderType.RaisedInner; this.panel4.StyleMouseOver.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(7)))), ((int)(((byte)(157)))), ((int)(((byte)(235))))); this.panel4.TabIndex = 3; @@ -60,12 +61,23 @@ this.panel3.Location = new System.Drawing.Point(31, 43); this.panel3.Name = "panel3"; this.panel3.Size = new System.Drawing.Size(172, 65); - this.panel3.Style.BackgroundImage = global::LittleRabbit.Properties.Resources.choice_buyer_blast; + this.panel3.Style.BackgroundImage = global::TemuKJD.Properties.Resources.choice_buyer_blast; this.panel3.StyleMouseOver.Border = DevComponents.DotNetBar.eBorderType.RaisedInner; this.panel3.StyleMouseOver.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(7)))), ((int)(((byte)(157)))), ((int)(((byte)(235))))); this.panel3.TabIndex = 2; + this.panel3.Visible = false; this.panel3.Click += new System.EventHandler(this.panel3_Click); // + // label1 + // + this.label1.AutoSize = true; + this.label1.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label1.Location = new System.Drawing.Point(34, 43); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(224, 27); + this.label1.TabIndex = 54; + this.label1.Text = "登录成功，正在跳转……"; + // // panel2 // this.panel2.Cursor = System.Windows.Forms.Cursors.Hand; @@ -73,10 +85,11 @@ this.panel2.Location = new System.Drawing.Point(234, 43); this.panel2.Name = "panel2"; this.panel2.Size = new System.Drawing.Size(172, 65); - this.panel2.Style.BackgroundImage = global::LittleRabbit.Properties.Resources.choice_upload; + this.panel2.Style.BackgroundImage = global::TemuKJD.Properties.Resources.choice_upload; this.panel2.StyleMouseOver.Border = DevComponents.DotNetBar.eBorderType.RaisedInner; this.panel2.StyleMouseOver.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(7)))), ((int)(((byte)(157)))), ((int)(((byte)(235))))); this.panel2.TabIndex = 1; + this.panel2.Visible = false; this.panel2.Click += new System.EventHandler(this.panel2_Click); // // panel1 @@ -86,7 +99,7 @@ this.panel1.Location = new System.Drawing.Point(31, 215); this.panel1.Name = "panel1"; this.panel1.Size = new System.Drawing.Size(172, 65); - this.panel1.Style.BackgroundImage = global::LittleRabbit.Properties.Resources.choice_loginer; + this.panel1.Style.BackgroundImage = global::TemuKJD.Properties.Resources.choice_loginer; this.panel1.StyleMouseOver.Border = DevComponents.DotNetBar.eBorderType.RaisedInner; this.panel1.StyleMouseOver.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(7)))), ((int)(((byte)(157)))), ((int)(((byte)(235))))); this.panel1.TabIndex = 0; @@ -96,17 +109,17 @@ // panel5 // this.panel5.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel5.Controls.Add(this.label1); this.panel5.Controls.Add(this.pnlExtend); this.panel5.Controls.Add(this.pnlChat); - this.panel5.Controls.Add(this.panel1); this.panel5.Controls.Add(this.panel3); this.panel5.Controls.Add(this.panel4); this.panel5.Controls.Add(this.panel2); this.panel5.DisabledBackColor = System.Drawing.Color.Empty; this.panel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel5.Location = new System.Drawing.Point(1, 33); + this.panel5.Location = new System.Drawing.Point(1, 1); this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(440, 258); + this.panel5.Size = new System.Drawing.Size(440, 290); this.panel5.TabIndex = 4; // // pnlExtend @@ -116,7 +129,7 @@ this.pnlExtend.Location = new System.Drawing.Point(234, 131); this.pnlExtend.Name = "pnlExtend"; this.pnlExtend.Size = new System.Drawing.Size(172, 65); - this.pnlExtend.Style.BackgroundImage = global::LittleRabbit.Properties.Resources.choice_extend; + this.pnlExtend.Style.BackgroundImage = global::TemuKJD.Properties.Resources.choice_extend; this.pnlExtend.StyleMouseOver.Border = DevComponents.DotNetBar.eBorderType.RaisedInner; this.pnlExtend.StyleMouseOver.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(7)))), ((int)(((byte)(157)))), ((int)(((byte)(235))))); this.pnlExtend.TabIndex = 35; @@ -130,10 +143,11 @@ this.pnlChat.Location = new System.Drawing.Point(31, 131); this.pnlChat.Name = "pnlChat"; this.pnlChat.Size = new System.Drawing.Size(172, 65); - this.pnlChat.Style.BackgroundImage = global::LittleRabbit.Properties.Resources.choice_chat; + this.pnlChat.Style.BackgroundImage = global::TemuKJD.Properties.Resources.choice_chat; this.pnlChat.StyleMouseOver.Border = DevComponents.DotNetBar.eBorderType.RaisedInner; this.pnlChat.StyleMouseOver.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(7)))), ((int)(((byte)(157)))), ((int)(((byte)(235))))); this.pnlChat.TabIndex = 16; + this.pnlChat.Visible = false; this.pnlChat.Click += new System.EventHandler(this.pnlChat_Click); // // ChangeForm @@ -145,7 +159,6 @@ this.Controls.Add(this.panel5); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; - this.ShowMinimizedBox = true; this.Name = "ChangeForm"; this.Text = "功能选择"; this.TitleText = "功能选择"; @@ -153,6 +166,7 @@ this.Load += new System.EventHandler(this.ChangeForm_Load); this.Controls.SetChildIndex(this.panel5, 0); this.panel5.ResumeLayout(false); + this.panel5.PerformLayout(); this.ResumeLayout(false); } @@ -166,5 +180,6 @@ private DevComponents.DotNetBar.PanelEx panel5; private DevComponents.DotNetBar.PanelEx pnlChat; private DevComponents.DotNetBar.PanelEx pnlExtend; + private System.Windows.Forms.Label label1; } } \ No newline at end of file diff --git a/TEMUKJD/ChatForms/ChatForm.cs b/TEMUKJD/ChatForms/ChatForm.cs index c478115..ae6bc01 100644 --- a/TEMUKJD/ChatForms/ChatForm.cs +++ b/TEMUKJD/ChatForms/ChatForm.cs @@ -3,12 +3,12 @@ using AllBase.Helper; using AllBase.Model.Result; using CefSharp; using CefSharp.WinForms; -using LittleRabbit.ChatForms.ChatHelper; -using LittleRabbit.ChatForms.ChatModel; -using LittleRabbit.Helper; -using LittleRabbit.LittleRabbitForms.BaseForms; -using LittleRabbit.LittleRabbitForms.ShopForms; -using LittleRabbit.LittleRabbitForms.ToolForms; +using TemuKJD.ChatForms.ChatHelper; +using TemuKJD.ChatForms.ChatModel; +using TemuKJD.Helper; +using TemuKJD.KJDForms.BaseForms; +using TemuKJD.KJDForms.ShopForms; +using TemuKJD.KJDForms.ToolForms; using NaiBa.CefHelper; using NaiBa.CefHelper.Handler; using NaiBa.Util.Extension; @@ -27,7 +27,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using Work; -namespace LittleRabbit.ChatForms +namespace TemuKJD.ChatForms { public partial class ChatForm : Form { @@ -172,7 +172,7 @@ namespace LittleRabbit.ChatForms while (!StartUp.IsShopInit) Thread.Sleep(100); - SetMainBrowserUrl(GlobalConfig.DouShopLoginList.FirstOrDefault()); + SetMainBrowserUrl(GlobalConfig.ShopLoginList.FirstOrDefault()); LoadShop(); InitAutoExecute(); }); @@ -200,16 +200,16 @@ namespace LittleRabbit.ChatForms private void Chat_SearchResultReceived(DouShopLoginInfo shop) { - var r = dgvShop.Rows.Cast().FirstOrDefault(x => x.Cells["columnShopId"].Value.ToString() == shop.ShopAccountId); + var r = dgvShop.Rows.Cast().FirstOrDefault(x => x.Cells["columnShopId"].Value.ToString() == shop.ShopId); if (r != null) { for (int i = 0; i < dgvShop.Rows.Count; i++) { var row = dgvShop.Rows[i]; - if (row.Cells[0].Value.ToString() == shop.ShopAccountId && shop != currentShop) + if (row.Cells[0].Value.ToString() == shop.ShopId && shop != currentShop) { - if (ShopChatCount.ContainsKey(shop.ShopAccountId) && ShopChatCount[shop.ShopAccountId] > 0) + if (ShopChatCount.ContainsKey(shop.ShopId) && ShopChatCount[shop.ShopId] > 0) { Task.Run(() => { @@ -301,7 +301,7 @@ namespace LittleRabbit.ChatForms public void DgvShopClick(DouShopLoginInfo shop) { - var r = dgvShop.Rows.Cast().FirstOrDefault(x => x.Cells["columnShopId"].Value.ToString() == shop.ShopAccountId); + var r = dgvShop.Rows.Cast().FirstOrDefault(x => x.Cells["columnShopId"].Value.ToString() == shop.ShopId); if (r != null) { @@ -319,7 +319,7 @@ namespace LittleRabbit.ChatForms string shopId = dgvShop.Rows[e.RowIndex].Cells["ColumnShopID"].Value?.ToString(); if (string.IsNullOrEmpty(shopId)) return; - var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ShopAccountId == shopId); + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId); if (shop == null) return; @@ -360,7 +360,7 @@ namespace LittleRabbit.ChatForms return; dgvShop.Rows[e.RowIndex].DefaultCellStyle.BackColor = Color.White; - var shop = GlobalConfig.DouShopLoginList.Where(s => s.ShopAccountId == shopId).FirstOrDefault(); + var shop = GlobalConfig.ShopLoginList.Where(s => s.ShopId == shopId).FirstOrDefault(); if (shop == null) return; @@ -510,17 +510,17 @@ namespace LittleRabbit.ChatForms shopList = new List(); if (shopList.Count == 0) - shopList.AddRange(GlobalConfig.DouShopLoginList); + shopList.AddRange(GlobalConfig.ShopLoginList); for (int i = 0; i < shopList.Count; i++) { var shop = shopList[i]; DouShopLoginInfo result = new DouShopLoginInfo(); - result.ShopAccountId = shop.ShopAccountId; + result.ShopId = shop.ShopId; result.ShopAccount = shop.ShopAccount; result.LoginStatus = shop.LoginStatus; - var r = dgvShop.Rows.Cast().FirstOrDefault(x => x.Cells["columnShopId"].Value.ToString() == shop.ShopAccountId); + var r = dgvShop.Rows.Cast().FirstOrDefault(x => x.Cells["columnShopId"].Value.ToString() == shop.ShopId); this.Invoke(new Action(() => { int iGrid = 0; @@ -529,7 +529,7 @@ namespace LittleRabbit.ChatForms else iGrid = r.Index; - dgvShop.Rows[iGrid].Cells["ColumnShopID"].Value = shop.ShopAccountId; // 店铺ID + dgvShop.Rows[iGrid].Cells["ColumnShopID"].Value = shop.ShopId; // 店铺ID dgvShop.Rows[iGrid].Cells["ColumnShopName"].Value = shop.ShopAccount; // 店铺名称 dgvShop.Rows[iGrid].Cells["ColumnShopStatus"].Value = shop.LoginStatus == "未登录" ? "未登录 点击登录" : shop.LoginStatus; // 登录状态 dicRowColor[dgvShop.Rows[iGrid]] = dgvShop.Rows[iGrid].DefaultCellStyle.BackColor; @@ -719,7 +719,7 @@ namespace LittleRabbit.ChatForms { while (true) { - foreach (var shop in GlobalConfig.DouShopLoginList) + foreach (var shop in GlobalConfig.ShopLoginList) { try { @@ -1100,7 +1100,7 @@ namespace LittleRabbit.ChatForms if (isNewMessage) { - ShopChatCount[shop.ShopAccountId] = 1; + ShopChatCount[shop.ShopId] = 1; SearchNewMessageNofity(shop); if (!ChatConfig.ChatSettingConfig.IsNotShowMessageWindow) ShowMessageForm(shop); @@ -1109,7 +1109,7 @@ namespace LittleRabbit.ChatForms } else { - ShopChatCount[shop.ShopAccountId] = 0; + ShopChatCount[shop.ShopId] = 0; SearchNewMessageNofity(shop); CloseMessageForm(shop); } @@ -1185,7 +1185,7 @@ namespace LittleRabbit.ChatForms private void button1_Click(object sender, EventArgs e) { - var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ShopAccountId == "9050819"); + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == "9050819"); Task.Run(() => { AutoReplyWithJs(shop); }); } diff --git a/TEMUKJD/ChatForms/ChatForm.designer.cs b/TEMUKJD/ChatForms/ChatForm.designer.cs index 2a26ad9..1e8122e 100644 --- a/TEMUKJD/ChatForms/ChatForm.designer.cs +++ b/TEMUKJD/ChatForms/ChatForm.designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.ChatForms +namespace TemuKJD.ChatForms { partial class ChatForm { @@ -42,12 +42,12 @@ this.txtAutoReplyText = new System.Windows.Forms.TextBox(); this.chkIsAutoReply = new System.Windows.Forms.CheckBox(); this.splitContainer4 = new System.Windows.Forms.SplitContainer(); - this.dgvShop = new LittleRabbit.UserComponent.DataGridViewEx(); + this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx(); this.ColumnShopID = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.ColumnShopName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.ColumnShopStatus = new System.Windows.Forms.DataGridViewLinkColumn(); this.pnlRefresh = new DevComponents.DotNetBar.PanelEx(); - this.tabControl1 = new LittleRabbit.UserComponent.UcTabControl(); + this.tabControl1 = new TemuKJD.UserComponent.UcTabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); this.panel1 = new System.Windows.Forms.Panel(); this.tabPage2 = new System.Windows.Forms.TabPage(); @@ -459,7 +459,7 @@ // // pbLogo // - this.pbLogo.Image = global::LittleRabbit.Properties.Resources.main_form_logo; + this.pbLogo.Image = global::TemuKJD.Properties.Resources.main_form_logo; this.pbLogo.Location = new System.Drawing.Point(7, 9); this.pbLogo.Name = "pbLogo"; this.pbLogo.Size = new System.Drawing.Size(180, 60); @@ -547,13 +547,13 @@ this.max.Style.BackColor1.Color = System.Drawing.Color.Transparent; this.max.Style.BackColor2.Alpha = ((byte)(0)); this.max.Style.BackColor2.Color = System.Drawing.Color.Transparent; - this.max.Style.BackgroundImage = global::LittleRabbit.Properties.Resources.max; + this.max.Style.BackgroundImage = global::TemuKJD.Properties.Resources.max; this.max.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; this.max.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.max.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; this.max.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; this.max.Style.GradientAngle = 90; - this.max.StyleMouseOver.BackgroundImage = global::LittleRabbit.Properties.Resources.max_hover; + this.max.StyleMouseOver.BackgroundImage = global::TemuKJD.Properties.Resources.max_hover; this.max.TabIndex = 33; this.max.Click += new System.EventHandler(this.max_Click); // @@ -572,13 +572,13 @@ this.min.Style.BackColor1.Color = System.Drawing.Color.Transparent; this.min.Style.BackColor2.Alpha = ((byte)(0)); this.min.Style.BackColor2.Color = System.Drawing.Color.Transparent; - this.min.Style.BackgroundImage = global::LittleRabbit.Properties.Resources.min; + this.min.Style.BackgroundImage = global::TemuKJD.Properties.Resources.min; this.min.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; this.min.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.min.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; this.min.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; this.min.Style.GradientAngle = 90; - this.min.StyleMouseOver.BackgroundImage = global::LittleRabbit.Properties.Resources.min_hover; + this.min.StyleMouseOver.BackgroundImage = global::TemuKJD.Properties.Resources.min_hover; this.min.TabIndex = 32; this.min.Click += new System.EventHandler(this.min_Click); // @@ -597,13 +597,13 @@ this.close.Style.BackColor1.Color = System.Drawing.Color.Transparent; this.close.Style.BackColor2.Alpha = ((byte)(0)); this.close.Style.BackColor2.Color = System.Drawing.Color.Transparent; - this.close.Style.BackgroundImage = global::LittleRabbit.Properties.Resources.close; + this.close.Style.BackgroundImage = global::TemuKJD.Properties.Resources.close; this.close.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; this.close.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.close.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; this.close.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; this.close.Style.GradientAngle = 90; - this.close.StyleMouseOver.BackgroundImage = global::LittleRabbit.Properties.Resources.close_hover; + this.close.StyleMouseOver.BackgroundImage = global::TemuKJD.Properties.Resources.close_hover; this.close.TabIndex = 31; this.close.Click += new System.EventHandler(this.close_Click); // diff --git a/TEMUKJD/ChatForms/ChatHelper/ChatConfig.cs b/TEMUKJD/ChatForms/ChatHelper/ChatConfig.cs index a7145a5..7e5af68 100644 --- a/TEMUKJD/ChatForms/ChatHelper/ChatConfig.cs +++ b/TEMUKJD/ChatForms/ChatHelper/ChatConfig.cs @@ -1,4 +1,4 @@ -using LittleRabbit.ChatForms.ChatModel; +using TemuKJD.ChatForms.ChatModel; using NaiBa.Util; using System; using System.Collections.Generic; @@ -6,7 +6,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace LittleRabbit.ChatForms.ChatHelper +namespace TemuKJD.ChatForms.ChatHelper { public class ChatConfig { diff --git a/TEMUKJD/ChatForms/ChatMessageForm.Designer.cs b/TEMUKJD/ChatForms/ChatMessageForm.Designer.cs index 3665e86..927499c 100644 --- a/TEMUKJD/ChatForms/ChatMessageForm.Designer.cs +++ b/TEMUKJD/ChatForms/ChatMessageForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.ChatForms +namespace TemuKJD.ChatForms { partial class ChatMessageForm { diff --git a/TEMUKJD/ChatForms/ChatMessageForm.cs b/TEMUKJD/ChatForms/ChatMessageForm.cs index 479dc9e..78f8a8f 100644 --- a/TEMUKJD/ChatForms/ChatMessageForm.cs +++ b/TEMUKJD/ChatForms/ChatMessageForm.cs @@ -1,5 +1,5 @@ using AllBase.Model.Result; -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.KJDForms.BaseForms; using System; using System.Collections.Generic; using System.ComponentModel; @@ -11,7 +11,7 @@ using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; -namespace LittleRabbit.ChatForms +namespace TemuKJD.ChatForms { public partial class ChatMessageForm : LRBaseForm { diff --git a/TEMUKJD/ChatForms/ChatModel/ChatSettingsParam.cs b/TEMUKJD/ChatForms/ChatModel/ChatSettingsParam.cs index 14b950e..3e0a096 100644 --- a/TEMUKJD/ChatForms/ChatModel/ChatSettingsParam.cs +++ b/TEMUKJD/ChatForms/ChatModel/ChatSettingsParam.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace LittleRabbit.ChatForms.ChatModel +namespace TemuKJD.ChatForms.ChatModel { public class ChatSettingsParam { diff --git a/TEMUKJD/CookieVisitor.cs b/TEMUKJD/CookieVisitor.cs index 892bc2f..06a907c 100644 --- a/TEMUKJD/CookieVisitor.cs +++ b/TEMUKJD/CookieVisitor.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; -namespace LittleRabbit +namespace TemuKJD { public class CookieVisitor : CefSharp.ICookieVisitor { diff --git a/TEMUKJD/DashBoardForms/DashBoardForm.Designer.cs b/TEMUKJD/DashBoardForms/DashBoardForm.Designer.cs index 543d667..155a376 100644 --- a/TEMUKJD/DashBoardForms/DashBoardForm.Designer.cs +++ b/TEMUKJD/DashBoardForms/DashBoardForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.DashBoardForms +namespace TemuKJD.DashBoardForms { partial class DashBoardForm { @@ -34,10 +34,10 @@ this.rbChat = new System.Windows.Forms.RadioButton(); this.rbInvite = new System.Windows.Forms.RadioButton(); this.label7 = new System.Windows.Forms.Label(); - this.btnSend = new LittleRabbit.UserControls.ButtonEx(); + this.btnSend = new TemuKJD.UserControls.ButtonEx(); this.pnlDetailForm = new DevComponents.DotNetBar.PanelEx(); this.pnlMainForm = new DevComponents.DotNetBar.PanelEx(); - this.btnLoginDouyin = new LittleRabbit.UserControls.ButtonEx(); + this.btnLoginDouyin = new TemuKJD.UserControls.ButtonEx(); this.cmbShop = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.label5 = new System.Windows.Forms.Label(); this.txtSuccessCount = new System.Windows.Forms.TextBox(); @@ -392,13 +392,13 @@ this.max.Style.BackColor1.Color = System.Drawing.Color.Transparent; this.max.Style.BackColor2.Alpha = ((byte)(0)); this.max.Style.BackColor2.Color = System.Drawing.Color.Transparent; - this.max.Style.BackgroundImage = global::LittleRabbit.Properties.Resources.max; + this.max.Style.BackgroundImage = global::TemuKJD.Properties.Resources.max; this.max.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; this.max.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.max.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; this.max.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; this.max.Style.GradientAngle = 90; - this.max.StyleMouseOver.BackgroundImage = global::LittleRabbit.Properties.Resources.max_hover; + this.max.StyleMouseOver.BackgroundImage = global::TemuKJD.Properties.Resources.max_hover; this.max.TabIndex = 22; this.max.Click += new System.EventHandler(this.max_Click); // @@ -417,13 +417,13 @@ this.min.Style.BackColor1.Color = System.Drawing.Color.Transparent; this.min.Style.BackColor2.Alpha = ((byte)(0)); this.min.Style.BackColor2.Color = System.Drawing.Color.Transparent; - this.min.Style.BackgroundImage = global::LittleRabbit.Properties.Resources.min; + this.min.Style.BackgroundImage = global::TemuKJD.Properties.Resources.min; this.min.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; this.min.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.min.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; this.min.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; this.min.Style.GradientAngle = 90; - this.min.StyleMouseOver.BackgroundImage = global::LittleRabbit.Properties.Resources.min_hover; + this.min.StyleMouseOver.BackgroundImage = global::TemuKJD.Properties.Resources.min_hover; this.min.TabIndex = 21; this.min.Click += new System.EventHandler(this.min_Click); // @@ -442,13 +442,13 @@ this.close.Style.BackColor1.Color = System.Drawing.Color.Transparent; this.close.Style.BackColor2.Alpha = ((byte)(0)); this.close.Style.BackColor2.Color = System.Drawing.Color.Transparent; - this.close.Style.BackgroundImage = global::LittleRabbit.Properties.Resources.close; + this.close.Style.BackgroundImage = global::TemuKJD.Properties.Resources.close; this.close.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; this.close.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.close.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; this.close.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; this.close.Style.GradientAngle = 90; - this.close.StyleMouseOver.BackgroundImage = global::LittleRabbit.Properties.Resources.close_hover; + this.close.StyleMouseOver.BackgroundImage = global::TemuKJD.Properties.Resources.close_hover; this.close.TabIndex = 20; this.close.Click += new System.EventHandler(this.close_Click); // diff --git a/TEMUKJD/DashBoardForms/DashBoardForm.cs b/TEMUKJD/DashBoardForms/DashBoardForm.cs index 6c5df51..18a5995 100644 --- a/TEMUKJD/DashBoardForms/DashBoardForm.cs +++ b/TEMUKJD/DashBoardForms/DashBoardForm.cs @@ -2,8 +2,8 @@ using AllBase.Helper; using CefSharp; using CefSharp.WinForms; -using LittleRabbit.Helper; -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.Helper; +using TemuKJD.KJDForms.BaseForms; using NaiBa.CefHelper; using NaiBa.Util; using NaiBa.Util.Extension; @@ -20,7 +20,7 @@ using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; -namespace LittleRabbit.DashBoardForms +namespace TemuKJD.DashBoardForms { public partial class DashBoardForm : Form { @@ -89,17 +89,17 @@ namespace LittleRabbit.DashBoardForms this.rbChat.CheckedChanged += rbChat_CheckedChanged; rbInvite.Checked = true; - for (int i = 0; i < GlobalConfig.DouShopLoginList.Count; i++) + for (int i = 0; i < GlobalConfig.ShopLoginList.Count; i++) { - var shop = GlobalConfig.DouShopLoginList[i]; + var shop = GlobalConfig.ShopLoginList[i]; this.cmbShop.Items.Add(shop.ShopAccount); } this.cmbShop.SelectedIndex = 0; string cookie = ""; - if (GlobalConfig.DouShopLoginList.Count > 0) + if (GlobalConfig.ShopLoginList.Count > 0) { - cookie = GlobalConfig.DouShopLoginList[0].Cookies; + cookie = GlobalConfig.ShopLoginList[0].Cookies; } InitCef(cookie); } @@ -750,7 +750,7 @@ namespace LittleRabbit.DashBoardForms private void btnLoginDouyin_Click(object sender, EventArgs e) { string cookie = ""; - var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ShopAccount == cmbShop.SelectedItem.ToString()); + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopAccount == cmbShop.SelectedItem.ToString()); if (shop != null) cookie = shop.Cookies; InitCef(cookie); diff --git a/TEMUKJD/Extension/DataGridViewExtension.cs b/TEMUKJD/Extension/DataGridViewExtension.cs index b69d2e7..db62b6b 100644 --- a/TEMUKJD/Extension/DataGridViewExtension.cs +++ b/TEMUKJD/Extension/DataGridViewExtension.cs @@ -9,7 +9,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace LittleRabbit.Extension +namespace TemuKJD.Extension { public static class DataGridViewExtension { diff --git a/TEMUKJD/Helper/CustomResourceRequestHandlerLocal.cs b/TEMUKJD/Helper/CustomResourceRequestHandlerLocal.cs index e85964d..08a4495 100644 --- a/TEMUKJD/Helper/CustomResourceRequestHandlerLocal.cs +++ b/TEMUKJD/Helper/CustomResourceRequestHandlerLocal.cs @@ -16,7 +16,7 @@ using System.Text; using System.Threading.Tasks; using System.Web; -namespace LittleRabbit.Helper +namespace TemuKJD.Helper { //public event Action ResourceLoadCompleteEvent; // requestUrl, postData, responseData diff --git a/TEMUKJD/Helper/LifeSpanHandlerLocal.cs b/TEMUKJD/Helper/LifeSpanHandlerLocal.cs index 8087357..e5e7d08 100644 --- a/TEMUKJD/Helper/LifeSpanHandlerLocal.cs +++ b/TEMUKJD/Helper/LifeSpanHandlerLocal.cs @@ -1,6 +1,6 @@ using CefSharp; using CefSharp.WinForms; -using LittleRabbit.LittleRabbitForms.ToolForms; +using TemuKJD.KJDForms.ToolForms; using NaiBa.CefHelper; using System; using System.Collections.Generic; @@ -8,7 +8,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace LittleRabbit.Helper +namespace TemuKJD.Helper { public enum PopWindowType diff --git a/TEMUKJD/InitForm.Designer.cs b/TEMUKJD/InitForm.Designer.cs index f0228cb..8fbebe7 100644 --- a/TEMUKJD/InitForm.Designer.cs +++ b/TEMUKJD/InitForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit +namespace TemuKJD { partial class InitForm { @@ -69,7 +69,7 @@ this.pbShopLoading.Anchor = System.Windows.Forms.AnchorStyles.None; this.pbShopLoading.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); this.pbShopLoading.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.pbShopLoading.Image = global::LittleRabbit.Properties.Resources.loading_blue; + this.pbShopLoading.Image = global::TemuKJD.Properties.Resources.loading_blue; this.pbShopLoading.Location = new System.Drawing.Point(84, 49); this.pbShopLoading.Name = "pbShopLoading"; this.pbShopLoading.Size = new System.Drawing.Size(64, 64); diff --git a/TEMUKJD/InitForm.cs b/TEMUKJD/InitForm.cs index e95fb2c..c9b2565 100644 --- a/TEMUKJD/InitForm.cs +++ b/TEMUKJD/InitForm.cs @@ -1,4 +1,4 @@ -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.KJDForms.BaseForms; using System; using System.Collections.Generic; using System.ComponentModel; @@ -11,7 +11,7 @@ using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; -namespace LittleRabbit +namespace TemuKJD { public partial class InitForm : LRBaseForm { diff --git a/TEMUKJD/KJD.csproj b/TEMUKJD/KJD.csproj index f519fa5..3a77233 100644 --- a/TEMUKJD/KJD.csproj +++ b/TEMUKJD/KJD.csproj @@ -12,8 +12,8 @@ {7A28B19F-BD0C-45DF-AC1A-78064631745A} WinExe Properties - LittleRabbit - LittleRabbit + TemuKJD + TemuKJD v4.5.2 512 true @@ -571,6 +571,12 @@ IeForm.cs + + Form + + + StockUpForm.cs + Form @@ -956,6 +962,9 @@ IeForm.cs + + StockUpForm.cs + UploadProductErrorForm.cs diff --git a/TEMUKJD/KJDForms/BaseForms/BaseMsgForm.cs b/TEMUKJD/KJDForms/BaseForms/BaseMsgForm.cs index 7dec47a..d649b4a 100644 --- a/TEMUKJD/KJDForms/BaseForms/BaseMsgForm.cs +++ b/TEMUKJD/KJDForms/BaseForms/BaseMsgForm.cs @@ -9,7 +9,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace LittleRabbit.LittleRabbitForms.BaseForms +namespace TemuKJD.KJDForms.BaseForms { public partial class BaseMsgForm : LRBaseForm { @@ -25,7 +25,7 @@ namespace LittleRabbit.LittleRabbitForms.BaseForms { string title = string.IsNullOrEmpty(caption) ? "系统提示" : caption; BaseMsgForm msgBox = CreateMsgForm(msg, fl, title); - msgBox.picTip.Image = global::LittleRabbit.Properties.Resources.BaseMsgInfo; + msgBox.picTip.Image = global::TemuKJD.Properties.Resources.BaseMsgInfo; msgBox.ShowDialog(); return msgBox; } @@ -47,7 +47,7 @@ namespace LittleRabbit.LittleRabbitForms.BaseForms { string title = string.IsNullOrEmpty(caption) ? "系统错误" : caption; BaseMsgForm msgBox = CreateMsgForm(msg, fl, title); - msgBox.picTip.Image = global::LittleRabbit.Properties.Resources.BaseMsgErr; + msgBox.picTip.Image = global::TemuKJD.Properties.Resources.BaseMsgErr; msgBox.ShowDialog(); return msgBox; } @@ -60,7 +60,7 @@ namespace LittleRabbit.LittleRabbitForms.BaseForms Text = title, lblMsg = { Text = msg }, TitleText = title, - picTip = { Image = global::LittleRabbit.Properties.Resources.BaseMsgQue }, + picTip = { Image = global::TemuKJD.Properties.Resources.BaseMsgQue }, TopMost = isTopMost }; if (fl.Equals(FormLevel.LARGE)) diff --git a/TEMUKJD/KJDForms/BaseForms/BaseMsgForm.designer.cs b/TEMUKJD/KJDForms/BaseForms/BaseMsgForm.designer.cs index 8d9e156..d64211b 100644 --- a/TEMUKJD/KJDForms/BaseForms/BaseMsgForm.designer.cs +++ b/TEMUKJD/KJDForms/BaseForms/BaseMsgForm.designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.BaseForms +namespace TemuKJD.KJDForms.BaseForms { partial class BaseMsgForm { diff --git a/TEMUKJD/KJDForms/BaseForms/LRBaseForm.cs b/TEMUKJD/KJDForms/BaseForms/LRBaseForm.cs index c06d796..7611f12 100644 --- a/TEMUKJD/KJDForms/BaseForms/LRBaseForm.cs +++ b/TEMUKJD/KJDForms/BaseForms/LRBaseForm.cs @@ -9,7 +9,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace LittleRabbit.LittleRabbitForms.BaseForms +namespace TemuKJD.KJDForms.BaseForms { public partial class LRBaseForm : Form { @@ -100,7 +100,7 @@ namespace LittleRabbit.LittleRabbitForms.BaseForms if (BaseClass.Ico != null) Iconx = Icon = BaseClass.Ico; else - Iconx = this.Icon = BaseClass.Ico = ImageBuild.ConvertToIcon(global::LittleRabbit.Properties.Resources.icon); + Iconx = this.Icon = BaseClass.Ico = ImageBuild.ConvertToIcon(global::TemuKJD.Properties.Resources.icon); if (!this.ShowIcon) { @@ -239,28 +239,28 @@ namespace LittleRabbit.LittleRabbitForms.BaseForms private void PictureBox1_MouseHover(object sender, EventArgs e) { - this.pbCloseBase.Image = global::LittleRabbit.Properties.Resources.close_hover; + this.pbCloseBase.Image = global::TemuKJD.Properties.Resources.close_hover; this.Cursor = Cursors.Hand; } private void PictureBox1_MouseLeave(object sender, EventArgs e) { - this.pbCloseBase.Image = global::LittleRabbit.Properties.Resources.close; + this.pbCloseBase.Image = global::TemuKJD.Properties.Resources.close; this.Cursor = Cursors.Default; } private void PictureBox2_MouseHover(object sender, EventArgs e) { - this.pbMinBase.Image = global::LittleRabbit.Properties.Resources.min_hover; + this.pbMinBase.Image = global::TemuKJD.Properties.Resources.min_hover; this.Cursor = Cursors.Hand; } private void PictureBox2_MouseLeave(object sender, EventArgs e) { - this.pbMinBase.Image = global::LittleRabbit.Properties.Resources.min; + this.pbMinBase.Image = global::TemuKJD.Properties.Resources.min; this.Cursor = Cursors.Default; } @@ -292,13 +292,13 @@ namespace LittleRabbit.LittleRabbitForms.BaseForms private void pbNormalBase_MouseHover(object sender, EventArgs e) { - this.pbNormalBase.Image = global::LittleRabbit.Properties.Resources.normal_hover; + this.pbNormalBase.Image = global::TemuKJD.Properties.Resources.normal_hover; this.Cursor = Cursors.Hand; } private void pbNormalBase_MouseLeave(object sender, EventArgs e) { - this.pbNormalBase.Image = global::LittleRabbit.Properties.Resources.normal; + this.pbNormalBase.Image = global::TemuKJD.Properties.Resources.normal; this.Cursor = Cursors.Default; } @@ -311,13 +311,13 @@ namespace LittleRabbit.LittleRabbitForms.BaseForms private void pbMaxBase_MouseHover(object sender, EventArgs e) { - this.pbMaxBase.Image = global::LittleRabbit.Properties.Resources.max_hover; + this.pbMaxBase.Image = global::TemuKJD.Properties.Resources.max_hover; this.Cursor = Cursors.Hand; } private void pbMaxBase_MouseLeave(object sender, EventArgs e) { - this.pbMaxBase.Image = global::LittleRabbit.Properties.Resources.max; + this.pbMaxBase.Image = global::TemuKJD.Properties.Resources.max; this.Cursor = Cursors.Default; } diff --git a/TEMUKJD/KJDForms/BaseForms/LRBaseForm.designer.cs b/TEMUKJD/KJDForms/BaseForms/LRBaseForm.designer.cs index 9fce8fa..c5d6a95 100644 --- a/TEMUKJD/KJDForms/BaseForms/LRBaseForm.designer.cs +++ b/TEMUKJD/KJDForms/BaseForms/LRBaseForm.designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.BaseForms +namespace TemuKJD.KJDForms.BaseForms { partial class LRBaseForm { @@ -64,7 +64,7 @@ // pbMinBase // this.pbMinBase.Dock = System.Windows.Forms.DockStyle.Right; - this.pbMinBase.Image = global::LittleRabbit.Properties.Resources.min; + this.pbMinBase.Image = global::TemuKJD.Properties.Resources.min; this.pbMinBase.Location = new System.Drawing.Point(529, 0); this.pbMinBase.Name = "pbMinBase"; this.pbMinBase.Size = new System.Drawing.Size(32, 32); @@ -78,7 +78,7 @@ // pbNormalBase // this.pbNormalBase.Dock = System.Windows.Forms.DockStyle.Right; - this.pbNormalBase.Image = global::LittleRabbit.Properties.Resources.normal; + this.pbNormalBase.Image = global::TemuKJD.Properties.Resources.normal; this.pbNormalBase.Location = new System.Drawing.Point(561, 0); this.pbNormalBase.Name = "pbNormalBase"; this.pbNormalBase.Size = new System.Drawing.Size(32, 32); @@ -93,7 +93,7 @@ // pbMaxBase // this.pbMaxBase.Dock = System.Windows.Forms.DockStyle.Right; - this.pbMaxBase.Image = global::LittleRabbit.Properties.Resources.max; + this.pbMaxBase.Image = global::TemuKJD.Properties.Resources.max; this.pbMaxBase.Location = new System.Drawing.Point(593, 0); this.pbMaxBase.Name = "pbMaxBase"; this.pbMaxBase.Size = new System.Drawing.Size(32, 32); @@ -108,7 +108,7 @@ // pbLogo // this.pbLogo.BackColor = System.Drawing.Color.Transparent; - this.pbLogo.Image = global::LittleRabbit.Properties.Resources.icon; + this.pbLogo.Image = global::TemuKJD.Properties.Resources.icon; this.pbLogo.Location = new System.Drawing.Point(5, 4); this.pbLogo.Name = "pbLogo"; this.pbLogo.Size = new System.Drawing.Size(23, 23); @@ -134,7 +134,7 @@ // pbCloseBase // this.pbCloseBase.Dock = System.Windows.Forms.DockStyle.Right; - this.pbCloseBase.Image = global::LittleRabbit.Properties.Resources.close; + this.pbCloseBase.Image = global::TemuKJD.Properties.Resources.close; this.pbCloseBase.Location = new System.Drawing.Point(625, 0); this.pbCloseBase.Name = "pbCloseBase"; this.pbCloseBase.Size = new System.Drawing.Size(32, 32); diff --git a/TEMUKJD/KJDForms/CollectForms/CaiNiXiHuanCollectForm.Designer.cs b/TEMUKJD/KJDForms/CollectForms/CaiNiXiHuanCollectForm.Designer.cs index 3eec0db..0303bfd 100644 --- a/TEMUKJD/KJDForms/CollectForms/CaiNiXiHuanCollectForm.Designer.cs +++ b/TEMUKJD/KJDForms/CollectForms/CaiNiXiHuanCollectForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.CollectForms +namespace TemuKJD.KJDForms.CollectForms { partial class CaiNiXiHuanCollectForm { @@ -34,12 +34,12 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); - this.btnExport = new LittleRabbit.UserControls.ButtonEx(); - this.ucGroupBoxEx1 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components); + this.btnExport = new TemuKJD.UserControls.ButtonEx(); + this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.txtKeyWords = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.btnLoginDouyin = new LittleRabbit.UserControls.ButtonEx(); - this.btnCollect = new LittleRabbit.UserControls.ButtonEx(); - this.ucGroupBoxEx2 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components); + this.btnLoginDouyin = new TemuKJD.UserControls.ButtonEx(); + this.btnCollect = new TemuKJD.UserControls.ButtonEx(); + this.ucGroupBoxEx2 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.label4 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label(); this.txtRateMax = new System.Windows.Forms.TextBox(); @@ -60,7 +60,7 @@ this.label15 = new System.Windows.Forms.Label(); this.txtSellCountMin = new System.Windows.Forms.TextBox(); this.label16 = new System.Windows.Forms.Label(); - this.dgvCollect = new LittleRabbit.UserComponent.DataGridViewEx(); + this.dgvCollect = new TemuKJD.UserComponent.DataGridViewEx(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colProductId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colProductName = new System.Windows.Forms.DataGridViewLinkColumn(); @@ -70,7 +70,7 @@ this.colCommentCount = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colRate = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colDelete = new System.Windows.Forms.DataGridViewLinkColumn(); - this.statusBar = new LittleRabbit.UserControls.StatusBarUserControl(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -148,7 +148,7 @@ // ucGroupBoxEx1 // this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.ucGroupBoxEx1.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; this.ucGroupBoxEx1.Controls.Add(this.txtKeyWords); this.ucGroupBoxEx1.Location = new System.Drawing.Point(3, 2); this.ucGroupBoxEx1.Name = "ucGroupBoxEx1"; @@ -210,7 +210,7 @@ // ucGroupBoxEx2 // this.ucGroupBoxEx2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.ucGroupBoxEx2.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx2.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; this.ucGroupBoxEx2.Controls.Add(this.label4); this.ucGroupBoxEx2.Controls.Add(this.label3); this.ucGroupBoxEx2.Controls.Add(this.txtRateMax); diff --git a/TEMUKJD/KJDForms/CollectForms/CaiNiXiHuanCollectForm.cs b/TEMUKJD/KJDForms/CollectForms/CaiNiXiHuanCollectForm.cs index afeace2..06a0f23 100644 --- a/TEMUKJD/KJDForms/CollectForms/CaiNiXiHuanCollectForm.cs +++ b/TEMUKJD/KJDForms/CollectForms/CaiNiXiHuanCollectForm.cs @@ -1,7 +1,7 @@ using AllBase; using AllBase.Helper; using AllBase.Model.Result; -using LittleRabbit.LittleRabbitForms.ToolForms; +using TemuKJD.KJDForms.ToolForms; using NaiBa.Util.Extension; using Newtonsoft.Json.Linq; using System; @@ -17,7 +17,7 @@ using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; -namespace LittleRabbit.LittleRabbitForms.CollectForms +namespace TemuKJD.KJDForms.CollectForms { public partial class CaiNiXiHuanCollectForm : Form { @@ -45,7 +45,7 @@ namespace LittleRabbit.LittleRabbitForms.CollectForms } else { - var cookieShop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.LoginStatus == "登录成功"); + var cookieShop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.LoginStatus == "登录成功"); if (cookieShop == null) { BaseForms.BaseMsgForm.ShowError("请登录店铺账号后搜索"); diff --git a/TEMUKJD/KJDForms/CollectForms/CollectForm.Designer.cs b/TEMUKJD/KJDForms/CollectForms/CollectForm.Designer.cs index 88bb31c..9005367 100644 --- a/TEMUKJD/KJDForms/CollectForms/CollectForm.Designer.cs +++ b/TEMUKJD/KJDForms/CollectForms/CollectForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.CollectForms +namespace TemuKJD.KJDForms.CollectForms { partial class CollectForm { @@ -43,7 +43,7 @@ this.panel3 = new System.Windows.Forms.Panel(); this.panel2 = new System.Windows.Forms.Panel(); this.lblName = new System.Windows.Forms.Label(); - this.tv = new LittleRabbit.UserComponent.UcTreeView(); + this.tv = new TemuKJD.UserComponent.UcTreeView(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.panel1.SuspendLayout(); this.panel2.SuspendLayout(); diff --git a/TEMUKJD/KJDForms/CollectForms/CollectForm.cs b/TEMUKJD/KJDForms/CollectForms/CollectForm.cs index e5dca4f..51ef0e0 100644 --- a/TEMUKJD/KJDForms/CollectForms/CollectForm.cs +++ b/TEMUKJD/KJDForms/CollectForms/CollectForm.cs @@ -9,7 +9,7 @@ using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; -namespace LittleRabbit.LittleRabbitForms.CollectForms +namespace TemuKJD.KJDForms.CollectForms { public partial class CollectForm : Form { diff --git a/TEMUKJD/KJDForms/CollectForms/FriendShopCollectForm.Designer.cs b/TEMUKJD/KJDForms/CollectForms/FriendShopCollectForm.Designer.cs index 87773ce..de5bc10 100644 --- a/TEMUKJD/KJDForms/CollectForms/FriendShopCollectForm.Designer.cs +++ b/TEMUKJD/KJDForms/CollectForms/FriendShopCollectForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.CollectForms +namespace TemuKJD.KJDForms.CollectForms { partial class FriendShopCollectForm { @@ -33,12 +33,12 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.btnExport = new LittleRabbit.UserControls.ButtonEx(); - this.ucGroupBoxEx1 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components); + this.btnExport = new TemuKJD.UserControls.ButtonEx(); + this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.txtKeyWords = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.btnLoginDouyin = new LittleRabbit.UserControls.ButtonEx(); - this.btnCollect = new LittleRabbit.UserControls.ButtonEx(); - this.ucGroupBoxEx2 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components); + this.btnLoginDouyin = new TemuKJD.UserControls.ButtonEx(); + this.btnCollect = new TemuKJD.UserControls.ButtonEx(); + this.ucGroupBoxEx2 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.cmbSort = new System.Windows.Forms.ComboBox(); this.txtScoreRateMax = new System.Windows.Forms.TextBox(); this.checkBox1 = new System.Windows.Forms.CheckBox(); @@ -57,7 +57,7 @@ this.txtShopSalesMin = new System.Windows.Forms.TextBox(); this.label16 = new System.Windows.Forms.Label(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); - this.dgvCollect = new LittleRabbit.UserComponent.DataGridViewEx(); + this.dgvCollect = new TemuKJD.UserComponent.DataGridViewEx(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colKeyword = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -67,7 +67,7 @@ this.colShopCount = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colProductId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colDelete = new System.Windows.Forms.DataGridViewLinkColumn(); - this.statusBar = new LittleRabbit.UserControls.StatusBarUserControl(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -124,7 +124,7 @@ // ucGroupBoxEx1 // this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.ucGroupBoxEx1.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; this.ucGroupBoxEx1.Controls.Add(this.txtKeyWords); this.ucGroupBoxEx1.Location = new System.Drawing.Point(3, 2); this.ucGroupBoxEx1.Name = "ucGroupBoxEx1"; @@ -185,7 +185,7 @@ // ucGroupBoxEx2 // this.ucGroupBoxEx2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.ucGroupBoxEx2.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx2.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; this.ucGroupBoxEx2.Controls.Add(this.cmbSort); this.ucGroupBoxEx2.Controls.Add(this.txtScoreRateMax); this.ucGroupBoxEx2.Controls.Add(this.checkBox1); diff --git a/TEMUKJD/KJDForms/CollectForms/FriendShopCollectForm.cs b/TEMUKJD/KJDForms/CollectForms/FriendShopCollectForm.cs index cc0df4d..24e7963 100644 --- a/TEMUKJD/KJDForms/CollectForms/FriendShopCollectForm.cs +++ b/TEMUKJD/KJDForms/CollectForms/FriendShopCollectForm.cs @@ -1,8 +1,8 @@ using AllBase; using AllBase.Helper; using AllBase.Model.Result; -using LittleRabbit.LittleRabbitForms.BaseForms; -using LittleRabbit.LittleRabbitForms.ToolForms; +using TemuKJD.KJDForms.BaseForms; +using TemuKJD.KJDForms.ToolForms; using NaiBa.Util.Extension; using Newtonsoft.Json.Linq; using System; @@ -18,7 +18,7 @@ using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; -namespace LittleRabbit.LittleRabbitForms.CollectForms +namespace TemuKJD.KJDForms.CollectForms { public partial class FriendShopCollectForm : Form { @@ -134,7 +134,7 @@ namespace LittleRabbit.LittleRabbitForms.CollectForms return; } - var cookieShop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.LoginStatus == "登录成功"); + var cookieShop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.LoginStatus == "登录成功"); if (cookieShop == null) { BaseForms.BaseMsgForm.ShowError("请登录店铺账号后搜索"); diff --git a/TEMUKJD/KJDForms/CollectForms/HaoWuCollectForm.Designer.cs b/TEMUKJD/KJDForms/CollectForms/HaoWuCollectForm.Designer.cs index 3512ef1..3d53f2b 100644 --- a/TEMUKJD/KJDForms/CollectForms/HaoWuCollectForm.Designer.cs +++ b/TEMUKJD/KJDForms/CollectForms/HaoWuCollectForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.CollectForms +namespace TemuKJD.KJDForms.CollectForms { partial class HaoWuCollectForm { @@ -33,8 +33,8 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.btnExport = new LittleRabbit.UserControls.ButtonEx(); - this.ucGroupBoxEx1 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components); + this.btnExport = new TemuKJD.UserControls.ButtonEx(); + this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.cmbCategory = new System.Windows.Forms.ComboBox(); this.txtRateMax = new System.Windows.Forms.TextBox(); this.chkShowImage = new System.Windows.Forms.CheckBox(); @@ -52,10 +52,10 @@ this.label3 = new System.Windows.Forms.Label(); this.txtSaleCountMin = new System.Windows.Forms.TextBox(); this.label4 = new System.Windows.Forms.Label(); - this.btnLoginDouyin = new LittleRabbit.UserControls.ButtonEx(); - this.btnCollect = new LittleRabbit.UserControls.ButtonEx(); + this.btnLoginDouyin = new TemuKJD.UserControls.ButtonEx(); + this.btnCollect = new TemuKJD.UserControls.ButtonEx(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); - this.dgvCollect = new LittleRabbit.UserComponent.DataGridViewEx(); + this.dgvCollect = new TemuKJD.UserComponent.DataGridViewEx(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colProductId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colProductName = new System.Windows.Forms.DataGridViewLinkColumn(); @@ -67,7 +67,7 @@ this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colShopCount = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colDelete = new System.Windows.Forms.DataGridViewLinkColumn(); - this.statusBar = new LittleRabbit.UserControls.StatusBarUserControl(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -122,7 +122,7 @@ // ucGroupBoxEx1 // this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.ucGroupBoxEx1.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; this.ucGroupBoxEx1.Controls.Add(this.cmbCategory); this.ucGroupBoxEx1.Controls.Add(this.txtRateMax); this.ucGroupBoxEx1.Controls.Add(this.chkShowImage); diff --git a/TEMUKJD/KJDForms/CollectForms/HaoWuCollectForm.cs b/TEMUKJD/KJDForms/CollectForms/HaoWuCollectForm.cs index 249db98..d8d0edb 100644 --- a/TEMUKJD/KJDForms/CollectForms/HaoWuCollectForm.cs +++ b/TEMUKJD/KJDForms/CollectForms/HaoWuCollectForm.cs @@ -1,7 +1,7 @@ using AllBase; using AllBase.Helper; using AllBase.Model.Result; -using LittleRabbit.LittleRabbitForms.ToolForms; +using TemuKJD.KJDForms.ToolForms; using NaiBa.Util.Extension; using System; using System.Collections.Generic; @@ -18,7 +18,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using Work.BLL.Collect; -namespace LittleRabbit.LittleRabbitForms.CollectForms +namespace TemuKJD.KJDForms.CollectForms { public partial class HaoWuCollectForm : Form { diff --git a/TEMUKJD/KJDForms/CollectForms/KeywordCollectForm.Designer.cs b/TEMUKJD/KJDForms/CollectForms/KeywordCollectForm.Designer.cs index 1f53278..64226d5 100644 --- a/TEMUKJD/KJDForms/CollectForms/KeywordCollectForm.Designer.cs +++ b/TEMUKJD/KJDForms/CollectForms/KeywordCollectForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.CollectForms +namespace TemuKJD.KJDForms.CollectForms { partial class KeywordCollectForm { @@ -33,12 +33,12 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.btnExport = new LittleRabbit.UserControls.ButtonEx(); - this.ucGroupBoxEx1 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components); + this.btnExport = new TemuKJD.UserControls.ButtonEx(); + this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.txtKeyWords = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.btnLoginDouyin = new LittleRabbit.UserControls.ButtonEx(); - this.btnCollect = new LittleRabbit.UserControls.ButtonEx(); - this.ucGroupBoxEx2 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components); + this.btnLoginDouyin = new TemuKJD.UserControls.ButtonEx(); + this.btnCollect = new TemuKJD.UserControls.ButtonEx(); + this.ucGroupBoxEx2 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.cmbCategory = new System.Windows.Forms.ComboBox(); this.label9 = new System.Windows.Forms.Label(); this.txtCommentRateMax = new System.Windows.Forms.TextBox(); @@ -68,7 +68,7 @@ this.txtSellCountMin = new System.Windows.Forms.TextBox(); this.label16 = new System.Windows.Forms.Label(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); - this.dgvCollect = new LittleRabbit.UserComponent.DataGridViewEx(); + this.dgvCollect = new TemuKJD.UserComponent.DataGridViewEx(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colKeyword = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colProductId = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -82,7 +82,7 @@ this.colScore = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colShopNmae = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colDelete = new System.Windows.Forms.DataGridViewLinkColumn(); - this.statusBar = new LittleRabbit.UserControls.StatusBarUserControl(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -140,7 +140,7 @@ // ucGroupBoxEx1 // this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.ucGroupBoxEx1.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; this.ucGroupBoxEx1.Controls.Add(this.txtKeyWords); this.ucGroupBoxEx1.Location = new System.Drawing.Point(3, 2); this.ucGroupBoxEx1.Name = "ucGroupBoxEx1"; @@ -204,7 +204,7 @@ // ucGroupBoxEx2 // this.ucGroupBoxEx2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.ucGroupBoxEx2.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx2.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; this.ucGroupBoxEx2.Controls.Add(this.cmbCategory); this.ucGroupBoxEx2.Controls.Add(this.label9); this.ucGroupBoxEx2.Controls.Add(this.txtCommentRateMax); diff --git a/TEMUKJD/KJDForms/CollectForms/KeywordCollectForm.cs b/TEMUKJD/KJDForms/CollectForms/KeywordCollectForm.cs index 0919e96..25ddfb7 100644 --- a/TEMUKJD/KJDForms/CollectForms/KeywordCollectForm.cs +++ b/TEMUKJD/KJDForms/CollectForms/KeywordCollectForm.cs @@ -1,7 +1,7 @@ using AllBase; using AllBase.Helper; using AllBase.Model.Result; -using LittleRabbit.LittleRabbitForms.ToolForms; +using TemuKJD.KJDForms.ToolForms; using NaiBa.Util.Extension; using Newtonsoft.Json.Linq; using System; @@ -17,7 +17,7 @@ using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; -namespace LittleRabbit.LittleRabbitForms.CollectForms +namespace TemuKJD.KJDForms.CollectForms { public partial class KeywordCollectForm : Form { @@ -94,7 +94,7 @@ namespace LittleRabbit.LittleRabbitForms.CollectForms return; } - var cookieShop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.LoginStatus == "登录成功"); + var cookieShop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.LoginStatus == "登录成功"); if (cookieShop == null) { BaseForms.BaseMsgForm.ShowError("请登录店铺账号后搜索"); diff --git a/TEMUKJD/KJDForms/CollectForms/ShopProductCollectForm.Designer.cs b/TEMUKJD/KJDForms/CollectForms/ShopProductCollectForm.Designer.cs index f9b1f29..65c4800 100644 --- a/TEMUKJD/KJDForms/CollectForms/ShopProductCollectForm.Designer.cs +++ b/TEMUKJD/KJDForms/CollectForms/ShopProductCollectForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.CollectForms +namespace TemuKJD.KJDForms.CollectForms { partial class ShopProductCollectForm { @@ -33,12 +33,12 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.btnExport = new LittleRabbit.UserControls.ButtonEx(); - this.ucGroupBoxEx1 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components); + this.btnExport = new TemuKJD.UserControls.ButtonEx(); + this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.txtKeyWords = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.btnLoginDouyin = new LittleRabbit.UserControls.ButtonEx(); - this.btnCollect = new LittleRabbit.UserControls.ButtonEx(); - this.ucGroupBoxEx2 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components); + this.btnLoginDouyin = new TemuKJD.UserControls.ButtonEx(); + this.btnCollect = new TemuKJD.UserControls.ButtonEx(); + this.ucGroupBoxEx2 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.txtFilter = new DevComponents.DotNetBar.Controls.TextBoxX(); this.label10 = new System.Windows.Forms.Label(); this.txtTotalPage = new System.Windows.Forms.TextBox(); @@ -52,7 +52,7 @@ this.txtSellCountMin = new System.Windows.Forms.TextBox(); this.label16 = new System.Windows.Forms.Label(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); - this.dgvCollect = new LittleRabbit.UserComponent.DataGridViewEx(); + this.dgvCollect = new TemuKJD.UserComponent.DataGridViewEx(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colProductId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colProductName = new System.Windows.Forms.DataGridViewLinkColumn(); @@ -61,7 +61,7 @@ this.colSaleCount = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colPrice = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colDelete = new System.Windows.Forms.DataGridViewLinkColumn(); - this.statusBar = new LittleRabbit.UserControls.StatusBarUserControl(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -118,7 +118,7 @@ // ucGroupBoxEx1 // this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.ucGroupBoxEx1.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; this.ucGroupBoxEx1.Controls.Add(this.txtKeyWords); this.ucGroupBoxEx1.Location = new System.Drawing.Point(3, 2); this.ucGroupBoxEx1.Name = "ucGroupBoxEx1"; @@ -182,7 +182,7 @@ // ucGroupBoxEx2 // this.ucGroupBoxEx2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.ucGroupBoxEx2.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx2.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; this.ucGroupBoxEx2.Controls.Add(this.txtFilter); this.ucGroupBoxEx2.Controls.Add(this.label10); this.ucGroupBoxEx2.Controls.Add(this.txtTotalPage); diff --git a/TEMUKJD/KJDForms/CollectForms/ShopProductCollectForm.cs b/TEMUKJD/KJDForms/CollectForms/ShopProductCollectForm.cs index 8ca69ad..c8e6587 100644 --- a/TEMUKJD/KJDForms/CollectForms/ShopProductCollectForm.cs +++ b/TEMUKJD/KJDForms/CollectForms/ShopProductCollectForm.cs @@ -1,6 +1,6 @@ using AllBase; using AllBase.Model.Result; -using LittleRabbit.LittleRabbitForms.ToolForms; +using TemuKJD.KJDForms.ToolForms; using NaiBa.Util.Extension; using Newtonsoft.Json.Linq; using System; @@ -17,7 +17,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using Work.BLL.Collect; -namespace LittleRabbit.LittleRabbitForms.CollectForms +namespace TemuKJD.KJDForms.CollectForms { public partial class ShopProductCollectForm : Form { diff --git a/TEMUKJD/KJDForms/OrderForms/OrderForm.Designer.cs b/TEMUKJD/KJDForms/OrderForms/OrderForm.Designer.cs index 22d596e..0790a4b 100644 --- a/TEMUKJD/KJDForms/OrderForms/OrderForm.Designer.cs +++ b/TEMUKJD/KJDForms/OrderForms/OrderForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.OrderForms +namespace TemuKJD.KJDForms.OrderForms { partial class OrderForm { @@ -31,7 +31,7 @@ System.Windows.Forms.TreeNode treeNode3 = new System.Windows.Forms.TreeNode("添加子节点"); System.Windows.Forms.TreeNode treeNode4 = new System.Windows.Forms.TreeNode("订单管理", new System.Windows.Forms.TreeNode[] { treeNode3}); - this.tv = new LittleRabbit.UserComponent.UcTreeView(); + this.tv = new TemuKJD.UserComponent.UcTreeView(); this.panel1 = new System.Windows.Forms.Panel(); this.panel3 = new System.Windows.Forms.Panel(); this.panel2 = new System.Windows.Forms.Panel(); diff --git a/TEMUKJD/KJDForms/OrderForms/OrderForm.cs b/TEMUKJD/KJDForms/OrderForms/OrderForm.cs index 12fccfd..08af283 100644 --- a/TEMUKJD/KJDForms/OrderForms/OrderForm.cs +++ b/TEMUKJD/KJDForms/OrderForms/OrderForm.cs @@ -8,7 +8,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace LittleRabbit.LittleRabbitForms.OrderForms +namespace TemuKJD.KJDForms.OrderForms { public partial class OrderForm : Form { diff --git a/TEMUKJD/KJDForms/SalesCenterForms/CouponForm.Designer.cs b/TEMUKJD/KJDForms/SalesCenterForms/CouponForm.Designer.cs index 2673829..83655d4 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/CouponForm.Designer.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/CouponForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.SalesCenterForms +namespace TemuKJD.KJDForms.SalesCenterForms { partial class CouponForm { @@ -34,7 +34,7 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.splitContainer5 = new System.Windows.Forms.SplitContainer(); - this.ucGroupBoxEx3 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components); + this.ucGroupBoxEx3 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.pbPaste2 = new System.Windows.Forms.PictureBox(); this.pbPaste1 = new System.Windows.Forms.PictureBox(); this.txtFilter = new DevComponents.DotNetBar.Controls.TextBoxX(); @@ -53,7 +53,7 @@ this.btnStopGetProduct = new DevComponents.DotNetBar.PanelEx(); this.btnGetProduct = new DevComponents.DotNetBar.PanelEx(); this.rbOffSale = new System.Windows.Forms.RadioButton(); - this.ucGroupBoxEx2 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components); + this.ucGroupBoxEx2 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); this.nudThresHold = new System.Windows.Forms.NumericUpDown(); this.lblThresHold = new System.Windows.Forms.Label(); @@ -94,11 +94,11 @@ this.btnStopOperate = new DevComponents.DotNetBar.PanelEx(); this.nudDays = new System.Windows.Forms.NumericUpDown(); this.label7 = new System.Windows.Forms.Label(); - this.ucGroupBoxEx1 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components); - this.btnRefreshShop = new LittleRabbit.UserControls.ButtonEx(); + this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); + this.btnRefreshShop = new TemuKJD.UserControls.ButtonEx(); this.splitContainer3 = new System.Windows.Forms.SplitContainer(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); - this.dgvShop = new LittleRabbit.UserComponent.DataGridViewEx(); + this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -107,11 +107,11 @@ this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); - this.ucTabControl1 = new LittleRabbit.UserComponent.UcTabControl(); + this.ucTabControl1 = new TemuKJD.UserComponent.UcTabControl(); this.tabPageCheckResult = new System.Windows.Forms.TabPage(); this.tabPageViolateFileList = new System.Windows.Forms.TabPage(); this.splitContainer4 = new System.Windows.Forms.SplitContainer(); - this.statusBar = new LittleRabbit.UserControls.StatusBarUserControl(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); this.btnClear = new DevComponents.DotNetBar.PanelEx(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); @@ -197,7 +197,7 @@ | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.ucGroupBoxEx3.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.ucGroupBoxEx3.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx3.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; this.ucGroupBoxEx3.Controls.Add(this.pbPaste2); this.ucGroupBoxEx3.Controls.Add(this.pbPaste1); this.ucGroupBoxEx3.Controls.Add(this.txtFilter); @@ -227,7 +227,7 @@ // this.pbPaste2.BackColor = System.Drawing.Color.White; this.pbPaste2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.pbPaste2.Image = global::LittleRabbit.Properties.Resources.FullPaste; + this.pbPaste2.Image = global::TemuKJD.Properties.Resources.FullPaste; this.pbPaste2.Location = new System.Drawing.Point(277, 81); this.pbPaste2.Name = "pbPaste2"; this.pbPaste2.Size = new System.Drawing.Size(23, 23); @@ -240,7 +240,7 @@ // this.pbPaste1.BackColor = System.Drawing.Color.White; this.pbPaste1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.pbPaste1.Image = global::LittleRabbit.Properties.Resources.FullPaste; + this.pbPaste1.Image = global::TemuKJD.Properties.Resources.FullPaste; this.pbPaste1.Location = new System.Drawing.Point(277, 52); this.pbPaste1.Name = "pbPaste1"; this.pbPaste1.Size = new System.Drawing.Size(23, 23); @@ -444,7 +444,7 @@ | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.ucGroupBoxEx2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.ucGroupBoxEx2.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx2.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; this.ucGroupBoxEx2.Controls.Add(this.flowLayoutPanel1); this.ucGroupBoxEx2.Controls.Add(this.pnlTimePeriod); this.ucGroupBoxEx2.Controls.Add(this.panel3); @@ -927,7 +927,7 @@ this.ucGroupBoxEx1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.ucGroupBoxEx1.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; this.ucGroupBoxEx1.Controls.Add(this.btnRefreshShop); this.ucGroupBoxEx1.Location = new System.Drawing.Point(3, 2); this.ucGroupBoxEx1.Name = "ucGroupBoxEx1"; diff --git a/TEMUKJD/KJDForms/SalesCenterForms/CouponForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/CouponForm.cs index 4985103..210bde3 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/CouponForm.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/CouponForm.cs @@ -3,9 +3,9 @@ using AllBase.Helper; using AllBase.Model.Result; using CefSharp; using CefSharp.WinForms; -using LittleRabbit.Extension; -using LittleRabbit.Helper; -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.Extension; +using TemuKJD.Helper; +using TemuKJD.KJDForms.BaseForms; using NaiBa.CefHelper; using NaiBa.CefHelper.Handler; using NaiBa.Util.Extension; @@ -21,7 +21,7 @@ using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; -namespace LittleRabbit.LittleRabbitForms.SalesCenterForms +namespace TemuKJD.KJDForms.SalesCenterForms { public partial class CouponForm : Form { @@ -65,7 +65,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms else { lstShopId.Clear(); - var list = GlobalConfig.DouShopLoginList.Where(s => s.ApiAuthStatus == "授权成功" && s.LoginStatus == "登录成功").Select(ss => ss.ShopAccountId); + var list = GlobalConfig.ShopLoginList.Where(s => s.ApiAuthStatus == "授权成功" && s.LoginStatus == "登录成功").Select(ss => ss.ShopId); lstShopId.AddRange(list); foreach (DataGridViewRow row in dgvShop.Rows) { @@ -89,17 +89,17 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms private void RefreshShop() { // 更新选中的上货店铺Id - lstShopId = lstShopId.Where(id => GlobalConfig.DouShopLoginList.Any(s => s.ShopAccountId == id && s.LoginStatus == "已授权")).ToList(); + lstShopId = lstShopId.Where(id => GlobalConfig.ShopLoginList.Any(s => s.ShopId == id && s.LoginStatus == "已授权")).ToList(); // 获取被删除的店铺 List dgvRowList = dgvShop.Rows.Cast().Where(row - => !GlobalConfig.DouShopLoginList.Any(s => s.ShopAccountId == row.Cells["colShopId"]?.Value?.ToString())).ToList(); + => !GlobalConfig.ShopLoginList.Any(s => s.ShopId == row.Cells["colShopId"]?.Value?.ToString())).ToList(); // 更新被删除的店铺列表 foreach (var row in dgvRowList) { dgvShop.Rows.Remove(row); } // 绑定其他店铺（含新导入的店铺） - foreach (DouShopLoginInfo shopEntity in GlobalConfig.DouShopLoginList) + foreach (DouShopLoginInfo shopEntity in GlobalConfig.ShopLoginList) { BindShop(shopEntity); } @@ -111,12 +111,12 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms return; bool canUse = shopEntity.ApiAuthStatus == "授权成功" && shopEntity.LoginStatus == "登录成功"; - var row = dgvShop.Rows.Cast().FirstOrDefault(p => p.Cells.GetCellValueFromColumnName("colShopId").ParseToString() == shopEntity.ShopAccountId); + var row = dgvShop.Rows.Cast().FirstOrDefault(p => p.Cells.GetCellValueFromColumnName("colShopId").ParseToString() == shopEntity.ShopId); if (row == null) { this.dgvShop.Rows.Add( - lstShopId.Contains(shopEntity.ShopAccountId) && canUse, - shopEntity.ShopAccountId, + lstShopId.Contains(shopEntity.ShopId) && canUse, + shopEntity.ShopId, shopEntity.ShopAccount, shopEntity.ApiAuthStatus, shopEntity.LoginStatus, @@ -126,7 +126,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms } else { - row.Cells["colSelect"].Value = lstShopId.Contains(shopEntity.ShopAccountId) && canUse; + row.Cells["colSelect"].Value = lstShopId.Contains(shopEntity.ShopId) && canUse; row.Cells["colShopName"].Value = shopEntity.ShopAccount; row.Cells["colAuthStatus"].Value = shopEntity.ApiAuthStatus; row.Cells["colLoginStatus"].Value = shopEntity.LoginStatus; @@ -142,7 +142,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms string columnName = dgvShop.Columns[e.ColumnIndex].Name; long shopId = dgvShop.Rows[e.RowIndex].Cells["colShopId"].Value.ParseToLong(); string shopName = dgvShop.Rows[e.RowIndex].Cells["colShopId"].Value.ToString(); - var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ShopAccountId == shopId.ToString()); + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId.ToString()); var row = dgvShop.Rows[e.RowIndex]; switch (columnName) { @@ -191,18 +191,18 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms if (cancellationTokenSource.IsCancellationRequested) break; - var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ShopAccountId == shopId); + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId); if (shop == null) continue; CouponShopForm couponShopForm = null; Invoke(new Action(() => { - var tab = this.ucTabControl1.TabPages.Cast().FirstOrDefault(t => t.Text == shop.ShopAccount && t.Name == "tab" + shop.ShopAccountId); + var tab = this.ucTabControl1.TabPages.Cast().FirstOrDefault(t => t.Text == shop.ShopAccount && t.Name == "tab" + shop.ShopId); if (tab == null) { tab = new TabPage(); - tab.Name = "tab" + shop.ShopAccountId; + tab.Name = "tab" + shop.ShopId; tab.Text = shop.ShopAccount; this.ucTabControl1.TabPages.Add(tab); @@ -341,7 +341,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms if (webBrowser.Tag != null) { var shop = webBrowser.Tag as DouShopLoginInfo; - var tab = this.ucTabControl1.TabPages.Cast().FirstOrDefault(t => t.Text == shop.ShopAccount && t.Name == "tab" + shop.ShopAccountId); + var tab = this.ucTabControl1.TabPages.Cast().FirstOrDefault(t => t.Text == shop.ShopAccount && t.Name == "tab" + shop.ShopId); var clearForm = tab.Controls[0] as CouponShopForm; Task.Run(() => diff --git a/TEMUKJD/KJDForms/SalesCenterForms/CouponMulitAddForm.Designer.cs b/TEMUKJD/KJDForms/SalesCenterForms/CouponMulitAddForm.Designer.cs index 367a5ec..e4f76f3 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/CouponMulitAddForm.Designer.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/CouponMulitAddForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.SalesCenterForms +namespace TemuKJD.KJDForms.SalesCenterForms { partial class CouponMulitAddForm { @@ -49,7 +49,7 @@ this.label6 = new System.Windows.Forms.Label(); this.panel3 = new System.Windows.Forms.Panel(); this.lblAdd = new System.Windows.Forms.LinkLabel(); - this.ucCouponAddParam = new LittleRabbit.LittleRabbitForms.SalesCenterForms.UcCouponAddParam(); + this.ucCouponAddParam = new TemuKJD.KJDForms.SalesCenterForms.UcCouponAddParam(); this.panel2.SuspendLayout(); this.panel4.SuspendLayout(); this.panel3.SuspendLayout(); @@ -285,7 +285,7 @@ this.ucCouponAddParam.Name = "ucCouponAddParam"; this.ucCouponAddParam.Size = new System.Drawing.Size(1180, 40); this.ucCouponAddParam.TabIndex = 0; - this.ucCouponAddParam.OnClose += new LittleRabbit.LittleRabbitForms.SalesCenterForms.UcCouponAddParam.CloseCouponAdd(this.couponAddParamControl1_OnClose); + this.ucCouponAddParam.OnClose += new TemuKJD.KJDForms.SalesCenterForms.UcCouponAddParam.CloseCouponAdd(this.couponAddParamControl1_OnClose); // // CouponMulitAddForm // diff --git a/TEMUKJD/KJDForms/SalesCenterForms/CouponMulitAddForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/CouponMulitAddForm.cs index d9d50be..ac25961 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/CouponMulitAddForm.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/CouponMulitAddForm.cs @@ -1,5 +1,5 @@ using AllBase; -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.KJDForms.BaseForms; using NaiBa.Util.Extension; using System; using System.Collections.Generic; @@ -12,7 +12,7 @@ using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; -namespace LittleRabbit.LittleRabbitForms.SalesCenterForms +namespace TemuKJD.KJDForms.SalesCenterForms { public partial class CouponMulitAddForm : LRBaseForm { diff --git a/TEMUKJD/KJDForms/SalesCenterForms/CouponShopForm.Designer.cs b/TEMUKJD/KJDForms/SalesCenterForms/CouponShopForm.Designer.cs index 0e1f49c..34d46b4 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/CouponShopForm.Designer.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/CouponShopForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.SalesCenterForms +namespace TemuKJD.KJDForms.SalesCenterForms { partial class CouponShopForm { @@ -33,11 +33,11 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); - this.dgvProduct = new LittleRabbit.UserComponent.DataGridViewEx(); + this.dgvProduct = new TemuKJD.UserComponent.DataGridViewEx(); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.编辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.label1 = new System.Windows.Forms.Label(); - this.statusBar = new LittleRabbit.UserControls.StatusBarUserControl(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colProductId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colProductName = new System.Windows.Forms.DataGridViewTextBoxColumn(); diff --git a/TEMUKJD/KJDForms/SalesCenterForms/CouponShopForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/CouponShopForm.cs index 6cbd574..0fa00ad 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/CouponShopForm.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/CouponShopForm.cs @@ -2,8 +2,8 @@ using AllBase.Extension; using AllBase.Helper; using AllBase.Model.Result; -using LittleRabbit.Extension; -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.Extension; +using TemuKJD.KJDForms.BaseForms; using NaiBa.Util.Extension; using Newtonsoft.Json.Linq; using System; @@ -18,7 +18,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using Work.BLL.Product; -namespace LittleRabbit.LittleRabbitForms.SalesCenterForms +namespace TemuKJD.KJDForms.SalesCenterForms { public partial class CouponShopForm : Form { diff --git a/TEMUKJD/KJDForms/SalesCenterForms/DouProductProPromotionListSkuInfoForm.Designer.cs b/TEMUKJD/KJDForms/SalesCenterForms/DouProductProPromotionListSkuInfoForm.Designer.cs index 2768655..9a5fc42 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/DouProductProPromotionListSkuInfoForm.Designer.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/DouProductProPromotionListSkuInfoForm.Designer.cs @@ -1,5 +1,5 @@  -namespace LittleRabbit.LittleRabbitForms.SalesCenterForms +namespace TemuKJD.KJDForms.SalesCenterForms { partial class DouProductProPromotionListSkuInfoForm { diff --git a/TEMUKJD/KJDForms/SalesCenterForms/DouProductProPromotionListSkuInfoForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/DouProductProPromotionListSkuInfoForm.cs index c64da4e..5e7e01a 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/DouProductProPromotionListSkuInfoForm.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/DouProductProPromotionListSkuInfoForm.cs @@ -1,13 +1,13 @@ using AllBase; using AllBase.Model.Result; -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.KJDForms.BaseForms; using NaiBa.Util.Extension; using System; using System.Collections.Generic; using System.Linq; using System.Windows.Forms; -namespace LittleRabbit.LittleRabbitForms.SalesCenterForms +namespace TemuKJD.KJDForms.SalesCenterForms { public partial class DouProductProPromotionListSkuInfoForm : Form { diff --git a/TEMUKJD/KJDForms/SalesCenterForms/DouProductPromotionListSkuInfoEditForm.Designer.cs b/TEMUKJD/KJDForms/SalesCenterForms/DouProductPromotionListSkuInfoEditForm.Designer.cs index 8077499..2a53763 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/DouProductPromotionListSkuInfoEditForm.Designer.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/DouProductPromotionListSkuInfoEditForm.Designer.cs @@ -1,5 +1,5 @@  -namespace LittleRabbit.LittleRabbitForms.SalesCenterForms +namespace TemuKJD.KJDForms.SalesCenterForms { partial class DouProductPromotionListSkuInfoEditForm { @@ -47,7 +47,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms this.label2 = new System.Windows.Forms.Label(); this.btnDelete = new DevComponents.DotNetBar.PanelEx(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); - this.dgvActiveSku = new LittleRabbit.UserComponent.DataGridViewEx(); + this.dgvActiveSku = new TemuKJD.UserComponent.DataGridViewEx(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colSkuId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colSku = new System.Windows.Forms.DataGridViewTextBoxColumn(); diff --git a/TEMUKJD/KJDForms/SalesCenterForms/DouProductPromotionListSkuInfoEditForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/DouProductPromotionListSkuInfoEditForm.cs index f6eb2a1..6ca598c 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/DouProductPromotionListSkuInfoEditForm.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/DouProductPromotionListSkuInfoEditForm.cs @@ -1,11 +1,11 @@ -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.KJDForms.BaseForms; using NaiBa.Util.Extension; using System; using System.Collections.Generic; using System.Linq; using System.Windows.Forms; -namespace LittleRabbit.LittleRabbitForms.SalesCenterForms +namespace TemuKJD.KJDForms.SalesCenterForms { public partial class DouProductPromotionListSkuInfoEditForm : Form { diff --git a/TEMUKJD/KJDForms/SalesCenterForms/FullMinusActiveForm.Designer.cs b/TEMUKJD/KJDForms/SalesCenterForms/FullMinusActiveForm.Designer.cs index 457d114..76711aa 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/FullMinusActiveForm.Designer.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/FullMinusActiveForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.SalesCenterForms +namespace TemuKJD.KJDForms.SalesCenterForms { partial class FullMinusActiveForm { @@ -46,7 +46,7 @@ this.lblActivity = new System.Windows.Forms.Label(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); - this.dgvActive = new LittleRabbit.UserComponent.DataGridViewEx(); + this.dgvActive = new TemuKJD.UserComponent.DataGridViewEx(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colActiveId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colActiveName = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -57,7 +57,7 @@ this.colActiveState = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.label1 = new System.Windows.Forms.Label(); - this.statusBar = new LittleRabbit.UserControls.StatusBarUserControl(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); this.panel1.SuspendLayout(); this.panel4.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); diff --git a/TEMUKJD/KJDForms/SalesCenterForms/FullMinusActiveForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/FullMinusActiveForm.cs index 404b184..0763877 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/FullMinusActiveForm.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/FullMinusActiveForm.cs @@ -1,7 +1,7 @@ using AllBase; using AllBase.Helper; using AllBase.Model.Result; -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.KJDForms.BaseForms; using NaiBa.Util.Extension; using Newtonsoft.Json.Linq; using System; @@ -11,7 +11,7 @@ using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; -namespace LittleRabbit.LittleRabbitForms.SalesCenterForms +namespace TemuKJD.KJDForms.SalesCenterForms { public partial class FullMinusActiveForm : Form { diff --git a/TEMUKJD/KJDForms/SalesCenterForms/FullMinusForm.Designer.cs b/TEMUKJD/KJDForms/SalesCenterForms/FullMinusForm.Designer.cs index afbc5c4..41c8138 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/FullMinusForm.Designer.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/FullMinusForm.Designer.cs @@ -1,5 +1,5 @@  -namespace LittleRabbit.LittleRabbitForms.SalesCenterForms +namespace TemuKJD.KJDForms.SalesCenterForms { partial class FullMinusForm { @@ -34,8 +34,8 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.ucGroupBoxEx2 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components); - this.ucGroupBoxEx4 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components); + this.ucGroupBoxEx2 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); + this.ucGroupBoxEx4 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.panel12 = new System.Windows.Forms.Panel(); this.panel15 = new System.Windows.Forms.Panel(); this.btnRemove9 = new DevComponents.DotNetBar.PanelEx(); @@ -85,7 +85,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms this.panel9 = new System.Windows.Forms.Panel(); this.rdoReduction = new System.Windows.Forms.RadioButton(); this.rdoDiscount = new System.Windows.Forms.RadioButton(); - this.ucGroupBoxEx3 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components); + this.ucGroupBoxEx3 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.btnAdd1 = new DevComponents.DotNetBar.PanelEx(); this.panel7 = new System.Windows.Forms.Panel(); this.btnRemove5 = new DevComponents.DotNetBar.PanelEx(); @@ -142,11 +142,11 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms this.btnSubAct = new DevComponents.DotNetBar.PanelEx(); this.btnGetProduct = new DevComponents.DotNetBar.PanelEx(); this.btnStopGetProduct = new DevComponents.DotNetBar.PanelEx(); - this.ucGroupBoxEx1 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components); - this.btnRefreshShop = new LittleRabbit.UserControls.ButtonEx(); + this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); + this.btnRefreshShop = new TemuKJD.UserControls.ButtonEx(); this.splitContainer3 = new System.Windows.Forms.SplitContainer(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); - this.dgvShop = new LittleRabbit.UserComponent.DataGridViewEx(); + this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -155,10 +155,10 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); - this.ucTabControl1 = new LittleRabbit.UserComponent.UcTabControl(); + this.ucTabControl1 = new TemuKJD.UserComponent.UcTabControl(); this.tabPageCheckResult = new System.Windows.Forms.TabPage(); this.splitContainer4 = new System.Windows.Forms.SplitContainer(); - this.statusBar = new LittleRabbit.UserControls.StatusBarUserControl(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); this.btnClear = new DevComponents.DotNetBar.PanelEx(); this.tabPageViolateFileList = new System.Windows.Forms.TabPage(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); @@ -229,7 +229,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.ucGroupBoxEx2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.ucGroupBoxEx2.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx2.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; this.ucGroupBoxEx2.Controls.Add(this.ucGroupBoxEx4); this.ucGroupBoxEx2.Controls.Add(this.ucGroupBoxEx3); this.ucGroupBoxEx2.Controls.Add(this.label2); @@ -260,7 +260,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.ucGroupBoxEx4.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.ucGroupBoxEx4.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx4.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; this.ucGroupBoxEx4.Controls.Add(this.panel12); this.ucGroupBoxEx4.Controls.Add(this.panel16); this.ucGroupBoxEx4.Controls.Add(this.panel9); @@ -855,7 +855,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.ucGroupBoxEx3.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.ucGroupBoxEx3.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx3.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; this.ucGroupBoxEx3.Controls.Add(this.btnAdd1); this.ucGroupBoxEx3.Controls.Add(this.panel7); this.ucGroupBoxEx3.Controls.Add(this.panel6); @@ -1544,7 +1544,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms this.ucGroupBoxEx1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.ucGroupBoxEx1.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; this.ucGroupBoxEx1.Controls.Add(this.btnRefreshShop); this.ucGroupBoxEx1.Location = new System.Drawing.Point(2, 2); this.ucGroupBoxEx1.Name = "ucGroupBoxEx1"; diff --git a/TEMUKJD/KJDForms/SalesCenterForms/FullMinusForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/FullMinusForm.cs index f985df7..afe3bb7 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/FullMinusForm.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/FullMinusForm.cs @@ -2,10 +2,10 @@ using AllBase.Helper; using AllBase.Model.Result; using CefSharp.WinForms; -using LittleRabbit.Extension; -using LittleRabbit.Helper; -using LittleRabbit.LittleRabbitForms.BaseForms; -using LittleRabbit.LittleRabbitForms.ShopForms; +using TemuKJD.Extension; +using TemuKJD.Helper; +using TemuKJD.KJDForms.BaseForms; +using TemuKJD.KJDForms.ShopForms; using NaiBa.CefHelper; using NaiBa.CefHelper.Handler; using NaiBa.Util.Extension; @@ -18,7 +18,7 @@ using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; -namespace LittleRabbit.LittleRabbitForms.SalesCenterForms +namespace TemuKJD.KJDForms.SalesCenterForms { public partial class FullMinusForm : Form { @@ -58,7 +58,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms else { lstShopId.Clear(); - var list = GlobalConfig.DouShopLoginList.Where(s => s.ApiAuthStatus == "授权成功" && s.LoginStatus == "登录成功").Select(ss => ss.ShopAccountId); + var list = GlobalConfig.ShopLoginList.Where(s => s.ApiAuthStatus == "授权成功" && s.LoginStatus == "登录成功").Select(ss => ss.ShopId); lstShopId.AddRange(list); foreach (DataGridViewRow row in dgvShop.Rows) { @@ -76,17 +76,17 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms private void RefreshShop() { // 更新选中的上货店铺Id - lstShopId = lstShopId.Where(id => GlobalConfig.DouShopLoginList.Any(s => s.ShopAccountId == id && s.LoginStatus == "已授权")).ToList(); + lstShopId = lstShopId.Where(id => GlobalConfig.ShopLoginList.Any(s => s.ShopId == id && s.LoginStatus == "已授权")).ToList(); // 获取被删除的店铺 List dgvRowList = dgvShop.Rows.Cast().Where(row - => !GlobalConfig.DouShopLoginList.Any(s => s.ShopAccountId == row.Cells["colShopId"]?.Value?.ToString())).ToList(); + => !GlobalConfig.ShopLoginList.Any(s => s.ShopId == row.Cells["colShopId"]?.Value?.ToString())).ToList(); // 更新被删除的店铺列表 foreach (var row in dgvRowList) { dgvShop.Rows.Remove(row); } // 绑定其他店铺（含新导入的店铺） - foreach (DouShopLoginInfo shopEntity in GlobalConfig.DouShopLoginList) + foreach (DouShopLoginInfo shopEntity in GlobalConfig.ShopLoginList) { BindShop(shopEntity); } @@ -97,12 +97,12 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms return; bool canUse = shopEntity.ApiAuthStatus == "授权成功" && shopEntity.LoginStatus == "登录成功"; - var row = dgvShop.Rows.Cast().FirstOrDefault(p => p.Cells.GetCellValueFromColumnName("colShopId").ParseToString() == shopEntity.ShopAccountId); + var row = dgvShop.Rows.Cast().FirstOrDefault(p => p.Cells.GetCellValueFromColumnName("colShopId").ParseToString() == shopEntity.ShopId); if (row == null) { this.dgvShop.Rows.Add( - lstShopId.Contains(shopEntity.ShopAccountId) && canUse, - shopEntity.ShopAccountId, + lstShopId.Contains(shopEntity.ShopId) && canUse, + shopEntity.ShopId, shopEntity.ShopAccount, shopEntity.ApiAuthStatus, shopEntity.LoginStatus, @@ -112,7 +112,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms } else { - row.Cells["colSelect"].Value = lstShopId.Contains(shopEntity.ShopAccountId) && canUse; + row.Cells["colSelect"].Value = lstShopId.Contains(shopEntity.ShopId) && canUse; if (!row.Cells["colSelect"].Value.ParseToBool()) chkSelectAll.Checked = false; row.Cells["colShopName"].Value = shopEntity.ShopAccount; @@ -130,7 +130,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms string columnName = dgvShop.Columns[e.ColumnIndex].Name; long shopId = dgvShop.Rows[e.RowIndex].Cells["colShopId"].Value.ParseToLong(); string shopName = dgvShop.Rows[e.RowIndex].Cells["colShopId"].Value.ToString(); - var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ShopAccountId == shopId.ToString()); + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId.ToString()); var row = dgvShop.Rows[e.RowIndex]; switch (columnName) { @@ -548,7 +548,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms if (cancellationTokenSource.IsCancellationRequested) break; - var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ShopAccountId == shopId); + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId); if (shop == null) continue; @@ -559,7 +559,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms { Invoke(new Action(() => { - var row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + var row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colLoginStatus"].Value = "未登录"; @@ -572,11 +572,11 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms FullMinusShopForm fullMinusShopForm = null; Invoke(new Action(() => { - var tab = this.ucTabControl1.TabPages.Cast().FirstOrDefault(t => t.Text == shop.ShopAccount && t.Name == "tab" + shop.ShopAccountId); + var tab = this.ucTabControl1.TabPages.Cast().FirstOrDefault(t => t.Text == shop.ShopAccount && t.Name == "tab" + shop.ShopId); if (tab == null) { tab = new TabPage(); - tab.Name = "tab" + shop.ShopAccountId; + tab.Name = "tab" + shop.ShopId; tab.Text = shop.ShopAccount; ucTabControl1.TabPages.Add(tab); @@ -672,7 +672,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms } var shop = webBrowser.Tag as DouShopLoginInfo; - var tab = this.ucTabControl1.TabPages.Cast().FirstOrDefault(t => t.Text == shop.ShopAccount && t.Name == "tab" + shop.ShopAccountId); + var tab = this.ucTabControl1.TabPages.Cast().FirstOrDefault(t => t.Text == shop.ShopAccount && t.Name == "tab" + shop.ShopId); if (tab != null && this.btnManagerAct.Enabled == false) { var minusShopForm = tab.Controls[0] as FullMinusShopForm; @@ -688,7 +688,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms } else { - tab = this.ucTabControl1.TabPages.Cast().FirstOrDefault(t => t.Text == shop.ShopAccount + "活动管理" && t.Name == "tab" + shop.ShopAccountId + "Active"); + tab = this.ucTabControl1.TabPages.Cast().FirstOrDefault(t => t.Text == shop.ShopAccount + "活动管理" && t.Name == "tab" + shop.ShopId + "Active"); if (tab != null) { var activeForm = tab.Controls[0] as FullMinusActiveForm; @@ -743,7 +743,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms { foreach (var shopId in lstShopId) { - var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ShopAccountId == shopId); + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId); if (shop == null) continue; @@ -918,7 +918,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms if (dptStartTime.Value <= DateTime.Now && dptEndTime.Value > DateTime.Now) minusForm.RefreshdgvProduct(strList); - var tab1 = this.ucTabControl1.TabPages.Cast().FirstOrDefault(t => t.Text == shop.ShopAccount + "活动管理" && t.Name == "tab" + shop.ShopAccountId + "Active"); + var tab1 = this.ucTabControl1.TabPages.Cast().FirstOrDefault(t => t.Text == shop.ShopAccount + "活动管理" && t.Name == "tab" + shop.ShopId + "Active"); if (tab1 != null) { FullMinusActiveForm actForm = tab1.Controls[0] as FullMinusActiveForm; @@ -963,7 +963,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms if (cancellationTokenSource.IsCancellationRequested) break; - var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ShopAccountId == shopId); + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId); if (shop == null) continue; @@ -974,7 +974,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms { Invoke(new Action(() => { - var row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + var row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colLoginStatus"].Value = "未登录"; @@ -987,11 +987,11 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms FullMinusActiveForm actForm = null; Invoke(new Action(() => { - var tab = this.ucTabControl1.TabPages.Cast().FirstOrDefault(t => t.Text == shop.ShopAccount + "活动管理" && t.Name == "tab" + shop.ShopAccountId + "Active"); + var tab = this.ucTabControl1.TabPages.Cast().FirstOrDefault(t => t.Text == shop.ShopAccount + "活动管理" && t.Name == "tab" + shop.ShopId + "Active"); if (tab == null) { tab = new TabPage(); - tab.Name = "tab" + shop.ShopAccountId + "Active"; + tab.Name = "tab" + shop.ShopId + "Active"; tab.Text = shop.ShopAccount + "活动管理"; this.ucTabControl1.TabPages.Add(tab); diff --git a/TEMUKJD/KJDForms/SalesCenterForms/FullMinusShopForm.Designer.cs b/TEMUKJD/KJDForms/SalesCenterForms/FullMinusShopForm.Designer.cs index 62d6e61..235dade 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/FullMinusShopForm.Designer.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/FullMinusShopForm.Designer.cs @@ -1,5 +1,5 @@  -namespace LittleRabbit.LittleRabbitForms.SalesCenterForms +namespace TemuKJD.KJDForms.SalesCenterForms { partial class FullMinusShopForm { @@ -33,9 +33,9 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); - this.dgvProduct = new LittleRabbit.UserComponent.DataGridViewEx(); + this.dgvProduct = new TemuKJD.UserComponent.DataGridViewEx(); this.label1 = new System.Windows.Forms.Label(); - this.statusBar = new LittleRabbit.UserControls.StatusBarUserControl(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colProductId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colProductName = new System.Windows.Forms.DataGridViewTextBoxColumn(); diff --git a/TEMUKJD/KJDForms/SalesCenterForms/FullMinusShopForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/FullMinusShopForm.cs index 9fd06a8..96cb479 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/FullMinusShopForm.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/FullMinusShopForm.cs @@ -1,7 +1,7 @@ using AllBase; using AllBase.Helper; using AllBase.Model.Result; -using LittleRabbit.Extension; +using TemuKJD.Extension; using NaiBa.Util.Extension; using Newtonsoft.Json.Linq; using System; @@ -11,7 +11,7 @@ using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; -namespace LittleRabbit.LittleRabbitForms.SalesCenterForms +namespace TemuKJD.KJDForms.SalesCenterForms { public partial class FullMinusShopForm : Form { diff --git a/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyCustomActivityNameForm.Designer.cs b/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyCustomActivityNameForm.Designer.cs index 7b79cce..aa515bc 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyCustomActivityNameForm.Designer.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyCustomActivityNameForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.SalesCenterForms +namespace TemuKJD.KJDForms.SalesCenterForms { partial class GroupBuyCustomActivityNameForm { diff --git a/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyCustomActivityNameForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyCustomActivityNameForm.cs index 70f9d4e..727560e 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyCustomActivityNameForm.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyCustomActivityNameForm.cs @@ -1,4 +1,4 @@ -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.KJDForms.BaseForms; using NaiBa.Util; using System; using System.Collections.Generic; @@ -10,7 +10,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace LittleRabbit.LittleRabbitForms.SalesCenterForms +namespace TemuKJD.KJDForms.SalesCenterForms { public partial class GroupBuyCustomActivityNameForm : LRBaseForm { diff --git a/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyForm.Designer.cs b/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyForm.Designer.cs index 585434e..6a1bba6 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyForm.Designer.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.SalesCenterForms +namespace TemuKJD.KJDForms.SalesCenterForms { partial class GroupBuyForm { @@ -34,7 +34,7 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.splitContainer5 = new System.Windows.Forms.SplitContainer(); - this.ucGroupBoxEx3 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components); + this.ucGroupBoxEx3 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.label15 = new System.Windows.Forms.Label(); this.txtGetPage = new System.Windows.Forms.TextBox(); this.pbPaste2 = new System.Windows.Forms.PictureBox(); @@ -55,7 +55,7 @@ this.btnStopGetProduct = new DevComponents.DotNetBar.PanelEx(); this.btnGetProduct = new DevComponents.DotNetBar.PanelEx(); this.rbOffSale = new System.Windows.Forms.RadioButton(); - this.ucGroupBoxEx2 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components); + this.ucGroupBoxEx2 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.cmbSkuOptionType = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.第一个 = new DevComponents.Editors.ComboItem(); this.最后一个 = new DevComponents.Editors.ComboItem(); @@ -105,11 +105,11 @@ this.label4 = new System.Windows.Forms.Label(); this.btnSetActivity = new DevComponents.DotNetBar.PanelEx(); this.btnStopOperate = new DevComponents.DotNetBar.PanelEx(); - this.ucGroupBoxEx1 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components); - this.btnRefreshShop = new LittleRabbit.UserControls.ButtonEx(); + this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); + this.btnRefreshShop = new TemuKJD.UserControls.ButtonEx(); this.splitContainer3 = new System.Windows.Forms.SplitContainer(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); - this.dgvShop = new LittleRabbit.UserComponent.DataGridViewEx(); + this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -118,11 +118,11 @@ this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); - this.ucTabControl1 = new LittleRabbit.UserComponent.UcTabControl(); + this.ucTabControl1 = new TemuKJD.UserComponent.UcTabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); this.tabPage2 = new System.Windows.Forms.TabPage(); this.splitContainer4 = new System.Windows.Forms.SplitContainer(); - this.statusBar = new LittleRabbit.UserControls.StatusBarUserControl(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); this.btnClear = new DevComponents.DotNetBar.PanelEx(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); @@ -204,7 +204,7 @@ | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.ucGroupBoxEx3.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.ucGroupBoxEx3.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx3.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; this.ucGroupBoxEx3.Controls.Add(this.label15); this.ucGroupBoxEx3.Controls.Add(this.txtGetPage); this.ucGroupBoxEx3.Controls.Add(this.pbPaste2); @@ -254,7 +254,7 @@ this.pbPaste2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.pbPaste2.BackColor = System.Drawing.Color.White; this.pbPaste2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.pbPaste2.Image = global::LittleRabbit.Properties.Resources.FullPaste; + this.pbPaste2.Image = global::TemuKJD.Properties.Resources.FullPaste; this.pbPaste2.Location = new System.Drawing.Point(231, 113); this.pbPaste2.Name = "pbPaste2"; this.pbPaste2.Size = new System.Drawing.Size(23, 23); @@ -268,7 +268,7 @@ this.pbPaste1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.pbPaste1.BackColor = System.Drawing.Color.White; this.pbPaste1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.pbPaste1.Image = global::LittleRabbit.Properties.Resources.FullPaste; + this.pbPaste1.Image = global::TemuKJD.Properties.Resources.FullPaste; this.pbPaste1.Location = new System.Drawing.Point(231, 84); this.pbPaste1.Name = "pbPaste1"; this.pbPaste1.Size = new System.Drawing.Size(23, 23); @@ -476,7 +476,7 @@ | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.ucGroupBoxEx2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.ucGroupBoxEx2.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx2.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; this.ucGroupBoxEx2.Controls.Add(this.cmbSkuOptionType); this.ucGroupBoxEx2.Controls.Add(this.chkSetSkuOption); this.ucGroupBoxEx2.Controls.Add(this.label13); @@ -1028,7 +1028,7 @@ this.ucGroupBoxEx1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.ucGroupBoxEx1.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; this.ucGroupBoxEx1.Controls.Add(this.btnRefreshShop); this.ucGroupBoxEx1.Location = new System.Drawing.Point(3, 2); this.ucGroupBoxEx1.Name = "ucGroupBoxEx1"; diff --git a/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyForm.cs index 4824beb..dfe797f 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyForm.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyForm.cs @@ -3,10 +3,10 @@ using AllBase.Helper; using AllBase.Model.Result; using CefSharp; using CefSharp.WinForms; -using LittleRabbit.Extension; -using LittleRabbit.Helper; -using LittleRabbit.LittleRabbitForms.BaseForms; -using LittleRabbit.LittleRabbitForms.ShopForms; +using TemuKJD.Extension; +using TemuKJD.Helper; +using TemuKJD.KJDForms.BaseForms; +using TemuKJD.KJDForms.ShopForms; using NaiBa.CefHelper; using NaiBa.CefHelper.Handler; using NaiBa.Util; @@ -23,7 +23,7 @@ using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; -namespace LittleRabbit.LittleRabbitForms.SalesCenterForms +namespace TemuKJD.KJDForms.SalesCenterForms { public partial class GroupBuyForm : Form { @@ -89,7 +89,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms else { lstShopId.Clear(); - var list = GlobalConfig.DouShopLoginList.Where(s => s.ApiAuthStatus == "授权成功" && s.LoginStatus == "登录成功").Select(ss => ss.ShopAccountId); + var list = GlobalConfig.ShopLoginList.Where(s => s.ApiAuthStatus == "授权成功" && s.LoginStatus == "登录成功").Select(ss => ss.ShopId); lstShopId.AddRange(list); foreach (DataGridViewRow row in dgvShop.Rows) { @@ -123,17 +123,17 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms private void RefreshShop() { // 更新选中的上货店铺Id - lstShopId = lstShopId.Where(id => GlobalConfig.DouShopLoginList.Any(s => s.ShopAccountId == id && s.LoginStatus == "已授权")).ToList(); + lstShopId = lstShopId.Where(id => GlobalConfig.ShopLoginList.Any(s => s.ShopId == id && s.LoginStatus == "已授权")).ToList(); // 获取被删除的店铺 List dgvRowList = dgvShop.Rows.Cast().Where(row - => !GlobalConfig.DouShopLoginList.Any(s => s.ShopAccountId == row.Cells["colShopId"]?.Value?.ToString())).ToList(); + => !GlobalConfig.ShopLoginList.Any(s => s.ShopId == row.Cells["colShopId"]?.Value?.ToString())).ToList(); // 更新被删除的店铺列表 foreach (var row in dgvRowList) { dgvShop.Rows.Remove(row); } // 绑定其他店铺（含新导入的店铺） - foreach (DouShopLoginInfo shopEntity in GlobalConfig.DouShopLoginList) + foreach (DouShopLoginInfo shopEntity in GlobalConfig.ShopLoginList) { BindShop(shopEntity); } @@ -145,12 +145,12 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms return; bool canUse = shopEntity.ApiAuthStatus == "授权成功" && shopEntity.LoginStatus == "登录成功"; - var row = dgvShop.Rows.Cast().FirstOrDefault(p => p.Cells.GetCellValueFromColumnName("colShopId").ParseToString() == shopEntity.ShopAccountId); + var row = dgvShop.Rows.Cast().FirstOrDefault(p => p.Cells.GetCellValueFromColumnName("colShopId").ParseToString() == shopEntity.ShopId); if (row == null) { this.dgvShop.Rows.Add( - lstShopId.Contains(shopEntity.ShopAccountId) && canUse, - shopEntity.ShopAccountId, + lstShopId.Contains(shopEntity.ShopId) && canUse, + shopEntity.ShopId, shopEntity.ShopAccount, shopEntity.ApiAuthStatus, shopEntity.LoginStatus, @@ -160,7 +160,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms } else { - row.Cells["colSelect"].Value = lstShopId.Contains(shopEntity.ShopAccountId) && canUse; + row.Cells["colSelect"].Value = lstShopId.Contains(shopEntity.ShopId) && canUse; row.Cells["colShopName"].Value = shopEntity.ShopAccount; row.Cells["colAuthStatus"].Value = shopEntity.ApiAuthStatus; row.Cells["colLoginStatus"].Value = shopEntity.LoginStatus; @@ -262,7 +262,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms if (cancellationTokenSource.IsCancellationRequested) break; - var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ShopAccountId == shopId); + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId); if (shop == null) continue; @@ -273,7 +273,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms { Invoke(new Action(() => { - var row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + var row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colLoginStatus"].Value = "未登录"; @@ -286,11 +286,11 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms GroupBuyShopForm groupBuyShopForm = null; Invoke(new Action(() => { - var tab = this.ucTabControl1.TabPages.Cast().FirstOrDefault(t => t.Text == shop.ShopAccount && t.Name == "tab" + shop.ShopAccountId); + var tab = this.ucTabControl1.TabPages.Cast().FirstOrDefault(t => t.Text == shop.ShopAccount && t.Name == "tab" + shop.ShopId); if (tab == null) { tab = new TabPage(); - tab.Name = "tab" + shop.ShopAccountId; + tab.Name = "tab" + shop.ShopId; tab.Text = shop.ShopAccount; this.ucTabControl1.TabPages.Add(tab); @@ -488,7 +488,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms Invoke(new Action(() => { var shop = webBrowser.Tag as DouShopLoginInfo; - var tab = this.ucTabControl1.TabPages.Cast().FirstOrDefault(t => t.Text == shop.ShopAccount && t.Name == "tab" + shop.ShopAccountId); + var tab = this.ucTabControl1.TabPages.Cast().FirstOrDefault(t => t.Text == shop.ShopAccount && t.Name == "tab" + shop.ShopId); salesForm = tab.Controls[0] as GroupBuyShopForm; })); @@ -542,7 +542,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms string columnName = dgvShop.Columns[e.ColumnIndex].Name; long shopId = dgvShop.Rows[e.RowIndex].Cells["colShopId"].Value.ParseToLong(); string shopName = dgvShop.Rows[e.RowIndex].Cells["colShopId"].Value.ToString(); - var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ShopAccountId == shopId.ToString()); + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId.ToString()); var row = dgvShop.Rows[e.RowIndex]; switch (columnName) { @@ -619,7 +619,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms { foreach (var shopId in lstShopId) { - var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ShopAccountId == shopId); + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId); if (shop == null) continue; diff --git a/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyMonitorForm.Designer.cs b/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyMonitorForm.Designer.cs index bd9bab9..fae112e 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyMonitorForm.Designer.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyMonitorForm.Designer.cs @@ -1,5 +1,5 @@  -namespace LittleRabbit.LittleRabbitForms.SalesCenterForms +namespace TemuKJD.KJDForms.SalesCenterForms { partial class GroupBuyMonitorForm { @@ -34,7 +34,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.ucGroupBoxEx2 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components); + this.ucGroupBoxEx2 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.panelEx2 = new DevComponents.DotNetBar.PanelEx(); this.label2 = new System.Windows.Forms.Label(); this.numericUpDown2 = new System.Windows.Forms.NumericUpDown(); @@ -71,14 +71,14 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms this.label11 = new System.Windows.Forms.Label(); this.btnSetActivity = new DevComponents.DotNetBar.PanelEx(); this.btnStopOperate = new DevComponents.DotNetBar.PanelEx(); - this.ucGroupBoxEx1 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components); - this.btnRefreshShop = new LittleRabbit.UserControls.ButtonEx(); + this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); + this.btnRefreshShop = new TemuKJD.UserControls.ButtonEx(); this.splitContainer3 = new System.Windows.Forms.SplitContainer(); this.splitContainer4 = new System.Windows.Forms.SplitContainer(); - this.statusBar = new LittleRabbit.UserControls.StatusBarUserControl(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); this.btnClear = new DevComponents.DotNetBar.PanelEx(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); - this.dgvShop = new LittleRabbit.UserComponent.DataGridViewEx(); + this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -138,7 +138,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.ucGroupBoxEx2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.ucGroupBoxEx2.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx2.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; this.ucGroupBoxEx2.Controls.Add(this.panelEx2); this.ucGroupBoxEx2.Controls.Add(this.label2); this.ucGroupBoxEx2.Controls.Add(this.numericUpDown2); @@ -599,7 +599,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms this.ucGroupBoxEx1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.ucGroupBoxEx1.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; this.ucGroupBoxEx1.Controls.Add(this.btnRefreshShop); this.ucGroupBoxEx1.Location = new System.Drawing.Point(3, 2); this.ucGroupBoxEx1.Name = "ucGroupBoxEx1"; diff --git a/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyMonitorForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyMonitorForm.cs index 425d57d..bd4b551 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyMonitorForm.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyMonitorForm.cs @@ -9,7 +9,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace LittleRabbit.LittleRabbitForms.SalesCenterForms +namespace TemuKJD.KJDForms.SalesCenterForms { public partial class GroupBuyMonitorForm : Form { diff --git a/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyShopForm.Designer.cs b/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyShopForm.Designer.cs index a7ed010..a4d536b 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyShopForm.Designer.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyShopForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.SalesCenterForms +namespace TemuKJD.KJDForms.SalesCenterForms { partial class GroupBuyShopForm { @@ -32,7 +32,7 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); - this.dgvProduct = new LittleRabbit.UserComponent.DataGridViewEx(); + this.dgvProduct = new TemuKJD.UserComponent.DataGridViewEx(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colProductId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colProductName = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -42,7 +42,7 @@ this.colCreateTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.label1 = new System.Windows.Forms.Label(); - this.statusBar = new LittleRabbit.UserControls.StatusBarUserControl(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit(); this.splitContainer2.Panel1.SuspendLayout(); this.splitContainer2.Panel2.SuspendLayout(); diff --git a/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyShopForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyShopForm.cs index 92eb5c5..310084c 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyShopForm.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/GroupBuyShopForm.cs @@ -2,8 +2,8 @@ using AllBase.Extension; using AllBase.Helper; using AllBase.Model.Result; -using LittleRabbit.Extension; -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.Extension; +using TemuKJD.KJDForms.BaseForms; using NaiBa.Util.Extension; using Newtonsoft.Json.Linq; using System; @@ -18,7 +18,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using Work.BLL.Product; -namespace LittleRabbit.LittleRabbitForms.SalesCenterForms +namespace TemuKJD.KJDForms.SalesCenterForms { public partial class GroupBuyShopForm : Form { diff --git a/TEMUKJD/KJDForms/SalesCenterForms/LimitedSalesActivityNameForm.Designer.cs b/TEMUKJD/KJDForms/SalesCenterForms/LimitedSalesActivityNameForm.Designer.cs index ce442b0..21aa97f 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/LimitedSalesActivityNameForm.Designer.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/LimitedSalesActivityNameForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.SalesCenterForms +namespace TemuKJD.KJDForms.SalesCenterForms { partial class LimitedSalesActivityNameForm { diff --git a/TEMUKJD/KJDForms/SalesCenterForms/LimitedSalesActivityNameForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/LimitedSalesActivityNameForm.cs index b9d2e5c..58e6ebd 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/LimitedSalesActivityNameForm.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/LimitedSalesActivityNameForm.cs @@ -1,4 +1,4 @@ -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.KJDForms.BaseForms; using NaiBa.Util; using System; using System.Collections.Generic; @@ -10,7 +10,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace LittleRabbit.LittleRabbitForms.SalesCenterForms +namespace TemuKJD.KJDForms.SalesCenterForms { public partial class LimitedSalesActivityNameForm : LRBaseForm { diff --git a/TEMUKJD/KJDForms/SalesCenterForms/LimitedSalesManagerActiveForm.Designer.cs b/TEMUKJD/KJDForms/SalesCenterForms/LimitedSalesManagerActiveForm.Designer.cs index 7882d6d..bea16c4 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/LimitedSalesManagerActiveForm.Designer.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/LimitedSalesManagerActiveForm.Designer.cs @@ -1,5 +1,5 @@  -namespace LittleRabbit.LittleRabbitForms.SalesCenterForms +namespace TemuKJD.KJDForms.SalesCenterForms { partial class LimitedSalesManagerActiveForm { @@ -33,7 +33,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); - this.dgvActive = new LittleRabbit.UserComponent.DataGridViewEx(); + this.dgvActive = new TemuKJD.UserComponent.DataGridViewEx(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colActivityId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colActivityName = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -44,7 +44,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms this.colActiveState = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.label1 = new System.Windows.Forms.Label(); - this.statusBar = new LittleRabbit.UserControls.StatusBarUserControl(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.txtProID = new System.Windows.Forms.TextBox(); this.cmbType = new DevComponents.DotNetBar.Controls.ComboBoxEx(); diff --git a/TEMUKJD/KJDForms/SalesCenterForms/LimitedSalesManagerActiveForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/LimitedSalesManagerActiveForm.cs index 567159b..5f94b60 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/LimitedSalesManagerActiveForm.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/LimitedSalesManagerActiveForm.cs @@ -1,8 +1,8 @@ using AllBase; using AllBase.Helper; using AllBase.Model.Result; -using LittleRabbit.Extension; -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.Extension; +using TemuKJD.KJDForms.BaseForms; using NaiBa.Util.Extension; using Newtonsoft.Json.Linq; using System; @@ -12,7 +12,7 @@ using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; -namespace LittleRabbit.LittleRabbitForms.SalesCenterForms +namespace TemuKJD.KJDForms.SalesCenterForms { public partial class LimitedSalesManagerActiveForm : Form { diff --git a/TEMUKJD/KJDForms/SalesCenterForms/SalesCenterForm.Designer.cs b/TEMUKJD/KJDForms/SalesCenterForms/SalesCenterForm.Designer.cs index 8026ee3..f4044a3 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/SalesCenterForm.Designer.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/SalesCenterForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.SalesCenterForms +namespace TemuKJD.KJDForms.SalesCenterForms { partial class SalesCenterForm { @@ -40,7 +40,7 @@ treeNode4, treeNode5}); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.tv = new LittleRabbit.UserComponent.UcTreeView(); + this.tv = new TemuKJD.UserComponent.UcTreeView(); this.panel1 = new System.Windows.Forms.Panel(); this.panel3 = new System.Windows.Forms.Panel(); this.panel2 = new System.Windows.Forms.Panel(); diff --git a/TEMUKJD/KJDForms/SalesCenterForms/SalesCenterForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/SalesCenterForm.cs index 5f473ba..df8c8b5 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/SalesCenterForm.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/SalesCenterForm.cs @@ -9,7 +9,7 @@ using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; -namespace LittleRabbit.LittleRabbitForms.SalesCenterForms +namespace TemuKJD.KJDForms.SalesCenterForms { public partial class SalesCenterForm : Form { diff --git a/TEMUKJD/KJDForms/SalesCenterForms/SeckillingAndLimitedSalesForm.Designer.cs b/TEMUKJD/KJDForms/SalesCenterForms/SeckillingAndLimitedSalesForm.Designer.cs index 8cace3c..057d478 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/SeckillingAndLimitedSalesForm.Designer.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/SeckillingAndLimitedSalesForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.SalesCenterForms +namespace TemuKJD.KJDForms.SalesCenterForms { partial class SeckillingAndLimitedSalesForm { @@ -34,7 +34,7 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer3 = new System.Windows.Forms.SplitContainer(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); - this.dgvShop = new LittleRabbit.UserComponent.DataGridViewEx(); + this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -43,17 +43,17 @@ this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); - this.ucTabControl1 = new LittleRabbit.UserComponent.UcTabControl(); + this.ucTabControl1 = new TemuKJD.UserComponent.UcTabControl(); this.tabPageCheckResult = new System.Windows.Forms.TabPage(); this.lblProductName = new System.Windows.Forms.Label(); this.txtProductName = new System.Windows.Forms.TextBox(); this.chkSkipHasSale = new System.Windows.Forms.CheckBox(); this.tabPageViolateFileList = new System.Windows.Forms.TabPage(); this.splitContainer4 = new System.Windows.Forms.SplitContainer(); - this.statusBar = new LittleRabbit.UserControls.StatusBarUserControl(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); this.btnClear = new DevComponents.DotNetBar.PanelEx(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.ucGroupBoxEx3 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components); + this.ucGroupBoxEx3 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.btnMdyAct = new DevComponents.DotNetBar.PanelEx(); this.btnStopMdyAct = new DevComponents.DotNetBar.PanelEx(); this.btnCancelGet = new DevComponents.DotNetBar.PanelEx(); @@ -145,8 +145,8 @@ this.rbTimePeriod = new System.Windows.Forms.RadioButton(); this.lblTime = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); - this.ucGroupBoxEx1 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components); - this.btnRefreshShop = new LittleRabbit.UserControls.ButtonEx(); + this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); + this.btnRefreshShop = new TemuKJD.UserControls.ButtonEx(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).BeginInit(); this.splitContainer3.Panel1.SuspendLayout(); this.splitContainer3.Panel2.SuspendLayout(); @@ -483,7 +483,7 @@ | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.ucGroupBoxEx3.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.ucGroupBoxEx3.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx3.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; this.ucGroupBoxEx3.Controls.Add(this.btnMdyAct); this.ucGroupBoxEx3.Controls.Add(this.btnStopMdyAct); this.ucGroupBoxEx3.Controls.Add(this.btnCancelGet); @@ -1491,7 +1491,7 @@ this.ucGroupBoxEx1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.ucGroupBoxEx1.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; this.ucGroupBoxEx1.Controls.Add(this.btnRefreshShop); this.ucGroupBoxEx1.Location = new System.Drawing.Point(2, 2); this.ucGroupBoxEx1.Name = "ucGroupBoxEx1"; diff --git a/TEMUKJD/KJDForms/SalesCenterForms/SeckillingAndLimitedSalesForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/SeckillingAndLimitedSalesForm.cs index 1c4bdd4..e165014 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/SeckillingAndLimitedSalesForm.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/SeckillingAndLimitedSalesForm.cs @@ -2,10 +2,10 @@ using AllBase.Helper; using AllBase.Model.Result; using CefSharp.WinForms; -using LittleRabbit.Extension; -using LittleRabbit.Helper; -using LittleRabbit.LittleRabbitForms.BaseForms; -using LittleRabbit.LittleRabbitForms.ShopForms; +using TemuKJD.Extension; +using TemuKJD.Helper; +using TemuKJD.KJDForms.BaseForms; +using TemuKJD.KJDForms.ShopForms; using NaiBa.CefHelper; using NaiBa.CefHelper.Handler; using NaiBa.Util.Extension; @@ -21,7 +21,7 @@ using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; -namespace LittleRabbit.LittleRabbitForms.SalesCenterForms +namespace TemuKJD.KJDForms.SalesCenterForms { public partial class SeckillingAndLimitedSalesForm : Form { @@ -182,7 +182,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms else { lstShopId.Clear(); - var list = GlobalConfig.DouShopLoginList.Where(s => s.ApiAuthStatus == "授权成功" && s.LoginStatus == "登录成功").Select(ss => ss.ShopAccountId); + var list = GlobalConfig.ShopLoginList.Where(s => s.ApiAuthStatus == "授权成功" && s.LoginStatus == "登录成功").Select(ss => ss.ShopId); lstShopId.AddRange(list); foreach (DataGridViewRow row in dgvShop.Rows) { @@ -235,17 +235,17 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms private void RefreshShop() { // 更新选中的上货店铺Id - lstShopId = lstShopId.Where(id => GlobalConfig.DouShopLoginList.Any(s => s.ShopAccountId == id && s.LoginStatus == "已授权")).ToList(); + lstShopId = lstShopId.Where(id => GlobalConfig.ShopLoginList.Any(s => s.ShopId == id && s.LoginStatus == "已授权")).ToList(); // 获取被删除的店铺 List dgvRowList = dgvShop.Rows.Cast().Where(row - => !GlobalConfig.DouShopLoginList.Any(s => s.ShopAccountId == row.Cells["colShopId"]?.Value?.ToString())).ToList(); + => !GlobalConfig.ShopLoginList.Any(s => s.ShopId == row.Cells["colShopId"]?.Value?.ToString())).ToList(); // 更新被删除的店铺列表 foreach (var row in dgvRowList) { dgvShop.Rows.Remove(row); } // 绑定其他店铺（含新导入的店铺） - foreach (DouShopLoginInfo shopEntity in GlobalConfig.DouShopLoginList) + foreach (DouShopLoginInfo shopEntity in GlobalConfig.ShopLoginList) { BindShop(shopEntity); } @@ -257,12 +257,12 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms return; bool canUse = shopEntity.ApiAuthStatus == "授权成功" && shopEntity.LoginStatus == "登录成功"; - var row = dgvShop.Rows.Cast().FirstOrDefault(p => p.Cells.GetCellValueFromColumnName("colShopId").ParseToString() == shopEntity.ShopAccountId); + var row = dgvShop.Rows.Cast().FirstOrDefault(p => p.Cells.GetCellValueFromColumnName("colShopId").ParseToString() == shopEntity.ShopId); if (row == null) { this.dgvShop.Rows.Add( - lstShopId.Contains(shopEntity.ShopAccountId) && canUse, - shopEntity.ShopAccountId, + lstShopId.Contains(shopEntity.ShopId) && canUse, + shopEntity.ShopId, shopEntity.ShopAccount, shopEntity.ApiAuthStatus, shopEntity.LoginStatus, @@ -272,7 +272,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms } else { - row.Cells["colSelect"].Value = lstShopId.Contains(shopEntity.ShopAccountId) && canUse; + row.Cells["colSelect"].Value = lstShopId.Contains(shopEntity.ShopId) && canUse; row.Cells["colShopName"].Value = shopEntity.ShopAccount; row.Cells["colAuthStatus"].Value = shopEntity.ApiAuthStatus; row.Cells["colLoginStatus"].Value = shopEntity.LoginStatus; @@ -288,7 +288,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms string columnName = dgvShop.Columns[e.ColumnIndex].Name; long shopId = dgvShop.Rows[e.RowIndex].Cells["colShopId"].Value.ParseToLong(); string shopName = dgvShop.Rows[e.RowIndex].Cells["colShopId"].Value.ToString(); - var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ShopAccountId == shopId.ToString()); + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId.ToString()); var row = dgvShop.Rows[e.RowIndex]; switch (columnName) { @@ -349,7 +349,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms if (cancellationTokenSource.IsCancellationRequested) break; - var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ShopAccountId == shopId); + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId); if (shop == null) continue; @@ -360,7 +360,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms { Invoke(new Action(() => { - var row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + var row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colLoginStatus"].Value = "未登录"; @@ -373,11 +373,11 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms SeckillingAndLimitedSalesShopForm salesShopForm = null; Invoke(new Action(() => { - var tab = this.ucTabControl1.TabPages.Cast().FirstOrDefault(t => t.Text == shop.ShopAccount && t.Name == "tab" + shop.ShopAccountId); + var tab = this.ucTabControl1.TabPages.Cast().FirstOrDefault(t => t.Text == shop.ShopAccount && t.Name == "tab" + shop.ShopId); if (tab == null) { tab = new TabPage(); - tab.Name = "tab" + shop.ShopAccountId; + tab.Name = "tab" + shop.ShopId; tab.Text = shop.ShopAccount; this.ucTabControl1.TabPages.Add(tab); @@ -481,7 +481,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms } var shop = webBrowser.Tag as DouShopLoginInfo; - var tab = this.ucTabControl1.TabPages.Cast().FirstOrDefault(t => t.Text == shop.ShopAccount && t.Name == "tab" + shop.ShopAccountId); + var tab = this.ucTabControl1.TabPages.Cast().FirstOrDefault(t => t.Text == shop.ShopAccount && t.Name == "tab" + shop.ShopId); var salesForm = tab.Controls[0] as SeckillingAndLimitedSalesShopForm; Task.Run(() => @@ -511,7 +511,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms } var shop = webBrowser.Tag as DouShopLoginInfo; - var tab = this.ucTabControl1.TabPages.Cast().FirstOrDefault(t => t.Text == shop.ShopAccount + "活动管理" && t.Name == "tab" + shop.ShopAccountId + "Active"); + var tab = this.ucTabControl1.TabPages.Cast().FirstOrDefault(t => t.Text == shop.ShopAccount + "活动管理" && t.Name == "tab" + shop.ShopId + "Active"); var managerActiveForm = tab.Controls[0] as LimitedSalesManagerActiveForm; Task.Run(() => @@ -570,7 +570,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms foreach (var shopId in lstShopIdTemp) { - var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ShopAccountId == shopId); + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId); if (shop == null) continue; @@ -1259,7 +1259,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms if (cancellationTokenSource.IsCancellationRequested) break; - var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ShopAccountId == shopId); + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId); if (shop == null) continue; @@ -1270,7 +1270,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms { Invoke(new Action(() => { - var row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + var row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colLoginStatus"].Value = "未登录"; @@ -1283,11 +1283,11 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms LimitedSalesManagerActiveForm managerActiveForm = null; Invoke(new Action(() => { - var tab = this.ucTabControl1.TabPages.Cast().FirstOrDefault(t => t.Text == shop.ShopAccount + "活动管理" && t.Name == "tab" + shop.ShopAccountId + "Active"); + var tab = this.ucTabControl1.TabPages.Cast().FirstOrDefault(t => t.Text == shop.ShopAccount + "活动管理" && t.Name == "tab" + shop.ShopId + "Active"); if (tab == null) { tab = new TabPage(); - tab.Name = "tab" + shop.ShopAccountId + "Active"; + tab.Name = "tab" + shop.ShopId + "Active"; tab.Text = shop.ShopAccount + "活动管理"; this.ucTabControl1.TabPages.Add(tab); @@ -1476,7 +1476,7 @@ namespace LittleRabbit.LittleRabbitForms.SalesCenterForms foreach (var shopId in lstShopIdTemp) { - var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ShopAccountId == shopId); + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId); if (shop == null) continue; diff --git a/TEMUKJD/KJDForms/SalesCenterForms/SeckillingAndLimitedSalesShopForm.Designer.cs b/TEMUKJD/KJDForms/SalesCenterForms/SeckillingAndLimitedSalesShopForm.Designer.cs index 0f038a0..370e8a2 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/SeckillingAndLimitedSalesShopForm.Designer.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/SeckillingAndLimitedSalesShopForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.SalesCenterForms +namespace TemuKJD.KJDForms.SalesCenterForms { partial class SeckillingAndLimitedSalesShopForm { @@ -32,9 +32,9 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); - this.dgvProduct = new LittleRabbit.UserComponent.DataGridViewEx(); + this.dgvProduct = new TemuKJD.UserComponent.DataGridViewEx(); this.label1 = new System.Windows.Forms.Label(); - this.statusBar = new LittleRabbit.UserControls.StatusBarUserControl(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colProductId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colProductName = new System.Windows.Forms.DataGridViewTextBoxColumn(); diff --git a/TEMUKJD/KJDForms/SalesCenterForms/SeckillingAndLimitedSalesShopForm.cs b/TEMUKJD/KJDForms/SalesCenterForms/SeckillingAndLimitedSalesShopForm.cs index d59b793..4f4a265 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/SeckillingAndLimitedSalesShopForm.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/SeckillingAndLimitedSalesShopForm.cs @@ -2,8 +2,8 @@ using AllBase.Extension; using AllBase.Helper; using AllBase.Model.Result; -using LittleRabbit.Extension; -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.Extension; +using TemuKJD.KJDForms.BaseForms; using NaiBa.Util.Extension; using Newtonsoft.Json.Linq; using System; @@ -20,7 +20,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using Work.BLL.Product; -namespace LittleRabbit.LittleRabbitForms.SalesCenterForms +namespace TemuKJD.KJDForms.SalesCenterForms { public partial class SeckillingAndLimitedSalesShopForm : Form { diff --git a/TEMUKJD/KJDForms/SalesCenterForms/UcCouponAddParam.Designer.cs b/TEMUKJD/KJDForms/SalesCenterForms/UcCouponAddParam.Designer.cs index 9c761bf..5e46c62 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/UcCouponAddParam.Designer.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/UcCouponAddParam.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.SalesCenterForms +namespace TemuKJD.KJDForms.SalesCenterForms { partial class UcCouponAddParam { diff --git a/TEMUKJD/KJDForms/SalesCenterForms/UcCouponAddParam.cs b/TEMUKJD/KJDForms/SalesCenterForms/UcCouponAddParam.cs index 7aaf236..36f255d 100644 --- a/TEMUKJD/KJDForms/SalesCenterForms/UcCouponAddParam.cs +++ b/TEMUKJD/KJDForms/SalesCenterForms/UcCouponAddParam.cs @@ -8,7 +8,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace LittleRabbit.LittleRabbitForms.SalesCenterForms +namespace TemuKJD.KJDForms.SalesCenterForms { public partial class UcCouponAddParam : UserControl { diff --git a/TEMUKJD/KJDForms/ShopForms/FreightTemplateAddForm.Designer.cs b/TEMUKJD/KJDForms/ShopForms/FreightTemplateAddForm.Designer.cs index 9d51eaa..3c84b98 100644 --- a/TEMUKJD/KJDForms/ShopForms/FreightTemplateAddForm.Designer.cs +++ b/TEMUKJD/KJDForms/ShopForms/FreightTemplateAddForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.ShopForms +namespace TemuKJD.KJDForms.ShopForms { partial class FreightTemplateAddForm { @@ -42,7 +42,7 @@ this.label10 = new System.Windows.Forms.Label(); this.label11 = new System.Windows.Forms.Label(); this.txtFixCost = new System.Windows.Forms.TextBox(); - this.groupTemplate = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components); + this.groupTemplate = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.label4 = new System.Windows.Forms.Label(); this.rbtype1 = new System.Windows.Forms.RadioButton(); this.rbtype2 = new System.Windows.Forms.RadioButton(); @@ -58,17 +58,17 @@ this.cobCity = new System.Windows.Forms.ComboBox(); this.cobProvince = new System.Windows.Forms.ComboBox(); this.label9 = new System.Windows.Forms.Label(); - this.btnSave = new LittleRabbit.UserControls.ButtonEx(); + this.btnSave = new TemuKJD.UserControls.ButtonEx(); this.label2 = new System.Windows.Forms.Label(); this.txtTemplate = new System.Windows.Forms.TextBox(); this.label1 = new System.Windows.Forms.Label(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); - this.dgvShop = new LittleRabbit.UserComponent.DataGridViewEx(); + this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colStatus = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.statusBar = new LittleRabbit.UserControls.StatusBarUserControl(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -210,7 +210,7 @@ // groupTemplate // this.groupTemplate.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.groupTemplate.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.groupTemplate.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; this.groupTemplate.Controls.Add(this.label4); this.groupTemplate.Controls.Add(this.rbtype1); this.groupTemplate.Controls.Add(this.rbtype2); diff --git a/TEMUKJD/KJDForms/ShopForms/FreightTemplateAddForm.cs b/TEMUKJD/KJDForms/ShopForms/FreightTemplateAddForm.cs index 37c62f3..328a1c3 100644 --- a/TEMUKJD/KJDForms/ShopForms/FreightTemplateAddForm.cs +++ b/TEMUKJD/KJDForms/ShopForms/FreightTemplateAddForm.cs @@ -1,7 +1,7 @@ using AllBase; using AllBase.Helper; using AllBase.Model.Result; -using LittleRabbit.Extension; +using TemuKJD.Extension; using System; using System.Collections.Generic; using System.ComponentModel; @@ -15,7 +15,7 @@ using System.Web.UI.WebControls; using System.Windows.Forms; using Work; -namespace LittleRabbit.LittleRabbitForms.ShopForms +namespace TemuKJD.KJDForms.ShopForms { /// /// 运费模板管理窗口 @@ -53,10 +53,10 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms .Select(r2 => r2.Cells["colShopId"].Value?.ToString()).ToList(); Task.Run(()=> { - for (int i = 0; i < GlobalConfig.DouShopLoginList.Count; i++) + for (int i = 0; i < GlobalConfig.ShopLoginList.Count; i++) { - var shop = GlobalConfig.DouShopLoginList[i]; - if (!ids.Any(id => id == shop.ShopAccountId) || shop.LoginStatus != "登录成功") + var shop = GlobalConfig.ShopLoginList[i]; + if (!ids.Any(id => id == shop.ShopId) || shop.LoginStatus != "登录成功") continue; string data = "template_name=" + template_name + "&product_province=" + pid + "&product_city=" + cid; //固定运费 @@ -123,7 +123,7 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms count++; for (int i = 0; i < dgvShop.Rows.Count; i++) { - if (shop.ShopAccountId== dgvShop.Rows[i].Cells["colShopId"].Value.ToString()) + if (shop.ShopId== dgvShop.Rows[i].Cells["colShopId"].Value.ToString()) { dgvShop.Rows[i].Cells["colStatus"].Value = message; break; @@ -202,7 +202,7 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms { var area = cobProvince.SelectedItem as ListItem; int id = int.Parse(area.Value); - var shop = GlobalConfig.DouShopLoginList.Where(s=>s.LoginStatus=="登录成功").FirstOrDefault(); + var shop = GlobalConfig.ShopLoginList.Where(s=>s.LoginStatus=="登录成功").FirstOrDefault(); if (shop == null) return; List list = new List(); @@ -265,10 +265,10 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms } public void ReadLoad() { - for (int i = 0; i < GlobalConfig.DouShopLoginList.Count; i++) + for (int i = 0; i < GlobalConfig.ShopLoginList.Count; i++) { - var shop = GlobalConfig.DouShopLoginList[i]; - dgvShop.Rows.Add(false, shop.ShopAccountId, shop.ShopAccount, 0, shop.LoginStatus); + var shop = GlobalConfig.ShopLoginList[i]; + dgvShop.Rows.Add(false, shop.ShopId, shop.ShopAccount, 0, shop.LoginStatus); } } diff --git a/TEMUKJD/KJDForms/ShopForms/FreightTemplateForm.Designer.cs b/TEMUKJD/KJDForms/ShopForms/FreightTemplateForm.Designer.cs index 5f78825..79bccf8 100644 --- a/TEMUKJD/KJDForms/ShopForms/FreightTemplateForm.Designer.cs +++ b/TEMUKJD/KJDForms/ShopForms/FreightTemplateForm.Designer.cs @@ -1,5 +1,5 @@  -namespace LittleRabbit.LittleRabbitForms.ShopForms +namespace TemuKJD.KJDForms.ShopForms { partial class FreightTemplateForm { @@ -34,7 +34,7 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.ucGroupBoxEx3 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components); + this.ucGroupBoxEx3 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.cmbCity = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.cmbProvince = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.label3 = new System.Windows.Forms.Label(); @@ -71,16 +71,17 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms this.label7 = new System.Windows.Forms.Label(); this.btnAdd = new DevComponents.DotNetBar.PanelEx(); this.btnStopAdd = new DevComponents.DotNetBar.PanelEx(); - this.ucGroupBoxEx2 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components); + this.chkLimited = new System.Windows.Forms.CheckBox(); + this.ucGroupBoxEx2 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.txtSearchText = new System.Windows.Forms.TextBox(); this.label4 = new System.Windows.Forms.Label(); this.btnSearch = new DevComponents.DotNetBar.PanelEx(); this.btnStop = new DevComponents.DotNetBar.PanelEx(); - this.ucGroupBoxEx1 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components); + this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.btnRefreshShop = new DevComponents.DotNetBar.PanelEx(); this.splitContainer3 = new System.Windows.Forms.SplitContainer(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); - this.dgvShop = new LittleRabbit.UserComponent.DataGridViewEx(); + this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -88,15 +89,14 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms this.colLoginStatus = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); - this.ucTabControl1 = new LittleRabbit.UserComponent.UcTabControl(); - this.tabPage1 = new System.Windows.Forms.TabPage(); - this.tabPage2 = new System.Windows.Forms.TabPage(); this.splitContainer4 = new System.Windows.Forms.SplitContainer(); - this.statusBar = new LittleRabbit.UserControls.StatusBarUserControl(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); this.btnClear = new DevComponents.DotNetBar.PanelEx(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); - this.chkLimited = new System.Windows.Forms.CheckBox(); + this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); + this.tabPage2 = new System.Windows.Forms.TabPage(); + this.tabPage1 = new System.Windows.Forms.TabPage(); + this.ucTabControl1 = new TemuKJD.UserComponent.UcTabControl(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -119,12 +119,12 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms this.splitContainer2.Panel2.SuspendLayout(); this.splitContainer2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dgvShop)).BeginInit(); - this.panelEx1.SuspendLayout(); - this.ucTabControl1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer4)).BeginInit(); this.splitContainer4.Panel1.SuspendLayout(); this.splitContainer4.Panel2.SuspendLayout(); this.splitContainer4.SuspendLayout(); + this.panelEx1.SuspendLayout(); + this.ucTabControl1.SuspendLayout(); this.SuspendLayout(); // // splitContainer1 @@ -154,7 +154,7 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.ucGroupBoxEx3.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.ucGroupBoxEx3.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx3.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; this.ucGroupBoxEx3.Controls.Add(this.cmbCity); this.ucGroupBoxEx3.Controls.Add(this.cmbProvince); this.ucGroupBoxEx3.Controls.Add(this.label3); @@ -641,12 +641,22 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms this.btnStopAdd.Text = "停止创建"; this.btnStopAdd.Click += new System.EventHandler(this.btnStopAdd_Click); // + // chkLimited + // + this.chkLimited.AutoSize = true; + this.chkLimited.Location = new System.Drawing.Point(22, 61); + this.chkLimited.Name = "chkLimited"; + this.chkLimited.Size = new System.Drawing.Size(131, 21); + this.chkLimited.TabIndex = 657; + this.chkLimited.Text = "限制下单区域(可选)"; + this.chkLimited.UseVisualStyleBackColor = true; + // // ucGroupBoxEx2 // this.ucGroupBoxEx2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); this.ucGroupBoxEx2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.ucGroupBoxEx2.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx2.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; this.ucGroupBoxEx2.Controls.Add(this.txtSearchText); this.ucGroupBoxEx2.Controls.Add(this.label4); this.ucGroupBoxEx2.Controls.Add(this.btnSearch); @@ -727,7 +737,7 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms this.ucGroupBoxEx1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.ucGroupBoxEx1.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; this.ucGroupBoxEx1.Controls.Add(this.btnRefreshShop); this.ucGroupBoxEx1.Location = new System.Drawing.Point(3, 2); this.ucGroupBoxEx1.Name = "ucGroupBoxEx1"; @@ -894,62 +904,6 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms this.colMessage.Visible = false; this.colMessage.Width = 120; // - // panelEx1 - // - this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; - this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.panelEx1.Controls.Add(this.ucTabControl1); - this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty; - this.panelEx1.Dock = System.Windows.Forms.DockStyle.Fill; - this.panelEx1.Location = new System.Drawing.Point(0, 0); - this.panelEx1.Name = "panelEx1"; - this.panelEx1.Padding = new System.Windows.Forms.Padding(1); - this.panelEx1.Size = new System.Drawing.Size(849, 408); - this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; - this.panelEx1.Style.BackColor1.Color = System.Drawing.Color.White; - this.panelEx1.Style.BackColor2.Color = System.Drawing.Color.White; - this.panelEx1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.panelEx1.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.panelEx1.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.panelEx1.Style.GradientAngle = 90; - this.panelEx1.TabIndex = 183; - // - // ucTabControl1 - // - this.ucTabControl1.BackgroundColor = System.Drawing.Color.White; - this.ucTabControl1.Controls.Add(this.tabPage1); - this.ucTabControl1.Controls.Add(this.tabPage2); - this.ucTabControl1.Dock = System.Windows.Forms.DockStyle.Fill; - this.ucTabControl1.Location = new System.Drawing.Point(1, 1); - this.ucTabControl1.Name = "ucTabControl1"; - this.ucTabControl1.Padding = new System.Drawing.Point(10, 3); - this.ucTabControl1.SelectedIndex = 0; - this.ucTabControl1.ShowCloseButton = true; - this.ucTabControl1.Size = new System.Drawing.Size(847, 406); - this.ucTabControl1.TabIndex = 0; - this.ucTabControl1.TabSelectColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.ucTabControl1.TabTextColor = System.Drawing.Color.Gray; - // - // tabPage1 - // - this.tabPage1.Location = new System.Drawing.Point(2, 26); - this.tabPage1.Name = "tabPage1"; - this.tabPage1.Padding = new System.Windows.Forms.Padding(3); - this.tabPage1.Size = new System.Drawing.Size(841, 376); - this.tabPage1.TabIndex = 0; - this.tabPage1.Text = "店铺1"; - this.tabPage1.UseVisualStyleBackColor = true; - // - // tabPage2 - // - this.tabPage2.Location = new System.Drawing.Point(2, 26); - this.tabPage2.Name = "tabPage2"; - this.tabPage2.Padding = new System.Windows.Forms.Padding(3); - this.tabPage2.Size = new System.Drawing.Size(841, 376); - this.tabPage2.TabIndex = 1; - this.tabPage2.Text = "店铺2"; - this.tabPage2.UseVisualStyleBackColor = true; - // // splitContainer4 // this.splitContainer4.Dock = System.Windows.Forms.DockStyle.Fill; @@ -1004,15 +958,61 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms this.btnClear.TabIndex = 440; this.btnClear.Text = "清空结果"; // - // chkLimited + // panelEx1 // - this.chkLimited.AutoSize = true; - this.chkLimited.Location = new System.Drawing.Point(22, 61); - this.chkLimited.Name = "chkLimited"; - this.chkLimited.Size = new System.Drawing.Size(131, 21); - this.chkLimited.TabIndex = 657; - this.chkLimited.Text = "限制下单区域(可选)"; - this.chkLimited.UseVisualStyleBackColor = true; + this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; + this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.panelEx1.Controls.Add(this.ucTabControl1); + this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty; + this.panelEx1.Dock = System.Windows.Forms.DockStyle.Fill; + this.panelEx1.Location = new System.Drawing.Point(0, 0); + this.panelEx1.Name = "panelEx1"; + this.panelEx1.Padding = new System.Windows.Forms.Padding(1); + this.panelEx1.Size = new System.Drawing.Size(849, 408); + this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; + this.panelEx1.Style.BackColor1.Color = System.Drawing.Color.White; + this.panelEx1.Style.BackColor2.Color = System.Drawing.Color.White; + this.panelEx1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.panelEx1.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.panelEx1.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.panelEx1.Style.GradientAngle = 90; + this.panelEx1.TabIndex = 183; + // + // tabPage2 + // + this.tabPage2.Location = new System.Drawing.Point(2, 26); + this.tabPage2.Name = "tabPage2"; + this.tabPage2.Padding = new System.Windows.Forms.Padding(3); + this.tabPage2.Size = new System.Drawing.Size(841, 376); + this.tabPage2.TabIndex = 1; + this.tabPage2.Text = "店铺2"; + this.tabPage2.UseVisualStyleBackColor = true; + // + // tabPage1 + // + this.tabPage1.Location = new System.Drawing.Point(2, 26); + this.tabPage1.Name = "tabPage1"; + this.tabPage1.Padding = new System.Windows.Forms.Padding(3); + this.tabPage1.Size = new System.Drawing.Size(841, 376); + this.tabPage1.TabIndex = 0; + this.tabPage1.Text = "店铺1"; + this.tabPage1.UseVisualStyleBackColor = true; + // + // ucTabControl1 + // + this.ucTabControl1.BackgroundColor = System.Drawing.Color.White; + this.ucTabControl1.Controls.Add(this.tabPage1); + this.ucTabControl1.Controls.Add(this.tabPage2); + this.ucTabControl1.Dock = System.Windows.Forms.DockStyle.Fill; + this.ucTabControl1.Location = new System.Drawing.Point(1, 1); + this.ucTabControl1.Name = "ucTabControl1"; + this.ucTabControl1.Padding = new System.Drawing.Point(10, 3); + this.ucTabControl1.SelectedIndex = 0; + this.ucTabControl1.ShowCloseButton = true; + this.ucTabControl1.Size = new System.Drawing.Size(847, 406); + this.ucTabControl1.TabIndex = 0; + this.ucTabControl1.TabSelectColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.ucTabControl1.TabTextColor = System.Drawing.Color.Gray; // // FreightTemplateForm // @@ -1054,12 +1054,12 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit(); this.splitContainer2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.dgvShop)).EndInit(); - this.panelEx1.ResumeLayout(false); - this.ucTabControl1.ResumeLayout(false); this.splitContainer4.Panel1.ResumeLayout(false); this.splitContainer4.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitContainer4)).EndInit(); this.splitContainer4.ResumeLayout(false); + this.panelEx1.ResumeLayout(false); + this.ucTabControl1.ResumeLayout(false); this.ResumeLayout(false); } @@ -1077,10 +1077,6 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms private System.Windows.Forms.SplitContainer splitContainer3; private System.Windows.Forms.SplitContainer splitContainer2; private UserComponent.DataGridViewEx dgvShop; - private DevComponents.DotNetBar.PanelEx panelEx1; - private UserComponent.UcTabControl ucTabControl1; - private System.Windows.Forms.TabPage tabPage1; - private System.Windows.Forms.TabPage tabPage2; private System.Windows.Forms.SplitContainer splitContainer4; private UserControls.StatusBarUserControl statusBar; private DevComponents.DotNetBar.PanelEx btnClear; @@ -1130,5 +1126,9 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms private System.Windows.Forms.DataGridViewCheckBoxColumn colCanUse; private System.Windows.Forms.DataGridViewTextBoxColumn colMessage; private System.Windows.Forms.CheckBox chkLimited; + private DevComponents.DotNetBar.PanelEx panelEx1; + private UserComponent.UcTabControl ucTabControl1; + private System.Windows.Forms.TabPage tabPage1; + private System.Windows.Forms.TabPage tabPage2; } } \ No newline at end of file diff --git a/TEMUKJD/KJDForms/ShopForms/FreightTemplateForm.cs b/TEMUKJD/KJDForms/ShopForms/FreightTemplateForm.cs index 79355e1..8b61f81 100644 --- a/TEMUKJD/KJDForms/ShopForms/FreightTemplateForm.cs +++ b/TEMUKJD/KJDForms/ShopForms/FreightTemplateForm.cs @@ -2,8 +2,8 @@ using AllBase.Helper; using AllBase.Model.Param.OrderManage; using AllBase.Model.Result; -using LittleRabbit.Extension; -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.Extension; +using TemuKJD.KJDForms.BaseForms; using NaiBa.Util.Extension; using NaiBa.Util.Helper; using Newtonsoft.Json.Linq; @@ -20,7 +20,7 @@ using System.Windows.Forms; using Work; using Work.DouyinApiClass; -namespace LittleRabbit.LittleRabbitForms.ShopForms +namespace TemuKJD.KJDForms.ShopForms { public partial class FreightTemplateForm : Form { @@ -84,14 +84,14 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms => row.Cells["colSelect"]?.Value.ParseToBool() == true).Select(r => r.Cells["colShopId"]?.Value.ToString()).ToList(); // 获取被删除的店铺 List dgvRowList = dgvShop.Rows.Cast().Where(row - => !GlobalConfig.DouShopLoginList.Any(s => s.ShopAccountId == row.Cells["colShopId"]?.Value?.ToString())).ToList(); + => !GlobalConfig.ShopLoginList.Any(s => s.ShopId == row.Cells["colShopId"]?.Value?.ToString())).ToList(); // 更新被删除的店铺列表 foreach (var row in dgvRowList) { dgvShop.Rows.Remove(row); } // 绑定其他店铺（含新导入的店铺） - foreach (DouShopLoginInfo shopEntity in GlobalConfig.DouShopLoginList) + foreach (DouShopLoginInfo shopEntity in GlobalConfig.ShopLoginList) { BindShop(shopEntity, selectIds); } @@ -104,12 +104,12 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms selectShopId = new List(); bool canUse = shopEntity.BuyApiAuth.ApiAuthStatus == "授权成功" && shopEntity.LoginStatus == "登录成功"; - var row = dgvShop.Rows.Cast().FirstOrDefault(p => p.Cells.GetCellValueFromColumnName("colShopId").ParseToString() == shopEntity.ShopAccountId); + var row = dgvShop.Rows.Cast().FirstOrDefault(p => p.Cells.GetCellValueFromColumnName("colShopId").ParseToString() == shopEntity.ShopId); if (row == null) { this.dgvShop.Rows.Add( - selectShopId.Contains(shopEntity.ShopAccountId) && canUse, - shopEntity.ShopAccountId, + selectShopId.Contains(shopEntity.ShopId) && canUse, + shopEntity.ShopId, shopEntity.ShopAccount, shopEntity.BuyApiAuth.ApiAuthStatus, shopEntity.LoginStatus, @@ -119,7 +119,7 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms } else { - row.Cells["colSelect"].Value = selectShopId.Contains(shopEntity.ShopAccountId) && canUse; + row.Cells["colSelect"].Value = selectShopId.Contains(shopEntity.ShopId) && canUse; row.Cells["colShopName"].Value = shopEntity.ShopAccount; row.Cells["colBuyAuthStatus"].Value = shopEntity.BuyApiAuth.ApiAuthStatus; row.Cells["colLoginStatus"].Value = shopEntity.LoginStatus; @@ -139,7 +139,7 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms } else { - var list = GlobalConfig.DouShopLoginList.Where(s => s.ApiAuthStatus == "授权成功" && s.LoginStatus == "登录成功").Select(ss => ss.ShopAccountId); + var list = GlobalConfig.ShopLoginList.Where(s => s.ApiAuthStatus == "授权成功" && s.LoginStatus == "登录成功").Select(ss => ss.ShopId); foreach (DataGridViewRow row in dgvShop.Rows) { if (list.Any(l => l == row.Cells["colShopId"]?.Value?.ToString())) @@ -156,7 +156,7 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms string columnName = dgvShop.Columns[e.ColumnIndex].Name; long shopId = dgvShop.Rows[e.RowIndex].Cells["colShopId"].Value.ParseToLong(); string shopName = dgvShop.Rows[e.RowIndex].Cells["colShopId"].Value.ToString(); - var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ShopAccountId == shopId.ToString()); + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId.ToString()); var row = dgvShop.Rows[e.RowIndex]; switch (columnName) { @@ -201,7 +201,7 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms if (cancellationTokenSource.IsCancellationRequested) break; - var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ShopAccountId == shopId); + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId); if (shop == null) continue; @@ -212,7 +212,7 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms { Invoke(new Action(() => { - var row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + var row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colLoginStatus"].Value = "未登录"; @@ -225,11 +225,11 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms FreightTemplateListForm templateListForm = null; Invoke(new Action(() => { - var tab = this.ucTabControl1.TabPages.Cast().FirstOrDefault(t => t.Text == shop.ShopAccount && t.Name == "tab" + shop.ShopAccountId); + var tab = this.ucTabControl1.TabPages.Cast().FirstOrDefault(t => t.Text == shop.ShopAccount && t.Name == "tab" + shop.ShopId); if (tab == null) { tab = new TabPage(); - tab.Name = "tab" + shop.ShopAccountId; + tab.Name = "tab" + shop.ShopId; tab.Text = shop.ShopAccount; this.ucTabControl1.TabPages.Add(tab); @@ -281,7 +281,7 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms if (addr != null && (addr.sub_districts != null || addr.level == "Town")) return addr; - var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.BuyApiAuth.ApiAuthStatus == "授权成功"); + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.BuyApiAuth.ApiAuthStatus == "授权成功"); if (shop == null) { BaseMsgForm.ShowError("请确保有店铺拍单授权成功！"); @@ -593,7 +593,7 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms if (cancellationTokenSource.IsCancellationRequested) break; - var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ShopAccountId == shopId); + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId); if (shop == null) continue; @@ -604,7 +604,7 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms { Invoke(new Action(() => { - var row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + var row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colLoginStatus"].Value = "未登录"; @@ -617,11 +617,11 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms FreightTemplateListForm templateListForm = null; Invoke(new Action(() => { - var tab = this.ucTabControl1.TabPages.Cast().FirstOrDefault(t => t.Text == shop.ShopAccount && t.Name == "tab" + shop.ShopAccountId); + var tab = this.ucTabControl1.TabPages.Cast().FirstOrDefault(t => t.Text == shop.ShopAccount && t.Name == "tab" + shop.ShopId); if (tab == null) { tab = new TabPage(); - tab.Name = "tab" + shop.ShopAccountId; + tab.Name = "tab" + shop.ShopId; tab.Text = shop.ShopAccount; this.ucTabControl1.TabPages.Add(tab); diff --git a/TEMUKJD/KJDForms/ShopForms/FreightTemplateListForm.Designer.cs b/TEMUKJD/KJDForms/ShopForms/FreightTemplateListForm.Designer.cs index c5e2ab2..0496814 100644 --- a/TEMUKJD/KJDForms/ShopForms/FreightTemplateListForm.Designer.cs +++ b/TEMUKJD/KJDForms/ShopForms/FreightTemplateListForm.Designer.cs @@ -1,5 +1,5 @@  -namespace LittleRabbit.LittleRabbitForms.ShopForms +namespace TemuKJD.KJDForms.ShopForms { partial class FreightTemplateListForm { @@ -33,9 +33,9 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); - this.dgvTemplate = new LittleRabbit.UserComponent.DataGridViewEx(); + this.dgvTemplate = new TemuKJD.UserComponent.DataGridViewEx(); this.label1 = new System.Windows.Forms.Label(); - this.statusBar = new LittleRabbit.UserControls.StatusBarUserControl(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colTemplateId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colTemplateName = new System.Windows.Forms.DataGridViewTextBoxColumn(); diff --git a/TEMUKJD/KJDForms/ShopForms/FreightTemplateListForm.cs b/TEMUKJD/KJDForms/ShopForms/FreightTemplateListForm.cs index 8ce64f7..56a040e 100644 --- a/TEMUKJD/KJDForms/ShopForms/FreightTemplateListForm.cs +++ b/TEMUKJD/KJDForms/ShopForms/FreightTemplateListForm.cs @@ -14,7 +14,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using Work.DouyinApiClass; -namespace LittleRabbit.LittleRabbitForms.ShopForms +namespace TemuKJD.KJDForms.ShopForms { public partial class FreightTemplateListForm : Form { diff --git a/TEMUKJD/KJDForms/ShopForms/FreightTemplateNameForm.Designer.cs b/TEMUKJD/KJDForms/ShopForms/FreightTemplateNameForm.Designer.cs index 29b1611..19e196c 100644 --- a/TEMUKJD/KJDForms/ShopForms/FreightTemplateNameForm.Designer.cs +++ b/TEMUKJD/KJDForms/ShopForms/FreightTemplateNameForm.Designer.cs @@ -1,5 +1,5 @@  -namespace LittleRabbit.LittleRabbitForms.ShopForms +namespace TemuKJD.KJDForms.ShopForms { partial class FreightTemplateNameForm { diff --git a/TEMUKJD/KJDForms/ShopForms/FreightTemplateNameForm.cs b/TEMUKJD/KJDForms/ShopForms/FreightTemplateNameForm.cs index b22abf6..3bad822 100644 --- a/TEMUKJD/KJDForms/ShopForms/FreightTemplateNameForm.cs +++ b/TEMUKJD/KJDForms/ShopForms/FreightTemplateNameForm.cs @@ -8,7 +8,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace LittleRabbit.LittleRabbitForms.ShopForms +namespace TemuKJD.KJDForms.ShopForms { public partial class FreightTemplateNameForm : BaseForms.LRBaseForm { diff --git a/TEMUKJD/KJDForms/ShopForms/FreightTemplateNotSendAreaForm.Designer.cs b/TEMUKJD/KJDForms/ShopForms/FreightTemplateNotSendAreaForm.Designer.cs index b9551df..95c2f1b 100644 --- a/TEMUKJD/KJDForms/ShopForms/FreightTemplateNotSendAreaForm.Designer.cs +++ b/TEMUKJD/KJDForms/ShopForms/FreightTemplateNotSendAreaForm.Designer.cs @@ -1,5 +1,5 @@  -namespace LittleRabbit.LittleRabbitForms.ShopForms +namespace TemuKJD.KJDForms.ShopForms { partial class FreightTemplateNotSendAreaForm { diff --git a/TEMUKJD/KJDForms/ShopForms/FreightTemplateNotSendAreaForm.cs b/TEMUKJD/KJDForms/ShopForms/FreightTemplateNotSendAreaForm.cs index f638dc9..368f041 100644 --- a/TEMUKJD/KJDForms/ShopForms/FreightTemplateNotSendAreaForm.cs +++ b/TEMUKJD/KJDForms/ShopForms/FreightTemplateNotSendAreaForm.cs @@ -10,7 +10,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace LittleRabbit.LittleRabbitForms.ShopForms +namespace TemuKJD.KJDForms.ShopForms { public partial class FreightTemplateNotSendAreaForm : BaseForms.LRBaseForm { diff --git a/TEMUKJD/KJDForms/ShopForms/MaterialManageForm.Designer.cs b/TEMUKJD/KJDForms/ShopForms/MaterialManageForm.Designer.cs index d17b125..5d9ab24 100644 --- a/TEMUKJD/KJDForms/ShopForms/MaterialManageForm.Designer.cs +++ b/TEMUKJD/KJDForms/ShopForms/MaterialManageForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.ShopForms +namespace TemuKJD.KJDForms.ShopForms { partial class MaterialManageForm { @@ -33,26 +33,26 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.ucGroupBoxEx3 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components); + this.ucGroupBoxEx3 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.dtEndTime = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); this.dtBaginTime = new DevComponents.Editors.DateTimeAdv.DateTimeInput(); this.labelX47 = new DevComponents.DotNetBar.LabelX(); this.label4 = new System.Windows.Forms.Label(); this.btnClear = new DevComponents.DotNetBar.PanelEx(); this.btnStop = new DevComponents.DotNetBar.PanelEx(); - this.ucGroupBoxEx1 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components); - this.btnGetProductCount = new LittleRabbit.UserControls.ButtonEx(); - this.btnRefreshShop = new LittleRabbit.UserControls.ButtonEx(); + this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); + this.btnGetProductCount = new TemuKJD.UserControls.ButtonEx(); + this.btnRefreshShop = new TemuKJD.UserControls.ButtonEx(); this.splitContainer3 = new System.Windows.Forms.SplitContainer(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); - this.dgvShop = new LittleRabbit.UserComponent.DataGridViewEx(); + this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colAuthStatus = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.splitContainer4 = new System.Windows.Forms.SplitContainer(); - this.statusBar = new LittleRabbit.UserControls.StatusBarUserControl(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -102,7 +102,7 @@ this.ucGroupBoxEx3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); this.ucGroupBoxEx3.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.ucGroupBoxEx3.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx3.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; this.ucGroupBoxEx3.Controls.Add(this.dtEndTime); this.ucGroupBoxEx3.Controls.Add(this.dtBaginTime); this.ucGroupBoxEx3.Controls.Add(this.labelX47); @@ -278,7 +278,7 @@ this.ucGroupBoxEx1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.ucGroupBoxEx1.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; this.ucGroupBoxEx1.Controls.Add(this.btnGetProductCount); this.ucGroupBoxEx1.Controls.Add(this.btnRefreshShop); this.ucGroupBoxEx1.Location = new System.Drawing.Point(3, 2); diff --git a/TEMUKJD/KJDForms/ShopForms/MaterialManageForm.cs b/TEMUKJD/KJDForms/ShopForms/MaterialManageForm.cs index 3801846..2cd50b9 100644 --- a/TEMUKJD/KJDForms/ShopForms/MaterialManageForm.cs +++ b/TEMUKJD/KJDForms/ShopForms/MaterialManageForm.cs @@ -1,6 +1,6 @@ using AllBase.Helper; -using LittleRabbit.Extension; -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.Extension; +using TemuKJD.KJDForms.BaseForms; using NaiBa.Util.Extension; using System; using System.Collections.Generic; @@ -15,7 +15,7 @@ using System.Windows.Forms; using Work.BLL.Upload; using Work.DouyinApiClass; -namespace LittleRabbit.LittleRabbitForms.ShopForms +namespace TemuKJD.KJDForms.ShopForms { public partial class MaterialManageForm : Form { @@ -47,7 +47,7 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms } else { - var list = GlobalConfig.DouShopLoginList.Where(s => s.ApiAuthStatus == "授权成功").Select(ss => ss.ShopAccountId); + var list = GlobalConfig.ShopLoginList.Where(s => s.ApiAuthStatus == "授权成功").Select(ss => ss.ShopId); foreach (DataGridViewRow row in dgvShop.Rows) { if (list.Any(l => l == row.Cells["colShopId"]?.Value?.ToString())) @@ -60,19 +60,19 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms { // 获取被删除的店铺 List dgvRowList = dgvShop.Rows.Cast().Where(row - => !GlobalConfig.DouShopLoginList.Any(s => s.ShopAccountId == row.Cells["colShopId"]?.Value?.ToString())).ToList(); + => !GlobalConfig.ShopLoginList.Any(s => s.ShopId == row.Cells["colShopId"]?.Value?.ToString())).ToList(); // 更新被删除的店铺列表 foreach (var row in dgvRowList) { dgvShop.Rows.Remove(row); } - for (int i = 0; i < GlobalConfig.DouShopLoginList.Count; i++) + for (int i = 0; i < GlobalConfig.ShopLoginList.Count; i++) { - var shop = GlobalConfig.DouShopLoginList[i]; - var row = dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value?.ToString() == shop.ShopAccountId); + var shop = GlobalConfig.ShopLoginList[i]; + var row = dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value?.ToString() == shop.ShopId); if (row == null) - dgvShop.Rows.Add(false, shop.ShopAccountId, shop.ShopAccount, shop.LoginStatus); + dgvShop.Rows.Add(false, shop.ShopId, shop.ShopAccount, shop.LoginStatus); else { row.Cells["colAuthStatus"].Value = shop.ApiAuthStatus; @@ -161,7 +161,7 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms cancellationTokenSource = new CancellationTokenSource(); Task.Run(() => { - var shopList = GlobalConfig.DouShopLoginList.Where(s => s.ApiAuthStatus == "授权成功" && lstShopId.Contains(s.ShopAccountId)); + var shopList = GlobalConfig.ShopLoginList.Where(s => s.ApiAuthStatus == "授权成功" && lstShopId.Contains(s.ShopId)); foreach (var shop in shopList) { DataGridViewRow row = null; @@ -176,7 +176,7 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms this.statusBar.pgbTaskProgress.Text = n + "/" + total; this.statusBar.pgbTaskProgress.Maximum = total; - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colMessage"].Value = "正在获取素材文件夹"; } })); @@ -335,7 +335,7 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms this.Invoke(new Action(() => { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colMessage"].Value = "素材文件夹删除完成"; } })); Thread.Sleep(2000); diff --git a/TEMUKJD/KJDForms/ShopForms/ShopAddEditForm.Designer.cs b/TEMUKJD/KJDForms/ShopForms/ShopAddEditForm.Designer.cs index d3afe19..9129c8c 100644 --- a/TEMUKJD/KJDForms/ShopForms/ShopAddEditForm.Designer.cs +++ b/TEMUKJD/KJDForms/ShopForms/ShopAddEditForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.ShopForms +namespace TemuKJD.KJDForms.ShopForms { partial class ShopAddEditForm { @@ -43,7 +43,7 @@ this.txtLoginName = new System.Windows.Forms.TextBox(); this.label1 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); - this.btnOk = new LittleRabbit.UserControls.ButtonEx(); + this.btnOk = new TemuKJD.UserControls.ButtonEx(); this.panel2.SuspendLayout(); this.SuspendLayout(); // diff --git a/TEMUKJD/KJDForms/ShopForms/ShopAddEditForm.cs b/TEMUKJD/KJDForms/ShopForms/ShopAddEditForm.cs index 4428547..a2e11fd 100644 --- a/TEMUKJD/KJDForms/ShopForms/ShopAddEditForm.cs +++ b/TEMUKJD/KJDForms/ShopForms/ShopAddEditForm.cs @@ -1,6 +1,6 @@ using AllBase.Helper; using AllBase.Model.Result; -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.KJDForms.BaseForms; using System; using System.Collections.Generic; using System.ComponentModel; @@ -11,7 +11,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace LittleRabbit.LittleRabbitForms.ShopForms +namespace TemuKJD.KJDForms.ShopForms { public partial class ShopAddEditForm : LRBaseForm { @@ -59,7 +59,7 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms { this.cmbGroup.Items.Clear(); this.cmbGroup.Items.Add(string.Empty); - foreach (var shop in GlobalConfig.DouShopLoginList) + foreach (var shop in GlobalConfig.ShopLoginList) { if (!string.IsNullOrEmpty(shop.Group) && !this.cmbGroup.Items.Contains(shop.Group)) this.cmbGroup.Items.Add(shop.Group); diff --git a/TEMUKJD/KJDForms/ShopForms/ShopAuthForm.Designer.cs b/TEMUKJD/KJDForms/ShopForms/ShopAuthForm.Designer.cs index e8fd8f4..9df2ad5 100644 --- a/TEMUKJD/KJDForms/ShopForms/ShopAuthForm.Designer.cs +++ b/TEMUKJD/KJDForms/ShopForms/ShopAuthForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.ShopForms +namespace TemuKJD.KJDForms.ShopForms { partial class ShopAuthForm { @@ -30,16 +30,16 @@ { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ShopAuthForm)); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.buttonEx1 = new LittleRabbit.UserControls.ButtonEx(); - this.btnAuthInWeb = new LittleRabbit.UserControls.ButtonEx(); + this.buttonEx1 = new TemuKJD.UserControls.ButtonEx(); + this.btnAuthInWeb = new TemuKJD.UserControls.ButtonEx(); this.label2 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); - this.btnCopyPassword = new LittleRabbit.UserControls.ButtonEx(); - this.btnCopyUserName = new LittleRabbit.UserControls.ButtonEx(); + this.btnCopyPassword = new TemuKJD.UserControls.ButtonEx(); + this.btnCopyUserName = new TemuKJD.UserControls.ButtonEx(); this.txtPassWord = new System.Windows.Forms.TextBox(); this.txtUserName = new System.Windows.Forms.TextBox(); - this.btnStop = new LittleRabbit.UserControls.ButtonEx(); - this.btnReload = new LittleRabbit.UserControls.ButtonEx(); + this.btnStop = new TemuKJD.UserControls.ButtonEx(); + this.btnReload = new TemuKJD.UserControls.ButtonEx(); this.chkCloseAfterLogin = new DevComponents.DotNetBar.Controls.CheckBoxX(); this.txtAddress = new System.Windows.Forms.TextBox(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); diff --git a/TEMUKJD/KJDForms/ShopForms/ShopAuthForm.cs b/TEMUKJD/KJDForms/ShopForms/ShopAuthForm.cs index 95080ed..90023c4 100644 --- a/TEMUKJD/KJDForms/ShopForms/ShopAuthForm.cs +++ b/TEMUKJD/KJDForms/ShopForms/ShopAuthForm.cs @@ -3,7 +3,7 @@ using AllBase.Helper; using AllBase.Model.Result; using CefSharp; using CefSharp.WinForms; -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.KJDForms.BaseForms; using NaiBa.CefHelper; using NaiBa.CefHelper.Handler; using System; @@ -19,7 +19,7 @@ using System.Windows.Forms; using Work; using Work.BLL.Tools; -namespace LittleRabbit.LittleRabbitForms.ShopForms +namespace TemuKJD.KJDForms.ShopForms { public partial class ShopAuthForm : LRBaseForm { @@ -42,7 +42,7 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms { var url = BaseClass.BuildObjString("shop&act=add_shop_agent_name"); var data = UserLogin.GetSignaturex() - + "&shop_id=" + shop.ShopAccountId + + "&shop_id=" + shop.ShopId + "&agent_name=" + BaseClass.AgentName; var result = GetHtml.PostUtf8(url, data); @@ -113,7 +113,7 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms if (res != null && res.StartsWith("授权成功") && res.EndsWith(shop.ShopAccount)) { //shop.ApiAuthStatus = "授权成功"; - ShopListForm.UpdateShopTokens(GlobalConfig.DouShopLoginList.Where(s => s.ShopAccount == shop.ShopAccount).ToList()); + ShopListForm.UpdateShopTokens(GlobalConfig.ShopLoginList.Where(s => s.ShopAccount == shop.ShopAccount).ToList()); StartUp.SaveLocalShopLoginInfo(); OnSaveComplete(shop); if (this.Created && this.chkCloseAfterLogin.Checked) @@ -133,7 +133,7 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms if (this.Created && this.chkCloseAfterLogin.Checked) { - ShopListForm.UpdateShopTokens(GlobalConfig.DouShopLoginList.Where(s => s.ShopAccount == shop.ShopAccount).ToList()); + ShopListForm.UpdateShopTokens(GlobalConfig.ShopLoginList.Where(s => s.ShopAccount == shop.ShopAccount).ToList()); StartUp.SaveLocalShopLoginInfo(); OnSaveComplete(shop); Thread.Sleep(2000); @@ -233,7 +233,7 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms var data = responseData; if (this.shop != null && data.Contains("\"code\":0")) { - shop.ShopAccountId = BaseRegex.GetStringJson(ref data, "id"); + shop.ShopId = BaseRegex.GetStringJson(ref data, "id"); shop.ShopToken = BaseRegex.GetStringJson(ref data, "token"); shop.ShopAccount = BaseRegex.GetStringJson(ref data, "shop_name"); shop.Mobile = BaseRegex.GetStringJson(ref data, "mobile"); diff --git a/TEMUKJD/KJDForms/ShopForms/ShopForm.Designer.cs b/TEMUKJD/KJDForms/ShopForms/ShopForm.Designer.cs index e03a002..310a283 100644 --- a/TEMUKJD/KJDForms/ShopForms/ShopForm.Designer.cs +++ b/TEMUKJD/KJDForms/ShopForms/ShopForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.ShopForms +namespace TemuKJD.KJDForms.ShopForms { partial class ShopForm { @@ -44,7 +44,7 @@ this.panel2 = new System.Windows.Forms.Panel(); this.lblName = new System.Windows.Forms.Label(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.tv = new LittleRabbit.UserComponent.UcTreeView(); + this.tv = new TemuKJD.UserComponent.UcTreeView(); this.panel1.SuspendLayout(); this.panel2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); diff --git a/TEMUKJD/KJDForms/ShopForms/ShopForm.cs b/TEMUKJD/KJDForms/ShopForms/ShopForm.cs index ccc4603..1428f12 100644 --- a/TEMUKJD/KJDForms/ShopForms/ShopForm.cs +++ b/TEMUKJD/KJDForms/ShopForms/ShopForm.cs @@ -9,7 +9,7 @@ using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; -namespace LittleRabbit.LittleRabbitForms.ShopForms +namespace TemuKJD.KJDForms.ShopForms { public partial class ShopForm : Form { diff --git a/TEMUKJD/KJDForms/ShopForms/ShopListForm.Designer.cs b/TEMUKJD/KJDForms/ShopForms/ShopListForm.Designer.cs index 649a8d9..c990c95 100644 --- a/TEMUKJD/KJDForms/ShopForms/ShopListForm.Designer.cs +++ b/TEMUKJD/KJDForms/ShopForms/ShopListForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.ShopForms +namespace TemuKJD.KJDForms.ShopForms { partial class ShopListForm { @@ -35,17 +35,17 @@ this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); this.panel5 = new System.Windows.Forms.Panel(); - this.btnRefreshAuth = new LittleRabbit.UserControls.ButtonEx(); - this.btnLoginSelect = new LittleRabbit.UserControls.ButtonEx(); - this.btnCheck = new LittleRabbit.UserControls.ButtonEx(); + this.btnRefreshAuth = new TemuKJD.UserControls.ButtonEx(); + this.btnLoginSelect = new TemuKJD.UserControls.ButtonEx(); + this.btnCheck = new TemuKJD.UserControls.ButtonEx(); this.panel4 = new System.Windows.Forms.Panel(); - this.btnImport = new LittleRabbit.UserControls.ButtonEx(); - this.btnAddShop = new LittleRabbit.UserControls.ButtonEx(); + this.btnImport = new TemuKJD.UserControls.ButtonEx(); + this.btnAddShop = new TemuKJD.UserControls.ButtonEx(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.pbLoading = new System.Windows.Forms.PictureBox(); - this.dgvShop = new LittleRabbit.UserComponent.DataGridViewEx(); + this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx(); this.chkAutoDrag = new System.Windows.Forms.CheckBox(); - this.statusBar = new LittleRabbit.UserControls.StatusBarUserControl(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -56,6 +56,7 @@ this.colBuyAccount = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colChatAccount = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colLoginStatus = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colGotoShop = new System.Windows.Forms.DataGridViewLinkColumn(); this.colShopOperate = new System.Windows.Forms.DataGridViewLinkColumn(); this.colRelogin = new System.Windows.Forms.DataGridViewLinkColumn(); this.colMultiLogin = new System.Windows.Forms.DataGridViewLinkColumn(); @@ -251,7 +252,7 @@ // pbLoading // this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None; - this.pbLoading.Image = global::LittleRabbit.Properties.Resources.loading_blue; + this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue; this.pbLoading.Location = new System.Drawing.Point(506, 252); this.pbLoading.Name = "pbLoading"; this.pbLoading.Size = new System.Drawing.Size(50, 50); @@ -288,6 +289,7 @@ this.colBuyAccount, this.colChatAccount, this.colLoginStatus, + this.colGotoShop, this.colShopOperate, this.colRelogin, this.colMultiLogin, @@ -406,6 +408,15 @@ this.colLoginStatus.ReadOnly = true; this.colLoginStatus.Visible = false; // + // colGotoShop + // + this.colGotoShop.FillWeight = 46F; + this.colGotoShop.HeaderText = "进入店铺"; + this.colGotoShop.Name = "colGotoShop"; + this.colGotoShop.ReadOnly = true; + this.colGotoShop.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colGotoShop.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + // // colShopOperate // this.colShopOperate.FillWeight = 46F; @@ -414,6 +425,7 @@ this.colShopOperate.ReadOnly = true; this.colShopOperate.Resizable = System.Windows.Forms.DataGridViewTriState.True; this.colShopOperate.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colShopOperate.Visible = false; // // colRelogin // @@ -539,6 +551,7 @@ private System.Windows.Forms.DataGridViewTextBoxColumn colBuyAccount; private System.Windows.Forms.DataGridViewTextBoxColumn colChatAccount; private System.Windows.Forms.DataGridViewTextBoxColumn colLoginStatus; + private System.Windows.Forms.DataGridViewLinkColumn colGotoShop; private System.Windows.Forms.DataGridViewLinkColumn colShopOperate; private System.Windows.Forms.DataGridViewLinkColumn colRelogin; private System.Windows.Forms.DataGridViewLinkColumn colMultiLogin; diff --git a/TEMUKJD/KJDForms/ShopForms/ShopListForm.cs b/TEMUKJD/KJDForms/ShopForms/ShopListForm.cs index 5135925..3d9b1b2 100644 --- a/TEMUKJD/KJDForms/ShopForms/ShopListForm.cs +++ b/TEMUKJD/KJDForms/ShopForms/ShopListForm.cs @@ -1,8 +1,8 @@ using AllBase; using AllBase.Helper; using AllBase.Model.Result; -using LittleRabbit.Extension; -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.Extension; +using TemuKJD.KJDForms.BaseForms; using NaiBa.Util.Extension; using Newtonsoft.Json.Linq; using System; @@ -19,7 +19,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using Work; -namespace LittleRabbit.LittleRabbitForms.ShopForms +namespace TemuKJD.KJDForms.ShopForms { public partial class ShopListForm : Form { @@ -35,7 +35,7 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms var data = UserLogin.GetSignaturex() + "&login_name=" + _shop.LoginName + "&login_pass=" + GetHtml.UrlEncodeUtf8(_shop.Password) - + "&shop_id=" + _shop.ShopAccountId + + "&shop_id=" + _shop.ShopId + "&shop_account=" + _shop.ShopAccount + "&cookie=" + _shop.Cookies + "&shop_group=" + GetHtml.UrlEncodeUtf8(_shop.Group); @@ -54,6 +54,30 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms } return result; } + + public static string MdyServerDouShop(DouShopLoginInfo _shop) + { + var url = BaseClass.BuildObjString("shop/mdy_shop"); + var data = UserLogin.GetSignaturex() + + "&login_name=" + _shop.LoginName + + "&login_pass=" + GetHtml.UrlEncodeUtf8(_shop.Password) + + "&shop_group=" + GetHtml.UrlEncodeUtf8(_shop.Group); + + var result = GetHtml.PostUtf8(url, data); + if (!result.Contains("\"code\":200") && !result.Contains("已达上限") && !result.Contains("已存在")) + result = GetHtml.PostUtf8(url, data); + if (!result.Contains("\"code\":200") && !result.Contains("已达上限") && !result.Contains("已存在")) + result = GetHtml.PostUtf8(url, data); + if (!result.Contains("\"code\":200")) + { + var msg = BaseRegex.GetStringJson(ref result, "msg"); + if (string.IsNullOrEmpty(msg)) + msg = "店铺保存失败！"; + BaseMsgForm.ShowError(msg); + } + return result; + } + public static List GetServerDouShop() { List list = new List(); @@ -89,7 +113,7 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms continue; shop.LoginName = BaseRegex.GetStringJson(ref shopStr, "login_name"); shop.Password = BaseRegex.GetStringJson(ref shopStr, "login_pass"); - shop.ShopAccountId = BaseRegex.GetStringJson(ref shopStr, "shop_id"); + shop.ShopId = BaseRegex.GetStringJson(ref shopStr, "shop_id"); shop.ShopAccount = BaseRegex.GetStringJson(ref shopStr, "shop_account"); shop.Group = BaseRegex.GetStringJson(ref shopStr, "shop_group"); shop.Cookies = BaseRegex.GetStringJson(ref shopStr, "cookie"); @@ -144,7 +168,7 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms string shopIds = ""; foreach (var shop in shops) { - shopIds += shop.ShopAccountId + ","; + shopIds += shop.ShopId + ","; } var shopTokens = GetServerShopTokens(shopIds); //{"code":200,"msg":"success","data":[{"shop_id":"9050819","app_key":"6876612657718691336","access_token":"fd818b94-b4e7-4707-8073-bebcd81d8e4c","refresh_token":"9a109ef3-2bef-4ca9-8f4e-18369a356255","add_time":"2021-07-09 10:54:56","expires_in":"2021-07-14 18:40:44"}]} @@ -161,7 +185,7 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms { string shopStr = JsonHelper.SerializeObject(jShop); string shop_id = BaseRegex.GetStringJson(ref shopStr, "shop_id"); - var shop = shops.FirstOrDefault(s => s.ShopAccountId == shop_id); + var shop = shops.FirstOrDefault(s => s.ShopId == shop_id); if (shop != null) { var appkey = BaseRegex.GetStringJson(ref shopStr, "app_key"); @@ -279,36 +303,42 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms { if ((isAdd as bool?) == true) { - var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(v => v.LoginName == shopInfo.LoginName); + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(v => v.LoginName == shopInfo.LoginName); if (shop != null) { BaseMsgForm.ShowError("店铺" + shopInfo.LoginName + "已存在！"); } else { - GlobalConfig.DouShopLoginList.Add(shopInfo); + GlobalConfig.ShopLoginList.Add(shopInfo); StartUp.SaveLocalShopLoginInfo(); ShopListForm.AddServerDouShop(shopInfo); + RefreshDataGridView(false); } } else { StartUp.SaveLocalShopLoginInfo(); ShopListForm.AddServerDouShop(shopInfo); - shopLoginForm_SaveComplete(shopInfo); + RefreshDataGridView(false); } } } private void shopLoginForm_SaveComplete(object obj) { - CheckShopLoginAsync(new string[] { (obj as DouShopLoginInfo).ShopAccount }); + Task.Run(() => + { + //CheckShopListLogin(new string[] { (obj as DouShopLoginInfo).LoginName }); + RefreshDataGridView(false); + }); } private void btnImport_Click(object sender, EventArgs e) { IsOperate = true; ImportShop(); + RefreshDataGridView(); } void ImportShop() @@ -355,14 +385,14 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms //shopLoginForm.ShowDialog(); //StartUp.SaveDouShopLoginInfo(); - var shopInfo = GlobalConfig.DouShopLoginList.FirstOrDefault(v => v.LoginName == shop.LoginName); + var shopInfo = GlobalConfig.ShopLoginList.FirstOrDefault(v => v.LoginName == shop.LoginName); if (shopInfo != null) { shopInfo.Password = shop.Password; shopInfo.Group = shop.Group; } else - GlobalConfig.DouShopLoginList.Add(shop); + GlobalConfig.ShopLoginList.Add(shop); StartUp.SaveLocalShopLoginInfo(); ShopListForm.AddServerDouShop(shop); } @@ -372,22 +402,19 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms { } } - RefreshDataGridView(); } } IsOperate = false; this.btnImport.Enabled = true; } - private void RefreshDataGridView() + private void RefreshDataGridView(bool updateStatus=true) { if (isLoading) { //BaseMsgForm.ShowError("当前正在加载，请稍等"); return; } - this.statusBar.pgbTaskProgress.Maximum = GlobalConfig.DouShopLoginList.Count; - this.dgvShop.Rows.Clear(); Task.Run(() => { isLoading = true; @@ -396,27 +423,36 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms Thread.Sleep(1000); } - for (int i = 0; i < GlobalConfig.DouShopLoginList.Count; i++) + var shopList = GlobalConfig.ShopLoginList.Where(s => !string.IsNullOrEmpty(s.ShopId) + || GlobalConfig.ShopLoginList.Where(ss=>ss.LoginName == s.LoginName).Count() == 1) + .OrderBy(s=>s.LoginName).ToList(); + + this.Invoke(new Action(() => { - if (i % 5 == 0 || i == GlobalConfig.DouShopLoginList.Count - 1) + this.dgvShop.Rows.Clear(); + if (updateStatus) + this.statusBar.pgbTaskProgress.Maximum = shopList.Count; // 显示总数 + })); + + for (int i = 0; i < shopList.Count; i++) + { + if (this.Created && updateStatus && (i % 5 == 0 || i == shopList.Count - 1)) { - if (this.Created) + this.Invoke(new Action(() => { - this.Invoke(new Action(() => - { - this.statusBar.lblTaskStatus.Text = "正在加载..."; - this.statusBar.pgbTaskProgress.Value = (i + 1); - this.statusBar.pgbTaskProgress.Text = (i + 1) + "/" + GlobalConfig.DouShopLoginList.Count; - })); - } + this.statusBar.lblTaskStatus.Text = "正在加载..."; + this.statusBar.pgbTaskProgress.Value = (i + 1); + this.statusBar.pgbTaskProgress.Text = (i + 1) + "/" + shopList.Count; + })); } - AddDataGridViewRow(GlobalConfig.DouShopLoginList[i], true); + AddDataGridViewRow(shopList[i], true); } if (this.Created) { this.Invoke(new Action(() => { - this.statusBar.lblTaskStatus.Text = "加载完毕"; + if (updateStatus) + this.statusBar.lblTaskStatus.Text = "加载完毕"; this.pbLoading.Visible = false; })); } @@ -432,7 +468,7 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms { DataGridViewRow dgvr = dgvShop.Rows.Cast().Where(p => p.Cells.GetCellValueFromColumnName("colLoginName").ParseToString() == param.LoginName && - p.Cells.GetCellValueFromColumnName("colShopId").ParseToString() == param.ShopAccountId).FirstOrDefault(); + p.Cells.GetCellValueFromColumnName("colShopId").ParseToString() == param.ShopId).FirstOrDefault(); if (dgvr != null) { UpdateDataGridViewRowToken(dgvr, param); @@ -447,7 +483,7 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms int rowIndex = this.dgvShop.Rows.Add( false, param.LoginName, - param.ShopAccountId, + param.ShopId, param.ShopAccount, param.Cookies, param.Group, @@ -455,6 +491,7 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms param.BuyAccount, param.ChatAccount, "", + "进入", "检测", string.IsNullOrWhiteSpace(param.LoginStatus) ? "未登录" : param.LoginStatus.Trim(), "多重登录", @@ -493,7 +530,7 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms /// /// /// - public void CheckShopLoginAsync(string[] shopNames, bool isShowProgress = true) + public void CheckShopListLogin(string[] shopNames, bool isShowProgress = true) { if (isShowProgress) { @@ -506,114 +543,53 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms })); } - Task.Run(() => - { - CheckShopLogin(shopNames, isShowProgress); + CheckShopLogin(shopNames, isShowProgress); - if (this.Created && isShowProgress) + if (this.Created && isShowProgress) + { + this.Invoke(new Action(() => { - this.Invoke(new Action(() => - { - this.statusBar.lblTaskStatus.Text = "检测完毕"; - })); - } - }); + this.statusBar.lblTaskStatus.Text = "检测完毕"; + })); + } } public void CheckShopLogin(string[] shopNames, bool isShowProgress = true) { for (int i = 0; i < shopNames.Length; i++) { - var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(v => v.LoginName == shopNames[i]); + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(v => v.LoginName == shopNames[i]); + var campanys = GlobalConfig.ShopLoginList.Where(v => v.LoginName == shopNames[i]).ToList(); if (shop != null) { - retryLogin: - var loginResult = "\"code\":0";//GetShopStatus(shop); - if (loginResult.Contains("\"code\":0")) + //var loginResult = "\"code\":0";//GetShopStatus(shop); + var loginResult = GetShopStatus(shop); + if (loginResult.Contains("\"success\":true")) { - shop.LoginStatus = "登录成功"; - //var shopId = BaseRegex.GetStringJson(ref loginResult, "id"); - //var shopToken = BaseRegex.GetStringJson(ref loginResult, "token"); - //var shopName = BaseRegex.GetStringJson(ref loginResult, "shop_name"); - //var mobile = BaseRegex.GetStringJson(ref loginResult, "mobile"); - //if (!string.IsNullOrEmpty(shopId)) shop.ShopAccountId = shopId; - //if (!string.IsNullOrEmpty(shopToken)) shop.ShopToken = shopToken; - //if (!string.IsNullOrEmpty(shopName)) shop.ShopAccount = shopName; - //if (!string.IsNullOrEmpty(mobile)) shop.Mobile = mobile; - } - else if (loginResult.Contains("未登录")) - { - var keyValue = shop.DictMultiCookies.FirstOrDefault(c => c.Value == shop.Cookies); - if (keyValue.Key != null) - shop.DictMultiCookies.Remove(keyValue.Key); - - if (shop.DictMultiCookies.Keys.Count > 0) + foreach(var sc in campanys) { - shop.Cookies = shop.DictMultiCookies.FirstOrDefault().Value; - goto retryLogin; + sc.LoginStatus = "登录成功"; + //var shopId = BaseRegex.GetStringJson(ref loginResult, "id"); + //var shopToken = BaseRegex.GetStringJson(ref loginResult, "token"); + //var shopName = BaseRegex.GetStringJson(ref loginResult, "shop_name"); + //var mobile = BaseRegex.GetStringJson(ref loginResult, "mobile"); + //if (!string.IsNullOrEmpty(shopId)) shop.ShopId = shopId; + //if (!string.IsNullOrEmpty(shopToken)) shop.ShopToken = shopToken; + //if (!string.IsNullOrEmpty(shopName)) shop.ShopAccount = shopName; + //if (!string.IsNullOrEmpty(mobile)) shop.Mobile = mobile; } - shop.LoginStatus = "未登录"; } else { - shop.LoginStatus = "登录失败"; - } - - // 获取店铺token列表 - shop.ApiAuthStatus = "未授权"; - if (!string.IsNullOrEmpty(shop.AccessToken) && shop.ExpiresTime > DateTime.Now) - { - Work.DouyinApiClass.DouyinApi api = new Work.DouyinApiClass.DouyinApi(shop); - string html = ""; - //if (shop.LstBrand == null) - //{ - // html = api.shopBrandList(); - // if (html.Contains("\"code\":10000") && html.Contains("\"data\":[")) - // { - // shop.LstBrand = JsonHelper.DeserializeJsonToList(JsonHelper.SerializeObject(JObject.Parse(html)["data"])); - // } - //} - if (string.IsNullOrEmpty(html) || html.Contains("该接口即将下线")) + foreach (var sc in campanys) { - Dictionary dictionary = new Dictionary(); - dictionary.Add("page", "1"); - dictionary.Add("size", "1"); - api.JsonData = dictionary; - html = api.GetProductList(); - } - if (html.Contains("\"code\":10000")) - { - shop.ApiAuthStatus = "授权成功"; - } - else - { - if (html.Contains("access_token已过期")) - { - } - else - { - var errMsg = BaseRegex.GetStringJson(ref html, "sub_msg"); - if (string.IsNullOrEmpty(errMsg)) - errMsg = html; - if (errMsg.Contains("店铺授权已被关闭")) - shop.ApiAuthStatus = "未授权，授权未开通或已关闭"; - else - BaseMsgForm.ShowError("店铺 " + shop.ShopAccount + " 检测错误:\r\n" + errMsg); - } + //sc.LoginStatus = "登录失败"; + sc.LoginStatus = "未登录"; } } - - shop.BuyApiAuth.ApiAuthStatus = "未授权"; - if (!string.IsNullOrEmpty(shop.BuyApiAuth.AccessToken) && shop.BuyApiAuth.ExpiresTime > DateTime.Now) - { - shop.BuyApiAuth.ApiAuthStatus = "授权成功"; - } - - if (!string.IsNullOrEmpty(loginResult)) - shop.LastRefreshDate = DateTime.Now.ToString("yyyyMMdd"); - + //if (!string.IsNullOrEmpty(loginResult)) + // shop.LastRefreshDate = DateTime.Now.ToString("yyyyMMdd"); StartUp.SaveLocalShopLoginInfo(); - AddDataGridViewRow(shop); } if (this.Created && isShowProgress) { @@ -641,25 +617,41 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms string result; try { - string url = "https://fxg.jinritemai.com/common/index/index?_lid=" + _lid; - url = "https://fxg.jinritemai.com/common/index/index?_=" + timeStamp + "&appid=1"; + //string url = "https://fxg.jinritemai.com/common/index/index?_lid=" + _lid; + //url = "https://fxg.jinritemai.com/common/index/index?_=" + timeStamp + "&appid=1"; + string url = "https://seller.kuajingmaihuo.com/bg/quiet/api/mms/userInfo"; HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url); request.KeepAlive = true; - request.Headers.Add("sec-ch-ua", @""" Not;A Brand"";v=""99"", ""Google Chrome"";v=""91"", ""Chromium"";v=""91"""); + request.Headers.Set(HttpRequestHeader.CacheControl, "max-age=0"); + request.Headers.Add("Anti-Content", @"0aqAfqFyXcGvBgd9Q0HiJJ7kvWcKK7muUHnJ6oMAdmem0tmm_enmX1DBr-nJNxmoki33dqHTkZU18BU2p8P72Cg2uEZ_acOOBCxGmIs-Gym4EtKpTdZ6kWRCSClS9L6maLm0imx0GIjodHtLnwpx4ayHnhzNnCXEFecZSC8lBRHb9WCAoyY79kMLIWxBMZZSZrR2_LYUJ5UXzf-82ob455f7OvJa6s895N4wiMGR4vbVH8gFN2VuCxS27RpXDa2WCQQQd6XsJPw7amSUaob6oZ2MXuYb9K3ZqoCX5-nJimNZDR0rNCLB13sYgWq9jy0Q3gjnsFY2dJQDh3ewXS2vvf2DN9IAEzInwWTY31Fn0B6-s8DqwIm61OlXsfYt1AYOOyNMLzkw5llaDaqK21f7vspAuXwnJdAdKXJXSyyEimvTyF_AYLp1gkNqBqN1_ik_jc6cKTDJtGUgFjRojR4g4zM7Ww3wfW63WQrJftYhiTIJiS1tZcsceZht3Zu3MsvyxpAbx4bxFrvL0A6OFx752XsVi04Tm6HDhgt7MmpsrTO5WD_KjgjxNX8VNoGndD0OmriAYVn6kwmZXE6Y_khGedxumIGy4sOQI36__CeiuiPIvB8itfOqd7eyqyeCIaEODrh9dSLBQz8AxQ2xt60OTn4HSiPmlwo1J0TFtjUw2DUZB68tdrINb7ugulMsaIwMKr8S0bilSKW6JuYw3oAsmK3daQfJWy3mzVowY1UwPQfTB4Ibz6uRQxHkvhsRTXkrAygGeZIc9S"); + request.Headers.Add("sec-ch-ua-platform", @"""Windows"""); + request.UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/137.0.0.0 Safari/537.36"; + request.Headers.Add("sec-ch-ua", @"""Google Chrome"";v=""137"", ""Chromium"";v=""137"", ""Not/A)Brand"";v=""24"""); + request.Headers.Add("Sec-Purpose", @"prefetch;prerender"); + request.ContentType = "application/json"; request.Headers.Add("sec-ch-ua-mobile", @"?0"); - request.UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.114 Safari/537.36"; request.Accept = "*/*"; + request.Headers.Add("Origin", @"https://seller.kuajingmaihuo.com"); + request.Headers.Add("Purpose", @"prefetch"); request.Headers.Add("Sec-Fetch-Site", @"same-origin"); request.Headers.Add("Sec-Fetch-Mode", @"cors"); request.Headers.Add("Sec-Fetch-Dest", @"empty"); - request.Referer = "https://fxg.jinritemai.com/ffa/mshop/homepage/index"; - //request.Headers.Set(HttpRequestHeader.AcceptEncoding, "gzip, deflate, br"); - request.Headers.Set(HttpRequestHeader.AcceptEncoding, "gzip, deflate"); + request.Referer = "https://seller.kuajingmaihuo.com/"; + request.Headers.Set(HttpRequestHeader.AcceptEncoding, "gzip, deflate, br, zstd"); + //request.Headers.Set(HttpRequestHeader.AcceptEncoding, "gzip, deflate"); request.Headers.Set(HttpRequestHeader.AcceptLanguage, "zh-CN,zh;q=0.9"); request.Headers.Set(HttpRequestHeader.Cookie, shop.Cookies); - //gfsitesid=MTQyNTYzMzg3MXwxNjI0ODY5MDgyMjN8fDQyOTIxMTA1Mjk2MDgzNzUHBwcHBwcH; gfsitesid=MTQyNTYzMzg3MXwxNjI0ODY5MDgyMjN8fDQyOTIxMTA1Mjk2MDgzNzUHBwcHBwcH; gfsitesid=MTQyNTYzMzg3MXwxNjI0ODY5MDgyMjN8fDQyOTIxMTA1Mjk2MDgzNzUHBwcHBwcH; gfsitesid=MTQyNTYzMzg3MXwxNjI0ODY5MDgyMjN8fDQyOTIxMTA1Mjk2MDgzNzUHBwcHBwcH; gftoken=MTQyNTYzMzg3MXwxNjI0ODY5MDgyMjN8fDAGBgYGBgY; Hm_lvt_b6520b076191ab4b36812da4c90f7a5e=1624869083; passport_csrf_token_default=63caff152adc5e1d5da5767bf68c6e13; passport_csrf_token=63caff152adc5e1d5da5767bf68c6e13; ttwid=1%7C7YnupmizSCfMVfQ9y8cSyDYdaFFZFIG3i91Gg2_c5o4%7C1624869083%7C2527885991ce10cc1d54edcb381f47d01aaaf862a2c1fb587f55e26aa41eba5b; ttcid=40a3419fe96343f794046035c0f1c6bb88; n_mh=7LrrRmeUceh3vjPZWa4C3h7B_APxodsUr7zuYy75V90; sso_uid_tt=c1960cf8de21effe142f1b380670a8a3; sso_uid_tt_ss=c1960cf8de21effe142f1b380670a8a3; toutiao_sso_user=c00794bc53d4a42eb9ab1388ca003bcb; toutiao_sso_user_ss=c00794bc53d4a42eb9ab1388ca003bcb; odin_tt=c646a97f8da607104fc7f1b424cf575d3a9360b52a860aa41d467407a14512fa049a875904a556a8ecbca4985d302a8287ae02bafeaf8235cd31d44a86c2f27f; gfpart_1.0.0.2541_75650=0; uidpasaddaehruigqreajf=0; ucas_sso_c0_ss=CkEKBTEuMC4wEIeIg9zOm-LsYBjmJiC9k9DP4oyUBCiwITC39dDb7fTPB0DjkeaGBkjjxaKJBlCOvKLE77ansWBYbhIU4IRRs4bwygU2zJUnwUihzw_S6ko; ucas_sso_c0=CkEKBTEuMC4wEIeIg9zOm-LsYBjmJiC9k9DP4oyUBCiwITC39dDb7fTPB0DjkeaGBkjjxaKJBlCOvKLE77ansWBYbhIU4IRRs4bwygU2zJUnwUihzw_S6ko; ucas_c0_ss=CkEKBTEuMC4wEKKIg9SJmuLsYBjmJiC9k9DP4oyUBCiwITC39dDb7fTPB0DkkeaGBkjkxaKJBlCOvKLE77ansWBYbhIU3xVR2vJ8IbAhCwtumICcjmmBLh0; sid_guard=16f989cfdea4ddac75677dfc0ce57afd%7C1624869092%7C5184000%7CFri%2C+27-Aug-2021+08%3A31%3A32+GMT; uid_tt=6fdbf1e79a0ed585dfa8e872be181249; uid_tt_ss=6fdbf1e79a0ed585dfa8e872be181249; sid_tt=16f989cfdea4ddac75677dfc0ce57afd; sessionid=16f989cfdea4ddac75677dfc0ce57afd; sessionid_ss=16f989cfdea4ddac75677dfc0ce57afd; ucas_c0=CkEKBTEuMC4wEKKIg9SJmuLsYBjmJiC9k9DP4oyUBCiwITC39dDb7fTPB0DkkeaGBkjkxaKJBlCOvKLE77ansWBYbhIU3xVR2vJ8IbAhCwtumICcjmmBLh0; PHPSESSID=3fe844ca974ebeea09da3231eee9646e; PHPSESSID_SS=3fe844ca974ebeea09da3231eee9646e; need_choose_shop=0; Hm_lpvt_b6520b076191ab4b36812da4c90f7a5e=1624869093; login_info=%7B%22for_im_reply%22%3A%223fe844ca974ebeea09da3231eee9646e%22%7D; tt_scid=jkzjB5E7zloxWMb2G449QYbHcDZpzOLTpPUBSBff8qryqYe.RyJXHuV0J7Zgm6nNa041; MONITOR_WEB_ID=4292110529608375 - //passport_csrf_token_default=e5523a2b927b7a05c96d78a002476760; passport_csrf_token=e5523a2b927b7a05c96d78a002476760; source=bd.pcpz.1; uidpasaddaehruigqreajf=0; need_choose_shop=0; gfpart_1.0.0.695_75006=0; SHOP_ID=9050819; PIGEON_CID=4292110529608375; gfpart_1.0.0.2509_75019=0; Hm_lvt_b6520b076191ab4b36812da4c90f7a5e=1624517875,1624518442; passport_auth_status_ss=be2c708f6b44b8a69f25bb0be517ed9e%2C3eecc7d21580d321236fc0fdc098042c; passport_auth_status=be2c708f6b44b8a69f25bb0be517ed9e%2C3eecc7d21580d321236fc0fdc098042c; n_mh=7LrrRmeUceh3vjPZWa4C3h7B_APxodsUr7zuYy75V90; gfpart_1.0.0.312_74679=1; ttwid=1%7Cn--vVhfZ3AB5VnU0qJCRI6DEqVeEtvQU9yArHD7nu7A%7C1624868199%7Ccd636d9e6f1719d9a763eee1acf81ab435e14c542490ef0a5150c7566f110764; sso_uid_tt=b577dc2d646f30ca85d073bf096eb952; sso_uid_tt_ss=b577dc2d646f30ca85d073bf096eb952; toutiao_sso_user=c1581bc437561fd5a52f850ccd927686; toutiao_sso_user_ss=c1581bc437561fd5a52f850ccd927686; odin_tt=e85b04b36cb5475fe06a487c55655d731be76d54ae26e57e080823d3a568d863c7b24a14aa1c89b488b91e2e2f5743b98bc4e9b7f726b342d8f0c5ea43744e5c; ucas_sso_c0_ss=CkEKBTEuMC4wEIiIkvirrOHsYBjmJiC9k9DP4oyUBCiwITC39dDb7fTPB0DsiuaGBkjsvqKJBlCOvKLE77ansWBYbhIUtAA8VK2j6e3rNeErWjH8DgLTusg; ucas_sso_c0=CkEKBTEuMC4wEIiIkvirrOHsYBjmJiC9k9DP4oyUBCiwITC39dDb7fTPB0DsiuaGBkjsvqKJBlCOvKLE77ansWBYbhIUtAA8VK2j6e3rNeErWjH8DgLTusg; ucas_c0_ss=CkEKBTEuMC4wEISIh4LFquHsYBjmJiC9k9DP4oyUBCiwITC39dDb7fTPB0DtiuaGBkjtvqKJBlCOvKLE77ansWBYbhIUW5zoGPqAfCOgljJMo1C38jEuxXU; sid_guard=e57a8c80525e8c0ed19010416cada4b5%7C1624868205%7C5184000%7CFri%2C+27-Aug-2021+08%3A16%3A45+GMT; uid_tt=77d00870f7e450b238e44daad9c2ce4b; uid_tt_ss=77d00870f7e450b238e44daad9c2ce4b; sid_tt=e57a8c80525e8c0ed19010416cada4b5; sessionid=e57a8c80525e8c0ed19010416cada4b5; sessionid_ss=e57a8c80525e8c0ed19010416cada4b5; ucas_c0=CkEKBTEuMC4wEISIh4LFquHsYBjmJiC9k9DP4oyUBCiwITC39dDb7fTPB0DtiuaGBkjtvqKJBlCOvKLE77ansWBYbhIUW5zoGPqAfCOgljJMo1C38jEuxXU; PHPSESSID=4509fb9e486ea387dd36c94c3300d730; PHPSESSID_SS=4509fb9e486ea387dd36c94c3300d730; login_info=%7B%22for_im_reply%22%3A%224509fb9e486ea387dd36c94c3300d730%22%7D; __G_CREATE_VERIFY_PASS__=9050819; gftoken=ZTU3YThjODA1MnwxNjI0ODY4MjE5MTN8fDAGBgYGBgY; Hm_lpvt_b6520b076191ab4b36812da4c90f7a5e=1624868264; tt_scid=UdcHHkJ0VryryaO30UGOPrdEqaM70FrV6n5xUCKx17Y27H1b.8HjmzE2PXTyrHxL62c8; MONITOR_WEB_ID=4292110529608375; gfpart_1.0.0.2541_75650=0 + + request.Method = "POST"; + request.ServicePoint.Expect100Continue = false; + + string body = @"{}"; + byte[] postBytes = System.Text.Encoding.UTF8.GetBytes(body); + request.ContentLength = postBytes.Length; + Stream stream = request.GetRequestStream(); + stream.Write(postBytes, 0, postBytes.Length); + stream.Close(); response = (HttpWebResponse)request.GetResponse(); } @@ -687,7 +679,7 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms if (this.Visible == true) { this.pbLoading.Visible = true; - RefreshDataGridView(); + RefreshDataGridView(true); } } @@ -726,21 +718,30 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms return; string headerText = dgvShop.Columns[e.ColumnIndex].HeaderText; string loginName = dgvShop.Rows[e.RowIndex].Cells["colLoginName"].Value.ParseToString(); - var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(v => v.LoginName == loginName); + string accountId = dgvShop.Rows[e.RowIndex].Cells["colShopId"].Value.ParseToString(); + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(v => v.LoginName == loginName && v.ShopId == accountId); switch (headerText) { case "检测": //CheckShopLoginAsync(new string[] { loginName }); + case "进入店铺": IsOperate = true; { ShopLoginForm shopLoginForm = new ShopLoginForm(shop); shopLoginForm.openType = EnumOpenType.manage; - shopLoginForm.SaveComplete += shopLoginForm_SaveComplete; shopLoginForm.ShowDialog(); IsOperate = false; } break; + case "复制Cookies": + //SUB_PASS_ID=eyJ0IjoiRHBPWTBvVGxKWlZCZ1FmNVpPNGFwUjczdDZzUGk5bWVzbHZGejBUYlFkK3c4VjN4ZUIyV1RtZ24ybCtwWkhyNSIsInYiOjEsInMiOjEwMDAwLCJ1IjoyNDg3NDUxOTIxNzE0fQ== + string cook = shop.Cookies; + cook = BaseRegex.GetStringCookie(ref cook, "SUB_PASS_ID"); + cook = "SUB_PASS_ID=" + cook; + Clipboard.SetDataObject(cook); + BaseMsgForm.ShowInfo("复制成功"); + break; case "删除": if (BaseMsgForm.ShowConfirm("确定删除店铺吗？删除后不可恢复！").DialogResult == DialogResult.Cancel) return; @@ -802,7 +803,7 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms foreach(var row in dgvRows) dgvShop.Rows.Remove(row); - GlobalConfig.DouShopLoginList.RemoveAll(v => v.LoginName == shopLoginName); + GlobalConfig.ShopLoginList.RemoveAll(v => v.LoginName == shopLoginName); } private void btnCheck_Click(object sender, EventArgs e) @@ -816,7 +817,11 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms return; } - CheckShopLoginAsync(shopNameList.ToArray()); + Task.Run(() => + { + CheckShopListLogin(shopNameList.Distinct().ToArray()); + RefreshDataGridView(false); + }); } } @@ -847,12 +852,13 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms return; } + shopLoginNameList = shopLoginNameList.Distinct().ToList(); foreach (var loginName in shopLoginNameList) { if (ShopListForm.IsOperate == false) break; - var shopInfo = GlobalConfig.DouShopLoginList.FirstOrDefault(v => v.LoginName == loginName); + var shopInfo = GlobalConfig.ShopLoginList.FirstOrDefault(v => v.LoginName == loginName); if (shopInfo != null && !string.IsNullOrEmpty(shopInfo.LoginName) && !string.IsNullOrEmpty(shopInfo.Password)) { ShopLoginForm shopLoginForm = new ShopLoginForm(shopInfo); @@ -899,8 +905,12 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms return; } - UpdateShopTokens(GlobalConfig.DouShopLoginList.Where(s => shopNameList.Contains(s.ShopAccount)).ToList()); - CheckShopLoginAsync(shopNameList.ToArray()); + UpdateShopTokens(GlobalConfig.ShopLoginList.Where(s => shopNameList.Contains(s.ShopAccount)).ToList()); + Task.Run(() => + { + CheckShopListLogin(shopNameList.ToArray()); + RefreshDataGridView(false); + }); } } } diff --git a/TEMUKJD/KJDForms/ShopForms/ShopListForm.resx b/TEMUKJD/KJDForms/ShopForms/ShopListForm.resx index 9c2b8cb..d48cac6 100644 --- a/TEMUKJD/KJDForms/ShopForms/ShopListForm.resx +++ b/TEMUKJD/KJDForms/ShopForms/ShopListForm.resx @@ -147,6 +147,9 @@ True + + True + True diff --git a/TEMUKJD/KJDForms/ShopForms/ShopLoginForm.Designer.cs b/TEMUKJD/KJDForms/ShopForms/ShopLoginForm.Designer.cs index 9d39903..92ebf70 100644 --- a/TEMUKJD/KJDForms/ShopForms/ShopLoginForm.Designer.cs +++ b/TEMUKJD/KJDForms/ShopForms/ShopLoginForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.ShopForms +namespace TemuKJD.KJDForms.ShopForms { partial class ShopLoginForm { @@ -36,12 +36,12 @@ this.btnDel = new DevComponents.DotNetBar.PanelEx(); this.label2 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); - this.btnCopyPassword = new LittleRabbit.UserControls.ButtonEx(); - this.btnCopyUserName = new LittleRabbit.UserControls.ButtonEx(); + this.btnCopyPassword = new TemuKJD.UserControls.ButtonEx(); + this.btnCopyUserName = new TemuKJD.UserControls.ButtonEx(); this.txtPassWord = new System.Windows.Forms.TextBox(); this.txtUserName = new System.Windows.Forms.TextBox(); - this.btnStop = new LittleRabbit.UserControls.ButtonEx(); - this.btnReload = new LittleRabbit.UserControls.ButtonEx(); + this.btnStop = new TemuKJD.UserControls.ButtonEx(); + this.btnReload = new TemuKJD.UserControls.ButtonEx(); this.chkCloseAfterLogin = new DevComponents.DotNetBar.Controls.CheckBoxX(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.txtAddress = new System.Windows.Forms.TextBox(); diff --git a/TEMUKJD/KJDForms/ShopForms/ShopLoginForm.cs b/TEMUKJD/KJDForms/ShopForms/ShopLoginForm.cs index 73bb6b7..9033fca 100644 --- a/TEMUKJD/KJDForms/ShopForms/ShopLoginForm.cs +++ b/TEMUKJD/KJDForms/ShopForms/ShopLoginForm.cs @@ -3,9 +3,9 @@ using AllBase.Helper; using AllBase.Model.Result; using CefSharp; using CefSharp.WinForms; -using LittleRabbit.DashBoardForms; -using LittleRabbit.Helper; -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.DashBoardForms; +using TemuKJD.Helper; +using TemuKJD.KJDForms.BaseForms; using Microsoft.Win32; using NaiBa.CefHelper; using NaiBa.CefHelper.Handler; @@ -25,7 +25,7 @@ using System.Windows.Forms; using Work; using Work.BLL.Tools; -namespace LittleRabbit.LittleRabbitForms.ShopForms +namespace TemuKJD.KJDForms.ShopForms { public enum EnumOpenType { @@ -61,8 +61,8 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms if (openType == EnumOpenType.login) { - this.shop.ShopAccountId = ""; - this.shop.ShopAccount = ""; + //this.shop.ShopId = ""; + //this.shop.ShopAccount = ""; } if (isMultiLogin && shop != null) @@ -113,92 +113,72 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms if (!lstShopCompany.Any(c => c.LoginName == shop.LoginName)) continue; - + + string cookies = ""; + List cookieList = CEFBrowser.GetCookieList(shopCookieHead, cefWebBrowser.RequestContext.GetCookieManager(null)); + if (cookieList != null && cookieList.Count > 0) { - string cookies = ""; - List cookieList = CEFBrowser.GetCookieList(shopCookieHead, cefWebBrowser.RequestContext.GetCookieManager(null)); - if (cookieList != null && cookieList.Count > 0) + foreach (var cookie in cookieList) { - foreach (var cookie in cookieList) - { - //if (cookies.Contains(cookie.Name + "=" + cookie.Value)) - // continue; - - cookies += cookie.Name + "=" + cookie.Value + "; "; - } - cookies = cookies.Trim().TrimEnd(';'); + //if (cookies.Contains(cookie.Name + "=" + cookie.Value)) + // continue; + cookies += cookie.Name + "=" + cookie.Value + "; "; } + cookies = cookies.Trim().TrimEnd(';'); + } - if (!string.IsNullOrEmpty(cookies) - && lstShopCompany.Any(c => c.LoginName == shop.LoginName)) + if (!string.IsNullOrEmpty(cookies) + && lstShopCompany.Any(c => c.LoginName == shop.LoginName)) + { + shop.Cookies = cookies; + var lstShopCompanyCopy = lstShopCompany.ToList(); + lstShopCompanyCopy = lstShopCompanyCopy.Where(l => l.LoginName == shop.LoginName).ToList(); + + foreach (ShopCompany sc in lstShopCompanyCopy) { - var lstShopCompanyCopy = lstShopCompany.ToList(); - //var shopCompany = lstShopCompany.FirstOrDefault(c=>c.LoginName==shop.LoginName); - //if (shopCompany == null) - // shopCompany = new ShopCompany(); - - //shop.LoginStatus = "登录成功"; - //shop.ShopAccountId = shopCompany.AccountId; - //shop.ShopAccount = shopCompany.AccountName; - //shop.Cookies = cookies; - - //shop.LastRefreshDate = DateTime.Now.ToString("yyyyMMdd"); - //var shopInfo = GlobalConfig.DouShopLoginList.FirstOrDefault(v => v.ShopAccountId == shop.ShopAccountId); - //if (shopInfo != null) - //{ - // shopInfo.Cookies = shop.Cookies; - // shopInfo.Password = shop.Password; - // shopInfo.ShopAccountId = shop.ShopAccountId; - // shopInfo.ShopAccount = shop.ShopAccount; - //} - //else - // GlobalConfig.DouShopLoginList.Add(shop); - //StartUp.SaveLocalShopLoginInfo(); - ////ShopListForm.AddServerDouShop(shop); // 店铺写入到服务端 - //ShopListForm.UpdateServerShopCookies(shop, shop.Cookies); // cookie写入到服务端 - - foreach (ShopCompany sc in lstShopCompanyCopy) + DouShopLoginInfo newShop = new DouShopLoginInfo() { - DouShopLoginInfo newShop = new DouShopLoginInfo() - { - LoginName = shop.LoginName, - Password = shop.Password, - Group = shop.Group, - LoginStatus = "登录成功", - ShopAccount = sc.AccountName, - ShopAccountId = sc.AccountId, - Cookies = cookies, - }; + LoginName = shop.LoginName, + Password = shop.Password, + Group = shop.Group, + ShopAccount = sc.AccountName, + ShopId = sc.AccountId, + }; - var oldShop = GlobalConfig.DouShopLoginList.FirstOrDefault(l => - l.LoginName == newShop.LoginName && l.ShopAccountId == newShop.ShopAccountId); - if (oldShop == null) - { - GlobalConfig.DouShopLoginList.Add(newShop); - ShopListForm.AddServerDouShop(newShop); // 店铺写入到服务端 - } - else - { - oldShop.LoginName = shop.LoginName; - oldShop.Password = shop.Password; - oldShop.Group = shop.Group; - oldShop.LoginStatus = "登录成功"; - oldShop.ShopAccount = sc.AccountName; - oldShop.ShopAccountId = sc.AccountId; - oldShop.Cookies = cookies; - } - StartUp.SaveLocalShopLoginInfo(); - ShopListForm.UpdateServerShopCookies(newShop, newShop.Cookies); - } - - OnSaveComplete(shop); - if (this.Created && this.chkCloseAfterLogin.Checked) + var oldShop = GlobalConfig.ShopLoginList.FirstOrDefault(l => + l.LoginName == newShop.LoginName && l.ShopId == newShop.ShopId); + if (oldShop == null) { - Invoke(new Action(() => { this.Close(); })); + newShop.LoginStatus = "登录成功"; + newShop.LastRefreshDate = DateTime.Now.ToString("yyyyMMdd"); + GlobalConfig.ShopLoginList.Add(newShop); + ShopListForm.AddServerDouShop(newShop); // 店铺写入到服务端 } else - break; + { + oldShop.LoginStatus = "登录成功"; + oldShop.LastRefreshDate = DateTime.Now.ToString("yyyyMMdd"); + oldShop.LoginName = newShop.LoginName; + oldShop.Password = newShop.Password; + oldShop.Group = newShop.Group; + oldShop.ShopAccount = newShop.ShopAccount; + oldShop.ShopId = newShop.ShopId; + } } + var lstShop = GlobalConfig.ShopLoginList.Where(l => l.LoginName == shop.LoginName).ToList(); + foreach(var s in lstShop) + { + s.Cookies = shop.Cookies; + } + StartUp.SaveLocalShopLoginInfo(); // 店铺保存到本地 + ShopListForm.UpdateServerShopCookies(shop, shop.Cookies); // 店铺cookie写入服务端，多店共用一个登录账号一组cookie + OnSaveComplete(shop); + if (this.Created && this.chkCloseAfterLogin.Checked) + { + Invoke(new Action(() => { this.Close(); })); + } + else + break; } } } diff --git a/TEMUKJD/KJDForms/ShopForms/SubAccountListForm.Designer.cs b/TEMUKJD/KJDForms/ShopForms/SubAccountListForm.Designer.cs index b84c9a6..f0b36ed 100644 --- a/TEMUKJD/KJDForms/ShopForms/SubAccountListForm.Designer.cs +++ b/TEMUKJD/KJDForms/ShopForms/SubAccountListForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.ShopForms +namespace TemuKJD.KJDForms.ShopForms { partial class SubAccountListForm { @@ -49,10 +49,10 @@ this.label39 = new System.Windows.Forms.Label(); this.nametextBox = new System.Windows.Forms.TextBox(); this.label40 = new System.Windows.Forms.Label(); - this.btnRefresh = new LittleRabbit.UserControls.ButtonEx(); - this.btnCancel = new LittleRabbit.UserControls.ButtonEx(); - this.btnOpUser = new LittleRabbit.UserControls.ButtonEx(); - this.dgvUser = new LittleRabbit.UserComponent.DataGridViewEx(); + this.btnRefresh = new TemuKJD.UserControls.ButtonEx(); + this.btnCancel = new TemuKJD.UserControls.ButtonEx(); + this.btnOpUser = new TemuKJD.UserControls.ButtonEx(); + this.dgvUser = new TemuKJD.UserComponent.DataGridViewEx(); this.UserIdColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.UserNameColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.mobileColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); diff --git a/TEMUKJD/KJDForms/ShopForms/SubAccountListForm.cs b/TEMUKJD/KJDForms/ShopForms/SubAccountListForm.cs index bfd4f77..c6f0487 100644 --- a/TEMUKJD/KJDForms/ShopForms/SubAccountListForm.cs +++ b/TEMUKJD/KJDForms/ShopForms/SubAccountListForm.cs @@ -1,6 +1,6 @@ using AllBase; using AllBase.Model.Result; -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.KJDForms.BaseForms; using System; using System.Collections.Generic; using System.ComponentModel; @@ -12,7 +12,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using Work; -namespace LittleRabbit.LittleRabbitForms.ShopForms +namespace TemuKJD.KJDForms.ShopForms { public partial class SubAccountListForm : Form { diff --git a/TEMUKJD/KJDForms/ShopForms/SubAccountShopEditForm.Designer.cs b/TEMUKJD/KJDForms/ShopForms/SubAccountShopEditForm.Designer.cs index c77f121..836208b 100644 --- a/TEMUKJD/KJDForms/ShopForms/SubAccountShopEditForm.Designer.cs +++ b/TEMUKJD/KJDForms/ShopForms/SubAccountShopEditForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.ShopForms +namespace TemuKJD.KJDForms.ShopForms { partial class SubAccountShopEditForm { @@ -34,10 +34,10 @@ this.flpShopSubAccount = new System.Windows.Forms.FlowLayoutPanel(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.btnAdd = new LittleRabbit.UserControls.ButtonEx(); - this.btnRemove = new LittleRabbit.UserControls.ButtonEx(); + this.btnAdd = new TemuKJD.UserControls.ButtonEx(); + this.btnRemove = new TemuKJD.UserControls.ButtonEx(); this.flpNotSubAccount = new System.Windows.Forms.FlowLayoutPanel(); - this.btnOk = new LittleRabbit.UserControls.ButtonEx(); + this.btnOk = new TemuKJD.UserControls.ButtonEx(); this.panel1 = new System.Windows.Forms.Panel(); this.label2 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); diff --git a/TEMUKJD/KJDForms/ShopForms/SubAccountShopEditForm.cs b/TEMUKJD/KJDForms/ShopForms/SubAccountShopEditForm.cs index 20d0a1c..dca1db6 100644 --- a/TEMUKJD/KJDForms/ShopForms/SubAccountShopEditForm.cs +++ b/TEMUKJD/KJDForms/ShopForms/SubAccountShopEditForm.cs @@ -1,6 +1,6 @@ using AllBase; using AllBase.Model.Result; -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.KJDForms.BaseForms; using System; using System.Collections.Generic; using System.ComponentModel; @@ -12,7 +12,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using Work; -namespace LittleRabbit.LittleRabbitForms.ShopForms +namespace TemuKJD.KJDForms.ShopForms { public partial class SubAccountShopEditForm : LRBaseForm { @@ -137,7 +137,7 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms shop.ShopSubAccountList.Remove(co.subAccount); string url = BaseClass.BuildObjString("shop&act=delete_shop_user_sub_group"); string data = UserLogin.GetSignaturex() - + "&shop_id=" + shop.ShopAccountId + + "&shop_id=" + shop.ShopId + "&sub_user_id=" + co.subAccount.sub_user_id + "&status=" + co.subAccount.status + "&group_id=" + co.subAccount.group_id; @@ -156,7 +156,7 @@ namespace LittleRabbit.LittleRabbitForms.ShopForms shop.ShopSubAccountList.Add(co.subAccount); string url = BaseClass.BuildObjString("shop&act=update_shop_user_sub_group"); string data = UserLogin.GetSignaturex() - + "&shop_id=" + shop.ShopAccountId + + "&shop_id=" + shop.ShopId + "&sub_user_id=" + co.subAccount.sub_user_id + "&status=" + co.subAccount.status + "&group_id=" + co.subAccount.group_id; diff --git a/TEMUKJD/KJDForms/ShopForms/UcSubAccount.Designer.cs b/TEMUKJD/KJDForms/ShopForms/UcSubAccount.Designer.cs index 9bdd8e9..4c382f7 100644 --- a/TEMUKJD/KJDForms/ShopForms/UcSubAccount.Designer.cs +++ b/TEMUKJD/KJDForms/ShopForms/UcSubAccount.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.ShopForms +namespace TemuKJD.KJDForms.ShopForms { partial class UcSubAccount { diff --git a/TEMUKJD/KJDForms/ShopForms/UcSubAccount.cs b/TEMUKJD/KJDForms/ShopForms/UcSubAccount.cs index e8e7ada..12ede71 100644 --- a/TEMUKJD/KJDForms/ShopForms/UcSubAccount.cs +++ b/TEMUKJD/KJDForms/ShopForms/UcSubAccount.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using AllBase.Model.Result; -namespace LittleRabbit.LittleRabbitForms.ShopForms +namespace TemuKJD.KJDForms.ShopForms { public partial class UcSubAccount : UserControl { diff --git a/TEMUKJD/KJDForms/ShopOptimizeForms/ClearNoVisitorForm.Designer.cs b/TEMUKJD/KJDForms/ShopOptimizeForms/ClearNoVisitorForm.Designer.cs index 3a8be5d..751bab5 100644 --- a/TEMUKJD/KJDForms/ShopOptimizeForms/ClearNoVisitorForm.Designer.cs +++ b/TEMUKJD/KJDForms/ShopOptimizeForms/ClearNoVisitorForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.ShopOptimizeForms +namespace TemuKJD.KJDForms.ShopOptimizeForms { partial class ClearNoVisitorForm { @@ -33,11 +33,11 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer4 = new System.Windows.Forms.SplitContainer(); - this.statusBar = new LittleRabbit.UserControls.StatusBarUserControl(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); this.btnClear = new DevComponents.DotNetBar.PanelEx(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.splitContainer5 = new System.Windows.Forms.SplitContainer(); - this.ucGroupBoxEx3 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components); + this.ucGroupBoxEx3 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.panelEx2 = new DevComponents.DotNetBar.PanelEx(); this.label11 = new System.Windows.Forms.Label(); this.cmbSource = new DevComponents.DotNetBar.Controls.ComboBoxEx(); @@ -59,7 +59,7 @@ this.btnStopGetProduct = new DevComponents.DotNetBar.PanelEx(); this.btnGetProduct = new DevComponents.DotNetBar.PanelEx(); this.label1 = new System.Windows.Forms.Label(); - this.ucGroupBoxEx2 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components); + this.ucGroupBoxEx2 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.txtOperateCount = new System.Windows.Forms.TextBox(); this.label4 = new System.Windows.Forms.Label(); this.txtUploadDays = new System.Windows.Forms.TextBox(); @@ -79,11 +79,11 @@ this.btnDelete = new DevComponents.DotNetBar.PanelEx(); this.chkUploadDays = new System.Windows.Forms.CheckBox(); this.label8 = new System.Windows.Forms.Label(); - this.ucGroupBoxEx1 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components); - this.btnRefreshShop = new LittleRabbit.UserControls.ButtonEx(); + this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); + this.btnRefreshShop = new TemuKJD.UserControls.ButtonEx(); this.splitContainer3 = new System.Windows.Forms.SplitContainer(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); - this.dgvShop = new LittleRabbit.UserComponent.DataGridViewEx(); + this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -92,7 +92,7 @@ this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); - this.ucTabControl1 = new LittleRabbit.UserComponent.UcTabControl(); + this.ucTabControl1 = new TemuKJD.UserComponent.UcTabControl(); this.tabPageCheckResult = new System.Windows.Forms.TabPage(); this.tabPageViolateFileList = new System.Windows.Forms.TabPage(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer4)).BeginInit(); @@ -223,7 +223,7 @@ | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.ucGroupBoxEx3.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.ucGroupBoxEx3.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx3.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; this.ucGroupBoxEx3.Controls.Add(this.panelEx2); this.ucGroupBoxEx3.Controls.Add(this.label11); this.ucGroupBoxEx3.Controls.Add(this.cmbSource); @@ -488,7 +488,7 @@ | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.ucGroupBoxEx2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.ucGroupBoxEx2.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx2.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; this.ucGroupBoxEx2.Controls.Add(this.txtOperateCount); this.ucGroupBoxEx2.Controls.Add(this.label4); this.ucGroupBoxEx2.Controls.Add(this.txtUploadDays); @@ -738,7 +738,7 @@ this.ucGroupBoxEx1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.ucGroupBoxEx1.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; this.ucGroupBoxEx1.Controls.Add(this.btnRefreshShop); this.ucGroupBoxEx1.Location = new System.Drawing.Point(3, 2); this.ucGroupBoxEx1.Name = "ucGroupBoxEx1"; diff --git a/TEMUKJD/KJDForms/ShopOptimizeForms/ClearNoVisitorForm.cs b/TEMUKJD/KJDForms/ShopOptimizeForms/ClearNoVisitorForm.cs index d3ae6f7..5b49767 100644 --- a/TEMUKJD/KJDForms/ShopOptimizeForms/ClearNoVisitorForm.cs +++ b/TEMUKJD/KJDForms/ShopOptimizeForms/ClearNoVisitorForm.cs @@ -4,10 +4,10 @@ using AllBase.Helper; using AllBase.Model.Result; using CefSharp; using CefSharp.WinForms; -using LittleRabbit.DashBoardForms; -using LittleRabbit.Extension; -using LittleRabbit.Helper; -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.DashBoardForms; +using TemuKJD.Extension; +using TemuKJD.Helper; +using TemuKJD.KJDForms.BaseForms; using NaiBa.CefHelper; using NaiBa.CefHelper.Handler; using NaiBa.Util.Extension; @@ -24,7 +24,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using Work.DouyinApiClass; -namespace LittleRabbit.LittleRabbitForms.ShopOptimizeForms +namespace TemuKJD.KJDForms.ShopOptimizeForms { public partial class ClearNoVisitorForm : Form { @@ -63,7 +63,7 @@ namespace LittleRabbit.LittleRabbitForms.ShopOptimizeForms else { lstShopId.Clear(); - var list = GlobalConfig.DouShopLoginList.Where(s => s.ApiAuthStatus == "授权成功" && s.LoginStatus == "登录成功").Select(ss => ss.ShopAccountId); + var list = GlobalConfig.ShopLoginList.Where(s => s.ApiAuthStatus == "授权成功" && s.LoginStatus == "登录成功").Select(ss => ss.ShopId); lstShopId.AddRange(list); foreach (DataGridViewRow row in dgvShop.Rows) { @@ -87,17 +87,17 @@ namespace LittleRabbit.LittleRabbitForms.ShopOptimizeForms private void RefreshShop() { // 更新选中的上货店铺Id - lstShopId = lstShopId.Where(id => GlobalConfig.DouShopLoginList.Any(s => s.ShopAccountId == id && s.LoginStatus == "已授权")).ToList(); + lstShopId = lstShopId.Where(id => GlobalConfig.ShopLoginList.Any(s => s.ShopId == id && s.LoginStatus == "已授权")).ToList(); // 获取被删除的店铺 List dgvRowList = dgvShop.Rows.Cast().Where(row - => !GlobalConfig.DouShopLoginList.Any(s => s.ShopAccountId == row.Cells["colShopId"]?.Value?.ToString())).ToList(); + => !GlobalConfig.ShopLoginList.Any(s => s.ShopId == row.Cells["colShopId"]?.Value?.ToString())).ToList(); // 更新被删除的店铺列表 foreach (var row in dgvRowList) { dgvShop.Rows.Remove(row); } // 绑定其他店铺（含新导入的店铺） - foreach (DouShopLoginInfo shopEntity in GlobalConfig.DouShopLoginList) + foreach (DouShopLoginInfo shopEntity in GlobalConfig.ShopLoginList) { BindShop(shopEntity); } @@ -109,12 +109,12 @@ namespace LittleRabbit.LittleRabbitForms.ShopOptimizeForms return; bool canUse = shopEntity.ApiAuthStatus == "授权成功" && shopEntity.LoginStatus == "登录成功"; - var row = dgvShop.Rows.Cast().FirstOrDefault(p => p.Cells.GetCellValueFromColumnName("colShopId").ParseToString() == shopEntity.ShopAccountId); + var row = dgvShop.Rows.Cast().FirstOrDefault(p => p.Cells.GetCellValueFromColumnName("colShopId").ParseToString() == shopEntity.ShopId); if (row == null) { this.dgvShop.Rows.Add( - lstShopId.Contains(shopEntity.ShopAccountId) && canUse, - shopEntity.ShopAccountId, + lstShopId.Contains(shopEntity.ShopId) && canUse, + shopEntity.ShopId, shopEntity.ShopAccount, shopEntity.ApiAuthStatus, shopEntity.LoginStatus, @@ -124,7 +124,7 @@ namespace LittleRabbit.LittleRabbitForms.ShopOptimizeForms } else { - row.Cells["colSelect"].Value = lstShopId.Contains(shopEntity.ShopAccountId) && canUse; + row.Cells["colSelect"].Value = lstShopId.Contains(shopEntity.ShopId) && canUse; row.Cells["colShopName"].Value = shopEntity.ShopAccount; row.Cells["colAuthStatus"].Value = shopEntity.ApiAuthStatus; row.Cells["colLoginStatus"].Value = shopEntity.LoginStatus; @@ -140,7 +140,7 @@ namespace LittleRabbit.LittleRabbitForms.ShopOptimizeForms string columnName = dgvShop.Columns[e.ColumnIndex].Name; long shopId = dgvShop.Rows[e.RowIndex].Cells["colShopId"].Value.ParseToLong(); string shopName = dgvShop.Rows[e.RowIndex].Cells["colShopId"].Value.ToString(); - var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ShopAccountId == shopId.ToString()); + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId.ToString()); var row = dgvShop.Rows[e.RowIndex]; switch (columnName) { @@ -188,18 +188,18 @@ namespace LittleRabbit.LittleRabbitForms.ShopOptimizeForms if (cancellationTokenSource.IsCancellationRequested) break; - var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ShopAccountId == shopId); + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId); if (shop == null) continue; ClearNoVisitorShopForm clearForm = null; Invoke(new Action(() => { - var tab = this.ucTabControl1.TabPages.Cast().FirstOrDefault(t => t.Text == shop.ShopAccount && t.Name == "tab" + shop.ShopAccountId); + var tab = this.ucTabControl1.TabPages.Cast().FirstOrDefault(t => t.Text == shop.ShopAccount && t.Name == "tab" + shop.ShopId); if (tab == null) { tab = new TabPage(); - tab.Name = "tab" + shop.ShopAccountId; + tab.Name = "tab" + shop.ShopId; tab.Text = shop.ShopAccount; this.ucTabControl1.TabPages.Add(tab); @@ -341,7 +341,7 @@ namespace LittleRabbit.LittleRabbitForms.ShopOptimizeForms if (webBrowser.Tag != null) { var shop = webBrowser.Tag as DouShopLoginInfo; - var tab = this.ucTabControl1.TabPages.Cast().FirstOrDefault(t => t.Text == shop.ShopAccount && t.Name == "tab" + shop.ShopAccountId); + var tab = this.ucTabControl1.TabPages.Cast().FirstOrDefault(t => t.Text == shop.ShopAccount && t.Name == "tab" + shop.ShopId); var clearForm = tab.Controls[0] as ClearNoVisitorShopForm; Task.Run(() => @@ -441,7 +441,7 @@ namespace LittleRabbit.LittleRabbitForms.ShopOptimizeForms if (webBrowser.Tag != null) { var shop = webBrowser.Tag as DouShopLoginInfo; - var tab = this.ucTabControl1.TabPages.Cast().FirstOrDefault(t => t.Text == shop.ShopAccount && t.Name == "tab" + shop.ShopAccountId); + var tab = this.ucTabControl1.TabPages.Cast().FirstOrDefault(t => t.Text == shop.ShopAccount && t.Name == "tab" + shop.ShopId); var clearForm = tab.Controls[0] as ClearNoVisitorShopForm; Task.Run(() => @@ -725,7 +725,7 @@ namespace LittleRabbit.LittleRabbitForms.ShopOptimizeForms { foreach (var shopId in lstShopId) { - var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ShopAccountId == shopId); + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId); if (shop == null) continue; diff --git a/TEMUKJD/KJDForms/ShopOptimizeForms/ClearNoVisitorShopForm.Designer.cs b/TEMUKJD/KJDForms/ShopOptimizeForms/ClearNoVisitorShopForm.Designer.cs index 07eb686..6a19dee 100644 --- a/TEMUKJD/KJDForms/ShopOptimizeForms/ClearNoVisitorShopForm.Designer.cs +++ b/TEMUKJD/KJDForms/ShopOptimizeForms/ClearNoVisitorShopForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.ShopOptimizeForms +namespace TemuKJD.KJDForms.ShopOptimizeForms { partial class ClearNoVisitorShopForm { @@ -32,9 +32,9 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); - this.dgvProduct = new LittleRabbit.UserComponent.DataGridViewEx(); + this.dgvProduct = new TemuKJD.UserComponent.DataGridViewEx(); this.label1 = new System.Windows.Forms.Label(); - this.statusBar = new LittleRabbit.UserControls.StatusBarUserControl(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colProductId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colProductName = new System.Windows.Forms.DataGridViewTextBoxColumn(); diff --git a/TEMUKJD/KJDForms/ShopOptimizeForms/ClearNoVisitorShopForm.cs b/TEMUKJD/KJDForms/ShopOptimizeForms/ClearNoVisitorShopForm.cs index 65989a0..8297548 100644 --- a/TEMUKJD/KJDForms/ShopOptimizeForms/ClearNoVisitorShopForm.cs +++ b/TEMUKJD/KJDForms/ShopOptimizeForms/ClearNoVisitorShopForm.cs @@ -2,7 +2,7 @@ using AllBase.Extension; using AllBase.Helper; using AllBase.Model.Result; -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.KJDForms.BaseForms; using NaiBa.Util.Extension; using Newtonsoft.Json.Linq; using System; @@ -17,7 +17,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using Work.BLL.Product; -namespace LittleRabbit.LittleRabbitForms.ShopOptimizeForms +namespace TemuKJD.KJDForms.ShopOptimizeForms { public partial class ClearNoVisitorShopForm : Form { @@ -158,9 +158,9 @@ namespace LittleRabbit.LittleRabbitForms.ShopOptimizeForms }); tList.Add(t1); - if (LittleRabbitForms.ShopForms.ShopListForm.Instance == null) - LittleRabbitForms.ShopForms.ShopListForm.Instance = new LittleRabbitForms.ShopForms.ShopListForm(); - LittleRabbitForms.ShopForms.ShopListForm.Instance.CheckShopLogin(new string[] { shop.ShopAccount }, false); + if (KJDForms.ShopForms.ShopListForm.Instance == null) + KJDForms.ShopForms.ShopListForm.Instance = new KJDForms.ShopForms.ShopListForm(); + KJDForms.ShopForms.ShopListForm.Instance.CheckShopLogin(new string[] { shop.ShopAccount }, false); var t2 = Task.Run(() => { diff --git a/TEMUKJD/KJDForms/ShopOptimizeForms/OptimizeForm.Designer.cs b/TEMUKJD/KJDForms/ShopOptimizeForms/OptimizeForm.Designer.cs index b90a93f..839c30d 100644 --- a/TEMUKJD/KJDForms/ShopOptimizeForms/OptimizeForm.Designer.cs +++ b/TEMUKJD/KJDForms/ShopOptimizeForms/OptimizeForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.ShopOptimizeForms +namespace TemuKJD.KJDForms.ShopOptimizeForms { partial class OptimizeForm { @@ -32,7 +32,7 @@ System.Windows.Forms.TreeNode treeNode2 = new System.Windows.Forms.TreeNode("店铺优化", new System.Windows.Forms.TreeNode[] { treeNode1}); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.tv = new LittleRabbit.UserComponent.UcTreeView(); + this.tv = new TemuKJD.UserComponent.UcTreeView(); this.panel1 = new System.Windows.Forms.Panel(); this.panel3 = new System.Windows.Forms.Panel(); this.panel2 = new System.Windows.Forms.Panel(); diff --git a/TEMUKJD/KJDForms/ShopOptimizeForms/OptimizeForm.cs b/TEMUKJD/KJDForms/ShopOptimizeForms/OptimizeForm.cs index 37bd4fb..1e4e31f 100644 --- a/TEMUKJD/KJDForms/ShopOptimizeForms/OptimizeForm.cs +++ b/TEMUKJD/KJDForms/ShopOptimizeForms/OptimizeForm.cs @@ -9,7 +9,7 @@ using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; -namespace LittleRabbit.LittleRabbitForms.ShopOptimizeForms +namespace TemuKJD.KJDForms.ShopOptimizeForms { public partial class OptimizeForm : Form { diff --git a/TEMUKJD/KJDForms/SystemForms/SystemForm.Designer.cs b/TEMUKJD/KJDForms/SystemForms/SystemForm.Designer.cs index 2d353b5..1931c4e 100644 --- a/TEMUKJD/KJDForms/SystemForms/SystemForm.Designer.cs +++ b/TEMUKJD/KJDForms/SystemForms/SystemForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.SystemForms +namespace TemuKJD.KJDForms.SystemForms { partial class SystemForm { @@ -35,7 +35,7 @@ this.panel3 = new System.Windows.Forms.Panel(); this.panel2 = new System.Windows.Forms.Panel(); this.lblName = new System.Windows.Forms.Label(); - this.tv = new LittleRabbit.UserComponent.UcTreeView(); + this.tv = new TemuKJD.UserComponent.UcTreeView(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.panel1.SuspendLayout(); this.panel2.SuspendLayout(); diff --git a/TEMUKJD/KJDForms/SystemForms/SystemForm.cs b/TEMUKJD/KJDForms/SystemForms/SystemForm.cs index 62c2598..d38c9e4 100644 --- a/TEMUKJD/KJDForms/SystemForms/SystemForm.cs +++ b/TEMUKJD/KJDForms/SystemForms/SystemForm.cs @@ -9,7 +9,7 @@ using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; -namespace LittleRabbit.LittleRabbitForms.SystemForms +namespace TemuKJD.KJDForms.SystemForms { public partial class SystemForm : Form { diff --git a/TEMUKJD/KJDForms/SystemForms/SystemRemoveRestrictionsForm.Designer.cs b/TEMUKJD/KJDForms/SystemForms/SystemRemoveRestrictionsForm.Designer.cs index 9630acf..9c498cb 100644 --- a/TEMUKJD/KJDForms/SystemForms/SystemRemoveRestrictionsForm.Designer.cs +++ b/TEMUKJD/KJDForms/SystemForms/SystemRemoveRestrictionsForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.SystemForms +namespace TemuKJD.KJDForms.SystemForms { partial class SystemRemoveRestrictionsForm { @@ -215,7 +215,7 @@ // pbAgentIp // this.pbAgentIp.Cursor = System.Windows.Forms.Cursors.Hand; - this.pbAgentIp.Image = global::LittleRabbit.Properties.Resources.system_proxy; + this.pbAgentIp.Image = global::TemuKJD.Properties.Resources.system_proxy; this.pbAgentIp.Location = new System.Drawing.Point(132, 257); this.pbAgentIp.Name = "pbAgentIp"; this.pbAgentIp.Size = new System.Drawing.Size(64, 64); @@ -227,7 +227,7 @@ // pbManageToken // this.pbManageToken.Cursor = System.Windows.Forms.Cursors.Hand; - this.pbManageToken.Image = global::LittleRabbit.Properties.Resources.system_pdd_token; + this.pbManageToken.Image = global::TemuKJD.Properties.Resources.system_pdd_token; this.pbManageToken.Location = new System.Drawing.Point(336, 257); this.pbManageToken.Name = "pbManageToken"; this.pbManageToken.Size = new System.Drawing.Size(64, 64); @@ -239,7 +239,7 @@ // pbLogin1688 // this.pbLogin1688.Cursor = System.Windows.Forms.Cursors.Hand; - this.pbLogin1688.Image = global::LittleRabbit.Properties.Resources.system_1688; + this.pbLogin1688.Image = global::TemuKJD.Properties.Resources.system_1688; this.pbLogin1688.Location = new System.Drawing.Point(336, 111); this.pbLogin1688.Name = "pbLogin1688"; this.pbLogin1688.Size = new System.Drawing.Size(64, 64); @@ -251,7 +251,7 @@ // pbLoginPdd // this.pbLoginPdd.Cursor = System.Windows.Forms.Cursors.Hand; - this.pbLoginPdd.Image = global::LittleRabbit.Properties.Resources.system_pdd; + this.pbLoginPdd.Image = global::TemuKJD.Properties.Resources.system_pdd; this.pbLoginPdd.Location = new System.Drawing.Point(523, 111); this.pbLoginPdd.Name = "pbLoginPdd"; this.pbLoginPdd.Size = new System.Drawing.Size(64, 64); @@ -264,7 +264,7 @@ // pbAdsl // this.pbAdsl.Cursor = System.Windows.Forms.Cursors.Hand; - this.pbAdsl.Image = global::LittleRabbit.Properties.Resources.system_pppoe; + this.pbAdsl.Image = global::TemuKJD.Properties.Resources.system_pppoe; this.pbAdsl.Location = new System.Drawing.Point(523, 257); this.pbAdsl.Name = "pbAdsl"; this.pbAdsl.Size = new System.Drawing.Size(64, 64); @@ -277,7 +277,7 @@ // pbLoginTaobao // this.pbLoginTaobao.Cursor = System.Windows.Forms.Cursors.Hand; - this.pbLoginTaobao.Image = global::LittleRabbit.Properties.Resources.system_tb; + this.pbLoginTaobao.Image = global::TemuKJD.Properties.Resources.system_tb; this.pbLoginTaobao.Location = new System.Drawing.Point(132, 111); this.pbLoginTaobao.Name = "pbLoginTaobao"; this.pbLoginTaobao.Size = new System.Drawing.Size(64, 64); diff --git a/TEMUKJD/KJDForms/SystemForms/SystemRemoveRestrictionsForm.cs b/TEMUKJD/KJDForms/SystemForms/SystemRemoveRestrictionsForm.cs index 51e08ca..aa52269 100644 --- a/TEMUKJD/KJDForms/SystemForms/SystemRemoveRestrictionsForm.cs +++ b/TEMUKJD/KJDForms/SystemForms/SystemRemoveRestrictionsForm.cs @@ -1,4 +1,4 @@ -using LittleRabbit.LittleRabbitForms.ToolForms; +using TemuKJD.KJDForms.ToolForms; using System; using System.Collections.Generic; using System.ComponentModel; @@ -9,7 +9,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace LittleRabbit.LittleRabbitForms.SystemForms +namespace TemuKJD.KJDForms.SystemForms { public partial class SystemRemoveRestrictionsForm : Form { diff --git a/TEMUKJD/KJDForms/ToolForms/CefForm.Designer.cs b/TEMUKJD/KJDForms/ToolForms/CefForm.Designer.cs index 401c292..42abef5 100644 --- a/TEMUKJD/KJDForms/ToolForms/CefForm.Designer.cs +++ b/TEMUKJD/KJDForms/ToolForms/CefForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.ToolForms +namespace TemuKJD.KJDForms.ToolForms { partial class CefForm { diff --git a/TEMUKJD/KJDForms/ToolForms/CefForm.cs b/TEMUKJD/KJDForms/ToolForms/CefForm.cs index 600a6b1..450092e 100644 --- a/TEMUKJD/KJDForms/ToolForms/CefForm.cs +++ b/TEMUKJD/KJDForms/ToolForms/CefForm.cs @@ -1,7 +1,7 @@ using CefSharp; using CefSharp.WinForms; -using LittleRabbit.DashBoardForms; -using LittleRabbit.Helper; +using TemuKJD.DashBoardForms; +using TemuKJD.Helper; using NaiBa.CefHelper; using NaiBa.CefHelper.Handler; using NaiBa.Util; @@ -16,7 +16,7 @@ using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; -namespace LittleRabbit.LittleRabbitForms.ToolForms +namespace TemuKJD.KJDForms.ToolForms { public partial class CefForm : BaseForms.LRBaseForm { diff --git a/TEMUKJD/KJDForms/ToolForms/ChangeIPForm.cs b/TEMUKJD/KJDForms/ToolForms/ChangeIPForm.cs index 2e357c5..aea42f0 100644 --- a/TEMUKJD/KJDForms/ToolForms/ChangeIPForm.cs +++ b/TEMUKJD/KJDForms/ToolForms/ChangeIPForm.cs @@ -1,5 +1,5 @@ using AllBase; -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.KJDForms.BaseForms; using System; using System.Collections.Generic; using System.ComponentModel; @@ -12,7 +12,7 @@ using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; -namespace LittleRabbit.LittleRabbitForms.ToolForms +namespace TemuKJD.KJDForms.ToolForms { public partial class ChangeIPForm : LRBaseForm { diff --git a/TEMUKJD/KJDForms/ToolForms/ChangeIPForm.designer.cs b/TEMUKJD/KJDForms/ToolForms/ChangeIPForm.designer.cs index 2cc500b..d65d5a9 100644 --- a/TEMUKJD/KJDForms/ToolForms/ChangeIPForm.designer.cs +++ b/TEMUKJD/KJDForms/ToolForms/ChangeIPForm.designer.cs @@ -1,6 +1,6 @@ -using LittleRabbit.UserControls; +using TemuKJD.UserControls; -namespace LittleRabbit.LittleRabbitForms.ToolForms +namespace TemuKJD.KJDForms.ToolForms { partial class ChangeIPForm { @@ -37,8 +37,8 @@ namespace LittleRabbit.LittleRabbitForms.ToolForms this.label4 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label(); this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.DisConnectionButtonX = new LittleRabbit.UserControls.ButtonEx(); - this.ConnectionButtonX = new LittleRabbit.UserControls.ButtonEx(); + this.DisConnectionButtonX = new TemuKJD.UserControls.ButtonEx(); + this.ConnectionButtonX = new TemuKJD.UserControls.ButtonEx(); this.label7 = new System.Windows.Forms.Label(); this.label6 = new System.Windows.Forms.Label(); this.txtMinutes = new System.Windows.Forms.TextBox(); @@ -46,7 +46,7 @@ namespace LittleRabbit.LittleRabbitForms.ToolForms this.label8 = new System.Windows.Forms.Label(); this.txtSurplus = new System.Windows.Forms.TextBox(); this.label9 = new System.Windows.Forms.Label(); - this.spanTimeButtonX = new LittleRabbit.UserControls.ButtonEx(); + this.spanTimeButtonX = new TemuKJD.UserControls.ButtonEx(); this.panel1 = new System.Windows.Forms.Panel(); this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); diff --git a/TEMUKJD/KJDForms/ToolForms/DouUserLoginForm.Designer.cs b/TEMUKJD/KJDForms/ToolForms/DouUserLoginForm.Designer.cs index c904d7d..3313f31 100644 --- a/TEMUKJD/KJDForms/ToolForms/DouUserLoginForm.Designer.cs +++ b/TEMUKJD/KJDForms/ToolForms/DouUserLoginForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.ToolForms +namespace TemuKJD.KJDForms.ToolForms { partial class DouUserLoginForm { @@ -32,7 +32,7 @@ this.panel2 = new System.Windows.Forms.Panel(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.textBox1 = new System.Windows.Forms.TextBox(); - this.btnIsLogin = new LittleRabbit.UserControls.ButtonEx(); + this.btnIsLogin = new TemuKJD.UserControls.ButtonEx(); this.panel2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); diff --git a/TEMUKJD/KJDForms/ToolForms/DouUserLoginForm.cs b/TEMUKJD/KJDForms/ToolForms/DouUserLoginForm.cs index af32c40..d1942c9 100644 --- a/TEMUKJD/KJDForms/ToolForms/DouUserLoginForm.cs +++ b/TEMUKJD/KJDForms/ToolForms/DouUserLoginForm.cs @@ -1,5 +1,5 @@ using CefSharp.WinForms; -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.KJDForms.BaseForms; using NaiBa.CefHelper; using System; using System.Collections.Generic; @@ -11,7 +11,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace LittleRabbit.LittleRabbitForms.ToolForms +namespace TemuKJD.KJDForms.ToolForms { public partial class DouUserLoginForm : LRBaseForm { diff --git a/TEMUKJD/KJDForms/ToolForms/IeForm.cs b/TEMUKJD/KJDForms/ToolForms/IeForm.cs index e14778c..9b74b27 100644 --- a/TEMUKJD/KJDForms/ToolForms/IeForm.cs +++ b/TEMUKJD/KJDForms/ToolForms/IeForm.cs @@ -6,10 +6,10 @@ using AllBase; using CefSharp; using CefSharp.WinForms; using DevComponents.DotNetBar; -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.KJDForms.BaseForms; using NaiBa.CefHelper; -namespace LittleRabbit.LittleRabbitForms.ToolForms +namespace TemuKJD.KJDForms.ToolForms { public partial class IeForm : LRBaseForm { diff --git a/TEMUKJD/KJDForms/ToolForms/IeForm.designer.cs b/TEMUKJD/KJDForms/ToolForms/IeForm.designer.cs index 72975a1..08c846d 100644 --- a/TEMUKJD/KJDForms/ToolForms/IeForm.designer.cs +++ b/TEMUKJD/KJDForms/ToolForms/IeForm.designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.ToolForms +namespace TemuKJD.KJDForms.ToolForms { partial class IeForm { @@ -31,7 +31,7 @@ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(IeForm)); this.panel2 = new System.Windows.Forms.Panel(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.btnGoTo = new LittleRabbit.UserControls.ButtonEx(); + this.btnGoTo = new TemuKJD.UserControls.ButtonEx(); this.txtUrl = new System.Windows.Forms.TextBox(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); diff --git a/TEMUKJD/KJDForms/ToolForms/JDVerifyForm/CollectVerifyForm.cs b/TEMUKJD/KJDForms/ToolForms/JDVerifyForm/CollectVerifyForm.cs index 44277fa..cc6469b 100644 --- a/TEMUKJD/KJDForms/ToolForms/JDVerifyForm/CollectVerifyForm.cs +++ b/TEMUKJD/KJDForms/ToolForms/JDVerifyForm/CollectVerifyForm.cs @@ -1,7 +1,7 @@ using AllBase; using CefSharp; using CefSharp.WinForms; -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.KJDForms.BaseForms; using System; using System.Collections.Generic; using System.Text; @@ -10,7 +10,7 @@ using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; -namespace LittleRabbit.LittleRabbitForms.ToolForms.JDVerify +namespace TemuKJD.KJDForms.ToolForms.JDVerify { public partial class CollectVerifyForm : LRBaseForm { diff --git a/TEMUKJD/KJDForms/ToolForms/JDVerifyForm/CollectVerifyForm.designer.cs b/TEMUKJD/KJDForms/ToolForms/JDVerifyForm/CollectVerifyForm.designer.cs index 8ddb96e..9316243 100644 --- a/TEMUKJD/KJDForms/ToolForms/JDVerifyForm/CollectVerifyForm.designer.cs +++ b/TEMUKJD/KJDForms/ToolForms/JDVerifyForm/CollectVerifyForm.designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.ToolForms.JDVerify +namespace TemuKJD.KJDForms.ToolForms.JDVerify { partial class CollectVerifyForm { diff --git a/TEMUKJD/KJDForms/ToolForms/KeywordsForms/KeywordsCatchFrom.Designer.cs b/TEMUKJD/KJDForms/ToolForms/KeywordsForms/KeywordsCatchFrom.Designer.cs index 3202407..6a9c1c8 100644 --- a/TEMUKJD/KJDForms/ToolForms/KeywordsForms/KeywordsCatchFrom.Designer.cs +++ b/TEMUKJD/KJDForms/ToolForms/KeywordsForms/KeywordsCatchFrom.Designer.cs @@ -1,5 +1,5 @@  -namespace LittleRabbit.LittleRabbitForms.ToolForms.KeywordsForms +namespace TemuKJD.KJDForms.ToolForms.KeywordsForms { partial class KeywordsCatchFrom { @@ -36,7 +36,7 @@ namespace LittleRabbit.LittleRabbitForms.ToolForms.KeywordsForms System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(KeywordsCatchFrom)); this.panel2 = new System.Windows.Forms.Panel(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.ucGroupBoxEx2 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components); + this.ucGroupBoxEx2 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.btnChangeFissionTitle = new DevComponents.DotNetBar.PanelEx(); this.btnPicToContent = new DevComponents.DotNetBar.PanelEx(); this.exportButtonX = new DevComponents.DotNetBar.PanelEx(); @@ -52,7 +52,7 @@ namespace LittleRabbit.LittleRabbitForms.ToolForms.KeywordsForms this.removeEnglishButtonX = new DevComponents.DotNetBar.PanelEx(); this.IrregularitiesButtonX = new DevComponents.DotNetBar.PanelEx(); this.keyWordLengthButtonX = new DevComponents.DotNetBar.PanelEx(); - this.ucGroupBoxEx1 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components); + this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.checkBox1 = new System.Windows.Forms.CheckBox(); this.label14 = new System.Windows.Forms.Label(); this.endPriceTextBox = new System.Windows.Forms.TextBox(); @@ -65,7 +65,7 @@ namespace LittleRabbit.LittleRabbitForms.ToolForms.KeywordsForms this.txbSearchWord = new DevComponents.DotNetBar.Controls.TextBoxX(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.descriptionTextBox = new DevComponents.DotNetBar.Controls.RichTextBoxEx(); - this.dataGridViewX1 = new LittleRabbit.UserComponent.DataGridViewEx(); + this.dataGridViewX1 = new TemuKJD.UserComponent.DataGridViewEx(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colKeywords = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -120,7 +120,7 @@ namespace LittleRabbit.LittleRabbitForms.ToolForms.KeywordsForms this.ucGroupBoxEx2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); this.ucGroupBoxEx2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.ucGroupBoxEx2.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx2.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; this.ucGroupBoxEx2.Controls.Add(this.btnChangeFissionTitle); this.ucGroupBoxEx2.Controls.Add(this.btnPicToContent); this.ucGroupBoxEx2.Controls.Add(this.exportButtonX); @@ -475,7 +475,7 @@ namespace LittleRabbit.LittleRabbitForms.ToolForms.KeywordsForms this.ucGroupBoxEx1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.ucGroupBoxEx1.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; this.ucGroupBoxEx1.Controls.Add(this.checkBox1); this.ucGroupBoxEx1.Controls.Add(this.label14); this.ucGroupBoxEx1.Controls.Add(this.endPriceTextBox); diff --git a/TEMUKJD/KJDForms/ToolForms/KeywordsForms/KeywordsCatchFrom.cs b/TEMUKJD/KJDForms/ToolForms/KeywordsForms/KeywordsCatchFrom.cs index 2f58dbe..2fee37e 100644 --- a/TEMUKJD/KJDForms/ToolForms/KeywordsForms/KeywordsCatchFrom.cs +++ b/TEMUKJD/KJDForms/ToolForms/KeywordsForms/KeywordsCatchFrom.cs @@ -1,9 +1,9 @@ using AllBase; using CefSharp; using CefSharp.WinForms; -using LittleRabbit.Helper; -using LittleRabbit.LittleRabbitForms.BaseForms; -using LittleRabbit.LittleRabbitForms.UploadForms; +using TemuKJD.Helper; +using TemuKJD.KJDForms.BaseForms; +using TemuKJD.KJDForms.UploadForms; using NaiBa.CefHelper.Handler; using System; using System.Collections.Generic; @@ -19,7 +19,7 @@ using System.Windows.Forms; using Work.BLL.Upload; using Work.CollectClass; -namespace LittleRabbit.LittleRabbitForms.ToolForms.KeywordsForms +namespace TemuKJD.KJDForms.ToolForms.KeywordsForms { public partial class KeywordsCatchFrom : LRBaseForm { diff --git a/TEMUKJD/KJDForms/ToolForms/MeituMessageDialog.cs b/TEMUKJD/KJDForms/ToolForms/MeituMessageDialog.cs index a46d0e4..9cd652b 100644 --- a/TEMUKJD/KJDForms/ToolForms/MeituMessageDialog.cs +++ b/TEMUKJD/KJDForms/ToolForms/MeituMessageDialog.cs @@ -13,7 +13,7 @@ using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; -namespace LittleRabbit.LittleRabbitForms.ToolForms +namespace TemuKJD.KJDForms.ToolForms { public partial class MeituMessageDialog : Form { diff --git a/TEMUKJD/KJDForms/ToolForms/MeituMessageDialog.designer.cs b/TEMUKJD/KJDForms/ToolForms/MeituMessageDialog.designer.cs index 312c460..5d1974b 100644 --- a/TEMUKJD/KJDForms/ToolForms/MeituMessageDialog.designer.cs +++ b/TEMUKJD/KJDForms/ToolForms/MeituMessageDialog.designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.ToolForms +namespace TemuKJD.KJDForms.ToolForms { partial class MeituMessageDialog { diff --git a/TEMUKJD/KJDForms/ToolForms/PinDuoDuoCaptchaForm.cs b/TEMUKJD/KJDForms/ToolForms/PinDuoDuoCaptchaForm.cs index 0fbf61f..53dd32f 100644 --- a/TEMUKJD/KJDForms/ToolForms/PinDuoDuoCaptchaForm.cs +++ b/TEMUKJD/KJDForms/ToolForms/PinDuoDuoCaptchaForm.cs @@ -1,7 +1,7 @@ using AllBase; using CefSharp; using CefSharp.WinForms; -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.KJDForms.BaseForms; using NaiBa.CefHelper; using NaiBa.CefHelper.Handler; using NaiBa.Util.Extension; @@ -27,7 +27,7 @@ using System.Windows.Forms; using Work; using Work.CollectClass; -namespace LittleRabbit.LittleRabbitForms.ToolForms +namespace TemuKJD.KJDForms.ToolForms { public partial class PinDuoDuoCaptchaForm : LRBaseForm { diff --git a/TEMUKJD/KJDForms/ToolForms/PinDuoDuoCaptchaForm.designer.cs b/TEMUKJD/KJDForms/ToolForms/PinDuoDuoCaptchaForm.designer.cs index ca0763e..17924b1 100644 --- a/TEMUKJD/KJDForms/ToolForms/PinDuoDuoCaptchaForm.designer.cs +++ b/TEMUKJD/KJDForms/ToolForms/PinDuoDuoCaptchaForm.designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.ToolForms +namespace TemuKJD.KJDForms.ToolForms { partial class PinDuoDuoCaptchaForm { diff --git a/TEMUKJD/KJDForms/ToolForms/PinDuoDuoLoginForm.cs b/TEMUKJD/KJDForms/ToolForms/PinDuoDuoLoginForm.cs index dc22513..2ce7209 100644 --- a/TEMUKJD/KJDForms/ToolForms/PinDuoDuoLoginForm.cs +++ b/TEMUKJD/KJDForms/ToolForms/PinDuoDuoLoginForm.cs @@ -1,7 +1,7 @@ using AllBase; using CefSharp; using CefSharp.WinForms; -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.KJDForms.BaseForms; using System; using System.Collections.Generic; using System.ComponentModel; @@ -13,7 +13,7 @@ using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; -namespace LittleRabbit.LittleRabbitForms.ToolForms +namespace TemuKJD.KJDForms.ToolForms { public partial class PinDuoDuoLoginForm : LRBaseForm { diff --git a/TEMUKJD/KJDForms/ToolForms/PinDuoDuoLoginForm.designer.cs b/TEMUKJD/KJDForms/ToolForms/PinDuoDuoLoginForm.designer.cs index 552aba5..0f093bd 100644 --- a/TEMUKJD/KJDForms/ToolForms/PinDuoDuoLoginForm.designer.cs +++ b/TEMUKJD/KJDForms/ToolForms/PinDuoDuoLoginForm.designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.ToolForms +namespace TemuKJD.KJDForms.ToolForms { partial class PinDuoDuoLoginForm { diff --git a/TEMUKJD/KJDForms/ToolForms/ProxyForm.cs b/TEMUKJD/KJDForms/ToolForms/ProxyForm.cs index 3472036..57bc880 100644 --- a/TEMUKJD/KJDForms/ToolForms/ProxyForm.cs +++ b/TEMUKJD/KJDForms/ToolForms/ProxyForm.cs @@ -1,6 +1,6 @@ using AllBase; using AllBase.Helper; -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.KJDForms.BaseForms; using NaiBa.Util.Extension; using System; using System.Collections.Generic; @@ -16,7 +16,7 @@ using System.Windows.Forms; using Work; using Work.Api; -namespace LittleRabbit.LittleRabbitForms.ToolForms +namespace TemuKJD.KJDForms.ToolForms { public partial class ProxyForm : LRBaseForm { diff --git a/TEMUKJD/KJDForms/ToolForms/ProxyForm.designer.cs b/TEMUKJD/KJDForms/ToolForms/ProxyForm.designer.cs index 45e25b5..95e5e6c 100644 --- a/TEMUKJD/KJDForms/ToolForms/ProxyForm.designer.cs +++ b/TEMUKJD/KJDForms/ToolForms/ProxyForm.designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.ToolForms +namespace TemuKJD.KJDForms.ToolForms { partial class ProxyForm { @@ -29,9 +29,9 @@ private void InitializeComponent() { this.txtProxy = new System.Windows.Forms.TextBox(); - this.proxyButtonX = new LittleRabbit.UserControls.ButtonEx(); + this.proxyButtonX = new TemuKJD.UserControls.ButtonEx(); this.panel2 = new System.Windows.Forms.Panel(); - this.btnAgentIPUrl = new LittleRabbit.UserControls.ButtonEx(); + this.btnAgentIPUrl = new TemuKJD.UserControls.ButtonEx(); this.label8 = new System.Windows.Forms.Label(); this.panel2.SuspendLayout(); this.SuspendLayout(); diff --git a/TEMUKJD/KJDForms/ToolForms/TextForm.cs b/TEMUKJD/KJDForms/ToolForms/TextForm.cs index 6fc7f30..82c0658 100644 --- a/TEMUKJD/KJDForms/ToolForms/TextForm.cs +++ b/TEMUKJD/KJDForms/ToolForms/TextForm.cs @@ -1,5 +1,5 @@ using AllBase; -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.KJDForms.BaseForms; using NaiBa.Util.Extension; using System; using System.Collections.Generic; @@ -11,7 +11,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace LittleRabbit.LittleRabbitForms.ToolForms +namespace TemuKJD.KJDForms.ToolForms { public partial class TextForm : LRBaseForm { diff --git a/TEMUKJD/KJDForms/ToolForms/TextForm.designer.cs b/TEMUKJD/KJDForms/ToolForms/TextForm.designer.cs index 77e0e0a..1ec0efe 100644 --- a/TEMUKJD/KJDForms/ToolForms/TextForm.designer.cs +++ b/TEMUKJD/KJDForms/ToolForms/TextForm.designer.cs @@ -1,7 +1,7 @@  -using LittleRabbit.UserControls; +using TemuKJD.UserControls; -namespace LittleRabbit.LittleRabbitForms.ToolForms +namespace TemuKJD.KJDForms.ToolForms { partial class TextForm { @@ -33,7 +33,7 @@ namespace LittleRabbit.LittleRabbitForms.ToolForms { this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.txtInfo = new System.Windows.Forms.TextBox(); - this.button1 = new LittleRabbit.UserControls.ButtonEx(); + this.button1 = new TemuKJD.UserControls.ButtonEx(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); diff --git a/TEMUKJD/KJDForms/ToolForms/TokenNewForm.cs b/TEMUKJD/KJDForms/ToolForms/TokenNewForm.cs index 7d54855..d8f00a2 100644 --- a/TEMUKJD/KJDForms/ToolForms/TokenNewForm.cs +++ b/TEMUKJD/KJDForms/ToolForms/TokenNewForm.cs @@ -1,5 +1,5 @@ using AllBase; -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.KJDForms.BaseForms; using NaiBa.Util.Extension; using Newtonsoft.Json; using Newtonsoft.Json.Linq; @@ -20,7 +20,7 @@ using Work; using Work.Api; using Work.CollectClass; -namespace LittleRabbit.LittleRabbitForms.ToolForms +namespace TemuKJD.KJDForms.ToolForms { public partial class TokenNewForm : LRBaseForm { diff --git a/TEMUKJD/KJDForms/ToolForms/TokenNewForm.designer.cs b/TEMUKJD/KJDForms/ToolForms/TokenNewForm.designer.cs index 148e3ac..9d9aa7e 100644 --- a/TEMUKJD/KJDForms/ToolForms/TokenNewForm.designer.cs +++ b/TEMUKJD/KJDForms/ToolForms/TokenNewForm.designer.cs @@ -1,5 +1,5 @@  -namespace LittleRabbit.LittleRabbitForms.ToolForms +namespace TemuKJD.KJDForms.ToolForms { partial class TokenNewForm { @@ -38,10 +38,10 @@ namespace LittleRabbit.LittleRabbitForms.ToolForms this.checkBox3 = new System.Windows.Forms.CheckBox(); this.checkBox2 = new System.Windows.Forms.CheckBox(); this.selectAllcheckBox = new System.Windows.Forms.CheckBox(); - this.button3 = new LittleRabbit.UserControls.ButtonEx(); + this.button3 = new TemuKJD.UserControls.ButtonEx(); this.checkBox1 = new System.Windows.Forms.CheckBox(); - this.button1 = new LittleRabbit.UserControls.ButtonEx(); - this.button2 = new LittleRabbit.UserControls.ButtonEx(); + this.button1 = new TemuKJD.UserControls.ButtonEx(); + this.button2 = new TemuKJD.UserControls.ButtonEx(); this.groupBox3 = new System.Windows.Forms.GroupBox(); this.label2 = new System.Windows.Forms.Label(); this.textBox2 = new System.Windows.Forms.TextBox(); @@ -58,7 +58,7 @@ namespace LittleRabbit.LittleRabbitForms.ToolForms this.colCaptchaColumn = new System.Windows.Forms.DataGridViewLinkColumn(); this.colShopOperateColumn = new System.Windows.Forms.DataGridViewLinkColumn(); this.delColumn = new System.Windows.Forms.DataGridViewLinkColumn(); - this.statusBar = new LittleRabbit.UserControls.StatusBarUserControl(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); diff --git a/TEMUKJD/KJDForms/UploadForms/CatForm.cs b/TEMUKJD/KJDForms/UploadForms/CatForm.cs index 286478b..8ed5eb0 100644 --- a/TEMUKJD/KJDForms/UploadForms/CatForm.cs +++ b/TEMUKJD/KJDForms/UploadForms/CatForm.cs @@ -1,6 +1,6 @@ using AllBase; using AllBase.Model.Param.FissionManage; -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.KJDForms.BaseForms; using System; using System.Collections.Generic; using System.ComponentModel; @@ -13,7 +13,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace LittleRabbit.LittleRabbitForms.UploadForms +namespace TemuKJD.KJDForms.UploadForms { public partial class CatForm : LRBaseForm { diff --git a/TEMUKJD/KJDForms/UploadForms/CatForm.designer.cs b/TEMUKJD/KJDForms/UploadForms/CatForm.designer.cs index ba78586..de74142 100644 --- a/TEMUKJD/KJDForms/UploadForms/CatForm.designer.cs +++ b/TEMUKJD/KJDForms/UploadForms/CatForm.designer.cs @@ -1,6 +1,6 @@ using System.Windows.Forms; -namespace LittleRabbit.LittleRabbitForms.UploadForms +namespace TemuKJD.KJDForms.UploadForms { partial class CatForm { @@ -36,7 +36,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms this.lbxSearch = new System.Windows.Forms.ListBox(); this.txtCateSearch = new System.Windows.Forms.TextBox(); this.lbSelectCatName = new System.Windows.Forms.Label(); - this.btnChangeCatId = new LittleRabbit.UserComponent.ButtonLc(); + this.btnChangeCatId = new TemuKJD.UserComponent.ButtonLc(); this.lv3rdCategory = new System.Windows.Forms.ListView(); this.lv2rdCategory = new System.Windows.Forms.ListView(); this.lvRootCategory = new System.Windows.Forms.ListView(); diff --git a/TEMUKJD/KJDForms/UploadForms/CleanDataForm.Designer.cs b/TEMUKJD/KJDForms/UploadForms/CleanDataForm.Designer.cs index 6af9524..93b29dc 100644 --- a/TEMUKJD/KJDForms/UploadForms/CleanDataForm.Designer.cs +++ b/TEMUKJD/KJDForms/UploadForms/CleanDataForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.UploadForms +namespace TemuKJD.KJDForms.UploadForms { partial class CleanDataForm { @@ -38,7 +38,7 @@ this.pbPaste = new System.Windows.Forms.PictureBox(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.label1 = new System.Windows.Forms.Label(); - this.btnSearch = new LittleRabbit.UserControls.ButtonEx(); + this.btnSearch = new TemuKJD.UserControls.ButtonEx(); ((System.ComponentModel.ISupportInitialize)(this.pbPaste)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); @@ -145,7 +145,7 @@ this.pbPaste.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.pbPaste.BackColor = System.Drawing.Color.White; this.pbPaste.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.pbPaste.Image = global::LittleRabbit.Properties.Resources.FullPaste; + this.pbPaste.Image = global::TemuKJD.Properties.Resources.FullPaste; this.pbPaste.Location = new System.Drawing.Point(879, 129); this.pbPaste.Name = "pbPaste"; this.pbPaste.Size = new System.Drawing.Size(33, 29); diff --git a/TEMUKJD/KJDForms/UploadForms/CleanDataForm.cs b/TEMUKJD/KJDForms/UploadForms/CleanDataForm.cs index 6533a5c..b1c544e 100644 --- a/TEMUKJD/KJDForms/UploadForms/CleanDataForm.cs +++ b/TEMUKJD/KJDForms/UploadForms/CleanDataForm.cs @@ -3,7 +3,7 @@ using AllBase.Helper; using AllBase.Model.Param.FissionManage; using AllBase.Model.Param.ProductManage; using AllBase.Model.Result; -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.KJDForms.BaseForms; using System; using System.Collections.Generic; using System.ComponentModel; @@ -20,7 +20,7 @@ using Work.Api; using Work.BLL.Upload; using Work.CollectClass; -namespace LittleRabbit.LittleRabbitForms.UploadForms +namespace TemuKJD.KJDForms.UploadForms { public partial class CleanDataForm : Form { diff --git a/TEMUKJD/KJDForms/UploadForms/CommissionForm.Designer.cs b/TEMUKJD/KJDForms/UploadForms/CommissionForm.Designer.cs index 9efbaec..bf1acf2 100644 --- a/TEMUKJD/KJDForms/UploadForms/CommissionForm.Designer.cs +++ b/TEMUKJD/KJDForms/UploadForms/CommissionForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.UploadForms +namespace TemuKJD.KJDForms.UploadForms { partial class CommissionForm { @@ -36,7 +36,7 @@ this.btnStart = new DevComponents.DotNetBar.PanelEx(); this.btnEditSampleRule = new DevComponents.DotNetBar.PanelEx(); this.btnStop = new DevComponents.DotNetBar.PanelEx(); - this.ucGroupBoxEx2 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components); + this.ucGroupBoxEx2 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.rbFreeSample = new System.Windows.Forms.RadioButton(); this.rbNoSample = new System.Windows.Forms.RadioButton(); this.label10 = new System.Windows.Forms.Label(); @@ -44,14 +44,14 @@ this.txtTotalPage = new System.Windows.Forms.TextBox(); this.label26 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); - this.ucGroupBoxEx1 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components); - this.btnRefresh = new LittleRabbit.UserControls.ButtonEx(); + this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); + this.btnRefresh = new TemuKJD.UserControls.ButtonEx(); this.splitContainer3 = new System.Windows.Forms.SplitContainer(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.rbNew = new System.Windows.Forms.RadioButton(); this.rbAll = new System.Windows.Forms.RadioButton(); - this.btnPause = new LittleRabbit.UserControls.ButtonEx(); - this.dgvShop = new LittleRabbit.UserComponent.DataGridViewEx(); + this.btnPause = new TemuKJD.UserControls.ButtonEx(); + this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -60,7 +60,7 @@ this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.pnlShowError = new DevComponents.DotNetBar.PanelEx(); this.splitContainer4 = new System.Windows.Forms.SplitContainer(); - this.statusBar = new LittleRabbit.UserControls.StatusBarUserControl(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -185,7 +185,7 @@ this.ucGroupBoxEx2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); this.ucGroupBoxEx2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.ucGroupBoxEx2.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx2.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; this.ucGroupBoxEx2.Controls.Add(this.rbFreeSample); this.ucGroupBoxEx2.Controls.Add(this.rbNoSample); this.ucGroupBoxEx2.Controls.Add(this.label10); @@ -283,7 +283,7 @@ this.ucGroupBoxEx1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.ucGroupBoxEx1.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; this.ucGroupBoxEx1.Controls.Add(this.btnRefresh); this.ucGroupBoxEx1.Location = new System.Drawing.Point(2, 2); this.ucGroupBoxEx1.Name = "ucGroupBoxEx1"; diff --git a/TEMUKJD/KJDForms/UploadForms/CommissionForm.cs b/TEMUKJD/KJDForms/UploadForms/CommissionForm.cs index 3f7be34..fb907ea 100644 --- a/TEMUKJD/KJDForms/UploadForms/CommissionForm.cs +++ b/TEMUKJD/KJDForms/UploadForms/CommissionForm.cs @@ -2,9 +2,9 @@ using AllBase.Model.Result; using CefSharp; using CefSharp.WinForms; -using LittleRabbit.Extension; -using LittleRabbit.Helper; -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.Extension; +using TemuKJD.Helper; +using TemuKJD.KJDForms.BaseForms; using NaiBa.CefHelper; using NaiBa.CefHelper.Handler; using NaiBa.Util.Extension; @@ -19,7 +19,7 @@ using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; -namespace LittleRabbit.LittleRabbitForms.UploadForms +namespace TemuKJD.KJDForms.UploadForms { public partial class CommissionForm : Form { @@ -49,12 +49,12 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms public void LoadShops() { - for (int i = 0; i < GlobalConfig.DouShopLoginList.Count; i++) + for (int i = 0; i < GlobalConfig.ShopLoginList.Count; i++) { - var shop = GlobalConfig.DouShopLoginList[i]; - var row = dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value?.ToString() == shop.ShopAccountId); + var shop = GlobalConfig.ShopLoginList[i]; + var row = dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value?.ToString() == shop.ShopId); if (row == null) - dgvShop.Rows.Add(false, shop.ShopAccountId, shop.ShopAccount, shop.LoginStatus); + dgvShop.Rows.Add(false, shop.ShopId, shop.ShopAccount, shop.LoginStatus); else { row.Cells["colLoginStatus"].Value = shop.LoginStatus; @@ -83,7 +83,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms this.sampleRule = rbNoSample.Checked ? "不支持申样" : "免费申样"; var shopIds = this.dgvShop.Rows.Cast().Where(r => r.Cells["colSelect"].Value.ParseToBool() == true && r.Cells["colLoginStatus"].Value?.ToString() == "登录成功") .Select(r => r.Cells["colShopId"].Value?.ToString()).ToList(); - var shops = GlobalConfig.DouShopLoginList.Where(s => shopIds.Contains(s.ShopAccountId)).ToList(); + var shops = GlobalConfig.ShopLoginList.Where(s => shopIds.Contains(s.ShopId)).ToList(); isRun = true; btnStart.Enabled = false; @@ -110,7 +110,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms this.sampleRule = rbNoSample.Checked ? "不支持申样" : "免费申样"; var shopIds = this.dgvShop.Rows.Cast().Where(r => r.Cells["colSelect"].Value.ParseToBool() == true && r.Cells["colLoginStatus"].Value?.ToString() == "登录成功") .Select(r => r.Cells["colShopId"].Value?.ToString()).ToList(); - var shops = GlobalConfig.DouShopLoginList.Where(s => shopIds.Contains(s.ShopAccountId)).ToList(); + var shops = GlobalConfig.ShopLoginList.Where(s => shopIds.Contains(s.ShopId)).ToList(); isRun = true; btnStart.Enabled = false; @@ -166,7 +166,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms { Invoke(new Action(() => { - var row1 = dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value?.ToString() == shop.ShopAccountId); + var row1 = dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value?.ToString() == shop.ShopId); if (row1 != null) row1.Cells["colMessage"].Value = "设置中断"; })); @@ -187,7 +187,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms shop.Message = loadResult; Invoke(new Action(() => { - var row1 = dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value?.ToString() == shop.ShopAccountId); + var row1 = dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value?.ToString() == shop.ShopId); if (row1 != null) row1.Cells["colMessage"].Value = shop.Message; })); @@ -270,7 +270,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms { Invoke(new Action(() => { - var row1 = dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value?.ToString() == shop.ShopAccountId); + var row1 = dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value?.ToString() == shop.ShopId); if (row1 != null) row1.Cells["colMessage"].Value = "编辑申样中断"; })); @@ -389,7 +389,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms Invoke(new Action(() => { shop.Message = "设置完成"; - var row = dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value?.ToString() == shop.ShopAccountId); + var row = dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value?.ToString() == shop.ShopId); if (row != null) row.Cells["colMessage"].Value = "设置完成"; })); @@ -423,7 +423,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms } Invoke(new Action(() => { - var row1 = dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value?.ToString() == shop.ShopAccountId); + var row1 = dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value?.ToString() == shop.ShopId); if (row1 != null) row1.Cells["colMessage"].Value = shop.Message; })); @@ -463,7 +463,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms { Invoke(new Action(() => { - var row1 = dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value?.ToString() == shop.ShopAccountId); + var row1 = dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value?.ToString() == shop.ShopId); if (row1 != null) row1.Cells["colMessage"].Value = "设置中断"; })); @@ -484,7 +484,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms shop.Message = loadResult; Invoke(new Action(() => { - var row1 = dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value?.ToString() == shop.ShopAccountId); + var row1 = dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value?.ToString() == shop.ShopId); if (row1 != null) row1.Cells["colMessage"].Value = shop.Message; })); @@ -647,7 +647,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms { Invoke(new Action(() => { - var row1 = dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value?.ToString() == shop.ShopAccountId); + var row1 = dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value?.ToString() == shop.ShopId); if (row1 != null) row1.Cells["colMessage"].Value = "设置中断"; })); @@ -992,7 +992,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms Invoke(new Action(() => { shop.Message = "设置完成"; - var row = dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value?.ToString() == shop.ShopAccountId); + var row = dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value?.ToString() == shop.ShopId); if (row != null) row.Cells["colMessage"].Value = "设置完成"; })); @@ -1026,7 +1026,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms } Invoke(new Action(() => { - var row1 = dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value?.ToString() == shop.ShopAccountId); + var row1 = dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value?.ToString() == shop.ShopId); if (row1 != null) row1.Cells["colMessage"].Value = shop.Message; })); diff --git a/TEMUKJD/KJDForms/UploadForms/FilterForm.Designer.cs b/TEMUKJD/KJDForms/UploadForms/FilterForm.Designer.cs index 8f93edb..63e880b 100644 --- a/TEMUKJD/KJDForms/UploadForms/FilterForm.Designer.cs +++ b/TEMUKJD/KJDForms/UploadForms/FilterForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.UploadForms +namespace TemuKJD.KJDForms.UploadForms { partial class FilterForm { @@ -31,7 +31,7 @@ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FilterForm)); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.labelX1 = new DevComponents.DotNetBar.LabelX(); - this.btnSave = new LittleRabbit.UserControls.ButtonEx(); + this.btnSave = new TemuKJD.UserControls.ButtonEx(); this.richTextBox1 = new System.Windows.Forms.RichTextBox(); this.panel2 = new System.Windows.Forms.Panel(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); diff --git a/TEMUKJD/KJDForms/UploadForms/FilterForm.cs b/TEMUKJD/KJDForms/UploadForms/FilterForm.cs index 0cbc568..bc1423a 100644 --- a/TEMUKJD/KJDForms/UploadForms/FilterForm.cs +++ b/TEMUKJD/KJDForms/UploadForms/FilterForm.cs @@ -1,5 +1,5 @@ using AllBase; -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.KJDForms.BaseForms; using System; using System.Collections.Generic; using System.ComponentModel; @@ -12,7 +12,7 @@ using System.Windows.Forms; using Work; using Work.BLL.Upload; -namespace LittleRabbit.LittleRabbitForms.UploadForms +namespace TemuKJD.KJDForms.UploadForms { public partial class FilterForm : LRBaseForm { diff --git a/TEMUKJD/KJDForms/UploadForms/Fission.cs b/TEMUKJD/KJDForms/UploadForms/Fission.cs index 3838e94..92105e7 100644 --- a/TEMUKJD/KJDForms/UploadForms/Fission.cs +++ b/TEMUKJD/KJDForms/UploadForms/Fission.cs @@ -17,24 +17,24 @@ using System.Text; using AllBase.Helper; using NaiBa.Util.Extension; using Work.CollectClass; -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.KJDForms.BaseForms; using AllBase.Model.Param.FissionManage; using Work; using Work.Api; using System.Threading; -using LittleRabbit.LittleRabbitForms.ToolForms; -using LittleRabbit.LittleRabbitForms.ToolForms.JDVerify; +using TemuKJD.KJDForms.ToolForms; +using TemuKJD.KJDForms.ToolForms.JDVerify; using NaiBa.Util; using Work.DouyinApiClass; using Work.BLL.Upload; using NaiBa.CefHelper; using AllBase.Model.Param.ProductManage; -using LittleRabbit.LittleRabbitForms.UploadForms.FissionUserControl; +using TemuKJD.KJDForms.UploadForms.FissionUserControl; using AllBase.Model.Result; using NaiBa.CefHelper.Handler; -using LittleRabbit.LittleRabbitForms.ToolForms.KeywordsForms; +using TemuKJD.KJDForms.ToolForms.KeywordsForms; -namespace LittleRabbit.LittleRabbitForms.UploadForms +namespace TemuKJD.KJDForms.UploadForms { public partial class Fission : LRBaseForm { @@ -664,7 +664,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms var item = this.cmbGetCatShop.SelectedItem as ComboBoxItem; if (item != null && item.Name != "随机选择") { - dyShop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ShopAccountId == item.Name); + dyShop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == item.Name); if (dyShop != null) { catid = (int)UploadProductBLL.GetCat(data.name, out errMsg, out fullCatStrings, dyShop); @@ -679,7 +679,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms } else { - dyShop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.LoginStatus == "登录成功"); + dyShop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.LoginStatus == "登录成功"); if (dyShop == null) lblCategory.Text = "请登录店铺！"; while (dyShop != null && catid == 0) @@ -690,7 +690,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms if (dyShop.LoginStatus == "未登录") { StartUp.SaveLocalShopLoginInfo(); - dyShop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.LoginStatus == "登录成功"); + dyShop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.LoginStatus == "登录成功"); Thread.Sleep(100); } } @@ -1767,7 +1767,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms { cboxShop.Items.Clear(); - foreach (var shop in GlobalConfig.DouShopLoginList) + foreach (var shop in GlobalConfig.ShopLoginList) { cboxShop.Items.Add(shop.ShopAccount); } @@ -1782,7 +1782,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms cboxCat3.Items.Clear();//有的店铺没有一级、二级、三级类目，所以，更改店铺前要把一二三级类目全部清空 by ttzhao 2020.10.13 dicNameCate.Clear(); string shopname = cboxShop.Text; - var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(x => x.ShopAccount == shopname); + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(x => x.ShopAccount == shopname); if (shop == null || shop.LstShopCategory == null) { return; @@ -2060,10 +2060,10 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms List list = NaiBa.Util.Helper.ConfigHelper.LoadConfig>("cat_dy"); if (list == null) list = new List(); - if (list.Count == 0 || GlobalConfig.DouShopLoginList.Any(s => s.ApiAuthStatus == "授权成功" && (s.LstShopCategory == null || s.LstShopCategory.Count == 0))) + if (list.Count == 0 || GlobalConfig.ShopLoginList.Any(s => s.ApiAuthStatus == "授权成功" && (s.LstShopCategory == null || s.LstShopCategory.Count == 0))) { //list.Clear(); - foreach (var shop in GlobalConfig.DouShopLoginList) + foreach (var shop in GlobalConfig.ShopLoginList) { if (shop.ApiAuthStatus == "授权成功") { @@ -2562,7 +2562,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms if (!foodCate1Names.Any(f => categoryText.StartsWith(f))) return; - var dyShop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ApiAuthStatus == "授权成功"); + var dyShop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ApiAuthStatus == "授权成功"); if (dyShop == null) { BaseMsgForm.ShowError("请确保至少有一个店铺授权成功！"); @@ -2577,7 +2577,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms { dyShop.ApiAuthStatus = "未授权"; StartUp.SaveLocalShopLoginInfo(); - dyShop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ApiAuthStatus == "授权成功"); + dyShop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ApiAuthStatus == "授权成功"); if (dyShop == null) { BaseMsgForm.ShowError("请确保至少有一个店铺授权成功！"); @@ -2729,7 +2729,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms var textQuery = ""; while (result == "" || result.Contains("已过期")) { - var dyShop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ApiAuthStatus == "授权成功"); + var dyShop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ApiAuthStatus == "授权成功"); if (dyShop == null) { BaseMsgForm.ShowError("请确保至少有一个店铺授权成功！"); @@ -2923,9 +2923,9 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms this.cmbGetCatShop.Items.Clear(); this.cmbGetCatShop.Items.Add(new ComboBoxItem() { Name = "随机选择", Text = "随机选择" }); - foreach (var shop in GlobalConfig.DouShopLoginList) + foreach (var shop in GlobalConfig.ShopLoginList) { - cmbGetCatShop.Items.Add(new ComboBoxItem() { Name = shop.ShopAccountId, Text = shop.ShopAccount + (shop.LoginStatus == "登录成功" ? "" : " 未登录") }); + cmbGetCatShop.Items.Add(new ComboBoxItem() { Name = shop.ShopId, Text = shop.ShopAccount + (shop.LoginStatus == "登录成功" ? "" : " 未登录") }); } this.cmbGetCatShop.SelectedIndex = 0; } diff --git a/TEMUKJD/KJDForms/UploadForms/Fission.designer.cs b/TEMUKJD/KJDForms/UploadForms/Fission.designer.cs index 3fb4ca9..c52e7a0 100644 --- a/TEMUKJD/KJDForms/UploadForms/Fission.designer.cs +++ b/TEMUKJD/KJDForms/UploadForms/Fission.designer.cs @@ -1,9 +1,9 @@ using System; using System.Windows.Forms; using DevComponents.DotNetBar.Controls; -using LittleRabbit.UserComponent; +using TemuKJD.UserComponent; -namespace LittleRabbit.LittleRabbitForms.UploadForms +namespace TemuKJD.KJDForms.UploadForms { partial class Fission { @@ -75,7 +75,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms this.flpProp = new System.Windows.Forms.FlowLayoutPanel(); this.flpQualification = new System.Windows.Forms.FlowLayoutPanel(); this.splitContainer3 = new System.Windows.Forms.SplitContainer(); - this.dataGridView1 = new LittleRabbit.UserComponent.DataGridViewEx(); + this.dataGridView1 = new TemuKJD.UserComponent.DataGridViewEx(); this.id = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colDbId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colProductId = new System.Windows.Forms.DataGridViewLinkColumn(); @@ -83,30 +83,30 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms this.status = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colRemove = new System.Windows.Forms.DataGridViewLinkColumn(); this.colDelete = new System.Windows.Forms.DataGridViewLinkColumn(); - this.btnCatchWords = new LittleRabbit.UserComponent.ButtonLc(); - this.lklbResetShop = new LittleRabbit.UserComponent.LinkLabelLc(); + this.btnCatchWords = new TemuKJD.UserComponent.ButtonLc(); + this.lklbResetShop = new TemuKJD.UserComponent.LinkLabelLc(); this.cmbGetCatShop = new DevComponents.DotNetBar.Controls.ComboBoxEx(); this.label6 = new System.Windows.Forms.Label(); this.pnlShowOriginal = new System.Windows.Forms.Panel(); - this.btnShowOriginal = new LittleRabbit.UserComponent.ButtonLc(); + this.btnShowOriginal = new TemuKJD.UserComponent.ButtonLc(); this.label4 = new System.Windows.Forms.Label(); this.pnlShowCategoryList = new DevComponents.DotNetBar.PanelEx(); - this.buttonMeituPath = new LittleRabbit.UserComponent.ButtonLc(); - this.addToDBBtn = new LittleRabbit.UserComponent.ButtonLc(); - this.updateBtn = new LittleRabbit.UserComponent.ButtonLc(); + this.buttonMeituPath = new TemuKJD.UserComponent.ButtonLc(); + this.addToDBBtn = new TemuKJD.UserComponent.ButtonLc(); + this.updateBtn = new TemuKJD.UserComponent.ButtonLc(); this.pbPaste = new System.Windows.Forms.PictureBox(); - this.lklbChangeCatId = new LittleRabbit.UserComponent.LinkLabelLc(); + this.lklbChangeCatId = new TemuKJD.UserComponent.LinkLabelLc(); this.SourceTitlelabel = new System.Windows.Forms.LinkLabel(); this.lblFromUrl = new System.Windows.Forms.Label(); this.lblCategory = new System.Windows.Forms.Label(); this.label9 = new System.Windows.Forms.Label(); - this.importFileBtn = new LittleRabbit.UserComponent.ButtonLc(); + this.importFileBtn = new TemuKJD.UserComponent.ButtonLc(); this.freePostLabel = new System.Windows.Forms.Label(); this.importURLtextBox = new System.Windows.Forms.TextBox(); this.label8 = new System.Windows.Forms.Label(); - this.LastURLBtn = new LittleRabbit.UserComponent.ButtonLc(); + this.LastURLBtn = new TemuKJD.UserComponent.ButtonLc(); this.sourceLabel = new System.Windows.Forms.Label(); - this.NextURLBtn = new LittleRabbit.UserComponent.ButtonLc(); + this.NextURLBtn = new TemuKJD.UserComponent.ButtonLc(); this.label7 = new System.Windows.Forms.Label(); this.priceLabel = new System.Windows.Forms.Label(); this.priceLabel1 = new System.Windows.Forms.Label(); @@ -190,7 +190,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms // this.pbLoading.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.pbLoading.Image = global::LittleRabbit.Properties.Resources.loading_blue; + this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue; this.pbLoading.Location = new System.Drawing.Point(27, 214); this.pbLoading.Name = "pbLoading"; this.pbLoading.Size = new System.Drawing.Size(1088, 64); @@ -976,7 +976,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms this.pbPaste.BackColor = System.Drawing.Color.White; this.pbPaste.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.pbPaste.Cursor = System.Windows.Forms.Cursors.Hand; - this.pbPaste.Image = global::LittleRabbit.Properties.Resources.FullPaste; + this.pbPaste.Image = global::TemuKJD.Properties.Resources.FullPaste; this.pbPaste.Location = new System.Drawing.Point(811, 6); this.pbPaste.Name = "pbPaste"; this.pbPaste.Size = new System.Drawing.Size(22, 22); diff --git a/TEMUKJD/KJDForms/UploadForms/FissionBrowserObject.cs b/TEMUKJD/KJDForms/UploadForms/FissionBrowserObject.cs index 52eb02e..80b8035 100644 --- a/TEMUKJD/KJDForms/UploadForms/FissionBrowserObject.cs +++ b/TEMUKJD/KJDForms/UploadForms/FissionBrowserObject.cs @@ -1,7 +1,7 @@ using AllBase; using AllBase.Model.Param.FissionManage; -using LittleRabbit.LittleRabbitForms.BaseForms; -using LittleRabbit.LittleRabbitForms.ToolForms; +using TemuKJD.KJDForms.BaseForms; +using TemuKJD.KJDForms.ToolForms; using NaiBa.Util; using System; using System.Collections.Generic; @@ -12,7 +12,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using Work; -namespace LittleRabbit.LittleRabbitForms.UploadForms +namespace TemuKJD.KJDForms.UploadForms { class FissionBrowserObject { diff --git a/TEMUKJD/KJDForms/UploadForms/FissionDataBaseForm.Designer.cs b/TEMUKJD/KJDForms/UploadForms/FissionDataBaseForm.Designer.cs index ec940fa..d7811dc 100644 --- a/TEMUKJD/KJDForms/UploadForms/FissionDataBaseForm.Designer.cs +++ b/TEMUKJD/KJDForms/UploadForms/FissionDataBaseForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.UploadForms +namespace TemuKJD.KJDForms.UploadForms { partial class FissionDataBaseForm { @@ -105,7 +105,7 @@ this.buttonX5 = new DevComponents.DotNetBar.ButtonX(); this.superTabItem2 = new DevComponents.DotNetBar.SuperTabItem(); this.chkIsProxyIp = new System.Windows.Forms.CheckBox(); - this.dgvFissionProduct = new LittleRabbit.UserComponent.DataGridViewEx(); + this.dgvFissionProduct = new TemuKJD.UserComponent.DataGridViewEx(); this.labelX48 = new DevComponents.DotNetBar.LabelX(); this.chkAutoTurnPage = new System.Windows.Forms.CheckBox(); this.progressBarX1 = new DevComponents.DotNetBar.Controls.ProgressBarX(); @@ -1035,7 +1035,7 @@ // pbLoading // this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.pbLoading.Image = global::LittleRabbit.Properties.Resources.loading_blue; + this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue; this.pbLoading.Location = new System.Drawing.Point(596, 107); this.pbLoading.Name = "pbLoading"; this.pbLoading.Size = new System.Drawing.Size(72, 64); diff --git a/TEMUKJD/KJDForms/UploadForms/FissionDataBaseForm.cs b/TEMUKJD/KJDForms/UploadForms/FissionDataBaseForm.cs index abe86d1..ae62b3f 100644 --- a/TEMUKJD/KJDForms/UploadForms/FissionDataBaseForm.cs +++ b/TEMUKJD/KJDForms/UploadForms/FissionDataBaseForm.cs @@ -2,8 +2,8 @@ using AllBase.Helper; using AllBase.Model.Param.FissionManage; using AllBase.Model.Result; -using LittleRabbit.Extension; -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.Extension; +using TemuKJD.KJDForms.BaseForms; using NaiBa.Util.Extension; using Newtonsoft.Json; using Newtonsoft.Json.Linq; @@ -24,7 +24,7 @@ using Work.BLL.Upload; using Work.CollectClass; using Work.DouyinApiClass; -namespace LittleRabbit.LittleRabbitForms.UploadForms +namespace TemuKJD.KJDForms.UploadForms { public partial class FissionDataBaseForm : Form { @@ -208,7 +208,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms { cmbShop.Items.Clear(); cmbShop.Items.Add("不限"); - foreach (var shop in GlobalConfig.DouShopLoginList) + foreach (var shop in GlobalConfig.ShopLoginList) { cmbShop.Items.Add(shop.ShopAccount); } @@ -228,7 +228,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms catList1.Insert(0, new GoodsCategoryModel() { name = "不限", parent_id = 0, level = 0, enable = true, is_leaf = false, id = -1, main_cat_id = 0 }); string shopname = cmbShop.Text; - var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(x => x.ShopAccount == shopname); + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(x => x.ShopAccount == shopname); if (shop != null) { catList1.AddRange(GetCategoryList(0, shop)); @@ -258,7 +258,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms cmbShopCat3.Items.Clear(); // 防止有的店铺没有一级、二级、三级类目，所以，更改店铺前要把一级类目清空 List catList2 = new List(); string shopname = cmbShop.Text; - var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(x => x.ShopAccount == shopname); + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(x => x.ShopAccount == shopname); if (shop != null) { if (cmbShopCat1.SelectedItem is GoodsCategoryModel) @@ -277,7 +277,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms cmbShopCat3.Items.Clear(); // 防止有的店铺没有一级、二级、三级类目，所以，更改店铺前要把三级类目清空 List catList3 = new List(); string shopname = cmbShop.Text; - var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(x => x.ShopAccount == shopname); + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(x => x.ShopAccount == shopname); if (shop != null) { if (cmbShopCat2.SelectedItem is GoodsCategoryModel) diff --git a/TEMUKJD/KJDForms/UploadForms/FissionShowBigImgForm.cs b/TEMUKJD/KJDForms/UploadForms/FissionShowBigImgForm.cs index 3bf9344..441cd7f 100644 --- a/TEMUKJD/KJDForms/UploadForms/FissionShowBigImgForm.cs +++ b/TEMUKJD/KJDForms/UploadForms/FissionShowBigImgForm.cs @@ -1,5 +1,5 @@ using CefSharp; -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.KJDForms.BaseForms; using System; using System.Collections.Generic; using System.ComponentModel; @@ -12,7 +12,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace LittleRabbit.LittleRabbitForms.UploadForms +namespace TemuKJD.KJDForms.UploadForms { public partial class FissionShowBigImgForm : LRBaseForm { diff --git a/TEMUKJD/KJDForms/UploadForms/FissionShowBigImgForm.designer.cs b/TEMUKJD/KJDForms/UploadForms/FissionShowBigImgForm.designer.cs index 18db1bd..b1c40a1 100644 --- a/TEMUKJD/KJDForms/UploadForms/FissionShowBigImgForm.designer.cs +++ b/TEMUKJD/KJDForms/UploadForms/FissionShowBigImgForm.designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.UploadForms +namespace TemuKJD.KJDForms.UploadForms { partial class FissionShowBigImgForm { diff --git a/TEMUKJD/KJDForms/UploadForms/FissionUserControl/UcCategoryProp.Designer.cs b/TEMUKJD/KJDForms/UploadForms/FissionUserControl/UcCategoryProp.Designer.cs index 7c694a3..9f7d946 100644 --- a/TEMUKJD/KJDForms/UploadForms/FissionUserControl/UcCategoryProp.Designer.cs +++ b/TEMUKJD/KJDForms/UploadForms/FissionUserControl/UcCategoryProp.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.UploadForms.FissionUserControl +namespace TemuKJD.KJDForms.UploadForms.FissionUserControl { partial class UcCategoryProp { @@ -29,7 +29,7 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - this.ucGroupBoxEx1 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components); + this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.txtPropValue = new DevComponents.DotNetBar.Controls.TextBoxX(); this.ucGroupBoxEx1.SuspendLayout(); this.SuspendLayout(); @@ -37,7 +37,7 @@ // ucGroupBoxEx1 // this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.DodgerBlue; - this.ucGroupBoxEx1.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.SQUARE; + this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.SQUARE; this.ucGroupBoxEx1.Controls.Add(this.txtPropValue); this.ucGroupBoxEx1.Dock = System.Windows.Forms.DockStyle.Fill; this.ucGroupBoxEx1.Location = new System.Drawing.Point(0, 0); diff --git a/TEMUKJD/KJDForms/UploadForms/FissionUserControl/UcCategoryProp.cs b/TEMUKJD/KJDForms/UploadForms/FissionUserControl/UcCategoryProp.cs index 6d5552f..d5df314 100644 --- a/TEMUKJD/KJDForms/UploadForms/FissionUserControl/UcCategoryProp.cs +++ b/TEMUKJD/KJDForms/UploadForms/FissionUserControl/UcCategoryProp.cs @@ -8,9 +8,9 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; using AllBase.Helper; -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.KJDForms.BaseForms; -namespace LittleRabbit.LittleRabbitForms.UploadForms.FissionUserControl +namespace TemuKJD.KJDForms.UploadForms.FissionUserControl { public partial class UcCategoryProp : UserControl { diff --git a/TEMUKJD/KJDForms/UploadForms/FissionUserControl/UcQualifiaction.Designer.cs b/TEMUKJD/KJDForms/UploadForms/FissionUserControl/UcQualifiaction.Designer.cs index 2ffecde..93e436c 100644 --- a/TEMUKJD/KJDForms/UploadForms/FissionUserControl/UcQualifiaction.Designer.cs +++ b/TEMUKJD/KJDForms/UploadForms/FissionUserControl/UcQualifiaction.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.UploadForms.FissionUserControl +namespace TemuKJD.KJDForms.UploadForms.FissionUserControl { partial class UcQualifiaction { @@ -31,7 +31,7 @@ this.components = new System.ComponentModel.Container(); this.txtQualificationNumber = new DevComponents.DotNetBar.Controls.TextBoxX(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.ucGroupBoxEx1 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components); + this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.label1 = new System.Windows.Forms.Label(); this.btnUploadImg = new DevComponents.DotNetBar.PanelEx(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); @@ -76,7 +76,7 @@ // ucGroupBoxEx1 // this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.DodgerBlue; - this.ucGroupBoxEx1.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.SQUARE; + this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.SQUARE; this.ucGroupBoxEx1.Controls.Add(this.splitContainer1); this.ucGroupBoxEx1.Dock = System.Windows.Forms.DockStyle.Fill; this.ucGroupBoxEx1.Location = new System.Drawing.Point(0, 0); diff --git a/TEMUKJD/KJDForms/UploadForms/FissionUserControl/UcQualifiaction.cs b/TEMUKJD/KJDForms/UploadForms/FissionUserControl/UcQualifiaction.cs index b1ebf65..6340406 100644 --- a/TEMUKJD/KJDForms/UploadForms/FissionUserControl/UcQualifiaction.cs +++ b/TEMUKJD/KJDForms/UploadForms/FissionUserControl/UcQualifiaction.cs @@ -9,10 +9,10 @@ using System.Threading.Tasks; using System.Windows.Forms; using AllBase.Model.Param.ProductManage; using AllBase; -using LittleRabbit.LittleRabbitForms.BaseForms; -using LittleRabbit.LittleRabbitForms.UploadForms; +using TemuKJD.KJDForms.BaseForms; +using TemuKJD.KJDForms.UploadForms; -namespace LittleRabbit.LittleRabbitForms.UploadForms.FissionUserControl +namespace TemuKJD.KJDForms.UploadForms.FissionUserControl { public partial class UcQualifiaction : UserControl { diff --git a/TEMUKJD/KJDForms/UploadForms/GetUpProductForm.Designer.cs b/TEMUKJD/KJDForms/UploadForms/GetUpProductForm.Designer.cs index 96a799d..ea6bb5a 100644 --- a/TEMUKJD/KJDForms/UploadForms/GetUpProductForm.Designer.cs +++ b/TEMUKJD/KJDForms/UploadForms/GetUpProductForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.UploadForms +namespace TemuKJD.KJDForms.UploadForms { partial class GetUpProductForm { @@ -37,7 +37,7 @@ this.labelX10 = new DevComponents.DotNetBar.LabelX(); this.btnSearch = new DevComponents.DotNetBar.ButtonX(); this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); - this.dgvProduct = new LittleRabbit.UserComponent.DataGridViewEx(); + this.dgvProduct = new TemuKJD.UserComponent.DataGridViewEx(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colProductId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colFrom = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -61,7 +61,7 @@ this.pbPaste.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.pbPaste.BackColor = System.Drawing.Color.White; this.pbPaste.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.pbPaste.Image = global::LittleRabbit.Properties.Resources.FullPaste; + this.pbPaste.Image = global::TemuKJD.Properties.Resources.FullPaste; this.pbPaste.Location = new System.Drawing.Point(860, 75); this.pbPaste.Name = "pbPaste"; this.pbPaste.Size = new System.Drawing.Size(33, 29); diff --git a/TEMUKJD/KJDForms/UploadForms/GetUpProductForm.cs b/TEMUKJD/KJDForms/UploadForms/GetUpProductForm.cs index 814f8b4..fb366e3 100644 --- a/TEMUKJD/KJDForms/UploadForms/GetUpProductForm.cs +++ b/TEMUKJD/KJDForms/UploadForms/GetUpProductForm.cs @@ -1,5 +1,5 @@ using AllBase; -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.KJDForms.BaseForms; using NaiBa.Util; using NaiBa.Util.Extension; using NaiBa.Util.Helper; @@ -15,7 +15,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using Work; -namespace LittleRabbit.LittleRabbitForms.UploadForms +namespace TemuKJD.KJDForms.UploadForms { public partial class GetUpProductForm : Form { diff --git a/TEMUKJD/KJDForms/UploadForms/IeForm.cs b/TEMUKJD/KJDForms/UploadForms/IeForm.cs index e980693..76d7cf4 100644 --- a/TEMUKJD/KJDForms/UploadForms/IeForm.cs +++ b/TEMUKJD/KJDForms/UploadForms/IeForm.cs @@ -14,9 +14,9 @@ using Work; using System.Threading; using Work.CollectClass; using Work.Api; -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.KJDForms.BaseForms; -namespace LittleRabbit.LittleRabbitForms +namespace TemuKJD.KJDForms { public partial class IeForm : LRBaseForm { diff --git a/TEMUKJD/KJDForms/UploadForms/IeForm.designer.cs b/TEMUKJD/KJDForms/UploadForms/IeForm.designer.cs index 568bb41..c159c1e 100644 --- a/TEMUKJD/KJDForms/UploadForms/IeForm.designer.cs +++ b/TEMUKJD/KJDForms/UploadForms/IeForm.designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms +namespace TemuKJD.KJDForms { partial class IeForm { @@ -32,12 +32,12 @@ this.pnlBody = new System.Windows.Forms.Panel(); this.panel2 = new System.Windows.Forms.Panel(); this.panel3 = new System.Windows.Forms.Panel(); - this.buttonEx1 = new LittleRabbit.UserControls.ButtonEx(); + this.buttonEx1 = new TemuKJD.UserControls.ButtonEx(); this.panelSettleSlide = new DevComponents.DotNetBar.PanelEx(); this.userComboBox = new System.Windows.Forms.ComboBox(); this.label25 = new System.Windows.Forms.Label(); this.delCookiesButtonX = new DevComponents.DotNetBar.PanelEx(); - this.buttonEx4 = new LittleRabbit.UserControls.ButtonEx(); + this.buttonEx4 = new TemuKJD.UserControls.ButtonEx(); this.checkBox1 = new System.Windows.Forms.CheckBox(); this.label1 = new System.Windows.Forms.Label(); this.pnlBody.SuspendLayout(); diff --git a/TEMUKJD/KJDForms/UploadForms/ShopProductForm.Designer.cs b/TEMUKJD/KJDForms/UploadForms/ShopProductForm.Designer.cs index 166cbef..67d7d54 100644 --- a/TEMUKJD/KJDForms/UploadForms/ShopProductForm.Designer.cs +++ b/TEMUKJD/KJDForms/UploadForms/ShopProductForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.UploadForms +namespace TemuKJD.KJDForms.UploadForms { partial class ShopProductForm { @@ -33,17 +33,17 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.buttonEx1 = new LittleRabbit.UserControls.ButtonEx(); - this.ucGroupBoxEx3 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components); - this.btnStop = new LittleRabbit.UserControls.ButtonEx(); - this.btnDelOffSale = new LittleRabbit.UserControls.ButtonEx(); - this.btnDelOnSale = new LittleRabbit.UserControls.ButtonEx(); - this.btnOffline = new LittleRabbit.UserControls.ButtonEx(); - this.btnOnline = new LittleRabbit.UserControls.ButtonEx(); - this.ucGroupBoxEx1 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components); - this.btnGetProductCount = new LittleRabbit.UserControls.ButtonEx(); - this.btnRefreshShop = new LittleRabbit.UserControls.ButtonEx(); - this.ucGroupBoxEx2 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components); + this.buttonEx1 = new TemuKJD.UserControls.ButtonEx(); + this.ucGroupBoxEx3 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); + this.btnStop = new TemuKJD.UserControls.ButtonEx(); + this.btnDelOffSale = new TemuKJD.UserControls.ButtonEx(); + this.btnDelOnSale = new TemuKJD.UserControls.ButtonEx(); + this.btnOffline = new TemuKJD.UserControls.ButtonEx(); + this.btnOnline = new TemuKJD.UserControls.ButtonEx(); + this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); + this.btnGetProductCount = new TemuKJD.UserControls.ButtonEx(); + this.btnRefreshShop = new TemuKJD.UserControls.ButtonEx(); + this.ucGroupBoxEx2 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.txtKeywords = new DevComponents.DotNetBar.Controls.TextBoxX(); this.label1 = new System.Windows.Forms.Label(); this.chkNotOperateChangeDays = new System.Windows.Forms.CheckBox(); @@ -53,7 +53,7 @@ this.txtOperateCount = new System.Windows.Forms.TextBox(); this.label12 = new System.Windows.Forms.Label(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); - this.dgvShop = new LittleRabbit.UserComponent.DataGridViewEx(); + this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -65,8 +65,8 @@ this.colOffSaleCount = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colOperationCount = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colStatus = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.btnFailedDetail = new LittleRabbit.UserControls.ButtonEx(); - this.statusBar = new LittleRabbit.UserControls.StatusBarUserControl(); + this.btnFailedDetail = new TemuKJD.UserControls.ButtonEx(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -123,7 +123,7 @@ // ucGroupBoxEx3 // this.ucGroupBoxEx3.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.ucGroupBoxEx3.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx3.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; this.ucGroupBoxEx3.Controls.Add(this.btnStop); this.ucGroupBoxEx3.Controls.Add(this.btnDelOffSale); this.ucGroupBoxEx3.Controls.Add(this.btnDelOnSale); @@ -219,7 +219,7 @@ // ucGroupBoxEx1 // this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.ucGroupBoxEx1.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; this.ucGroupBoxEx1.Controls.Add(this.btnGetProductCount); this.ucGroupBoxEx1.Controls.Add(this.btnRefreshShop); this.ucGroupBoxEx1.Location = new System.Drawing.Point(2, 2); @@ -264,7 +264,7 @@ // ucGroupBoxEx2 // this.ucGroupBoxEx2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.ucGroupBoxEx2.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx2.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; this.ucGroupBoxEx2.Controls.Add(this.txtKeywords); this.ucGroupBoxEx2.Controls.Add(this.label1); this.ucGroupBoxEx2.Controls.Add(this.chkNotOperateChangeDays); diff --git a/TEMUKJD/KJDForms/UploadForms/ShopProductForm.cs b/TEMUKJD/KJDForms/UploadForms/ShopProductForm.cs index 6e2cc8b..6745a57 100644 --- a/TEMUKJD/KJDForms/UploadForms/ShopProductForm.cs +++ b/TEMUKJD/KJDForms/UploadForms/ShopProductForm.cs @@ -2,8 +2,8 @@ using AllBase.Helper; using AllBase.Model.Result; using CefSharp.WinForms; -using LittleRabbit.Extension; -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.Extension; +using TemuKJD.KJDForms.BaseForms; using NaiBa.CefHelper; using NaiBa.CefHelper.Handler; using NaiBa.Util.Extension; @@ -22,7 +22,7 @@ using System.Windows.Forms; using Work.BLL.Product; using Work.DouyinApiClass; -namespace LittleRabbit.LittleRabbitForms.UploadForms +namespace TemuKJD.KJDForms.UploadForms { public partial class ShopProductForm : Form { @@ -77,7 +77,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms void GetShopProduct(bool isShowProgress = true) { int i = 0; - var shopList = GlobalConfig.DouShopLoginList.Where(s => s.ApiAuthStatus == "授权成功" && lstShopId.Contains(s.ShopAccountId)); + var shopList = GlobalConfig.ShopLoginList.Where(s => s.ApiAuthStatus == "授权成功" && lstShopId.Contains(s.ShopId)); foreach (var shop in shopList) { this.Invoke(new Action(() => @@ -111,7 +111,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms DataGridViewRow row = null; Invoke(new Action(() => { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { if (isShowResult) @@ -199,17 +199,17 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms private void RefreshShop() { // 更新选中的上货店铺Id - lstShopId = lstShopId.Where(id => GlobalConfig.DouShopLoginList.Any(s => s.ShopAccountId == id && s.LoginStatus == "已授权")).ToList(); + lstShopId = lstShopId.Where(id => GlobalConfig.ShopLoginList.Any(s => s.ShopId == id && s.LoginStatus == "已授权")).ToList(); // 获取被删除的店铺 List dgvRowList = dgvShop.Rows.Cast().Where(row - => !GlobalConfig.DouShopLoginList.Any(s => s.ShopAccountId == row.Cells["colShopId"]?.Value?.ToString())).ToList(); + => !GlobalConfig.ShopLoginList.Any(s => s.ShopId == row.Cells["colShopId"]?.Value?.ToString())).ToList(); // 更新被删除的店铺列表 foreach (var row in dgvRowList) { dgvShop.Rows.Remove(row); } // 绑定其他店铺（含新导入的店铺） - foreach (DouShopLoginInfo shopEntity in GlobalConfig.DouShopLoginList) + foreach (DouShopLoginInfo shopEntity in GlobalConfig.ShopLoginList) { BindShop(shopEntity); } @@ -217,12 +217,12 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms private void BindShop(DouShopLoginInfo shopEntity) { - var row = dgvShop.Rows.Cast().FirstOrDefault(p => p.Cells.GetCellValueFromColumnName("colShopId").ParseToString() == shopEntity.ShopAccountId); + var row = dgvShop.Rows.Cast().FirstOrDefault(p => p.Cells.GetCellValueFromColumnName("colShopId").ParseToString() == shopEntity.ShopId); if (row == null) { this.dgvShop.Rows.Add( false, - shopEntity.ShopAccountId, + shopEntity.ShopId, shopEntity.ShopAccount, shopEntity.ApiAuthStatus, shopEntity.LoginStatus, @@ -236,7 +236,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms } else { - row.Cells["colSelect"].Value = lstShopId.Contains(shopEntity.ShopAccountId); + row.Cells["colSelect"].Value = lstShopId.Contains(shopEntity.ShopId); row.Cells["colShopName"].Value = shopEntity.ShopAccount; row.Cells["colAuthStatus"].Value = shopEntity.ApiAuthStatus; row.Cells["colLoginStatus"].Value = shopEntity.LoginStatus; @@ -259,7 +259,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms else { lstShopId.Clear(); - var list = GlobalConfig.DouShopLoginList.Where(s => s.ApiAuthStatus == "授权成功" && s.LoginStatus == "登录成功").Select(ss => ss.ShopAccountId); + var list = GlobalConfig.ShopLoginList.Where(s => s.ApiAuthStatus == "授权成功" && s.LoginStatus == "登录成功").Select(ss => ss.ShopId); lstShopId.AddRange(list); foreach (DataGridViewRow row in dgvShop.Rows) { @@ -281,7 +281,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms string headerText = dgvShop.Columns[e.ColumnIndex].HeaderText; long shopId = dgvShop.Rows[e.RowIndex].Cells["colShopId"].Value.ParseToLong(); string shopName = dgvShop.Rows[e.RowIndex].Cells["colShopId"].Value.ToString(); - var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ShopAccountId == shopId.ToString()); + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId.ToString()); switch (headerText) { case "操作": @@ -358,14 +358,14 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms this.statusBar.pgbTaskProgress.Maximum = total; })); - var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ShopAccountId == shopId); + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId); if (shop == null) continue; DataGridViewRow row = null; Invoke(new Action(() => { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colStatus"].Value = "正在上架商品"; } })); @@ -391,7 +391,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms currentNum += pageSize; if (cancellationTokenSource.IsCancellationRequested) { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { Invoke(new Action(() => { row.Cells["colStatus"].Value = "上架中断"; })); } break; } @@ -412,7 +412,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms Invoke(new Action(() => { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colOffSaleCount"].Value = totalNumBase; @@ -423,7 +423,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms onSaleMessage = "上架结束，店铺没有未上架的商品"; Invoke(new Action(() => { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colStatus"].Value = onSaleMessage; } })); break; @@ -446,7 +446,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms onSaleMessage = "正在获取商品，第 " + currentNum + " 件商品，共 " + shopOperatecount + " 件商品"; Invoke(new Action(() => { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colStatus"].Value = onSaleMessage; } })); } @@ -463,7 +463,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms onSaleMessage = ("上架失败，" + failMessage).TrimEnd('，'); Invoke(new Action(() => { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colStatus"].Value = onSaleMessage; } })); Thread.Sleep(1000); @@ -483,7 +483,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms { if (cancellationTokenSource.IsCancellationRequested) { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { Invoke(new Action(() => { row.Cells["colStatus"].Value = "上架中断"; })); } break; } @@ -492,7 +492,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms { Invoke(new Action(() => { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colStatus"].Value = "当前为试用版，请购买专业版"; } })); break; @@ -501,7 +501,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms Invoke(new Action(() => { onSaleMessage = "正在上架，第 " + (i + 1) + " 件商品，共 " + shopOperatecount + " 件商品"; - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colStatus"].Value = onSaleMessage; } })); Thread.Sleep(50); @@ -550,7 +550,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms list = ""; Invoke(new Action(() => { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colStatus"].Value = onSaleMessage; } })); if (onSaleMessage.Contains("失败")) @@ -565,7 +565,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms onSaleMessage = "上架完成"; Invoke(new Action(() => { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colStatus"].Value = onSaleMessage; } })); } @@ -678,7 +678,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms this.statusBar.pgbTaskProgress.Maximum = total; })); - var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ShopAccountId == shopId); + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId); if (shop == null) continue; @@ -686,13 +686,13 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms Invoke(new Action(() => { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colStatus"].Value = "正在初始化下架商品"; } })); if (cancellationTokenSource.IsCancellationRequested) { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { Invoke(new Action(() => { row.Cells["colStatus"].Value = "下架中断"; })); } break; } @@ -700,15 +700,15 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms // 过滤有销量的商品 if (isNotOperateHasSales) { - if (LittleRabbitForms.ShopForms.ShopListForm.Instance == null) - LittleRabbitForms.ShopForms.ShopListForm.Instance = new LittleRabbitForms.ShopForms.ShopListForm(); - LittleRabbitForms.ShopForms.ShopListForm.Instance.CheckShopLogin(new string[] { shop.ShopAccount }, false); + if (KJDForms.ShopForms.ShopListForm.Instance == null) + KJDForms.ShopForms.ShopListForm.Instance = new KJDForms.ShopForms.ShopListForm(); + KJDForms.ShopForms.ShopListForm.Instance.CheckShopLogin(new string[] { shop.ShopAccount }, false); if (shop.LoginStatus != "登录成功") { Invoke(new Action(() => { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colStatus"].Value = "未登录店铺无法获取商品销量。"; } })); continue; @@ -726,7 +726,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms Invoke(new Action(() => { this.btnOnline.Enabled = this.btnOffline.Enabled = this.btnDelOffSale.Enabled = this.btnDelOnSale.Enabled = true; - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colStatus"].Value = "店铺获取商品销量失败。"; } })); continue; @@ -756,7 +756,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms currentNum += pageSize; if (cancellationTokenSource.IsCancellationRequested) { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { Invoke(new Action(() => { row.Cells["colStatus"].Value = "下架中断"; })); } break; } @@ -777,7 +777,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms Invoke(new Action(() => { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colOnSaleCount"].Value = totalNumBase; @@ -788,7 +788,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms offSaleMessage = "下架结束，店铺没有未下架的商品"; Invoke(new Action(() => { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colStatus"].Value = offSaleMessage; } })); break; @@ -816,7 +816,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms offSaleMessage = "已获取：" + currentNum + "，符合条件：" + productList.Count + "，在售商品获取中..."; Invoke(new Action(() => { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colStatus"].Value = offSaleMessage; } })); } @@ -833,7 +833,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms offSaleMessage = ("下架失败，" + failMessage).TrimEnd('，'); Invoke(new Action(() => { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colStatus"].Value = offSaleMessage; } })); Thread.Sleep(1000); @@ -849,7 +849,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms offSaleMessage = "下架完成"; Invoke(new Action(() => { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colStatus"].Value = offSaleMessage; } })); } @@ -859,7 +859,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms { if (cancellationTokenSource.IsCancellationRequested) { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { Invoke(new Action(() => { row.Cells["colStatus"].Value = "下架中断"; })); } break; } @@ -868,7 +868,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms { Invoke(new Action(() => { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colStatus"].Value = "当前为试用版，请购买专业版"; } })); break; @@ -877,7 +877,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms Invoke(new Action(() => { offSaleMessage = "正在下架，第 " + (i + 1) + " 件商品，共 " + shopOperateCount + " 件商品"; - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colStatus"].Value = offSaleMessage; } })); Thread.Sleep(50); @@ -918,7 +918,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms list = ""; Invoke(new Action(() => { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colStatus"].Value = offSaleMessage; } })); Thread.Sleep(Randomx.GetId(100, 200)); @@ -931,7 +931,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms offSaleMessage = "下架完成"; Invoke(new Action(() => { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colStatus"].Value = offSaleMessage; } })); } @@ -1046,7 +1046,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms this.statusBar.pgbTaskProgress.Maximum = total; })); - var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ShopAccountId == shopId); + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId); if (shop == null) continue; @@ -1054,7 +1054,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms Invoke(new Action(() => { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { if (isDelOnline) @@ -1075,7 +1075,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms { Invoke(new Action(() => { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colStatus"].Value = "未登录店铺无法获取商品销量。"; } })); continue; @@ -1093,7 +1093,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms Invoke(new Action(() => { this.btnOnline.Enabled = this.btnOffline.Enabled = this.btnDelOffSale.Enabled = this.btnDelOnSale.Enabled = true; - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colStatus"].Value = "店铺获取商品销量失败。"; } })); continue; @@ -1128,7 +1128,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms currentNum += pageSize; if (cancellationTokenSource.IsCancellationRequested) { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { Invoke(new Action(() => { row.Cells["colStatus"].Value = "删除中断"; })); } break; } @@ -1155,7 +1155,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms Invoke(new Action(() => { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { if (isDelOnline) @@ -1171,7 +1171,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms deleteProductMessage = "删除结束，店铺没有仓库商品"; Invoke(new Action(() => { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colStatus"].Value = deleteProductMessage; } })); break; @@ -1201,7 +1201,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms deleteProductMessage = "已获取：" + currentNum + "，符合条件：" + productList.Count + "，仓库商品获取中..."; Invoke(new Action(() => { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colStatus"].Value = deleteProductMessage; } })); } @@ -1218,7 +1218,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms deleteProductMessage = ("删除失败，" + failMessage).TrimEnd('，'); Invoke(new Action(() => { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colStatus"].Value = deleteProductMessage; } })); Thread.Sleep(1000); @@ -1234,7 +1234,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms deleteProductMessage = "删除完成"; Invoke(new Action(() => { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colStatus"].Value = deleteProductMessage; } })); } @@ -1244,7 +1244,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms deleteProductMessage = "删除完成"; Invoke(new Action(() => { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colStatus"].Value = deleteProductMessage; } })); } @@ -1254,7 +1254,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms { if (cancellationTokenSource.IsCancellationRequested) { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { Invoke(new Action(() => { row.Cells["colStatus"].Value = "删除中断"; })); } break; } @@ -1263,7 +1263,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms { Invoke(new Action(() => { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colStatus"].Value = "当前为试用版，请购买专业版"; } })); break; @@ -1274,7 +1274,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms deleteProductMessage = "正在删除在售商品，第 " + (i + 1) + " 件商品，共 " + shopOperatecount + " 件商品"; if (!isDelOnline) deleteProductMessage = "正在删除仓库商品，第 " + (i + 1) + " 件商品，共 " + shopOperatecount + " 件商品"; - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colStatus"].Value = deleteProductMessage; } })); Thread.Sleep(50); @@ -1314,7 +1314,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms list = ""; Invoke(new Action(() => { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colStatus"].Value = deleteProductMessage; } })); Thread.Sleep(Randomx.GetId(100, 200)); @@ -1327,7 +1327,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms deleteProductMessage = "删除完成"; Invoke(new Action(() => { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colStatus"].Value = deleteProductMessage; } })); } diff --git a/TEMUKJD/KJDForms/UploadForms/SpecialDelaySendForm.Designer.cs b/TEMUKJD/KJDForms/UploadForms/SpecialDelaySendForm.Designer.cs index 980bdd3..d4be3f6 100644 --- a/TEMUKJD/KJDForms/UploadForms/SpecialDelaySendForm.Designer.cs +++ b/TEMUKJD/KJDForms/UploadForms/SpecialDelaySendForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.UploadForms +namespace TemuKJD.KJDForms.UploadForms { partial class SpecialDelaySendForm { @@ -33,19 +33,19 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.ucGroupBoxEx2 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components); + this.ucGroupBoxEx2 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.label1 = new System.Windows.Forms.Label(); this.txtNotOperateDays = new System.Windows.Forms.TextBox(); this.txtTotalCount = new System.Windows.Forms.TextBox(); this.label26 = new System.Windows.Forms.Label(); this.chkIsNotOperateDays = new System.Windows.Forms.CheckBox(); - this.ucGroupBoxEx1 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components); - this.btnRefresh = new LittleRabbit.UserControls.ButtonEx(); - this.btnStop = new LittleRabbit.UserControls.ButtonEx(); - this.btnStart = new LittleRabbit.UserControls.ButtonEx(); + this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); + this.btnRefresh = new TemuKJD.UserControls.ButtonEx(); + this.btnStop = new TemuKJD.UserControls.ButtonEx(); + this.btnStart = new TemuKJD.UserControls.ButtonEx(); this.splitContainer3 = new System.Windows.Forms.SplitContainer(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); - this.dgvShop = new LittleRabbit.UserComponent.DataGridViewEx(); + this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -54,7 +54,7 @@ this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.pnlShowError = new DevComponents.DotNetBar.PanelEx(); this.splitContainer4 = new System.Windows.Forms.SplitContainer(); - this.statusBar = new LittleRabbit.UserControls.StatusBarUserControl(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -103,7 +103,7 @@ this.ucGroupBoxEx2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); this.ucGroupBoxEx2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.ucGroupBoxEx2.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.SQUARE; + this.ucGroupBoxEx2.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.SQUARE; this.ucGroupBoxEx2.Controls.Add(this.label1); this.ucGroupBoxEx2.Controls.Add(this.txtNotOperateDays); this.ucGroupBoxEx2.Controls.Add(this.txtTotalCount); @@ -172,7 +172,7 @@ this.ucGroupBoxEx1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.ucGroupBoxEx1.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.SQUARE; + this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.SQUARE; this.ucGroupBoxEx1.Controls.Add(this.btnRefresh); this.ucGroupBoxEx1.Location = new System.Drawing.Point(2, 2); this.ucGroupBoxEx1.Name = "ucGroupBoxEx1"; diff --git a/TEMUKJD/KJDForms/UploadForms/SpecialDelaySendForm.cs b/TEMUKJD/KJDForms/UploadForms/SpecialDelaySendForm.cs index 8f25352..dc67b77 100644 --- a/TEMUKJD/KJDForms/UploadForms/SpecialDelaySendForm.cs +++ b/TEMUKJD/KJDForms/UploadForms/SpecialDelaySendForm.cs @@ -2,8 +2,8 @@ using AllBase.Helper; using AllBase.Model.Result; using CefSharp.WinForms; -using LittleRabbit.Extension; -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.Extension; +using TemuKJD.KJDForms.BaseForms; using NaiBa.CefHelper; using NaiBa.CefHelper.Handler; using NaiBa.Util.Extension; @@ -20,7 +20,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using Work.DouyinApiClass; -namespace LittleRabbit.LittleRabbitForms.UploadForms +namespace TemuKJD.KJDForms.UploadForms { public partial class SpecialDelaySendForm : Form { @@ -56,12 +56,12 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms public void LoadShops() { - for (int i = 0; i < GlobalConfig.DouShopLoginList.Count; i++) + for (int i = 0; i < GlobalConfig.ShopLoginList.Count; i++) { - var shop = GlobalConfig.DouShopLoginList[i]; - var row = dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value?.ToString() == shop.ShopAccountId); + var shop = GlobalConfig.ShopLoginList[i]; + var row = dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value?.ToString() == shop.ShopId); if (row == null) - dgvShop.Rows.Add(false, shop.ShopAccountId, shop.ShopAccount, shop.LoginStatus == "登录成功" && shop.ApiAuthStatus == "授权成功" ? "可用" : ""); + dgvShop.Rows.Add(false, shop.ShopId, shop.ShopAccount, shop.LoginStatus == "登录成功" && shop.ApiAuthStatus == "授权成功" ? "可用" : ""); else { row.Cells["colLoginStatus"].Value = shop.LoginStatus; @@ -88,7 +88,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms DataGridViewRow row = null; Invoke(new Action(() => { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { if (isShowResult) @@ -165,7 +165,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms this.operateCount = this.txtTotalCount.Text.ParseToInt(); var shopIds = this.dgvShop.Rows.Cast().Where(r => r.Cells["colSelect"].Value.ParseToBool() == true) .Select(r => r.Cells["colShopId"].Value?.ToString()).ToList(); - var shops = GlobalConfig.DouShopLoginList.Where(s => shopIds.Contains(s.ShopAccountId)).ToList(); + var shops = GlobalConfig.ShopLoginList.Where(s => shopIds.Contains(s.ShopId)).ToList(); if (shops.Count == 0) { BaseMsgForm.ShowError("请选择要操作的店铺"); @@ -208,7 +208,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms { Invoke(new Action(() => { - var row1 = dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value?.ToString() == shop.ShopAccountId); + var row1 = dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value?.ToString() == shop.ShopId); if (row1 != null) row1.Cells["colMessage"].Value = "设置中断"; })); @@ -242,7 +242,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms currentNum += pageSize; if (cancellationTokenSource != null && cancellationTokenSource.IsCancellationRequested) { - var row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + var row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { Invoke(new Action(() => { row.Cells["colMessage"].Value = "下架中断"; })); } break; } @@ -263,7 +263,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms Invoke(new Action(() => { - var row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + var row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { //row.Cells["colOnSaleCount"].Value = totalNumBase; @@ -274,7 +274,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms offSaleMessage = "设置结束，店铺没有在售的商品"; Invoke(new Action(() => { - var row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + var row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colMessage"].Value = offSaleMessage; } })); break; @@ -293,7 +293,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms offSaleMessage = "正在获取商品，第" + currentNum + "件商品，共" + operateCount + "件商品"; Invoke(new Action(() => { - var row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + var row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colMessage"].Value = offSaleMessage; } })); } @@ -310,7 +310,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms offSaleMessage = ("设置发货延迟失败，" + failMessage).TrimEnd('，'); Invoke(new Action(() => { - var row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + var row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colMessage"].Value = offSaleMessage; } })); } @@ -332,7 +332,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms { if (cancellationTokenSource != null && cancellationTokenSource.IsCancellationRequested) { - var row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + var row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { Invoke(new Action(() => { row.Cells["colMessage"].Value = "设置发货延迟中断"; })); } break; } @@ -340,7 +340,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms Invoke(new Action(() => { offSaleMessage = "正在设置发货延迟，第 " + (i + 1) + " 件商品，共 " + operateCount + " 件商品"; - var row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + var row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colMessage"].Value = offSaleMessage; } this.statusBar.lblTaskStatus.Text = offSaleMessage; })); @@ -425,7 +425,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms offSaleMessage = "设置特殊发货时间完成"; Invoke(new Action(() => { - var row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + var row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colMessage"].Value = offSaleMessage; } })); } @@ -485,7 +485,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms string headerText = dgvShop.Columns[e.ColumnIndex].HeaderText; long shopId = dgvShop.Rows[e.RowIndex].Cells["colShopId"].Value.ParseToLong(); string shopName = dgvShop.Rows[e.RowIndex].Cells["colShopId"].Value.ToString(); - var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ShopAccountId == shopId.ToString()); + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId.ToString()); switch (headerText) { case "操作": @@ -521,7 +521,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms } else { - var list = GlobalConfig.DouShopLoginList.Where(s => s.ApiAuthStatus == "授权成功" && s.LoginStatus == "登录成功").Select(ss => ss.ShopAccountId); + var list = GlobalConfig.ShopLoginList.Where(s => s.ApiAuthStatus == "授权成功" && s.LoginStatus == "登录成功").Select(ss => ss.ShopId); foreach (DataGridViewRow row in dgvShop.Rows) { if (list.Any(l => l == row.Cells["colShopId"]?.Value?.ToString())) diff --git a/TEMUKJD/KJDForms/UploadForms/StockSyncForm.Designer.cs b/TEMUKJD/KJDForms/UploadForms/StockSyncForm.Designer.cs index f96fcf6..b29f1af 100644 --- a/TEMUKJD/KJDForms/UploadForms/StockSyncForm.Designer.cs +++ b/TEMUKJD/KJDForms/UploadForms/StockSyncForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.UploadForms +namespace TemuKJD.KJDForms.UploadForms { partial class StockSyncForm { @@ -34,19 +34,19 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.txtKeywords = new System.Windows.Forms.TextBox(); - this.ucGroupBoxEx3 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components); - this.btnStop = new LittleRabbit.UserControls.ButtonEx(); - this.btnSetStock = new LittleRabbit.UserControls.ButtonEx(); - this.ucGroupBoxEx1 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components); - this.btnGetProductCount = new LittleRabbit.UserControls.ButtonEx(); - this.btnRefreshShop = new LittleRabbit.UserControls.ButtonEx(); - this.ucGroupBoxEx2 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components); + this.ucGroupBoxEx3 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); + this.btnStop = new TemuKJD.UserControls.ButtonEx(); + this.btnSetStock = new TemuKJD.UserControls.ButtonEx(); + this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); + this.btnGetProductCount = new TemuKJD.UserControls.ButtonEx(); + this.btnRefreshShop = new TemuKJD.UserControls.ButtonEx(); + this.ucGroupBoxEx2 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.txtStockCount = new System.Windows.Forms.TextBox(); this.label2 = new System.Windows.Forms.Label(); this.txtOperateCount = new System.Windows.Forms.TextBox(); this.label12 = new System.Windows.Forms.Label(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); - this.dgvShop = new LittleRabbit.UserComponent.DataGridViewEx(); + this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -56,8 +56,8 @@ this.colOffSaleCount = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colOperationCount = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colStatus = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.btnFailedDetail = new LittleRabbit.UserControls.ButtonEx(); - this.statusBar = new LittleRabbit.UserControls.StatusBarUserControl(); + this.btnFailedDetail = new TemuKJD.UserControls.ButtonEx(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -105,7 +105,7 @@ // ucGroupBoxEx3 // this.ucGroupBoxEx3.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.ucGroupBoxEx3.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx3.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; this.ucGroupBoxEx3.Controls.Add(this.btnStop); this.ucGroupBoxEx3.Controls.Add(this.btnSetStock); this.ucGroupBoxEx3.Location = new System.Drawing.Point(312, 2); @@ -150,7 +150,7 @@ // ucGroupBoxEx1 // this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.ucGroupBoxEx1.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; this.ucGroupBoxEx1.Controls.Add(this.btnGetProductCount); this.ucGroupBoxEx1.Controls.Add(this.btnRefreshShop); this.ucGroupBoxEx1.Location = new System.Drawing.Point(2, 2); @@ -195,7 +195,7 @@ // ucGroupBoxEx2 // this.ucGroupBoxEx2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.ucGroupBoxEx2.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx2.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; this.ucGroupBoxEx2.Controls.Add(this.txtStockCount); this.ucGroupBoxEx2.Controls.Add(this.label2); this.ucGroupBoxEx2.Controls.Add(this.txtOperateCount); diff --git a/TEMUKJD/KJDForms/UploadForms/StockSyncForm.cs b/TEMUKJD/KJDForms/UploadForms/StockSyncForm.cs index f997c4b..c622dd3 100644 --- a/TEMUKJD/KJDForms/UploadForms/StockSyncForm.cs +++ b/TEMUKJD/KJDForms/UploadForms/StockSyncForm.cs @@ -1,8 +1,8 @@ using AllBase; using AllBase.Helper; using AllBase.Model.Result; -using LittleRabbit.Extension; -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.Extension; +using TemuKJD.KJDForms.BaseForms; using NaiBa.Util.Extension; using Newtonsoft.Json.Linq; using System; @@ -17,7 +17,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using Work.DouyinApiClass; -namespace LittleRabbit.LittleRabbitForms.UploadForms +namespace TemuKJD.KJDForms.UploadForms { public partial class StockSyncForm : Form { @@ -49,17 +49,17 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms private void RefreshShop() { // 更新选中的上货店铺Id - lstShopId = lstShopId.Where(id => GlobalConfig.DouShopLoginList.Any(s => s.ShopAccountId == id && s.LoginStatus == "已授权")).ToList(); + lstShopId = lstShopId.Where(id => GlobalConfig.ShopLoginList.Any(s => s.ShopId == id && s.LoginStatus == "已授权")).ToList(); // 获取被删除的店铺 List dgvRowList = dgvShop.Rows.Cast().Where(row - => !GlobalConfig.DouShopLoginList.Any(s => s.ShopAccountId == row.Cells["colShopId"]?.Value?.ToString())).ToList(); + => !GlobalConfig.ShopLoginList.Any(s => s.ShopId == row.Cells["colShopId"]?.Value?.ToString())).ToList(); // 更新被删除的店铺列表 foreach (var row in dgvRowList) { dgvShop.Rows.Remove(row); } // 绑定其他店铺（含新导入的店铺） - foreach (DouShopLoginInfo shopEntity in GlobalConfig.DouShopLoginList) + foreach (DouShopLoginInfo shopEntity in GlobalConfig.ShopLoginList) { BindShop(shopEntity); } @@ -67,12 +67,12 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms private void BindShop(DouShopLoginInfo shopEntity) { - var row = dgvShop.Rows.Cast().FirstOrDefault(p => p.Cells.GetCellValueFromColumnName("colShopId").ParseToString() == shopEntity.ShopAccountId); + var row = dgvShop.Rows.Cast().FirstOrDefault(p => p.Cells.GetCellValueFromColumnName("colShopId").ParseToString() == shopEntity.ShopId); if (row == null) { this.dgvShop.Rows.Add( false, - shopEntity.ShopAccountId, + shopEntity.ShopId, shopEntity.ShopAccount, shopEntity.ApiAuthStatus == "授权成功" ? true : false, "查看详情", @@ -84,7 +84,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms } else { - row.Cells["colSelect"].Value = lstShopId.Contains(shopEntity.ShopAccountId); + row.Cells["colSelect"].Value = lstShopId.Contains(shopEntity.ShopId); row.Cells["colShopName"].Value = shopEntity.ShopAccount; row.Cells["colCanUse"].Value = shopEntity.ApiAuthStatus == "授权成功" ? true : false; row.Cells["colOnSaleCount"].Value = shopEntity.OnlineProductCount >= 0 ? shopEntity.OnlineProductCount.ToString() : ""; @@ -105,7 +105,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms else { lstShopId.Clear(); - var list = GlobalConfig.DouShopLoginList.Where(s => s.ApiAuthStatus == "授权成功").Select(ss => ss.ShopAccountId); + var list = GlobalConfig.ShopLoginList.Where(s => s.ApiAuthStatus == "授权成功").Select(ss => ss.ShopId); lstShopId.AddRange(list); foreach (DataGridViewRow row in dgvShop.Rows) { @@ -148,7 +148,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms void GetShopProduct(bool isShowProgress = true) { int i = 0; - var shopList = GlobalConfig.DouShopLoginList.Where(s => s.ApiAuthStatus == "授权成功" && lstShopId.Contains(s.ShopAccountId)); + var shopList = GlobalConfig.ShopLoginList.Where(s => s.ApiAuthStatus == "授权成功" && lstShopId.Contains(s.ShopId)); foreach (var shop in shopList) { this.Invoke(new Action(() => @@ -180,7 +180,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms DataGridViewRow row = null; Invoke(new Action(() => { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { if (isShowResult) @@ -319,14 +319,14 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms this.statusBar.pgbTaskProgress.Maximum = total; })); - var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ShopAccountId == shopId); + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId); if (shop == null) continue; DataGridViewRow row = null; Invoke(new Action(() => { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colStatus"].Value = "正在设置库存"; } })); @@ -350,7 +350,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms currentNum += pageSize; if (cancellationTokenSource.IsCancellationRequested) { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { Invoke(new Action(() => { row.Cells["colStatus"].Value = "下架中断"; })); } break; } @@ -371,7 +371,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms Invoke(new Action(() => { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colOnSaleCount"].Value = totalNumBase; @@ -382,7 +382,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms offSaleMessage = "设置结束，店铺没有在售的商品"; Invoke(new Action(() => { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colStatus"].Value = offSaleMessage; } })); break; @@ -401,7 +401,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms offSaleMessage = "正在获取商品，第" + currentNum + "件商品，共" + operateCount + "件商品"; Invoke(new Action(() => { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colStatus"].Value = offSaleMessage; } })); } @@ -418,7 +418,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms offSaleMessage = ("设置库存失败，" + failMessage).TrimEnd('，'); Invoke(new Action(() => { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colStatus"].Value = offSaleMessage; } })); } @@ -439,7 +439,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms { if (cancellationTokenSource.IsCancellationRequested) { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { Invoke(new Action(() => { row.Cells["colStatus"].Value = "设置库存中断"; })); } break; } @@ -447,7 +447,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms Invoke(new Action(() => { offSaleMessage = "正在设置库存，第 " + (i + 1) + " 件商品，共" + operateCount + "件商品"; - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colStatus"].Value = offSaleMessage; } })); Thread.Sleep(50); @@ -499,7 +499,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms } Invoke(new Action(() => { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colStatus"].Value = offSaleMessage; } })); Thread.Sleep(Randomx.GetId(100, 200)); @@ -514,7 +514,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms offSaleMessage = "设置库存完成"; Invoke(new Action(() => { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colStatus"].Value = offSaleMessage; } })); } @@ -580,7 +580,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms string headerText = dgvShop.Columns[e.ColumnIndex].HeaderText; long shopId = dgvShop.Rows[e.RowIndex].Cells["colShopId"].Value.ParseToLong(); string shopName = dgvShop.Rows[e.RowIndex].Cells["colShopId"].Value.ToString(); - var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ShopAccountId == shopId.ToString()); + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId.ToString()); switch (headerText) { case "操作": diff --git a/TEMUKJD/KJDForms/UploadForms/StockUpForm.Designer.cs b/TEMUKJD/KJDForms/UploadForms/StockUpForm.Designer.cs new file mode 100644 index 0000000..e625bcd --- /dev/null +++ b/TEMUKJD/KJDForms/UploadForms/StockUpForm.Designer.cs @@ -0,0 +1,1277 @@ + +namespace TemuKJD.KJDForms.UploadForms +{ + partial class StockUpForm + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.ucGroupBoxEx3 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); + this.cmbCity = new DevComponents.DotNetBar.Controls.ComboBoxEx(); + this.cmbProvince = new DevComponents.DotNetBar.Controls.ComboBoxEx(); + this.label3 = new System.Windows.Forms.Label(); + this.pnlSamePostage = new System.Windows.Forms.FlowLayoutPanel(); + this.label12 = new System.Windows.Forms.Label(); + this.txtSamePostagePrice = new System.Windows.Forms.TextBox(); + this.label13 = new System.Windows.Forms.Label(); + this.panel3 = new System.Windows.Forms.Panel(); + this.rbSamePostage = new System.Windows.Forms.RadioButton(); + this.rbStepPostage = new System.Windows.Forms.RadioButton(); + this.rbNoPostage = new System.Windows.Forms.RadioButton(); + this.pnlStepPostage = new System.Windows.Forms.FlowLayoutPanel(); + this.rbWithCount = new System.Windows.Forms.RadioButton(); + this.rbWithWeight = new System.Windows.Forms.RadioButton(); + this.label2 = new System.Windows.Forms.Label(); + this.txtWeightOrCountStep1 = new System.Windows.Forms.TextBox(); + this.lblWeightOrCountStep1 = new System.Windows.Forms.Label(); + this.txtWeightOrCountPrice1 = new System.Windows.Forms.TextBox(); + this.label5 = new System.Windows.Forms.Label(); + this.label6 = new System.Windows.Forms.Label(); + this.txtWeightOrCountStep2 = new System.Windows.Forms.TextBox(); + this.lblWeightOrCountStep2 = new System.Windows.Forms.Label(); + this.txtWeightOrCountPrice2 = new System.Windows.Forms.TextBox(); + this.label8 = new System.Windows.Forms.Label(); + this.panel2 = new System.Windows.Forms.Panel(); + this.textBox2 = new System.Windows.Forms.TextBox(); + this.btnSetNotArea = new DevComponents.DotNetBar.PanelEx(); + this.nudGroupCount = new System.Windows.Forms.NumericUpDown(); + this.label11 = new System.Windows.Forms.Label(); + this.panel1 = new System.Windows.Forms.Panel(); + this.btnSetName = new DevComponents.DotNetBar.PanelEx(); + this.rbCustomName = new System.Windows.Forms.RadioButton(); + this.rbAutoName = new System.Windows.Forms.RadioButton(); + this.label7 = new System.Windows.Forms.Label(); + this.btnAdd = new DevComponents.DotNetBar.PanelEx(); + this.btnStopAdd = new DevComponents.DotNetBar.PanelEx(); + this.chkLimited = new System.Windows.Forms.CheckBox(); + this.ucGroupBoxEx2 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); + this.txtPid = new System.Windows.Forms.TextBox(); + this.label9 = new System.Windows.Forms.Label(); + this.txtParentStockid = new System.Windows.Forms.TextBox(); + this.label1 = new System.Windows.Forms.Label(); + this.txtStockid = new System.Windows.Forms.TextBox(); + this.label4 = new System.Windows.Forms.Label(); + this.btnSearch = new DevComponents.DotNetBar.PanelEx(); + this.btnStop = new DevComponents.DotNetBar.PanelEx(); + this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); + this.btnRefreshShop = new DevComponents.DotNetBar.PanelEx(); + this.splitContainer3 = new System.Windows.Forms.SplitContainer(); + this.splitContainer2 = new System.Windows.Forms.SplitContainer(); + this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx(); + this.dgvStock = new TemuKJD.UserComponent.DataGridViewEx(); + this.splitContainer4 = new System.Windows.Forms.SplitContainer(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); + this.btnClear = new DevComponents.DotNetBar.PanelEx(); + this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.colShopLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colLoginStatus = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colUpId = new System.Windows.Forms.DataGridViewLinkColumn(); + this.colSupplierId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colSupplierName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colStockId = new System.Windows.Forms.DataGridViewLinkColumn(); + this.colParentStockId = new System.Windows.Forms.DataGridViewLinkColumn(); + this.colProductSkcPic = new System.Windows.Forms.DataGridViewImageColumn(); + this.colProductId = new System.Windows.Forms.DataGridViewLinkColumn(); + this.colProdSkc = new System.Windows.Forms.DataGridViewLinkColumn(); + this.colProdName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colPrcie = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colFrom = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colFromFake = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colMsg = new System.Windows.Forms.DataGridViewTextBoxColumn(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); + this.splitContainer1.Panel1.SuspendLayout(); + this.splitContainer1.Panel2.SuspendLayout(); + this.splitContainer1.SuspendLayout(); + this.ucGroupBoxEx3.SuspendLayout(); + this.pnlSamePostage.SuspendLayout(); + this.panel3.SuspendLayout(); + this.pnlStepPostage.SuspendLayout(); + this.panel2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.nudGroupCount)).BeginInit(); + this.panel1.SuspendLayout(); + this.ucGroupBoxEx2.SuspendLayout(); + this.ucGroupBoxEx1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).BeginInit(); + this.splitContainer3.Panel1.SuspendLayout(); + this.splitContainer3.Panel2.SuspendLayout(); + this.splitContainer3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit(); + this.splitContainer2.Panel1.SuspendLayout(); + this.splitContainer2.Panel2.SuspendLayout(); + this.splitContainer2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dgvShop)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dgvStock)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer4)).BeginInit(); + this.splitContainer4.Panel1.SuspendLayout(); + this.splitContainer4.Panel2.SuspendLayout(); + this.splitContainer4.SuspendLayout(); + this.SuspendLayout(); + // + // splitContainer1 + // + this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; + this.splitContainer1.Location = new System.Drawing.Point(0, 0); + this.splitContainer1.Name = "splitContainer1"; + this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal; + // + // splitContainer1.Panel1 + // + this.splitContainer1.Panel1.Controls.Add(this.ucGroupBoxEx3); + this.splitContainer1.Panel1.Controls.Add(this.ucGroupBoxEx2); + this.splitContainer1.Panel1.Controls.Add(this.ucGroupBoxEx1); + // + // splitContainer1.Panel2 + // + this.splitContainer1.Panel2.Controls.Add(this.splitContainer3); + this.splitContainer1.Size = new System.Drawing.Size(1148, 589); + this.splitContainer1.SplitterDistance = 150; + this.splitContainer1.TabIndex = 9; + // + // ucGroupBoxEx3 + // + this.ucGroupBoxEx3.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.ucGroupBoxEx3.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.ucGroupBoxEx3.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx3.Controls.Add(this.cmbCity); + this.ucGroupBoxEx3.Controls.Add(this.cmbProvince); + this.ucGroupBoxEx3.Controls.Add(this.label3); + this.ucGroupBoxEx3.Controls.Add(this.pnlSamePostage); + this.ucGroupBoxEx3.Controls.Add(this.panel3); + this.ucGroupBoxEx3.Controls.Add(this.pnlStepPostage); + this.ucGroupBoxEx3.Controls.Add(this.panel2); + this.ucGroupBoxEx3.Controls.Add(this.nudGroupCount); + this.ucGroupBoxEx3.Controls.Add(this.label11); + this.ucGroupBoxEx3.Controls.Add(this.panel1); + this.ucGroupBoxEx3.Controls.Add(this.btnAdd); + this.ucGroupBoxEx3.Controls.Add(this.btnStopAdd); + this.ucGroupBoxEx3.Controls.Add(this.chkLimited); + this.ucGroupBoxEx3.Location = new System.Drawing.Point(595, 2); + this.ucGroupBoxEx3.Name = "ucGroupBoxEx3"; + this.ucGroupBoxEx3.Size = new System.Drawing.Size(550, 150); + this.ucGroupBoxEx3.TabIndex = 470; + this.ucGroupBoxEx3.TabStop = false; + this.ucGroupBoxEx3.Text = "创建备货单"; + this.ucGroupBoxEx3.Visible = false; + // + // cmbCity + // + this.cmbCity.DisplayMember = "Text"; + this.cmbCity.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + this.cmbCity.FormattingEnabled = true; + this.cmbCity.ItemHeight = 18; + this.cmbCity.Location = new System.Drawing.Point(283, 28); + this.cmbCity.Name = "cmbCity"; + this.cmbCity.Size = new System.Drawing.Size(90, 24); + this.cmbCity.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.cmbCity.TabIndex = 650; + this.cmbCity.Text = "请选择"; + // + // cmbProvince + // + this.cmbProvince.DisplayMember = "Text"; + this.cmbProvince.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; + this.cmbProvince.FormattingEnabled = true; + this.cmbProvince.ItemHeight = 18; + this.cmbProvince.Location = new System.Drawing.Point(189, 29); + this.cmbProvince.Name = "cmbProvince"; + this.cmbProvince.Size = new System.Drawing.Size(90, 24); + this.cmbProvince.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.cmbProvince.TabIndex = 649; + this.cmbProvince.Text = "请选择"; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(130, 32); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(65, 12); + this.label3.TabIndex = 648; + this.label3.Text = "发货地区："; + // + // pnlSamePostage + // + this.pnlSamePostage.Controls.Add(this.label12); + this.pnlSamePostage.Controls.Add(this.txtSamePostagePrice); + this.pnlSamePostage.Controls.Add(this.label13); + this.pnlSamePostage.Location = new System.Drawing.Point(277, 88); + this.pnlSamePostage.Name = "pnlSamePostage"; + this.pnlSamePostage.Size = new System.Drawing.Size(194, 23); + this.pnlSamePostage.TabIndex = 641; + this.pnlSamePostage.Visible = false; + // + // label12 + // + this.label12.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label12.AutoSize = true; + this.label12.Location = new System.Drawing.Point(3, 4); + this.label12.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(53, 12); + this.label12.TabIndex = 612; + this.label12.Text = "固定运费"; + // + // txtSamePostagePrice + // + this.txtSamePostagePrice.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.txtSamePostagePrice.Location = new System.Drawing.Point(56, 0); + this.txtSamePostagePrice.Margin = new System.Windows.Forms.Padding(0); + this.txtSamePostagePrice.Name = "txtSamePostagePrice"; + this.txtSamePostagePrice.Size = new System.Drawing.Size(45, 21); + this.txtSamePostagePrice.TabIndex = 613; + // + // label13 + // + this.label13.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label13.AutoSize = true; + this.label13.Location = new System.Drawing.Point(101, 4); + this.label13.Margin = new System.Windows.Forms.Padding(0); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(17, 12); + this.label13.TabIndex = 614; + this.label13.Text = "元"; + // + // panel3 + // + this.panel3.Controls.Add(this.rbSamePostage); + this.panel3.Controls.Add(this.rbStepPostage); + this.panel3.Controls.Add(this.rbNoPostage); + this.panel3.Location = new System.Drawing.Point(21, 88); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(250, 23); + this.panel3.TabIndex = 640; + // + // rbSamePostage + // + this.rbSamePostage.AutoSize = true; + this.rbSamePostage.Location = new System.Drawing.Point(83, 1); + this.rbSamePostage.Name = "rbSamePostage"; + this.rbSamePostage.Size = new System.Drawing.Size(71, 16); + this.rbSamePostage.TabIndex = 466; + this.rbSamePostage.Text = "固定运费"; + this.rbSamePostage.UseVisualStyleBackColor = true; + // + // rbStepPostage + // + this.rbStepPostage.AutoSize = true; + this.rbStepPostage.Location = new System.Drawing.Point(3, 1); + this.rbStepPostage.Name = "rbStepPostage"; + this.rbStepPostage.Size = new System.Drawing.Size(71, 16); + this.rbStepPostage.TabIndex = 465; + this.rbStepPostage.Text = "阶梯计价"; + this.rbStepPostage.UseVisualStyleBackColor = true; + // + // rbNoPostage + // + this.rbNoPostage.AutoSize = true; + this.rbNoPostage.Checked = true; + this.rbNoPostage.Location = new System.Drawing.Point(163, 1); + this.rbNoPostage.Name = "rbNoPostage"; + this.rbNoPostage.Size = new System.Drawing.Size(71, 16); + this.rbNoPostage.TabIndex = 467; + this.rbNoPostage.TabStop = true; + this.rbNoPostage.Text = "卖家包邮"; + this.rbNoPostage.UseVisualStyleBackColor = true; + // + // pnlStepPostage + // + this.pnlStepPostage.Controls.Add(this.rbWithCount); + this.pnlStepPostage.Controls.Add(this.rbWithWeight); + this.pnlStepPostage.Controls.Add(this.label2); + this.pnlStepPostage.Controls.Add(this.txtWeightOrCountStep1); + this.pnlStepPostage.Controls.Add(this.lblWeightOrCountStep1); + this.pnlStepPostage.Controls.Add(this.txtWeightOrCountPrice1); + this.pnlStepPostage.Controls.Add(this.label5); + this.pnlStepPostage.Controls.Add(this.label6); + this.pnlStepPostage.Controls.Add(this.txtWeightOrCountStep2); + this.pnlStepPostage.Controls.Add(this.lblWeightOrCountStep2); + this.pnlStepPostage.Controls.Add(this.txtWeightOrCountPrice2); + this.pnlStepPostage.Controls.Add(this.label8); + this.pnlStepPostage.Location = new System.Drawing.Point(21, 116); + this.pnlStepPostage.Name = "pnlStepPostage"; + this.pnlStepPostage.Size = new System.Drawing.Size(575, 23); + this.pnlStepPostage.TabIndex = 639; + this.pnlStepPostage.Visible = false; + // + // rbWithCount + // + this.rbWithCount.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.rbWithCount.AutoSize = true; + this.rbWithCount.Checked = true; + this.rbWithCount.Location = new System.Drawing.Point(3, 2); + this.rbWithCount.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); + this.rbWithCount.Name = "rbWithCount"; + this.rbWithCount.Size = new System.Drawing.Size(59, 16); + this.rbWithCount.TabIndex = 615; + this.rbWithCount.TabStop = true; + this.rbWithCount.Text = "按件数"; + this.rbWithCount.UseVisualStyleBackColor = true; + // + // rbWithWeight + // + this.rbWithWeight.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.rbWithWeight.AutoSize = true; + this.rbWithWeight.Location = new System.Drawing.Point(62, 2); + this.rbWithWeight.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); + this.rbWithWeight.Name = "rbWithWeight"; + this.rbWithWeight.Size = new System.Drawing.Size(59, 16); + this.rbWithWeight.TabIndex = 616; + this.rbWithWeight.Text = "按重量"; + this.rbWithWeight.UseVisualStyleBackColor = true; + // + // label2 + // + this.label2.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(124, 4); + this.label2.Margin = new System.Windows.Forms.Padding(0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(53, 12); + this.label2.TabIndex = 605; + this.label2.Text = "默认运费"; + // + // txtWeightOrCountStep1 + // + this.txtWeightOrCountStep1.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.txtWeightOrCountStep1.Location = new System.Drawing.Point(177, 0); + this.txtWeightOrCountStep1.Margin = new System.Windows.Forms.Padding(0); + this.txtWeightOrCountStep1.Name = "txtWeightOrCountStep1"; + this.txtWeightOrCountStep1.Size = new System.Drawing.Size(45, 21); + this.txtWeightOrCountStep1.TabIndex = 606; + // + // lblWeightOrCountStep1 + // + this.lblWeightOrCountStep1.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.lblWeightOrCountStep1.AutoSize = true; + this.lblWeightOrCountStep1.Location = new System.Drawing.Point(222, 4); + this.lblWeightOrCountStep1.Margin = new System.Windows.Forms.Padding(0); + this.lblWeightOrCountStep1.Name = "lblWeightOrCountStep1"; + this.lblWeightOrCountStep1.Size = new System.Drawing.Size(53, 12); + this.lblWeightOrCountStep1.TabIndex = 607; + this.lblWeightOrCountStep1.Text = "件以内，"; + // + // txtWeightOrCountPrice1 + // + this.txtWeightOrCountPrice1.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.txtWeightOrCountPrice1.Location = new System.Drawing.Point(275, 0); + this.txtWeightOrCountPrice1.Margin = new System.Windows.Forms.Padding(0); + this.txtWeightOrCountPrice1.Name = "txtWeightOrCountPrice1"; + this.txtWeightOrCountPrice1.Size = new System.Drawing.Size(45, 21); + this.txtWeightOrCountPrice1.TabIndex = 608; + // + // label5 + // + this.label5.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(320, 4); + this.label5.Margin = new System.Windows.Forms.Padding(0); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(29, 12); + this.label5.TabIndex = 609; + this.label5.Text = "元，"; + // + // label6 + // + this.label6.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(349, 4); + this.label6.Margin = new System.Windows.Forms.Padding(0); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(41, 12); + this.label6.TabIndex = 610; + this.label6.Text = "每增加"; + // + // txtWeightOrCountStep2 + // + this.txtWeightOrCountStep2.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.txtWeightOrCountStep2.Location = new System.Drawing.Point(390, 0); + this.txtWeightOrCountStep2.Margin = new System.Windows.Forms.Padding(0); + this.txtWeightOrCountStep2.Name = "txtWeightOrCountStep2"; + this.txtWeightOrCountStep2.Size = new System.Drawing.Size(45, 21); + this.txtWeightOrCountStep2.TabIndex = 611; + // + // lblWeightOrCountStep2 + // + this.lblWeightOrCountStep2.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.lblWeightOrCountStep2.AutoSize = true; + this.lblWeightOrCountStep2.Location = new System.Drawing.Point(435, 4); + this.lblWeightOrCountStep2.Margin = new System.Windows.Forms.Padding(0); + this.lblWeightOrCountStep2.Name = "lblWeightOrCountStep2"; + this.lblWeightOrCountStep2.Size = new System.Drawing.Size(77, 12); + this.lblWeightOrCountStep2.TabIndex = 612; + this.lblWeightOrCountStep2.Text = "件，增加运费"; + // + // txtWeightOrCountPrice2 + // + this.txtWeightOrCountPrice2.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.txtWeightOrCountPrice2.Location = new System.Drawing.Point(512, 0); + this.txtWeightOrCountPrice2.Margin = new System.Windows.Forms.Padding(0); + this.txtWeightOrCountPrice2.Name = "txtWeightOrCountPrice2"; + this.txtWeightOrCountPrice2.Size = new System.Drawing.Size(45, 21); + this.txtWeightOrCountPrice2.TabIndex = 613; + // + // label8 + // + this.label8.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label8.AutoSize = true; + this.label8.Location = new System.Drawing.Point(557, 4); + this.label8.Margin = new System.Windows.Forms.Padding(0); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(17, 12); + this.label8.TabIndex = 614; + this.label8.Text = "元"; + // + // panel2 + // + this.panel2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.panel2.Controls.Add(this.textBox2); + this.panel2.Controls.Add(this.btnSetNotArea); + this.panel2.Location = new System.Drawing.Point(151, 59); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(295, 23); + this.panel2.TabIndex = 638; + // + // textBox2 + // + this.textBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.textBox2.Location = new System.Drawing.Point(0, 0); + this.textBox2.Name = "textBox2"; + this.textBox2.ReadOnly = true; + this.textBox2.Size = new System.Drawing.Size(229, 21); + this.textBox2.TabIndex = 638; + // + // btnSetNotArea + // + this.btnSetNotArea.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnSetNotArea.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnSetNotArea.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnSetNotArea.DisabledBackColor = System.Drawing.Color.Empty; + this.btnSetNotArea.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnSetNotArea.Location = new System.Drawing.Point(235, 2); + this.btnSetNotArea.Name = "btnSetNotArea"; + this.btnSetNotArea.Size = new System.Drawing.Size(56, 19); + this.btnSetNotArea.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnSetNotArea.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnSetNotArea.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnSetNotArea.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnSetNotArea.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnSetNotArea.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnSetNotArea.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnSetNotArea.Style.GradientAngle = 90; + this.btnSetNotArea.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnSetNotArea.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnSetNotArea.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnSetNotArea.TabIndex = 634; + this.btnSetNotArea.Text = "设置地区"; + // + // nudGroupCount + // + this.nudGroupCount.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.nudGroupCount.Location = new System.Drawing.Point(75, 29); + this.nudGroupCount.Maximum = new decimal(new int[] { + 10000, + 0, + 0, + 0}); + this.nudGroupCount.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.nudGroupCount.Name = "nudGroupCount"; + this.nudGroupCount.Size = new System.Drawing.Size(49, 21); + this.nudGroupCount.TabIndex = 603; + this.nudGroupCount.Value = new decimal(new int[] { + 10, + 0, + 0, + 0}); + // + // label11 + // + this.label11.AutoSize = true; + this.label11.Location = new System.Drawing.Point(18, 32); + this.label11.Name = "label11"; + this.label11.Size = new System.Drawing.Size(65, 12); + this.label11.TabIndex = 602; + this.label11.Text = "新建数量："; + // + // panel1 + // + this.panel1.Controls.Add(this.btnSetName); + this.panel1.Controls.Add(this.rbCustomName); + this.panel1.Controls.Add(this.rbAutoName); + this.panel1.Controls.Add(this.label7); + this.panel1.Location = new System.Drawing.Point(245, 29); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(254, 23); + this.panel1.TabIndex = 601; + // + // btnSetName + // + this.btnSetName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnSetName.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnSetName.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnSetName.DisabledBackColor = System.Drawing.Color.Empty; + this.btnSetName.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnSetName.Location = new System.Drawing.Point(194, 2); + this.btnSetName.Name = "btnSetName"; + this.btnSetName.Size = new System.Drawing.Size(56, 19); + this.btnSetName.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnSetName.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnSetName.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnSetName.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnSetName.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnSetName.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnSetName.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnSetName.Style.GradientAngle = 90; + this.btnSetName.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnSetName.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnSetName.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnSetName.TabIndex = 634; + this.btnSetName.Text = "设置名称"; + // + // rbCustomName + // + this.rbCustomName.AutoSize = true; + this.rbCustomName.Location = new System.Drawing.Point(133, 1); + this.rbCustomName.Name = "rbCustomName"; + this.rbCustomName.Size = new System.Drawing.Size(59, 16); + this.rbCustomName.TabIndex = 465; + this.rbCustomName.Text = "自定义"; + this.rbCustomName.UseVisualStyleBackColor = true; + // + // rbAutoName + // + this.rbAutoName.AutoSize = true; + this.rbAutoName.Checked = true; + this.rbAutoName.Location = new System.Drawing.Point(60, 1); + this.rbAutoName.Name = "rbAutoName"; + this.rbAutoName.Size = new System.Drawing.Size(71, 16); + this.rbAutoName.TabIndex = 464; + this.rbAutoName.TabStop = true; + this.rbAutoName.Text = "自动设置"; + this.rbAutoName.UseVisualStyleBackColor = true; + // + // label7 + // + this.label7.AutoSize = true; + this.label7.Location = new System.Drawing.Point(1, 3); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(65, 12); + this.label7.TabIndex = 638; + this.label7.Text = "模板名称："; + // + // btnAdd + // + this.btnAdd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnAdd.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnAdd.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnAdd.DisabledBackColor = System.Drawing.Color.Empty; + this.btnAdd.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnAdd.Location = new System.Drawing.Point(454, 29); + this.btnAdd.Name = "btnAdd"; + this.btnAdd.Size = new System.Drawing.Size(80, 23); + this.btnAdd.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnAdd.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnAdd.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnAdd.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnAdd.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnAdd.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnAdd.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnAdd.Style.GradientAngle = 90; + this.btnAdd.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnAdd.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnAdd.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnAdd.TabIndex = 427; + this.btnAdd.Text = "开始创建"; + // + // btnStopAdd + // + this.btnStopAdd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnStopAdd.CanvasColor = System.Drawing.SystemColors.Control; + this.btnStopAdd.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnStopAdd.DisabledBackColor = System.Drawing.Color.Empty; + this.btnStopAdd.Location = new System.Drawing.Point(454, 59); + this.btnStopAdd.Name = "btnStopAdd"; + this.btnStopAdd.Size = new System.Drawing.Size(80, 23); + this.btnStopAdd.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnStopAdd.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnStopAdd.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnStopAdd.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.btnStopAdd.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnStopAdd.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.btnStopAdd.Style.GradientAngle = 90; + this.btnStopAdd.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; + this.btnStopAdd.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnStopAdd.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnStopAdd.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnStopAdd.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.btnStopAdd.TabIndex = 405; + this.btnStopAdd.Text = "停止创建"; + // + // chkLimited + // + this.chkLimited.AutoSize = true; + this.chkLimited.Location = new System.Drawing.Point(22, 61); + this.chkLimited.Name = "chkLimited"; + this.chkLimited.Size = new System.Drawing.Size(132, 16); + this.chkLimited.TabIndex = 657; + this.chkLimited.Text = "限制下单区域(可选)"; + this.chkLimited.UseVisualStyleBackColor = true; + // + // ucGroupBoxEx2 + // + this.ucGroupBoxEx2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left))); + this.ucGroupBoxEx2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.ucGroupBoxEx2.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx2.Controls.Add(this.txtPid); + this.ucGroupBoxEx2.Controls.Add(this.label9); + this.ucGroupBoxEx2.Controls.Add(this.txtParentStockid); + this.ucGroupBoxEx2.Controls.Add(this.label1); + this.ucGroupBoxEx2.Controls.Add(this.txtStockid); + this.ucGroupBoxEx2.Controls.Add(this.label4); + this.ucGroupBoxEx2.Controls.Add(this.btnSearch); + this.ucGroupBoxEx2.Controls.Add(this.btnStop); + this.ucGroupBoxEx2.Location = new System.Drawing.Point(147, 2); + this.ucGroupBoxEx2.Name = "ucGroupBoxEx2"; + this.ucGroupBoxEx2.Size = new System.Drawing.Size(231, 150); + this.ucGroupBoxEx2.TabIndex = 469; + this.ucGroupBoxEx2.TabStop = false; + this.ucGroupBoxEx2.Text = "读取待创建"; + // + // txtPid + // + this.txtPid.Location = new System.Drawing.Point(70, 77); + this.txtPid.Name = "txtPid"; + this.txtPid.Size = new System.Drawing.Size(146, 21); + this.txtPid.TabIndex = 604; + this.txtPid.Visible = false; + // + // label9 + // + this.label9.AutoSize = true; + this.label9.Location = new System.Drawing.Point(37, 80); + this.label9.Name = "label9"; + this.label9.Size = new System.Drawing.Size(29, 12); + this.label9.TabIndex = 603; + this.label9.Text = "货号"; + this.label9.Visible = false; + // + // txtParentStockid + // + this.txtParentStockid.Location = new System.Drawing.Point(70, 53); + this.txtParentStockid.Name = "txtParentStockid"; + this.txtParentStockid.Size = new System.Drawing.Size(146, 21); + this.txtParentStockid.TabIndex = 602; + this.txtParentStockid.Visible = false; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(25, 56); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(41, 12); + this.label1.TabIndex = 601; + this.label1.Text = "母单号"; + this.label1.Visible = false; + // + // txtStockid + // + this.txtStockid.Location = new System.Drawing.Point(70, 29); + this.txtStockid.Name = "txtStockid"; + this.txtStockid.Size = new System.Drawing.Size(146, 21); + this.txtStockid.TabIndex = 594; + this.txtStockid.Visible = false; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(13, 32); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(53, 12); + this.label4.TabIndex = 474; + this.label4.Text = "备货单号"; + this.label4.Visible = false; + // + // btnSearch + // + this.btnSearch.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnSearch.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnSearch.DisabledBackColor = System.Drawing.Color.Empty; + this.btnSearch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnSearch.Location = new System.Drawing.Point(70, 107); + this.btnSearch.Name = "btnSearch"; + this.btnSearch.Size = new System.Drawing.Size(70, 23); + this.btnSearch.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnSearch.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnSearch.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnSearch.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnSearch.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnSearch.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnSearch.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnSearch.Style.GradientAngle = 90; + this.btnSearch.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnSearch.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnSearch.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnSearch.TabIndex = 427; + this.btnSearch.Text = "开始搜索"; + this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click); + // + // btnStop + // + this.btnStop.CanvasColor = System.Drawing.SystemColors.Control; + this.btnStop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnStop.DisabledBackColor = System.Drawing.Color.Empty; + this.btnStop.Location = new System.Drawing.Point(146, 107); + this.btnStop.Name = "btnStop"; + this.btnStop.Size = new System.Drawing.Size(70, 23); + this.btnStop.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnStop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnStop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnStop.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.btnStop.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnStop.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.btnStop.Style.GradientAngle = 90; + this.btnStop.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; + this.btnStop.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnStop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnStop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnStop.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.btnStop.TabIndex = 405; + this.btnStop.Text = "停止搜索"; + // + // ucGroupBoxEx1 + // + this.ucGroupBoxEx1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left))); + this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx1.Controls.Add(this.btnRefreshShop); + this.ucGroupBoxEx1.Location = new System.Drawing.Point(3, 2); + this.ucGroupBoxEx1.Name = "ucGroupBoxEx1"; + this.ucGroupBoxEx1.Size = new System.Drawing.Size(144, 150); + this.ucGroupBoxEx1.TabIndex = 399; + this.ucGroupBoxEx1.TabStop = false; + this.ucGroupBoxEx1.Text = "基础"; + // + // btnRefreshShop + // + this.btnRefreshShop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnRefreshShop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnRefreshShop.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnRefreshShop.DisabledBackColor = System.Drawing.Color.Empty; + this.btnRefreshShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnRefreshShop.Location = new System.Drawing.Point(17, 31); + this.btnRefreshShop.Name = "btnRefreshShop"; + this.btnRefreshShop.Size = new System.Drawing.Size(110, 24); + this.btnRefreshShop.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnRefreshShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnRefreshShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnRefreshShop.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnRefreshShop.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnRefreshShop.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnRefreshShop.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnRefreshShop.Style.GradientAngle = 90; + this.btnRefreshShop.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnRefreshShop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnRefreshShop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnRefreshShop.TabIndex = 431; + this.btnRefreshShop.Text = "刷新店铺"; + this.btnRefreshShop.Click += new System.EventHandler(this.btnRefreshShop_Click); + // + // splitContainer3 + // + this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer3.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; + this.splitContainer3.Location = new System.Drawing.Point(0, 0); + this.splitContainer3.Name = "splitContainer3"; + this.splitContainer3.Orientation = System.Windows.Forms.Orientation.Horizontal; + // + // splitContainer3.Panel1 + // + this.splitContainer3.Panel1.Controls.Add(this.splitContainer2); + // + // splitContainer3.Panel2 + // + this.splitContainer3.Panel2.Controls.Add(this.splitContainer4); + this.splitContainer3.Size = new System.Drawing.Size(1148, 435); + this.splitContainer3.SplitterDistance = 405; + this.splitContainer3.TabIndex = 1; + // + // splitContainer2 + // + this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer2.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; + this.splitContainer2.Location = new System.Drawing.Point(0, 0); + this.splitContainer2.Name = "splitContainer2"; + // + // splitContainer2.Panel1 + // + this.splitContainer2.Panel1.Controls.Add(this.dgvShop); + this.splitContainer2.Panel1.Padding = new System.Windows.Forms.Padding(4, 0, 0, 0); + // + // splitContainer2.Panel2 + // + this.splitContainer2.Panel2.Controls.Add(this.dgvStock); + this.splitContainer2.Panel2.Padding = new System.Windows.Forms.Padding(0, 0, 4, 0); + this.splitContainer2.Size = new System.Drawing.Size(1148, 405); + this.splitContainer2.SplitterDistance = 270; + this.splitContainer2.TabIndex = 0; + // + // dgvShop + // + this.dgvShop.AllowUserToAddRows = false; + this.dgvShop.AllowUserToDeleteRows = false; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + this.dgvShop.BackgroundColor = System.Drawing.Color.White; + this.dgvShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.colSelect, + this.colShopLoginName, + this.colShopId, + this.colShopName, + this.colLoginStatus, + this.colCanUse, + this.colMessage}); + this.dgvShop.Dock = System.Windows.Forms.DockStyle.Fill; + this.dgvShop.Location = new System.Drawing.Point(4, 0); + this.dgvShop.Name = "dgvShop"; + this.dgvShop.ReadOnly = true; + this.dgvShop.RowHeadersWidth = 30; + dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.dgvShop.RowsDefaultCellStyle = dataGridViewCellStyle3; + this.dgvShop.RowTemplate.Height = 23; + this.dgvShop.Size = new System.Drawing.Size(266, 405); + this.dgvShop.TabIndex = 6; + this.dgvShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick); + // + // dgvStock + // + this.dgvStock.AllowUserToAddRows = false; + this.dgvStock.AllowUserToDeleteRows = false; + dataGridViewCellStyle4.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvStock.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4; + this.dgvStock.BackgroundColor = System.Drawing.Color.White; + this.dgvStock.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvStock.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5; + this.dgvStock.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dgvStock.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.colUpId, + this.colSupplierId, + this.colSupplierName, + this.colStockId, + this.colParentStockId, + this.colProductSkcPic, + this.colProductId, + this.colProdSkc, + this.colProdName, + this.colPrcie, + this.colFrom, + this.colFromFake, + this.colMsg}); + this.dgvStock.Dock = System.Windows.Forms.DockStyle.Fill; + this.dgvStock.Location = new System.Drawing.Point(0, 0); + this.dgvStock.Name = "dgvStock"; + this.dgvStock.ReadOnly = true; + dataGridViewCellStyle6.Font = new System.Drawing.Font("微软雅黑", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.dgvStock.RowsDefaultCellStyle = dataGridViewCellStyle6; + this.dgvStock.RowTemplate.Height = 23; + this.dgvStock.Size = new System.Drawing.Size(870, 405); + this.dgvStock.TabIndex = 187; + // + // splitContainer4 + // + this.splitContainer4.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer4.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; + this.splitContainer4.Location = new System.Drawing.Point(0, 0); + this.splitContainer4.Name = "splitContainer4"; + // + // splitContainer4.Panel1 + // + this.splitContainer4.Panel1.Controls.Add(this.statusBar); + // + // splitContainer4.Panel2 + // + this.splitContainer4.Panel2.Controls.Add(this.btnClear); + this.splitContainer4.Size = new System.Drawing.Size(1148, 26); + this.splitContainer4.SplitterDistance = 1033; + this.splitContainer4.TabIndex = 3; + // + // statusBar + // + this.statusBar.BackColor = System.Drawing.Color.White; + this.statusBar.Dock = System.Windows.Forms.DockStyle.Fill; + this.statusBar.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.statusBar.Location = new System.Drawing.Point(0, 0); + this.statusBar.Margin = new System.Windows.Forms.Padding(0); + this.statusBar.Name = "statusBar"; + this.statusBar.Size = new System.Drawing.Size(1033, 26); + this.statusBar.TabIndex = 2; + // + // btnClear + // + this.btnClear.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.btnClear.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnClear.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnClear.DisabledBackColor = System.Drawing.Color.Empty; + this.btnClear.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnClear.Location = new System.Drawing.Point(17, 0); + this.btnClear.Name = "btnClear"; + this.btnClear.Size = new System.Drawing.Size(90, 21); + this.btnClear.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnClear.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnClear.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnClear.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnClear.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnClear.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnClear.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnClear.Style.GradientAngle = 90; + this.btnClear.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnClear.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnClear.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnClear.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.btnClear.TabIndex = 440; + this.btnClear.Text = "清空结果"; + // + // colSelect + // + this.colSelect.HeaderText = "全选"; + this.colSelect.Name = "colSelect"; + this.colSelect.ReadOnly = true; + this.colSelect.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colSelect.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colSelect.Width = 28; + // + // colShopLoginName + // + this.colShopLoginName.HeaderText = "店铺登录名"; + this.colShopLoginName.Name = "colShopLoginName"; + this.colShopLoginName.ReadOnly = true; + this.colShopLoginName.Visible = false; + // + // colShopId + // + this.colShopId.HeaderText = "店铺Id"; + this.colShopId.Name = "colShopId"; + this.colShopId.ReadOnly = true; + this.colShopId.Visible = false; + this.colShopId.Width = 55; + // + // colShopName + // + this.colShopName.FillWeight = 150F; + this.colShopName.HeaderText = "店铺名称"; + this.colShopName.Name = "colShopName"; + this.colShopName.ReadOnly = true; + this.colShopName.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colShopName.Width = 75; + // + // colLoginStatus + // + this.colLoginStatus.HeaderText = "登录状态"; + this.colLoginStatus.Name = "colLoginStatus"; + this.colLoginStatus.ReadOnly = true; + this.colLoginStatus.Width = 65; + // + // colCanUse + // + this.colCanUse.HeaderText = "可用"; + this.colCanUse.Name = "colCanUse"; + this.colCanUse.ReadOnly = true; + this.colCanUse.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colCanUse.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colCanUse.Width = 28; + // + // colMessage + // + this.colMessage.HeaderText = "消息"; + this.colMessage.Name = "colMessage"; + this.colMessage.ReadOnly = true; + this.colMessage.Width = 120; + // + // colUpId + // + this.colUpId.HeaderText = "上家Id"; + this.colUpId.Name = "colUpId"; + this.colUpId.ReadOnly = true; + this.colUpId.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colUpId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colUpId.Visible = false; + this.colUpId.Width = 95; + // + // colSupplierId + // + this.colSupplierId.HeaderText = "店铺Id"; + this.colSupplierId.Name = "colSupplierId"; + this.colSupplierId.ReadOnly = true; + // + // colSupplierName + // + this.colSupplierName.HeaderText = "店铺名称"; + this.colSupplierName.Name = "colSupplierName"; + this.colSupplierName.ReadOnly = true; + this.colSupplierName.Width = 120; + // + // colStockId + // + this.colStockId.HeaderText = "备货单号"; + this.colStockId.Name = "colStockId"; + this.colStockId.ReadOnly = true; + this.colStockId.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colStockId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + // + // colParentStockId + // + this.colParentStockId.HeaderText = "备货母单号"; + this.colParentStockId.Name = "colParentStockId"; + this.colParentStockId.ReadOnly = true; + this.colParentStockId.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colParentStockId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + // + // colProductSkcPic + // + this.colProductSkcPic.HeaderText = "Skc图片"; + this.colProductSkcPic.Name = "colProductSkcPic"; + this.colProductSkcPic.ReadOnly = true; + // + // colProductId + // + this.colProductId.HeaderText = "商品Id"; + this.colProductId.Name = "colProductId"; + this.colProductId.ReadOnly = true; + this.colProductId.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colProductId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colProductId.Visible = false; + // + // colProdSkc + // + this.colProdSkc.FillWeight = 150F; + this.colProdSkc.HeaderText = "商品SKC"; + this.colProdSkc.Name = "colProdSkc"; + this.colProdSkc.ReadOnly = true; + this.colProdSkc.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colProdSkc.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colProdSkc.Width = 120; + // + // colProdName + // + this.colProdName.HeaderText = "标题"; + this.colProdName.Name = "colProdName"; + this.colProdName.ReadOnly = true; + this.colProdName.Width = 220; + // + // colPrcie + // + this.colPrcie.HeaderText = "价格"; + this.colPrcie.Name = "colPrcie"; + this.colPrcie.ReadOnly = true; + this.colPrcie.Visible = false; + // + // colFrom + // + this.colFrom.HeaderText = "来源"; + this.colFrom.Name = "colFrom"; + this.colFrom.ReadOnly = true; + this.colFrom.Visible = false; + // + // colFromFake + // + this.colFromFake.HeaderText = "来源"; + this.colFromFake.Name = "colFromFake"; + this.colFromFake.ReadOnly = true; + this.colFromFake.Visible = false; + // + // colMsg + // + this.colMsg.HeaderText = "状态"; + this.colMsg.Name = "colMsg"; + this.colMsg.ReadOnly = true; + this.colMsg.Width = 400; + // + // StockUpForm + // + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; + this.BackColor = System.Drawing.Color.White; + this.ClientSize = new System.Drawing.Size(1148, 589); + this.Controls.Add(this.splitContainer1); + this.Name = "StockUpForm"; + this.Text = "StockUpForm"; + this.Load += new System.EventHandler(this.StockUpForm_Load); + this.VisibleChanged += new System.EventHandler(this.StockUpForm_VisibleChanged); + this.splitContainer1.Panel1.ResumeLayout(false); + this.splitContainer1.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); + this.splitContainer1.ResumeLayout(false); + this.ucGroupBoxEx3.ResumeLayout(false); + this.ucGroupBoxEx3.PerformLayout(); + this.pnlSamePostage.ResumeLayout(false); + this.pnlSamePostage.PerformLayout(); + this.panel3.ResumeLayout(false); + this.panel3.PerformLayout(); + this.pnlStepPostage.ResumeLayout(false); + this.pnlStepPostage.PerformLayout(); + this.panel2.ResumeLayout(false); + this.panel2.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.nudGroupCount)).EndInit(); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); + this.ucGroupBoxEx2.ResumeLayout(false); + this.ucGroupBoxEx2.PerformLayout(); + this.ucGroupBoxEx1.ResumeLayout(false); + this.splitContainer3.Panel1.ResumeLayout(false); + this.splitContainer3.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).EndInit(); + this.splitContainer3.ResumeLayout(false); + this.splitContainer2.Panel1.ResumeLayout(false); + this.splitContainer2.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit(); + this.splitContainer2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dgvShop)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dgvStock)).EndInit(); + this.splitContainer4.Panel1.ResumeLayout(false); + this.splitContainer4.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer4)).EndInit(); + this.splitContainer4.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.SplitContainer splitContainer1; + private UserComponent.UcGroupBoxEx ucGroupBoxEx3; + private DevComponents.DotNetBar.Controls.ComboBoxEx cmbCity; + private DevComponents.DotNetBar.Controls.ComboBoxEx cmbProvince; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.FlowLayoutPanel pnlSamePostage; + private System.Windows.Forms.Label label12; + private System.Windows.Forms.TextBox txtSamePostagePrice; + private System.Windows.Forms.Label label13; + private System.Windows.Forms.Panel panel3; + private System.Windows.Forms.RadioButton rbSamePostage; + private System.Windows.Forms.RadioButton rbStepPostage; + private System.Windows.Forms.RadioButton rbNoPostage; + private System.Windows.Forms.FlowLayoutPanel pnlStepPostage; + private System.Windows.Forms.RadioButton rbWithCount; + private System.Windows.Forms.RadioButton rbWithWeight; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.TextBox txtWeightOrCountStep1; + private System.Windows.Forms.Label lblWeightOrCountStep1; + private System.Windows.Forms.TextBox txtWeightOrCountPrice1; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.TextBox txtWeightOrCountStep2; + private System.Windows.Forms.Label lblWeightOrCountStep2; + private System.Windows.Forms.TextBox txtWeightOrCountPrice2; + private System.Windows.Forms.Label label8; + private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.TextBox textBox2; + private DevComponents.DotNetBar.PanelEx btnSetNotArea; + private System.Windows.Forms.NumericUpDown nudGroupCount; + private System.Windows.Forms.Label label11; + private System.Windows.Forms.Panel panel1; + private DevComponents.DotNetBar.PanelEx btnSetName; + private System.Windows.Forms.RadioButton rbCustomName; + private System.Windows.Forms.RadioButton rbAutoName; + private System.Windows.Forms.Label label7; + private DevComponents.DotNetBar.PanelEx btnAdd; + private DevComponents.DotNetBar.PanelEx btnStopAdd; + private System.Windows.Forms.CheckBox chkLimited; + private UserComponent.UcGroupBoxEx ucGroupBoxEx2; + private System.Windows.Forms.TextBox txtStockid; + private System.Windows.Forms.Label label4; + private DevComponents.DotNetBar.PanelEx btnSearch; + private DevComponents.DotNetBar.PanelEx btnStop; + private UserComponent.UcGroupBoxEx ucGroupBoxEx1; + private DevComponents.DotNetBar.PanelEx btnRefreshShop; + private System.Windows.Forms.SplitContainer splitContainer3; + private System.Windows.Forms.SplitContainer splitContainer2; + private UserComponent.DataGridViewEx dgvShop; + private System.Windows.Forms.SplitContainer splitContainer4; + private UserControls.StatusBarUserControl statusBar; + private DevComponents.DotNetBar.PanelEx btnClear; + private UserComponent.DataGridViewEx dgvStock; + private System.Windows.Forms.TextBox txtPid; + private System.Windows.Forms.Label label9; + private System.Windows.Forms.TextBox txtParentStockid; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect; + private System.Windows.Forms.DataGridViewTextBoxColumn colShopLoginName; + private System.Windows.Forms.DataGridViewTextBoxColumn colShopId; + private System.Windows.Forms.DataGridViewTextBoxColumn colShopName; + private System.Windows.Forms.DataGridViewTextBoxColumn colLoginStatus; + private System.Windows.Forms.DataGridViewCheckBoxColumn colCanUse; + private System.Windows.Forms.DataGridViewTextBoxColumn colMessage; + private System.Windows.Forms.DataGridViewLinkColumn colUpId; + private System.Windows.Forms.DataGridViewTextBoxColumn colSupplierId; + private System.Windows.Forms.DataGridViewTextBoxColumn colSupplierName; + private System.Windows.Forms.DataGridViewLinkColumn colStockId; + private System.Windows.Forms.DataGridViewLinkColumn colParentStockId; + private System.Windows.Forms.DataGridViewImageColumn colProductSkcPic; + private System.Windows.Forms.DataGridViewLinkColumn colProductId; + private System.Windows.Forms.DataGridViewLinkColumn colProdSkc; + private System.Windows.Forms.DataGridViewTextBoxColumn colProdName; + private System.Windows.Forms.DataGridViewTextBoxColumn colPrcie; + private System.Windows.Forms.DataGridViewTextBoxColumn colFrom; + private System.Windows.Forms.DataGridViewTextBoxColumn colFromFake; + private System.Windows.Forms.DataGridViewTextBoxColumn colMsg; + } +} \ No newline at end of file diff --git a/TEMUKJD/KJDForms/UploadForms/StockUpForm.cs b/TEMUKJD/KJDForms/UploadForms/StockUpForm.cs new file mode 100644 index 0000000..4d03eca --- /dev/null +++ b/TEMUKJD/KJDForms/UploadForms/StockUpForm.cs @@ -0,0 +1,347 @@ +using AllBase; +using AllBase.Helper; +using AllBase.Model.Result; +using NaiBa.Util.Extension; +using Newtonsoft.Json.Linq; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.IO; +using System.Linq; +using System.Net; +using System.Net.Http; +using System.Text; +using System.Threading; +using System.Threading.Tasks; +using System.Windows.Forms; +using TemuKJD.Extension; +using TemuKJD.KJDForms.BaseForms; +using TemuKJD.KJDForms.ShopForms; + +namespace TemuKJD.KJDForms.UploadForms +{ + public partial class StockUpForm : Form + { + private CheckBox chkSelectAll = null; + public CancellationTokenSource cancellationTokenSource { get; set; } = null; + + /// + /// 备货单列表 + /// + List lstStockInfo = new List(); + + public StockUpForm() + { + InitializeComponent(); + } + + private void StockUpForm_Load(object sender, EventArgs e) + { + pnlSamePostage.Location = pnlStepPostage.Location; + + chkSelectAll = dgvShop.Columns["colSelect"].AddHeaderCheckBox(HorizontalAlignment.Center, 0, 0, null, null, false); + dgvShop.Columns["colSelect"].HeaderText = ""; + chkSelectAll.Width = chkSelectAll.Height = 13; + chkSelectAll.CheckedChanged += chkSelectAll_CheckedChanged; + } + + private void chkSelectAll_CheckedChanged(object sender, EventArgs e) + { + if (!chkSelectAll.Checked) + { + foreach (DataGridViewRow row in dgvShop.Rows) + { + row.Cells["colSelect"].Value = false; + } + } + else + { + var list = GlobalConfig.ShopLoginList.Where(s => s.LoginStatus == "登录成功").Select(ss => ss.ShopId); + foreach (DataGridViewRow row in dgvShop.Rows) + { + if (list.Any(l => l == row.Cells["colShopId"]?.Value?.ToString())) + row.Cells["colSelect"].Value = true; + } + } + } + + private void StockUpForm_VisibleChanged(object sender, EventArgs e) + { + if (Visible == true) + RefreshShop(); + } + + private void btnRefreshShop_Click(object sender, EventArgs e) + { + RefreshShop(); + } + + private void RefreshShop() + { + // 店铺Id + var selectIds = dgvShop.Rows.Cast().Where(row + => row.Cells["colSelect"]?.Value.ParseToBool() == true).Select(r => r.Cells["colShopId"]?.Value.ToString()).ToList(); + // 获取被删除的店铺 + List dgvRowList = dgvShop.Rows.Cast().Where(row + => !GlobalConfig.ShopLoginList.Any(s => s.ShopId == row.Cells["colShopId"]?.Value?.ToString())).ToList(); + // 更新被删除的店铺列表 + foreach (var row in dgvRowList) + { + dgvShop.Rows.Remove(row); + } + // 绑定其他店铺（含新导入的店铺） + foreach (DouShopLoginInfo shopEntity in GlobalConfig.ShopLoginList) + { + if(!string.IsNullOrEmpty(shopEntity.ShopId)) + BindShop(shopEntity, selectIds); + } + } + + private void BindShop(DouShopLoginInfo shopEntity, List selectShopId = null) + { + if (shopEntity == null) + return; + if (selectShopId == null) + selectShopId = new List(); + + bool canUse = shopEntity.LoginStatus == "登录成功"; + var row = dgvShop.Rows.Cast().FirstOrDefault(p => p.Cells.GetCellValueFromColumnName("colShopId").ParseToString() == shopEntity.ShopId); + if (row == null) + { + this.dgvShop.Rows.Add( + selectShopId.Contains(shopEntity.ShopId) && canUse, + shopEntity.LoginName, + shopEntity.ShopId, + shopEntity.ShopAccount, + shopEntity.LoginStatus, + canUse, + string.Empty + ); + } + else + { + row.Cells["colSelect"].Value = selectShopId.Contains(shopEntity.ShopId) && canUse; + row.Cells["colShopLoginName"].Value = shopEntity.LoginName; + row.Cells["colShopName"].Value = shopEntity.ShopAccount; + row.Cells["colLoginStatus"].Value = shopEntity.LoginStatus; + row.Cells["colCanUse"].Value = canUse; + } + } + + private void btnSearch_Click(object sender, EventArgs e) + { + var lstShopId = dgvShop.Rows.Cast().Where(row + => row.Cells["colSelect"]?.Value.ParseToBool() == true).Select(r => r.Cells["colShopId"]?.Value.ToString()).ToList(); + if (lstShopId.Count == 0) + { + BaseMsgForm.ShowInfo("请选择店铺！"); + return; + } + + lstStockInfo.Clear(); + dgvStock.Rows.Clear(); + + string searchText = txtStockid.Text.Trim(); + btnSearch.Enabled = false; + + cancellationTokenSource = new CancellationTokenSource(); + Task.Run(() => + { + var lstShopIdTemp = new List(); + lstShopIdTemp.AddRange(lstShopId); + + foreach (var shopId in lstShopIdTemp) + { + if (cancellationTokenSource.IsCancellationRequested) + break; + + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId); + if (shop == null) + continue; + + #region 检测登录 + if (shop.LoginStatus != "登录成功") + { + continue; + } + if (ShopListForm.Instance == null) + ShopListForm.Instance = new ShopListForm(); + ShopListForm.Instance.CheckShopLogin(new string[] { shop.LoginName }, false); + if (shop.LoginStatus != "登录成功") + { + Invoke(new Action(() => + { + var rows = this.dgvShop.Rows.Cast().Where(r => r.Cells["colShopLoginName"].Value.ToString() == shop.LoginName); + foreach(var row in rows) + { + row.Cells["colLoginStatus"].Value = "未登录"; + row.Cells["colCanUse"].Value = false; + } + })); + continue; + } + #endregion + + int page = 1; + int totalPage = 1; + while (page <= totalPage) + { + Thread.Sleep(50 + Randomx.GetId(100)); + string jsonStr = GetStock(shop, page); + if (jsonStr.Contains("指定的值含有无效的控制字符")) + { + BaseMsgForm.ShowError("店铺" + shop.LoginName + " " + shop.ShopId + "已掉线"); + break; + } + if (!jsonStr.Contains("\"success\":true")) + jsonStr = GetStock(shop, page); + + if (jsonStr.Contains("\"success\":true")) + { + var jObj = JObject.Parse(jsonStr); + var jArr = jObj["result"]?["subOrderForSupplierList"] as JArray; + if (jArr == null) + jArr = new JArray(); + foreach(var item in jArr) + { + string sItem = item.ToString(); + StockInfo sInfo = JsonHelper.DeserializeJsonToObject(sItem); // 反序列化得到类 + if (sInfo != null) + { + lstStockInfo.Add(sInfo); + + //string url = "https://i0.wp.com/tvax1.sinaimg.cn/large/005DW9w3ly1h7dc70ghc5j32yo1o0773.jpg"; + //pictureBox1.Image = Image.FromStream(System.Net.WebRequest.Create(url).GetResponse().GetResponseStream()); + //var httpClient = new HttpClient(); + //var stream = httpClient.GetStreamAsync("https://i0.wp.com/tvax1.sinaimg.cn/large/005DW9w3ly1h7dc70ghc5j32yo1o0773.jpg").Result; // 异步下载图片流 + //Image image = Image.FromStream(stream); + + string url = sInfo.productSkcPicture.Replace("https", "http"); + var image = Image.FromStream(WebRequest.Create(url).GetResponse().GetResponseStream()); + Invoke(new Action(() => + { + this.dgvStock.Rows.Add( + "", + sInfo.supplierId, + sInfo.supplierName, + sInfo.subPurchaseOrderSn, + sInfo.originalPurchaseOrderSn, + image, + sInfo.productId, + sInfo.productSkcId, + sInfo.productName, + "", + "", + "", + "" + ); + })); + } + } + } + + int total = BaseRegex.GetStringJson(ref jsonStr, "total").ParseToInt(); + totalPage = Math.Ceiling(total / 20.0).ParseToInt(); + page++; + } + } + Invoke(new Action(() => + { + btnSearch.Enabled = true; + })); + }, cancellationTokenSource.Token); + } + + + private string GetStock(DouShopLoginInfo shop, int page=1) + { + HttpWebResponse response = null; + string result; + try + { + page = Math.Max(page, 1); + string url = "https://seller.kuajingmaihuo.com/oms/bg/venom/api/supplier/purchase/manager/querySubOrderList"; + HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url); + + request.KeepAlive = true; + request.Headers.Set(HttpRequestHeader.CacheControl, "max-age=0"); + request.Headers.Add("Anti-Content", @"0aqAfqFyXcGvBgd9Q0HiJJ7kvWcKK7muUHnJ6oMAdmem0tmm_enmX1DBr-nJNxmoki33dqHTkZU18BU2p8P72Cg2uEZ_acOOBCxGmIs-Gym4EtKpTdZ6kWRCSClS9L6maLm0imx0GIjodHtLnwpx4ayHnhzNnCXEFecZSC8lBRHb9WCAoyY79kMLIWxBMZZSZrR2_LYUJ5UXzf-82ob455f7OvJa6s895N4wiMGR4vbVH8gFN2VuCxS27RpXDa2WCQQQd6XsJPw7amSUaob6oZ2MXuYb9K3ZqoCX5-nJimNZDR0rNCLB13sYgWq9jy0Q3gjnsFY2dJQDh3ewXS2vvf2DN9IAEzInwWTY31Fn0B6-s8DqwIm61OlXsfYt1AYOOyNMLzkw5llaDaqK21f7vspAuXwnJdAdKXJXSyyEimvTyF_AYLp1gkNqBqN1_ik_jc6cKTDJtGUgFjRojR4g4zM7Ww3wfW63WQrJftYhiTIJiS1tZcsceZht3Zu3MsvyxpAbx4bxFrvL0A6OFx752XsVi04Tm6HDhgt7MmpsrTO5WD_KjgjxNX8VNoGndD0OmriAYVn6kwmZXE6Y_khGedxumIGy4sOQI36__CeiuiPIvB8itfOqd7eyqyeCIaEODrh9dSLBQz8AxQ2xt60OTn4HSiPmlwo1J0TFtjUw2DUZB68tdrINb7ugulMsaIwMKr8S0bilSKW6JuYw3oAsmK3daQfJWy3mzVowY1UwPQfTB4Ibz6uRQxHkvhsRTXkrAygGeZIc9S"); + request.Headers.Add("sec-ch-ua-platform", @"""Windows"""); + request.UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/137.0.0.0 Safari/537.36"; + request.Headers.Add("mallid", shop.ShopId); + request.Headers.Add("sec-ch-ua", @"""Google Chrome"";v=""137"", ""Chromium"";v=""137"", ""Not/A)Brand"";v=""24"""); + request.ContentType = "application/json"; + request.Headers.Add("sec-ch-ua-mobile", @"?0"); + request.Accept = "*/*"; + request.Headers.Add("Origin", @"https://seller.kuajingmaihuo.com"); + request.Headers.Add("Sec-Fetch-Site", @"same-origin"); + request.Headers.Add("Sec-Fetch-Mode", @"cors"); + request.Headers.Add("Sec-Fetch-Dest", @"empty"); + request.Referer = "https://seller.kuajingmaihuo.com/main/order-manage"; + request.Headers.Set(HttpRequestHeader.AcceptEncoding, "gzip, deflate, br, zstd"); + request.Headers.Set(HttpRequestHeader.AcceptLanguage, "zh-CN,zh;q=0.9"); + request.Headers.Set(HttpRequestHeader.Cookie, shop.Cookies); + + request.Method = "POST"; + request.ServicePoint.Expect100Continue = false; + + string body = @"{""pageNo"":" + page + @",""pageSize"":20,""urgencyType"":0,""isCustomGoods"":false,""statusList"":[2],""oneDimensionSort"":{""firstOrderByParam"":""realDeliverTime"",""firstOrderByDesc"":1}}"; + byte[] postBytes = System.Text.Encoding.UTF8.GetBytes(body); + request.ContentLength = postBytes.Length; + Stream stream = request.GetRequestStream(); + stream.Write(postBytes, 0, postBytes.Length); + stream.Close(); + + response = (HttpWebResponse)request.GetResponse(); + } + catch (WebException ex) + { + if (ex.Status == WebExceptionStatus.ProtocolError) + { + response = (HttpWebResponse)ex.Response; + result = GetProxyHtml.ReadResponse(response); + return result; + } + else return ex.Message; + } + catch (Exception e) + { + if (response != null) response.Close(); + return e.Message; + } + result = GetProxyHtml.ReadResponse(response); + return result; + } + + private void dgvShop_CellContentClick(object sender, DataGridViewCellEventArgs e) + { + if (e.ColumnIndex < 0 || e.RowIndex < 0) + return; + string headerText = dgvShop.Columns[e.ColumnIndex].HeaderText; + string columnName = dgvShop.Columns[e.ColumnIndex].Name; + long shopId = dgvShop.Rows[e.RowIndex].Cells["colShopId"].Value.ParseToLong(); + string shopAccount = dgvShop.Rows[e.RowIndex].Cells["colShopName"].Value.ToString(); + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId.ToString()); + var row = dgvShop.Rows[e.RowIndex]; + switch (columnName) + { + case "colSelect": + if (row.Cells["colCanUse"].Value.ParseToBool()) + { + row.Cells["colSelect"].Value = !row.Cells["colSelect"].Value.ParseToBool(); + if (dgvShop.Rows.Cast().All(r => r.Cells["colSelect"].Value.ParseToBool())) + chkSelectAll.Checked = true; + else + chkSelectAll.Checked = false; + } + else + { + BaseMsgForm.ShowInfo("店铺未登录！"); + } + break; + } + } + } +} diff --git a/TEMUKJD/KJDForms/UploadForms/StockUpForm.resx b/TEMUKJD/KJDForms/UploadForms/StockUpForm.resx new file mode 100644 index 0000000..09dae72 --- /dev/null +++ b/TEMUKJD/KJDForms/UploadForms/StockUpForm.resx @@ -0,0 +1,174 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + \ No newline at end of file diff --git a/TEMUKJD/KJDForms/UploadForms/TbSettleSlideForm.cs b/TEMUKJD/KJDForms/UploadForms/TbSettleSlideForm.cs index 228bd8f..70e2a72 100644 --- a/TEMUKJD/KJDForms/UploadForms/TbSettleSlideForm.cs +++ b/TEMUKJD/KJDForms/UploadForms/TbSettleSlideForm.cs @@ -1,5 +1,5 @@ using AllBase; -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.KJDForms.BaseForms; using System; using System.Collections.Generic; using System.ComponentModel; @@ -11,7 +11,7 @@ using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; -namespace LittleRabbit.LittleRabbitForms +namespace TemuKJD.KJDForms { public partial class TbSettleSlideForm : LRBaseForm { diff --git a/TEMUKJD/KJDForms/UploadForms/TbSettleSlideForm.designer.cs b/TEMUKJD/KJDForms/UploadForms/TbSettleSlideForm.designer.cs index 66fb0de..724c15d 100644 --- a/TEMUKJD/KJDForms/UploadForms/TbSettleSlideForm.designer.cs +++ b/TEMUKJD/KJDForms/UploadForms/TbSettleSlideForm.designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms +namespace TemuKJD.KJDForms { partial class TbSettleSlideForm { diff --git a/TEMUKJD/KJDForms/UploadForms/UploadForm.Designer.cs b/TEMUKJD/KJDForms/UploadForms/UploadForm.Designer.cs index 1e80742..d908261 100644 --- a/TEMUKJD/KJDForms/UploadForms/UploadForm.Designer.cs +++ b/TEMUKJD/KJDForms/UploadForms/UploadForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.UploadForms +namespace TemuKJD.KJDForms.UploadForms { partial class UploadForm { @@ -28,18 +28,19 @@ /// private void InitializeComponent() { - System.Windows.Forms.TreeNode treeNode1 = new System.Windows.Forms.TreeNode("商品发布"); - System.Windows.Forms.TreeNode treeNode2 = new System.Windows.Forms.TreeNode("佣金设置"); - System.Windows.Forms.TreeNode treeNode3 = new System.Windows.Forms.TreeNode("净化数据"); - System.Windows.Forms.TreeNode treeNode4 = new System.Windows.Forms.TreeNode("产品数据库"); - System.Windows.Forms.TreeNode treeNode5 = new System.Windows.Forms.TreeNode("商品上下架"); - System.Windows.Forms.TreeNode treeNode6 = new System.Windows.Forms.TreeNode("清理无流量"); - System.Windows.Forms.TreeNode treeNode7 = new System.Windows.Forms.TreeNode("库存管理"); - System.Windows.Forms.TreeNode treeNode8 = new System.Windows.Forms.TreeNode("特殊延迟发货"); - System.Windows.Forms.TreeNode treeNode9 = new System.Windows.Forms.TreeNode("云违规排查"); - System.Windows.Forms.TreeNode treeNode10 = new System.Windows.Forms.TreeNode("跳转上家"); - System.Windows.Forms.TreeNode treeNode11 = new System.Windows.Forms.TreeNode("上传错误列表"); - System.Windows.Forms.TreeNode treeNode12 = new System.Windows.Forms.TreeNode("商品管理", new System.Windows.Forms.TreeNode[] { + System.Windows.Forms.TreeNode treeNode1 = new System.Windows.Forms.TreeNode("备货管理"); + System.Windows.Forms.TreeNode treeNode2 = new System.Windows.Forms.TreeNode("商品发布"); + System.Windows.Forms.TreeNode treeNode3 = new System.Windows.Forms.TreeNode("佣金设置"); + System.Windows.Forms.TreeNode treeNode4 = new System.Windows.Forms.TreeNode("净化数据"); + System.Windows.Forms.TreeNode treeNode5 = new System.Windows.Forms.TreeNode("产品数据库"); + System.Windows.Forms.TreeNode treeNode6 = new System.Windows.Forms.TreeNode("商品上下架"); + System.Windows.Forms.TreeNode treeNode7 = new System.Windows.Forms.TreeNode("清理无流量"); + System.Windows.Forms.TreeNode treeNode8 = new System.Windows.Forms.TreeNode("库存管理"); + System.Windows.Forms.TreeNode treeNode9 = new System.Windows.Forms.TreeNode("特殊延迟发货"); + System.Windows.Forms.TreeNode treeNode10 = new System.Windows.Forms.TreeNode("云违规排查"); + System.Windows.Forms.TreeNode treeNode11 = new System.Windows.Forms.TreeNode("跳转上家"); + System.Windows.Forms.TreeNode treeNode12 = new System.Windows.Forms.TreeNode("上传错误列表"); + System.Windows.Forms.TreeNode treeNode13 = new System.Windows.Forms.TreeNode("商品管理", new System.Windows.Forms.TreeNode[] { treeNode1, treeNode2, treeNode3, @@ -50,13 +51,14 @@ treeNode8, treeNode9, treeNode10, - treeNode11}); + treeNode11, + treeNode12}); this.panel1 = new System.Windows.Forms.Panel(); this.panel3 = new System.Windows.Forms.Panel(); this.panel2 = new System.Windows.Forms.Panel(); this.lblName = new System.Windows.Forms.Label(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.tv = new LittleRabbit.UserComponent.UcTreeView(); + this.tv = new TemuKJD.UserComponent.UcTreeView(); this.panel1.SuspendLayout(); this.panel2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); @@ -141,33 +143,35 @@ this.tv.Location = new System.Drawing.Point(0, 0); this.tv.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.tv.Name = "tv"; - treeNode1.Name = "商品发布"; - treeNode1.Text = "商品发布"; - treeNode2.Name = "佣金设置"; - treeNode2.Text = "佣金设置"; - treeNode3.Name = "净化数据"; - treeNode3.Text = "净化数据"; - treeNode4.Name = "产品数据库"; - treeNode4.Text = "产品数据库"; - treeNode5.Name = "商品上下架"; - treeNode5.Text = "商品上下架"; - treeNode6.Name = "清理无流量"; - treeNode6.Text = "清理无流量"; - treeNode7.Name = "库存管理"; - treeNode7.Text = "库存管理"; - treeNode8.Name = "特殊延迟发货"; - treeNode8.Text = "特殊延迟发货"; - treeNode9.Name = "云违规排查"; - treeNode9.Text = "云违规排查"; - treeNode10.Name = "跳转上家"; - treeNode10.Tag = "bottom"; - treeNode10.Text = "跳转上家"; - treeNode11.Name = "上传错误列表"; - treeNode11.Text = "上传错误列表"; - treeNode12.Name = "商品管理"; - treeNode12.Text = "商品管理"; + treeNode1.Name = "备货管理"; + treeNode1.Text = "备货管理"; + treeNode2.Name = "商品发布"; + treeNode2.Text = "商品发布"; + treeNode3.Name = "佣金设置"; + treeNode3.Text = "佣金设置"; + treeNode4.Name = "净化数据"; + treeNode4.Text = "净化数据"; + treeNode5.Name = "产品数据库"; + treeNode5.Text = "产品数据库"; + treeNode6.Name = "商品上下架"; + treeNode6.Text = "商品上下架"; + treeNode7.Name = "清理无流量"; + treeNode7.Text = "清理无流量"; + treeNode8.Name = "库存管理"; + treeNode8.Text = "库存管理"; + treeNode9.Name = "特殊延迟发货"; + treeNode9.Text = "特殊延迟发货"; + treeNode10.Name = "云违规排查"; + treeNode10.Text = "云违规排查"; + treeNode11.Name = "跳转上家"; + treeNode11.Tag = "bottom"; + treeNode11.Text = "跳转上家"; + treeNode12.Name = "上传错误列表"; + treeNode12.Text = "上传错误列表"; + treeNode13.Name = "商品管理"; + treeNode13.Text = "商品管理"; this.tv.Nodes.AddRange(new System.Windows.Forms.TreeNode[] { - treeNode12}); + treeNode13}); this.tv.OverForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235))))); this.tv.Size = new System.Drawing.Size(140, 521); this.tv.TabIndex = 1; diff --git a/TEMUKJD/KJDForms/UploadForms/UploadForm.cs b/TEMUKJD/KJDForms/UploadForms/UploadForm.cs index 2c20642..eee6245 100644 --- a/TEMUKJD/KJDForms/UploadForms/UploadForm.cs +++ b/TEMUKJD/KJDForms/UploadForms/UploadForm.cs @@ -1,5 +1,6 @@ -using LittleRabbit.LittleRabbitForms.SalesCenterForms; -using LittleRabbit.LittleRabbitForms.ShopOptimizeForms; +using TemuKJD.KJDForms.UploadForms; +using TemuKJD.KJDForms.SalesCenterForms; +using TemuKJD.KJDForms.ShopOptimizeForms; using System; using System.Collections.Generic; using System.ComponentModel; @@ -11,11 +12,12 @@ using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; -namespace LittleRabbit.LittleRabbitForms.UploadForms +namespace TemuKJD.KJDForms.UploadForms { public partial class UploadForm : Form { public static UploadForm instance; + public Lazy stockUpForm = new Lazy(); public Lazy uploadProductForm = new Lazy(); public Lazy commissionForm = new Lazy(); public Lazy cleanDataForm = new Lazy(); @@ -49,6 +51,9 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms { switch (e.Node.Name) { + case "备货管理": + SetForm(stockUpForm.Value); + break; case "商品发布": SetForm(uploadProductForm.Value); break; @@ -153,7 +158,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms //if (AllBase.BaseClass.UserName != "18888888888") // hideName.Add("上传错误列表"); - List hideName = new List() { "佣金设置", + List hideName = new List() { "佣金设置", "商品发布", "净化数据","产品数据库","商品上下架","清理无流量","库存管理","特殊延迟发货","云违规排查","上传错误列表","跳转上家" }; foreach (var item in hideName) diff --git a/TEMUKJD/KJDForms/UploadForms/UploadProductCefForm.cs b/TEMUKJD/KJDForms/UploadForms/UploadProductCefForm.cs index 178060c..8b1ecd7 100644 --- a/TEMUKJD/KJDForms/UploadForms/UploadProductCefForm.cs +++ b/TEMUKJD/KJDForms/UploadForms/UploadProductCefForm.cs @@ -11,7 +11,7 @@ using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; -namespace LittleRabbit.LittleRabbitForms.UploadForms +namespace TemuKJD.KJDForms.UploadForms { /// /// 主要用来设置上货佣金逻辑 @@ -84,7 +84,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms Thread.Sleep(10); var commission = lstCommissionAddResult[0]; var commissions = lstCommissionAddResult.Where(c => c.ShopName == commission.ShopName && c.Rate == commission.Rate).ToList(); - var shop = AllBase.Helper.GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ShopAccount == commission.ShopName); + var shop = AllBase.Helper.GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopAccount == commission.ShopName); if (shop == null) { lstCommissionAddResult.RemoveAll(s => s.ShopName == commission.ShopName); diff --git a/TEMUKJD/KJDForms/UploadForms/UploadProductErrorForm.Designer.cs b/TEMUKJD/KJDForms/UploadForms/UploadProductErrorForm.Designer.cs index b9492c4..5c749ba 100644 --- a/TEMUKJD/KJDForms/UploadForms/UploadProductErrorForm.Designer.cs +++ b/TEMUKJD/KJDForms/UploadForms/UploadProductErrorForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.UploadForms +namespace TemuKJD.KJDForms.UploadForms { partial class UploadProductErrorForm { @@ -32,12 +32,12 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); this.panel1 = new System.Windows.Forms.Panel(); - this.btnCancel = new LittleRabbit.UserControls.ButtonEx(); - this.btnSave = new LittleRabbit.UserControls.ButtonEx(); + this.btnCancel = new TemuKJD.UserControls.ButtonEx(); + this.btnSave = new TemuKJD.UserControls.ButtonEx(); this.textBox1 = new System.Windows.Forms.TextBox(); - this.buttonExportCsv = new LittleRabbit.UserControls.ButtonEx(); - this.btnAddToUpload = new LittleRabbit.UserControls.ButtonEx(); - this.dgvError = new LittleRabbit.UserComponent.DataGridViewEx(); + this.buttonExportCsv = new TemuKJD.UserControls.ButtonEx(); + this.btnAddToUpload = new TemuKJD.UserControls.ButtonEx(); + this.dgvError = new TemuKJD.UserComponent.DataGridViewEx(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -48,11 +48,11 @@ this.ColError = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.ColRemark = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column3 = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.btnImport = new LittleRabbit.UserControls.ButtonEx(); - this.btnOnlineSearch = new LittleRabbit.UserControls.ButtonEx(); + this.btnImport = new TemuKJD.UserControls.ButtonEx(); + this.btnOnlineSearch = new TemuKJD.UserControls.ButtonEx(); this.label2 = new System.Windows.Forms.Label(); - this.btnGetProp材质 = new LittleRabbit.UserControls.ButtonEx(); - this.btnGetDetail = new LittleRabbit.UserControls.ButtonEx(); + this.btnGetProp材质 = new TemuKJD.UserControls.ButtonEx(); + this.btnGetDetail = new TemuKJD.UserControls.ButtonEx(); this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dgvError)).BeginInit(); this.SuspendLayout(); diff --git a/TEMUKJD/KJDForms/UploadForms/UploadProductErrorForm.cs b/TEMUKJD/KJDForms/UploadForms/UploadProductErrorForm.cs index 02cdedc..5add530 100644 --- a/TEMUKJD/KJDForms/UploadForms/UploadProductErrorForm.cs +++ b/TEMUKJD/KJDForms/UploadForms/UploadProductErrorForm.cs @@ -4,7 +4,7 @@ using AllBase.Model.Param.FissionManage; using AllBase.Model.Param.ProductManage; using AllBase.Model.Param.UploadManage; using AllBase.Model.Result; -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.KJDForms.BaseForms; using NaiBa.Util; using NaiBa.Util.Extension; using Newtonsoft.Json.Linq; @@ -22,7 +22,7 @@ using System.Windows.Forms; using Work.BLL.Upload; using Work.DouyinApiClass; -namespace LittleRabbit.LittleRabbitForms.UploadForms +namespace TemuKJD.KJDForms.UploadForms { public partial class UploadProductErrorForm : Form { @@ -369,7 +369,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms { if (Fission.goodsCategoryList.Count == 0) Fission.goodsCategoryList = JsonHelper.DeserializeJsonToList(DyCategoryParam.DyCategorys); - var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ApiAuthStatus == "授权成功"); + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ApiAuthStatus == "授权成功"); StringBuilder sb = new StringBuilder(); sb.Append(FileBase.ReadAllText("抖音类目包含材质必填项的属性.txt")); string errStr = ""; @@ -432,7 +432,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms private void btnGetDetail_Click(object sender, EventArgs e) { - var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ShopAccount == "开箱小店"); + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopAccount == "开箱小店"); if (shop != null) { DouyinApi api = new DouyinApi(shop); diff --git a/TEMUKJD/KJDForms/UploadForms/UploadProductForm.Designer.cs b/TEMUKJD/KJDForms/UploadForms/UploadProductForm.Designer.cs index 37cb9b5..1fde664 100644 --- a/TEMUKJD/KJDForms/UploadForms/UploadProductForm.Designer.cs +++ b/TEMUKJD/KJDForms/UploadForms/UploadProductForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.UploadForms +namespace TemuKJD.KJDForms.UploadForms { partial class UploadProductForm { @@ -92,7 +92,7 @@ this.chkFuzzyMatching = new System.Windows.Forms.CheckBox(); this.cmbNewPreTime = new System.Windows.Forms.ComboBox(); this.cmbSendDayAfterPre = new System.Windows.Forms.ComboBox(); - this.buttonEx2 = new LittleRabbit.UserControls.ButtonEx(); + this.buttonEx2 = new TemuKJD.UserControls.ButtonEx(); this.cmbSendType = new System.Windows.Forms.ComboBox(); this.txtremark = new System.Windows.Forms.TextBox(); this.label13 = new System.Windows.Forms.Label(); @@ -147,17 +147,17 @@ this.checkBox2 = new System.Windows.Forms.CheckBox(); this.chkCustomCategory = new System.Windows.Forms.CheckBox(); this.shopthreadCountTextBox = new System.Windows.Forms.ComboBox(); - this.btnUpload = new LittleRabbit.UserControls.ButtonEx(); - this.buttonEx1 = new LittleRabbit.UserControls.ButtonEx(); - this.btnUploadGood = new LittleRabbit.UserControls.ButtonEx(); + this.btnUpload = new TemuKJD.UserControls.ButtonEx(); + this.buttonEx1 = new TemuKJD.UserControls.ButtonEx(); + this.btnUploadGood = new TemuKJD.UserControls.ButtonEx(); this.countLabel = new System.Windows.Forms.Label(); this.label29 = new System.Windows.Forms.Label(); this.lblWaitUpload = new System.Windows.Forms.Label(); this.splitContainer3 = new System.Windows.Forms.SplitContainer(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.cboHour = new System.Windows.Forms.ComboBox(); - this.btnTest = new LittleRabbit.UserControls.ButtonEx(); - this.buttonEx4 = new LittleRabbit.UserControls.ButtonEx(); + this.btnTest = new TemuKJD.UserControls.ButtonEx(); + this.buttonEx4 = new TemuKJD.UserControls.ButtonEx(); this.chklogistime = new System.Windows.Forms.CheckBox(); this.label48 = new System.Windows.Forms.Label(); this.label10 = new System.Windows.Forms.Label(); @@ -165,26 +165,17 @@ this.txtRatio = new System.Windows.Forms.TextBox(); this.chkSaveToOffLine = new System.Windows.Forms.CheckBox(); this.chkIsSetCommission = new System.Windows.Forms.CheckBox(); - this.btnGetUpId = new LittleRabbit.UserControls.ButtonEx(); + this.btnGetUpId = new TemuKJD.UserControls.ButtonEx(); this.txtUpProduct = new System.Windows.Forms.TextBox(); - this.dgvShop = new LittleRabbit.UserComponent.DataGridViewEx(); + this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colUploadCount = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colStatus = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.pnlShowError = new DevComponents.DotNetBar.PanelEx(); - this.dgvProduct = new LittleRabbit.UserComponent.DataGridViewEx(); - this.idColumn = new System.Windows.Forms.DataGridViewLinkColumn(); - this.productIdColumn = new System.Windows.Forms.DataGridViewLinkColumn(); - this.shopNameColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.titleColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.prcieColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.fromColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colFromFake = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.messageColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.splitContainer4 = new System.Windows.Forms.SplitContainer(); - this.statusBar = new LittleRabbit.UserControls.StatusBarUserControl(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); this.btnGo = new System.Windows.Forms.Button(); this.label27 = new System.Windows.Forms.Label(); @@ -224,6 +215,15 @@ this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn9 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.messageColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colFromFake = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.fromColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.prcieColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.titleColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.shopNameColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.productIdColumn = new System.Windows.Forms.DataGridViewLinkColumn(); + this.idColumn = new System.Windows.Forms.DataGridViewLinkColumn(); + this.dgvProduct = new TemuKJD.UserComponent.DataGridViewEx(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -247,12 +247,12 @@ this.splitContainer2.Panel2.SuspendLayout(); this.splitContainer2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dgvShop)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dgvProduct)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer4)).BeginInit(); this.splitContainer4.Panel1.SuspendLayout(); this.splitContainer4.Panel2.SuspendLayout(); this.splitContainer4.SuspendLayout(); this.flowLayoutPanel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dgvProduct)).BeginInit(); this.SuspendLayout(); // // splitContainer1 @@ -2493,103 +2493,6 @@ this.pnlShowError.Text = "panelEx3"; this.pnlShowError.Visible = false; // - // dgvProduct - // - this.dgvProduct.AllowUserToAddRows = false; - this.dgvProduct.AllowUserToDeleteRows = false; - dataGridViewCellStyle4.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4; - this.dgvProduct.BackgroundColor = System.Drawing.Color.White; - this.dgvProduct.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5; - this.dgvProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dgvProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.idColumn, - this.productIdColumn, - this.shopNameColumn, - this.titleColumn, - this.prcieColumn, - this.fromColumn, - this.colFromFake, - this.messageColumn}); - this.dgvProduct.Dock = System.Windows.Forms.DockStyle.Fill; - this.dgvProduct.Location = new System.Drawing.Point(0, 0); - this.dgvProduct.Name = "dgvProduct"; - this.dgvProduct.ReadOnly = true; - dataGridViewCellStyle6.Font = new System.Drawing.Font("微软雅黑", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.dgvProduct.RowsDefaultCellStyle = dataGridViewCellStyle6; - this.dgvProduct.RowTemplate.Height = 23; - this.dgvProduct.Size = new System.Drawing.Size(755, 433); - this.dgvProduct.TabIndex = 7; - this.dgvProduct.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvProduct_CellContentClick); - this.dgvProduct.RowsAdded += new System.Windows.Forms.DataGridViewRowsAddedEventHandler(this.dgvProduct_RowsAdded); - // - // idColumn - // - this.idColumn.HeaderText = "上家Id"; - this.idColumn.Name = "idColumn"; - this.idColumn.ReadOnly = true; - this.idColumn.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.idColumn.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.idColumn.Width = 95; - // - // productIdColumn - // - this.productIdColumn.FillWeight = 150F; - this.productIdColumn.HeaderText = "商品Id"; - this.productIdColumn.Name = "productIdColumn"; - this.productIdColumn.ReadOnly = true; - this.productIdColumn.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.productIdColumn.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - this.productIdColumn.Width = 120; - // - // shopNameColumn - // - this.shopNameColumn.HeaderText = "店铺名"; - this.shopNameColumn.Name = "shopNameColumn"; - this.shopNameColumn.ReadOnly = true; - this.shopNameColumn.Width = 60; - // - // titleColumn - // - this.titleColumn.HeaderText = "标题"; - this.titleColumn.Name = "titleColumn"; - this.titleColumn.ReadOnly = true; - this.titleColumn.Width = 120; - // - // prcieColumn - // - this.prcieColumn.HeaderText = "价格"; - this.prcieColumn.Name = "prcieColumn"; - this.prcieColumn.ReadOnly = true; - // - // fromColumn - // - this.fromColumn.HeaderText = "来源"; - this.fromColumn.Name = "fromColumn"; - this.fromColumn.ReadOnly = true; - this.fromColumn.Visible = false; - // - // colFromFake - // - this.colFromFake.HeaderText = "来源"; - this.colFromFake.Name = "colFromFake"; - this.colFromFake.ReadOnly = true; - // - // messageColumn - // - this.messageColumn.HeaderText = "状态"; - this.messageColumn.Name = "messageColumn"; - this.messageColumn.ReadOnly = true; - this.messageColumn.Width = 400; - // // splitContainer4 // this.splitContainer4.Dock = System.Windows.Forms.DockStyle.Fill; @@ -3002,6 +2905,103 @@ this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10"; this.dataGridViewTextBoxColumn10.ReadOnly = true; // + // messageColumn + // + this.messageColumn.HeaderText = "状态"; + this.messageColumn.Name = "messageColumn"; + this.messageColumn.ReadOnly = true; + this.messageColumn.Width = 400; + // + // colFromFake + // + this.colFromFake.HeaderText = "来源"; + this.colFromFake.Name = "colFromFake"; + this.colFromFake.ReadOnly = true; + // + // fromColumn + // + this.fromColumn.HeaderText = "来源"; + this.fromColumn.Name = "fromColumn"; + this.fromColumn.ReadOnly = true; + this.fromColumn.Visible = false; + // + // prcieColumn + // + this.prcieColumn.HeaderText = "价格"; + this.prcieColumn.Name = "prcieColumn"; + this.prcieColumn.ReadOnly = true; + // + // titleColumn + // + this.titleColumn.HeaderText = "标题"; + this.titleColumn.Name = "titleColumn"; + this.titleColumn.ReadOnly = true; + this.titleColumn.Width = 120; + // + // shopNameColumn + // + this.shopNameColumn.HeaderText = "店铺名"; + this.shopNameColumn.Name = "shopNameColumn"; + this.shopNameColumn.ReadOnly = true; + this.shopNameColumn.Width = 60; + // + // productIdColumn + // + this.productIdColumn.FillWeight = 150F; + this.productIdColumn.HeaderText = "商品Id"; + this.productIdColumn.Name = "productIdColumn"; + this.productIdColumn.ReadOnly = true; + this.productIdColumn.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.productIdColumn.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.productIdColumn.Width = 120; + // + // idColumn + // + this.idColumn.HeaderText = "上家Id"; + this.idColumn.Name = "idColumn"; + this.idColumn.ReadOnly = true; + this.idColumn.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.idColumn.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.idColumn.Width = 95; + // + // dgvProduct + // + this.dgvProduct.AllowUserToAddRows = false; + this.dgvProduct.AllowUserToDeleteRows = false; + dataGridViewCellStyle4.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4; + this.dgvProduct.BackgroundColor = System.Drawing.Color.White; + this.dgvProduct.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5; + this.dgvProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dgvProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.idColumn, + this.productIdColumn, + this.shopNameColumn, + this.titleColumn, + this.prcieColumn, + this.fromColumn, + this.colFromFake, + this.messageColumn}); + this.dgvProduct.Dock = System.Windows.Forms.DockStyle.Fill; + this.dgvProduct.Location = new System.Drawing.Point(0, 0); + this.dgvProduct.Name = "dgvProduct"; + this.dgvProduct.ReadOnly = true; + dataGridViewCellStyle6.Font = new System.Drawing.Font("微软雅黑", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.dgvProduct.RowsDefaultCellStyle = dataGridViewCellStyle6; + this.dgvProduct.RowTemplate.Height = 23; + this.dgvProduct.Size = new System.Drawing.Size(755, 433); + this.dgvProduct.TabIndex = 7; + this.dgvProduct.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvProduct_CellContentClick); + this.dgvProduct.RowsAdded += new System.Windows.Forms.DataGridViewRowsAddedEventHandler(this.dgvProduct_RowsAdded); + // // UploadProductForm // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); @@ -3045,13 +3045,13 @@ ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit(); this.splitContainer2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.dgvShop)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dgvProduct)).EndInit(); this.splitContainer4.Panel1.ResumeLayout(false); this.splitContainer4.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitContainer4)).EndInit(); this.splitContainer4.ResumeLayout(false); this.flowLayoutPanel1.ResumeLayout(false); this.flowLayoutPanel1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dgvProduct)).EndInit(); this.ResumeLayout(false); } @@ -3091,7 +3091,6 @@ private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn9; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn10; private UserComponent.DataGridViewEx dgvShop; - private UserComponent.DataGridViewEx dgvProduct; private System.Windows.Forms.Label lblWaitUpload; private System.Windows.Forms.Label countLabel; private System.Windows.Forms.SplitContainer splitContainer3; @@ -3222,14 +3221,6 @@ private System.Windows.Forms.CheckBox chkFilterBrand; private DevComponents.DotNetBar.PanelEx btnSetSkuFilter; private System.Windows.Forms.CheckBox chkFilterSku; - private System.Windows.Forms.DataGridViewLinkColumn idColumn; - private System.Windows.Forms.DataGridViewLinkColumn productIdColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn shopNameColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn titleColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn prcieColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn fromColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn colFromFake; - private System.Windows.Forms.DataGridViewTextBoxColumn messageColumn; private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect; private System.Windows.Forms.DataGridViewTextBoxColumn colShopId; private System.Windows.Forms.DataGridViewTextBoxColumn colShopName; @@ -3247,5 +3238,14 @@ private System.Windows.Forms.CheckBox checkBox1; private System.Windows.Forms.CheckBox chkShopFissionUpload; private System.Windows.Forms.TabPage tabPage5; + private UserComponent.DataGridViewEx dgvProduct; + private System.Windows.Forms.DataGridViewLinkColumn idColumn; + private System.Windows.Forms.DataGridViewLinkColumn productIdColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn shopNameColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn titleColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn prcieColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn fromColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn colFromFake; + private System.Windows.Forms.DataGridViewTextBoxColumn messageColumn; } } \ No newline at end of file diff --git a/TEMUKJD/KJDForms/UploadForms/UploadProductForm.cs b/TEMUKJD/KJDForms/UploadForms/UploadProductForm.cs index 4e0a478..e3a8876 100644 --- a/TEMUKJD/KJDForms/UploadForms/UploadProductForm.cs +++ b/TEMUKJD/KJDForms/UploadForms/UploadProductForm.cs @@ -3,9 +3,9 @@ using AllBase.Helper; using AllBase.Model.Param.UploadManage; using AllBase.Model.Result; using DevComponents.DotNetBar; -using LittleRabbit.Extension; -using LittleRabbit.LittleRabbitForms.BaseForms; -using LittleRabbit.LittleRabbitForms.ToolForms; +using TemuKJD.Extension; +using TemuKJD.KJDForms.BaseForms; +using TemuKJD.KJDForms.ToolForms; using NaiBa.Util; using NaiBa.Util.Extension; using Newtonsoft.Json; @@ -29,7 +29,7 @@ using Work.CollectClass; using Work.DouyinApiClass; using Work.GoodDetail; -namespace LittleRabbit.LittleRabbitForms.UploadForms +namespace TemuKJD.KJDForms.UploadForms { public partial class UploadProductForm : Form { @@ -137,10 +137,10 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms } public void LoadShops() { - for (int i = 0; i < GlobalConfig.DouShopLoginList.Count; i++) + for (int i = 0; i < GlobalConfig.ShopLoginList.Count; i++) { - var shop = GlobalConfig.DouShopLoginList[i]; - dgvShop.Rows.Add(false, shop.ShopAccountId, shop.ShopAccount, 0, shop.LoginStatus); + var shop = GlobalConfig.ShopLoginList[i]; + dgvShop.Rows.Add(false, shop.ShopId, shop.ShopAccount, 0, shop.LoginStatus); } } public void RefreshIeForm() @@ -284,7 +284,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms UploadProductBLL.phone = txtPhone.Text; - foreach (var shop in GlobalConfig.DouShopLoginList) + foreach (var shop in GlobalConfig.ShopLoginList) { shop.CanUpload = shop.LoginStatus == "登录成功" && shop.ApiAuthStatus == "授权成功"; } @@ -311,10 +311,10 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms } } List ts = new List(); - for (int i = 0; i < GlobalConfig.DouShopLoginList.Count; i++) + for (int i = 0; i < GlobalConfig.ShopLoginList.Count; i++) { - var shop = GlobalConfig.DouShopLoginList[i]; - if (!UploadProductBLL.ids.Any(id => id == shop.ShopAccountId) || shop.ApiAuthStatus != "授权成功") + var shop = GlobalConfig.ShopLoginList[i]; + if (!UploadProductBLL.ids.Any(id => id == shop.ShopId) || shop.ApiAuthStatus != "授权成功") continue; if (UploadProductBLL.isMultiUpload) Threadx.ThreadListWait(ref ts, new Thread(GetMulti), UploadProductBLL.ShopThreadCount, shop); @@ -418,7 +418,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms if (p?.Message == "提交成功") { var row = dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopName"]?.Value?.ToString() == p.ShopName); - var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ShopAccount == p.ShopName); + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopAccount == p.ShopName); if (shop != null && row != null) { row.Cells["colUploadCount"].Value = shop.UploadCount; @@ -585,7 +585,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms //string name = dgvShop.Columns[e.ColumnIndex].HeaderText; string colId = dgvShop.Columns[e.ColumnIndex].Name; long shopId = dgvShop.Rows[e.RowIndex].Cells["colShopId"].Value.ParseToLong(); - var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ShopAccountId == shopId.ToString()); + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId.ToString()); if (colId == "colSelect") { bool canUse = shop?.ApiAuthStatus == "授权成功" && shop?.LoginStatus == "登录成功"; @@ -1185,7 +1185,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms /// public long GetBrandList() { - var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ShopAccount == "开箱小店"); + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopAccount == "开箱小店"); DouyinApi api = new DouyinApi(shop); api.JsonData = new Dictionary(); api.JsonData.Add("product_id", "3522394014194236398"); @@ -1409,7 +1409,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms //修改库存 private void button7_Click(object sender, EventArgs e) { - var shop = GlobalConfig.DouShopLoginList[0]; + var shop = GlobalConfig.ShopLoginList[0]; DouyinApi api = new DouyinApi(shop); api.JsonData = new Dictionary(); api.JsonData.Add("product_id", "3492731930347180135"); @@ -1445,7 +1445,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms //修改价格 private void button8_Click(object sender, EventArgs e) { - var shop = GlobalConfig.DouShopLoginList[0]; + var shop = GlobalConfig.ShopLoginList[0]; DouyinApi api = new DouyinApi(shop); api.JsonData = new Dictionary(); api.JsonData.Add("product_id", "3492731930347180135"); @@ -1820,7 +1820,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms { var url = "https://fxg.jinritemai.com/ffa/g/size-chart/manage"; var shopName = dgvProduct.Rows[e.RowIndex].Cells["shopNameColumn"].Value.ToString(); - var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ShopAccount == shopName); + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopAccount == shopName); if (shop != null) { var cookieStrArr = shop.Cookies.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); @@ -1939,7 +1939,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms } private static string HttpPostDataImage(string url, string referer, byte[] file) { - var shop = GlobalConfig.DouShopLoginList.Where(s => s.LoginStatus == "登录成功").FirstOrDefault(); + var shop = GlobalConfig.ShopLoginList.Where(s => s.LoginStatus == "登录成功").FirstOrDefault(); if (shop == null) return ""; string responseContent = ""; diff --git a/TEMUKJD/KJDForms/UploadForms/UploadProductViolateSelectForm.Designer.cs b/TEMUKJD/KJDForms/UploadForms/UploadProductViolateSelectForm.Designer.cs index 14821a2..954e1c3 100644 --- a/TEMUKJD/KJDForms/UploadForms/UploadProductViolateSelectForm.Designer.cs +++ b/TEMUKJD/KJDForms/UploadForms/UploadProductViolateSelectForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.UploadForms +namespace TemuKJD.KJDForms.UploadForms { partial class UploadProductViolateSelectForm { diff --git a/TEMUKJD/KJDForms/UploadForms/UploadProductViolateSelectForm.cs b/TEMUKJD/KJDForms/UploadForms/UploadProductViolateSelectForm.cs index 5ab68c6..655cf03 100644 --- a/TEMUKJD/KJDForms/UploadForms/UploadProductViolateSelectForm.cs +++ b/TEMUKJD/KJDForms/UploadForms/UploadProductViolateSelectForm.cs @@ -8,9 +8,9 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace LittleRabbit.LittleRabbitForms.UploadForms +namespace TemuKJD.KJDForms.UploadForms { - public partial class UploadProductViolateSelectForm : LittleRabbit.LittleRabbitForms.BaseForms.LRBaseForm + public partial class UploadProductViolateSelectForm : TemuKJD.KJDForms.BaseForms.LRBaseForm { public UploadProductViolateSelectForm() { diff --git a/TEMUKJD/KJDForms/UploadForms/ViolateManageForm.Designer.cs b/TEMUKJD/KJDForms/UploadForms/ViolateManageForm.Designer.cs index 1630d4e..88285da 100644 --- a/TEMUKJD/KJDForms/UploadForms/ViolateManageForm.Designer.cs +++ b/TEMUKJD/KJDForms/UploadForms/ViolateManageForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.LittleRabbitForms.UploadForms +namespace TemuKJD.KJDForms.UploadForms { partial class ViolateManageForm { @@ -41,36 +41,36 @@ this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.panelEx2 = new DevComponents.DotNetBar.PanelEx(); this.btnImport = new DevComponents.DotNetBar.PanelEx(); - this.ucGroupBoxEx3 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components); + this.ucGroupBoxEx3 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.chkOperateOffSale = new System.Windows.Forms.CheckBox(); this.chkOperateDataBase = new System.Windows.Forms.CheckBox(); this.chkOperateOnSale = new System.Windows.Forms.CheckBox(); this.btnStartTroubleShooting = new DevComponents.DotNetBar.PanelEx(); this.btnStop = new DevComponents.DotNetBar.PanelEx(); - this.ucGroupBoxEx2 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components); + this.ucGroupBoxEx2 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.panel1 = new System.Windows.Forms.Panel(); - this.llClear = new LittleRabbit.UserComponent.LinkLabelLc(); - this.llSelectSerious = new LittleRabbit.UserComponent.LinkLabelLc(); - this.llSelectAllRule = new LittleRabbit.UserComponent.LinkLabelLc(); + this.llClear = new TemuKJD.UserComponent.LinkLabelLc(); + this.llSelectSerious = new TemuKJD.UserComponent.LinkLabelLc(); + this.llSelectAllRule = new TemuKJD.UserComponent.LinkLabelLc(); this.flpViolate = new System.Windows.Forms.FlowLayoutPanel(); - this.ucGroupBoxEx1 = new LittleRabbit.UserComponent.UcGroupBoxEx(this.components); - this.btnRefreshShop = new LittleRabbit.UserControls.ButtonEx(); + this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); + this.btnRefreshShop = new TemuKJD.UserControls.ButtonEx(); this.splitContainer3 = new System.Windows.Forms.SplitContainer(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); - this.dgvShop = new LittleRabbit.UserComponent.DataGridViewEx(); + this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colAuthStatus = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); - this.ucTabControl1 = new LittleRabbit.UserComponent.UcTabControl(); + this.ucTabControl1 = new TemuKJD.UserComponent.UcTabControl(); this.tabPageCheckResult = new System.Windows.Forms.TabPage(); - this.dgvCheck = new LittleRabbit.UserComponent.DataGridViewEx(); + this.dgvCheck = new TemuKJD.UserComponent.DataGridViewEx(); this.tabPageViolateFileList = new System.Windows.Forms.TabPage(); - this.dgvViolateFileData = new LittleRabbit.UserComponent.DataGridViewEx(); + this.dgvViolateFileData = new TemuKJD.UserComponent.DataGridViewEx(); this.splitContainer4 = new System.Windows.Forms.SplitContainer(); - this.statusBar = new LittleRabbit.UserControls.StatusBarUserControl(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); this.btnClear = new DevComponents.DotNetBar.PanelEx(); this.dataGridViewCheckBoxColumn1 = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.col_dir = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -204,7 +204,7 @@ this.ucGroupBoxEx3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); this.ucGroupBoxEx3.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.ucGroupBoxEx3.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx3.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; this.ucGroupBoxEx3.Controls.Add(this.chkOperateOffSale); this.ucGroupBoxEx3.Controls.Add(this.chkOperateDataBase); this.ucGroupBoxEx3.Controls.Add(this.chkOperateOnSale); @@ -307,7 +307,7 @@ | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.ucGroupBoxEx2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.ucGroupBoxEx2.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx2.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; this.ucGroupBoxEx2.Controls.Add(this.panel1); this.ucGroupBoxEx2.Controls.Add(this.flpViolate); this.ucGroupBoxEx2.Location = new System.Drawing.Point(338, 2); @@ -375,7 +375,7 @@ this.ucGroupBoxEx1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.ucGroupBoxEx1.BorderStyle = LittleRabbit.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; + this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; this.ucGroupBoxEx1.Controls.Add(this.btnRefreshShop); this.ucGroupBoxEx1.Location = new System.Drawing.Point(3, 2); this.ucGroupBoxEx1.Name = "ucGroupBoxEx1"; diff --git a/TEMUKJD/KJDForms/UploadForms/ViolateManageForm.cs b/TEMUKJD/KJDForms/UploadForms/ViolateManageForm.cs index e4c77d7..a194e92 100644 --- a/TEMUKJD/KJDForms/UploadForms/ViolateManageForm.cs +++ b/TEMUKJD/KJDForms/UploadForms/ViolateManageForm.cs @@ -3,8 +3,8 @@ using AllBase.Helper; using AllBase.Model.Param.FissionManage; using AllBase.Model.Param.ProductManage; using AllBase.Model.Result; -using LittleRabbit.Extension; -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.Extension; +using TemuKJD.KJDForms.BaseForms; using NaiBa.Util; using NaiBa.Util.Extension; using Newtonsoft.Json; @@ -25,7 +25,7 @@ using Work.BLL.Product; using Work.BLL.Upload; using Work.DouyinApiClass; -namespace LittleRabbit.LittleRabbitForms.UploadForms +namespace TemuKJD.KJDForms.UploadForms { public partial class ViolateManageForm : Form { @@ -92,7 +92,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms { string dataFromDescribe = GetDataFromDescribe(violateParam.DataFrom); - var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ShopAccountId == violateParam.DouShopId); + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == violateParam.DouShopId); Invoke(new Action(() => { this.dgvCheck.Rows.Add(true, dataFromDescribe, violateParam.DouShopId, shop?.ShopAccount, violateParam.DouProductId, @@ -116,7 +116,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms } else { - var list = GlobalConfig.DouShopLoginList.Where(s => s.ApiAuthStatus == "授权成功").Select(ss => ss.ShopAccountId).ToList(); + var list = GlobalConfig.ShopLoginList.Where(s => s.ApiAuthStatus == "授权成功").Select(ss => ss.ShopId).ToList(); foreach (DataGridViewRow row in dgvShop.Rows) { if (list.Any(l => l == row.Cells["colShopId"]?.Value?.ToString())) @@ -203,19 +203,19 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms { // 获取被删除的店铺 List dgvRowList = dgvShop.Rows.Cast().Where(row - => !GlobalConfig.DouShopLoginList.Any(s => s.ShopAccountId == row.Cells["colShopId"]?.Value?.ToString())).ToList(); + => !GlobalConfig.ShopLoginList.Any(s => s.ShopId == row.Cells["colShopId"]?.Value?.ToString())).ToList(); // 更新被删除的店铺列表 foreach (var row in dgvRowList) { dgvShop.Rows.Remove(row); } - for (int i = 0; i < GlobalConfig.DouShopLoginList.Count; i++) + for (int i = 0; i < GlobalConfig.ShopLoginList.Count; i++) { - var shop = GlobalConfig.DouShopLoginList[i]; - var row = dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value?.ToString() == shop.ShopAccountId); + var shop = GlobalConfig.ShopLoginList[i]; + var row = dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value?.ToString() == shop.ShopId); if (row == null) - dgvShop.Rows.Add(false, shop.ShopAccountId, shop.ShopAccount, shop.LoginStatus); + dgvShop.Rows.Add(false, shop.ShopId, shop.ShopAccount, shop.LoginStatus); else { row.Cells["colAuthStatus"].Value = shop.ApiAuthStatus; @@ -470,7 +470,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms var lstShopId = dgvShop.Rows.Cast() .Where(r => r.Cells["colSelect"].Value.ParseToBool()) .Select(r => r.Cells["colShopId"].Value?.ToString()).ToList(); - var shopList = GlobalConfig.DouShopLoginList.Where(s => lstShopId.Contains(s.ShopAccountId) && s.ApiAuthStatus == "授权成功").ToList(); + var shopList = GlobalConfig.ShopLoginList.Where(s => lstShopId.Contains(s.ShopId) && s.ApiAuthStatus == "授权成功").ToList(); if (shopList.Count == 0 && (chkOperateOffSale.Checked || chkOperateOnSale.Checked)) { BaseMsgForm.ShowInfo("请选择要清理素材的店铺"); @@ -554,7 +554,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms Invoke(new Action(() => { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { if (shop.PayStatus != 1) @@ -597,7 +597,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms currentNum += pageSize; if (cancellationTokenSource != null && cancellationTokenSource.IsCancellationRequested) { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { Invoke(new Action(() => { row.Cells["colMessage"].Value = "排查中断"; })); } break; } @@ -633,7 +633,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms deleteProductMessage = "排查结束，店铺没有仓库商品"; Invoke(new Action(() => { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colMessage"].Value = deleteProductMessage; } })); break; @@ -656,7 +656,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms deleteProductMessage = "已获取：" + currentNum + "，仓库商品获取中..."; Invoke(new Action(() => { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colMessage"].Value = deleteProductMessage; } })); } @@ -673,7 +673,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms deleteProductMessage = ("排查遇到错误，" + failMessage).TrimEnd('，'); Invoke(new Action(() => { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colMessage"].Value = deleteProductMessage; } })); } @@ -688,7 +688,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms deleteProductMessage = "店铺商品排查完成"; Invoke(new Action(() => { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colMessage"].Value = deleteProductMessage; } })); } @@ -698,7 +698,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms deleteProductMessage = "店铺商品排查完成"; Invoke(new Action(() => { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colMessage"].Value = deleteProductMessage; } })); } @@ -709,7 +709,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms { if (cancellationTokenSource != null && cancellationTokenSource.IsCancellationRequested) { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { Invoke(new Action(() => { row.Cells["colMessage"].Value = "排查中断"; })); } break; } @@ -724,7 +724,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms deleteProductMessage = "正在排查在售商品，第 " + (i + 1) + " 件商品，共 " + operateCount + " 件商品"; if (!isOperateOnline) deleteProductMessage = "正在排查仓库商品，第 " + (i + 1) + " 件商品，共 " + operateCount + " 件商品"; - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { row.Cells["colMessage"].Value = deleteProductMessage; } })); Thread.Sleep(Randomx.GetId(50, 150)); @@ -736,7 +736,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms { DataFrom = isOperateOnline ? 2 : 3, DouProductId = product.product_id.ToString(), - DouShopId = shop.ShopAccountId, + DouShopId = shop.ShopId, }; violateParamList.Add(violateParam); @@ -1220,7 +1220,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms DataGridViewRow row = null; Invoke(new Action(() => { - row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopAccountId); + row = this.dgvShop.Rows.Cast().FirstOrDefault(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); if (row != null) { if (isShowResult) @@ -1367,7 +1367,7 @@ namespace LittleRabbit.LittleRabbitForms.UploadForms } else { - var shop = GlobalConfig.DouShopLoginList.FirstOrDefault(s => s.ShopAccountId == shopId); + var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId); if (shop != null) { Dictionary dictionary = new Dictionary(); diff --git a/TEMUKJD/MainForm.cs b/TEMUKJD/MainForm.cs index c41a121..e38caa5 100644 --- a/TEMUKJD/MainForm.cs +++ b/TEMUKJD/MainForm.cs @@ -12,16 +12,16 @@ using CefSharp.WinForms; using DevComponents.DotNetBar; using AllBase; using Work; -using LittleRabbit.UserForm; -using LittleRabbit.LittleRabbitForms.BaseForms; -using LittleRabbit.LittleRabbitForms.ToolForms; +using TemuKJD.UserForm; +using TemuKJD.KJDForms.BaseForms; +using TemuKJD.KJDForms.ToolForms; using System.Reflection; using System.Net; using System.Collections; -using LittleRabbit.LittleRabbitForms.ShopForms; -using LittleRabbit.LittleRabbitForms.UploadForms; -using LittleRabbit.LittleRabbitForms.OrderForms; -using LittleRabbit.LittleRabbitForms.SystemForms; +using TemuKJD.KJDForms.ShopForms; +using TemuKJD.KJDForms.UploadForms; +using TemuKJD.KJDForms.OrderForms; +using TemuKJD.KJDForms.SystemForms; using Work.CollectClass; using Newtonsoft.Json; using System.Text; @@ -29,7 +29,7 @@ using System.IO; using CefSharp; using System.IO.Compression; using AllBase.Helper; -using LittleRabbit.LittleRabbitForms.CollectForms; +using TemuKJD.KJDForms.CollectForms; using System.Drawing.Drawing2D; using NaiBa.CefHelper; using Newtonsoft.Json.Linq; @@ -37,10 +37,10 @@ using AllBase.Model.Result; using NaiBa.Util.Extension; using NaiBa.Util; using AllBase.Model.Param.ProductManage; -using LittleRabbit.LittleRabbitForms.SalesCenterForms; +using TemuKJD.KJDForms.SalesCenterForms; using NaiBa.CefHelper.Handler; -namespace LittleRabbit +namespace TemuKJD { public partial class MainForm : Form { @@ -641,14 +641,14 @@ namespace LittleRabbit if (WindowState.Equals(FormWindowState.Normal)) { WindowState = FormWindowState.Maximized; - max.Style.BackgroundImage = global::LittleRabbit.Properties.Resources.normal; - max.StyleMouseOver.BackgroundImage = global::LittleRabbit.Properties.Resources.normal_hover; + max.Style.BackgroundImage = global::TemuKJD.Properties.Resources.normal; + max.StyleMouseOver.BackgroundImage = global::TemuKJD.Properties.Resources.normal_hover; } else if (WindowState.Equals(FormWindowState.Maximized)) { WindowState = FormWindowState.Normal; - max.Style.BackgroundImage = global::LittleRabbit.Properties.Resources.max; - max.StyleMouseOver.BackgroundImage = global::LittleRabbit.Properties.Resources.max_hover; + max.Style.BackgroundImage = global::TemuKJD.Properties.Resources.max; + max.StyleMouseOver.BackgroundImage = global::TemuKJD.Properties.Resources.max_hover; } } @@ -961,7 +961,7 @@ namespace LittleRabbit } } - foreach (var shop in GlobalConfig.DouShopLoginList) + foreach (var shop in GlobalConfig.ShopLoginList) { if (shop.LoginStatus != "登录成功") continue; @@ -988,7 +988,7 @@ namespace LittleRabbit Thread.Sleep(10000); // 读取过全部违规数据的不再读取 - if (dicLastGetFullViolateTime.ContainsKey(shop.ShopAccountId) && dicLastGetFullViolateTime[shop.ShopAccountId] > DateTime.Now.AddDays(-3000)) + if (dicLastGetFullViolateTime.ContainsKey(shop.ShopId) && dicLastGetFullViolateTime[shop.ShopId] > DateTime.Now.AddDays(-3000)) continue; for (int i = 2; i < 101; i++) @@ -1008,7 +1008,7 @@ namespace LittleRabbit if (t1.Result.Result?.ToString() != "success") break; } - dicLastGetFullViolateTime[shop.ShopAccountId] = DateTime.Now; + dicLastGetFullViolateTime[shop.ShopId] = DateTime.Now; NaiBa.Util.Helper.ConfigHelper.SaveConfig>("last_get_full_violate_time", dicLastGetFullViolateTime); } } diff --git a/TEMUKJD/MainForm.designer.cs b/TEMUKJD/MainForm.designer.cs index 22ac5ef..2bd95ec 100644 --- a/TEMUKJD/MainForm.designer.cs +++ b/TEMUKJD/MainForm.designer.cs @@ -1,7 +1,7 @@ -using LittleRabbit.UserComponent; +using TemuKJD.UserComponent; using System.Drawing; -namespace LittleRabbit +namespace TemuKJD { partial class MainForm { @@ -42,7 +42,7 @@ namespace LittleRabbit this.pnlTools = new DevComponents.DotNetBar.PanelEx(); this.pnlOrder = new DevComponents.DotNetBar.PanelEx(); this.pbLogo = new System.Windows.Forms.PictureBox(); - this.lklbGetHwCode = new LittleRabbit.UserComponent.LinkLabelLc(); + this.lklbGetHwCode = new TemuKJD.UserComponent.LinkLabelLc(); this.plTopRight = new System.Windows.Forms.Panel(); this.lblContactSupport = new DevComponents.DotNetBar.LabelX(); this.picPinDuoDuoToken = new System.Windows.Forms.PictureBox(); @@ -316,7 +316,7 @@ namespace LittleRabbit // // pbLogo // - this.pbLogo.Image = global::LittleRabbit.Properties.Resources.main_form_logo; + this.pbLogo.Image = global::TemuKJD.Properties.Resources.main_form_logo; this.pbLogo.Location = new System.Drawing.Point(10, 15); this.pbLogo.Name = "pbLogo"; this.pbLogo.Size = new System.Drawing.Size(180, 60); diff --git a/TEMUKJD/Program.cs b/TEMUKJD/Program.cs index 170e647..a6e1c6e 100644 --- a/TEMUKJD/Program.cs +++ b/TEMUKJD/Program.cs @@ -3,10 +3,10 @@ using System.IO; using System.Net; using System.Runtime.InteropServices; using System.Windows.Forms; -using LittleRabbit.UserForm; +using TemuKJD.UserForm; using Work; -namespace LittleRabbit +namespace TemuKJD { static class Program { diff --git a/TEMUKJD/Properties/Resources.Designer.cs b/TEMUKJD/Properties/Resources.Designer.cs index 67203c5..461504d 100644 --- a/TEMUKJD/Properties/Resources.Designer.cs +++ b/TEMUKJD/Properties/Resources.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace LittleRabbit.Properties { +namespace TemuKJD.Properties { using System; @@ -39,7 +39,7 @@ namespace LittleRabbit.Properties { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("LittleRabbit.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("TemuKJD.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; @@ -47,8 +47,8 @@ namespace LittleRabbit.Properties { } /// - /// 重写当前线程的 CurrentUICulture 属性 - /// 重写当前线程的 CurrentUICulture 属性。 + /// 重写当前线程的 CurrentUICulture 属性，对 + /// 使用此强类型资源类的所有资源查找执行重写。 /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { diff --git a/TEMUKJD/Properties/Settings.Designer.cs b/TEMUKJD/Properties/Settings.Designer.cs index 385f1c6..5b4b6d1 100644 --- a/TEMUKJD/Properties/Settings.Designer.cs +++ b/TEMUKJD/Properties/Settings.Designer.cs @@ -8,11 +8,11 @@ // //------------------------------------------------------------------------------ -namespace LittleRabbit.Properties { +namespace TemuKJD.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.6.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/TEMUKJD/StartUp.cs b/TEMUKJD/StartUp.cs index 053df11..decd0f2 100644 --- a/TEMUKJD/StartUp.cs +++ b/TEMUKJD/StartUp.cs @@ -5,8 +5,8 @@ using AllBase.Model.Param.CollectManage; using AllBase.Model.Param.ProductManage; using AllBase.Model.Param.ShopManage; using AllBase.Model.Result; -using LittleRabbit.LittleRabbitForms.BaseForms; -using LittleRabbit.LittleRabbitForms.UploadForms; +using TemuKJD.KJDForms.BaseForms; +using TemuKJD.KJDForms.UploadForms; using NaiBa.Util; using NaiBa.Util.Extension; using System; @@ -21,7 +21,7 @@ using System.Threading.Tasks; using Work; using Work.DouyinApiClass; -namespace LittleRabbit +namespace TemuKJD { public class StartUp { @@ -67,28 +67,28 @@ namespace LittleRabbit Thread.Sleep(100); // 获取本地店铺和服务端店铺。将服务端相关信息与本地店铺合并后暂时存在内存中（不保存敏感信息）。 - GlobalConfig.DouShopLoginList = new ConcurrentList(); + GlobalConfig.ShopLoginList = new ConcurrentList(); // 获取服务端店铺 - var serverDouShopList = LittleRabbitForms.ShopForms.ShopListForm.GetServerDouShop(); - //var localDouShopList = NaiBa.Util.Helper.ConfigHelper.LoadConfig>("dou_shop_login"); - //if (localDouShopList == null) - // localDouShopList = new ConcurrentList(); - //foreach (var serverShop in serverDouShopList) - //{ - // var localShop = localDouShopList.FirstOrDefault(s => s.ShopAccountId == serverShop.ShopAccountId); - // if (localShop == null) - // { - // localDouShopList.Add(serverShop); - // } - //} - var localDouShopList = new ConcurrentList(); - localDouShopList.AddRange(serverDouShopList); + var serverDouShopList = KJDForms.ShopForms.ShopListForm.GetServerDouShop(); + var localDouShopList = NaiBa.Util.Helper.ConfigHelper.LoadConfig>("dou_shop_login"); + if (localDouShopList == null) + localDouShopList = new ConcurrentList(); + foreach (var serverShop in serverDouShopList) + { + var localShop = localDouShopList.FirstOrDefault(s => s.LoginName == serverShop.LoginName && s.ShopId == serverShop.ShopId); + if (localShop == null) + { + localDouShopList.Add(serverShop); + } + } + //var localDouShopList = new ConcurrentList(); + //localDouShopList.AddRange(serverDouShopList); foreach (var localShop in localDouShopList) { - if (GlobalConfig.DouShopLoginList.Any(s => s.LoginName == localShop.LoginName && s.ShopAccountId == localShop.ShopAccountId)) + if (GlobalConfig.ShopLoginList.Any(s => s.LoginName == localShop.LoginName && s.ShopId == localShop.ShopId)) continue; - var serverShop = serverDouShopList.FirstOrDefault(s => s.LoginName == localShop.LoginName && s.ShopAccountId == localShop.ShopAccountId); + var serverShop = serverDouShopList.FirstOrDefault(s => s.LoginName == localShop.LoginName && s.ShopId == localShop.ShopId); if (serverShop != null) { localShop.ShopAccount = serverShop.ShopAccount; @@ -107,23 +107,23 @@ namespace LittleRabbit localShop.Group = serverShop.Group; if (localShop.TrialUploadCount < 0) localShop.TrialUploadCount = 0; - GlobalConfig.DouShopLoginList.Add(localShop); + GlobalConfig.ShopLoginList.Add(localShop); } } - GlobalConfig.DouShopLoginOtherAccountList = new ConcurrentList(); - GlobalConfig.DouShopLoginOtherAccountList.AddRange(localDouShopList.Where(l => !GlobalConfig.DouShopLoginList.Any(s => s.LoginName == l.LoginName))); + GlobalConfig.DouShopLoginOtherUserShopList = new ConcurrentList(); + GlobalConfig.DouShopLoginOtherUserShopList.AddRange(localDouShopList.Where(l => !GlobalConfig.ShopLoginList.Any(s => s.LoginName == l.LoginName))); + IsShopInit = true; + //while (true) + //{ + // var needRefresh = GlobalConfig.DouShopLoginList.Where(s => s.LastRefreshDate != DateTime.Now.ToString("yyyyMMdd")); + // if (LittleRabbitForms.ShopForms.ShopListForm.Instance == null) + // LittleRabbitForms.ShopForms.ShopListForm.Instance = new LittleRabbitForms.ShopForms.ShopListForm(); + // LittleRabbitForms.ShopForms.ShopListForm.Instance.CheckShopListLogin(needRefresh.Select(r => r.ShopAccount).ToArray(), false); + // IsShopInit = true; - while (true) - { - var needRefresh = GlobalConfig.DouShopLoginList.Where(s => s.LastRefreshDate != DateTime.Now.ToString("yyyyMMdd")); - if (LittleRabbitForms.ShopForms.ShopListForm.Instance == null) - LittleRabbitForms.ShopForms.ShopListForm.Instance = new LittleRabbitForms.ShopForms.ShopListForm(); - LittleRabbitForms.ShopForms.ShopListForm.Instance.CheckShopLoginAsync(needRefresh.Select(r => r.ShopAccount).ToArray(), false); - IsShopInit = true; - - Thread.Sleep(1000 * 3600 * 24); // 每天刷新下验证，如果没关闭软件的话 - } + // Thread.Sleep(1000 * 3600 * 24); // 每天刷新下验证，如果没关闭软件的话 + //} })); #endregion @@ -162,17 +162,17 @@ namespace LittleRabbit var tick = BaseClass.DateTimeToTimestampSeconds(new DateTime(2022, 4, 25)); while (true) { - if (GlobalConfig.DouShopLoginList.All(shop => shop.ApiAuthStatus != "授权成功" - || GlobalConfig.SameProductCheckParamList.Any(sp => sp.ShopId == shop.ShopAccountId && sp.IsGetSuccess))) + if (GlobalConfig.ShopLoginList.All(shop => shop.ApiAuthStatus != "授权成功" + || GlobalConfig.SameProductCheckParamList.Any(sp => sp.ShopId == shop.ShopId && sp.IsGetSuccess))) { Thread.Sleep(1000); continue; } tList.Clear(); - foreach (var shop in GlobalConfig.DouShopLoginList) + foreach (var shop in GlobalConfig.ShopLoginList) { - if (GlobalConfig.SameProductCheckParamList.Any(sp => sp.ShopId == shop.ShopAccountId && sp.IsGetSuccess)) + if (GlobalConfig.SameProductCheckParamList.Any(sp => sp.ShopId == shop.ShopId && sp.IsGetSuccess)) continue; if (shop.ApiAuthStatus != "授权成功") @@ -183,12 +183,12 @@ namespace LittleRabbit var shopTemp = shop; try { - var sameProductCheckParam = GlobalConfig.SameProductCheckParamList.FirstOrDefault(sp => sp.ShopId == shop.ShopAccountId); + var sameProductCheckParam = GlobalConfig.SameProductCheckParamList.FirstOrDefault(sp => sp.ShopId == shop.ShopId); if (sameProductCheckParam == null) { sameProductCheckParam = new SameProductCheckParam() { - ShopId = shopTemp.ShopAccountId, + ShopId = shopTemp.ShopId, ShopName = shopTemp.ShopAccount, ShopSamePrpductItemList = new List(), }; @@ -262,7 +262,7 @@ namespace LittleRabbit if (FileBase.Exists("temp/proxy.txt")) { string sAgentIpKey = FileBase.ReadAllText("temp/proxy.txt").Trim(); - LittleRabbitForms.ToolForms.ProxyForm.InitProxyIp(sAgentIpKey, false); + KJDForms.ToolForms.ProxyForm.InitProxyIp(sAgentIpKey, false); } } @@ -453,8 +453,8 @@ namespace LittleRabbit public static void SaveLocalShopLoginInfo() { ConcurrentList shopLoginListCopy = - JsonHelper.DeserializeJsonToObject>(JsonHelper.SerializeObject(GlobalConfig.DouShopLoginList)); - shopLoginListCopy.AddRange(GlobalConfig.DouShopLoginOtherAccountList); + JsonHelper.DeserializeJsonToObject>(JsonHelper.SerializeObject(GlobalConfig.ShopLoginList)); + shopLoginListCopy.AddRange(GlobalConfig.DouShopLoginOtherUserShopList); // 替换掉密码，cookie等敏感参数 foreach (var shop in shopLoginListCopy) { diff --git a/TEMUKJD/TaobaoLoginForm.cs b/TEMUKJD/TaobaoLoginForm.cs index c8a6ccc..5eadc2d 100644 --- a/TEMUKJD/TaobaoLoginForm.cs +++ b/TEMUKJD/TaobaoLoginForm.cs @@ -16,10 +16,10 @@ using System.Threading.Tasks; using CefSharp; using CefSharp.WinForms; using Work; -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.KJDForms.BaseForms; using NaiBa.CefHelper; -namespace LittleRabbit +namespace TemuKJD { public partial class TaobaoLoginForm : LRBaseForm { diff --git a/TEMUKJD/TaobaoLoginForm.designer.cs b/TEMUKJD/TaobaoLoginForm.designer.cs index 070c99f..0c856d2 100644 --- a/TEMUKJD/TaobaoLoginForm.designer.cs +++ b/TEMUKJD/TaobaoLoginForm.designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit +namespace TemuKJD { partial class TaobaoLoginForm { diff --git a/TEMUKJD/UserComponent/ButtonLc.cs b/TEMUKJD/UserComponent/ButtonLc.cs index b29285c..def4abf 100644 --- a/TEMUKJD/UserComponent/ButtonLc.cs +++ b/TEMUKJD/UserComponent/ButtonLc.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace LittleRabbit.UserComponent +namespace TemuKJD.UserComponent { class ButtonLc:Button { diff --git a/TEMUKJD/UserComponent/DataGridViewEx.cs b/TEMUKJD/UserComponent/DataGridViewEx.cs index 54a57f5..9075f11 100644 --- a/TEMUKJD/UserComponent/DataGridViewEx.cs +++ b/TEMUKJD/UserComponent/DataGridViewEx.cs @@ -8,7 +8,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using DevComponents.DotNetBar.Controls; -namespace LittleRabbit.UserComponent +namespace TemuKJD.UserComponent { public class DataGridViewEx : DataGridView { diff --git a/TEMUKJD/UserComponent/DataGridViewXEx.cs b/TEMUKJD/UserComponent/DataGridViewXEx.cs index d796732..b018b8c 100644 --- a/TEMUKJD/UserComponent/DataGridViewXEx.cs +++ b/TEMUKJD/UserComponent/DataGridViewXEx.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using DevComponents.DotNetBar.Controls; -namespace LittleRabbit.UserComponent +namespace TemuKJD.UserComponent { public class DataGridViewXEx : DataGridViewX { diff --git a/TEMUKJD/UserComponent/UcComboBoxBase.cs b/TEMUKJD/UserComponent/UcComboBoxBase.cs index 5a3fba7..07bd994 100644 --- a/TEMUKJD/UserComponent/UcComboBoxBase.cs +++ b/TEMUKJD/UserComponent/UcComboBoxBase.cs @@ -8,7 +8,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace LittleRabbit.UserComponent +namespace TemuKJD.UserComponent { /// /// 自定义combobox控件 diff --git a/TEMUKJD/UserComponent/UcGroupBoxEx.Designer.cs b/TEMUKJD/UserComponent/UcGroupBoxEx.Designer.cs index c3e2d4b..d41dadf 100644 --- a/TEMUKJD/UserComponent/UcGroupBoxEx.Designer.cs +++ b/TEMUKJD/UserComponent/UcGroupBoxEx.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.UserComponent +namespace TemuKJD.UserComponent { partial class UcGroupBoxEx { diff --git a/TEMUKJD/UserComponent/UcGroupBoxEx.cs b/TEMUKJD/UserComponent/UcGroupBoxEx.cs index 03ee507..5026165 100644 --- a/TEMUKJD/UserComponent/UcGroupBoxEx.cs +++ b/TEMUKJD/UserComponent/UcGroupBoxEx.cs @@ -8,7 +8,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace LittleRabbit.UserComponent +namespace TemuKJD.UserComponent { /// /// 可以改变边框颜色的groupbox diff --git a/TEMUKJD/UserComponent/UcTabControl.cs b/TEMUKJD/UserComponent/UcTabControl.cs index 17b5f2f..2098009 100644 --- a/TEMUKJD/UserComponent/UcTabControl.cs +++ b/TEMUKJD/UserComponent/UcTabControl.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using System.Runtime.InteropServices; -namespace LittleRabbit.UserComponent +namespace TemuKJD.UserComponent { public partial class UcTabControl : TabControl { diff --git a/TEMUKJD/UserComponent/UcTabControl.designer.cs b/TEMUKJD/UserComponent/UcTabControl.designer.cs index 176c578..ac3960a 100644 --- a/TEMUKJD/UserComponent/UcTabControl.designer.cs +++ b/TEMUKJD/UserComponent/UcTabControl.designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.UserComponent +namespace TemuKJD.UserComponent { partial class UcTabControl { diff --git a/TEMUKJD/UserComponent/UcTreeView.Designer.cs b/TEMUKJD/UserComponent/UcTreeView.Designer.cs index 07479ba..12f7880 100644 --- a/TEMUKJD/UserComponent/UcTreeView.Designer.cs +++ b/TEMUKJD/UserComponent/UcTreeView.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.UserComponent +namespace TemuKJD.UserComponent { partial class UcTreeView { diff --git a/TEMUKJD/UserComponent/UcTreeView.cs b/TEMUKJD/UserComponent/UcTreeView.cs index f4b865d..e2c7ab0 100644 --- a/TEMUKJD/UserComponent/UcTreeView.cs +++ b/TEMUKJD/UserComponent/UcTreeView.cs @@ -10,7 +10,7 @@ using System.Windows.Forms; using System.Drawing.Drawing2D; using System.Threading; -namespace LittleRabbit.UserComponent +namespace TemuKJD.UserComponent { /// /// 基于树视图的任务控件 diff --git a/TEMUKJD/UserControls/ButtonEx.cs b/TEMUKJD/UserControls/ButtonEx.cs index aa7a94e..f97175c 100644 --- a/TEMUKJD/UserControls/ButtonEx.cs +++ b/TEMUKJD/UserControls/ButtonEx.cs @@ -8,7 +8,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace LittleRabbit.UserControls +namespace TemuKJD.UserControls { public partial class ButtonEx : Button { diff --git a/TEMUKJD/UserControls/CustomDataGridViewTextBoxCell.cs b/TEMUKJD/UserControls/CustomDataGridViewTextBoxCell.cs index 1c91fdd..bbee035 100644 --- a/TEMUKJD/UserControls/CustomDataGridViewTextBoxCell.cs +++ b/TEMUKJD/UserControls/CustomDataGridViewTextBoxCell.cs @@ -6,7 +6,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace LittleRabbit.UserControls +namespace TemuKJD.UserControls { /// /// 无边框的DataGridView单元格 diff --git a/TEMUKJD/UserControls/StatusBarUserControl.cs b/TEMUKJD/UserControls/StatusBarUserControl.cs index 1c5d22a..ac42cb3 100644 --- a/TEMUKJD/UserControls/StatusBarUserControl.cs +++ b/TEMUKJD/UserControls/StatusBarUserControl.cs @@ -1,6 +1,6 @@ using System.Windows.Forms; -namespace LittleRabbit.UserControls +namespace TemuKJD.UserControls { public partial class StatusBarUserControl : UserControl { diff --git a/TEMUKJD/UserControls/StatusBarUserControl.designer.cs b/TEMUKJD/UserControls/StatusBarUserControl.designer.cs index ee1e679..3e20e15 100644 --- a/TEMUKJD/UserControls/StatusBarUserControl.designer.cs +++ b/TEMUKJD/UserControls/StatusBarUserControl.designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.UserControls +namespace TemuKJD.UserControls { partial class StatusBarUserControl { diff --git a/TEMUKJD/UserForm/LoginForm.Designer.cs b/TEMUKJD/UserForm/LoginForm.Designer.cs index 2961c22..95cf105 100644 --- a/TEMUKJD/UserForm/LoginForm.Designer.cs +++ b/TEMUKJD/UserForm/LoginForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.UserForm +namespace TemuKJD.UserForm { partial class LoginForm { @@ -183,7 +183,7 @@ this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.panelEx1.Style.BackgroundImage = global::LittleRabbit.Properties.Resources.login_bg; + this.panelEx1.Style.BackgroundImage = global::TemuKJD.Properties.Resources.login_bg; this.panelEx1.Style.BackgroundImagePosition = DevComponents.DotNetBar.eBackgroundImagePosition.Center; this.panelEx1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; this.panelEx1.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; @@ -209,11 +209,11 @@ this.closePanel.Style.BackColor1.Color = System.Drawing.Color.Transparent; this.closePanel.Style.BackColor2.Alpha = ((byte)(0)); this.closePanel.Style.BackColor2.Color = System.Drawing.Color.Transparent; - this.closePanel.Style.BackgroundImage = global::LittleRabbit.Properties.Resources.close; + this.closePanel.Style.BackgroundImage = global::TemuKJD.Properties.Resources.close; this.closePanel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.closePanel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; this.closePanel.Style.GradientAngle = 90; - this.closePanel.StyleMouseOver.BackgroundImage = global::LittleRabbit.Properties.Resources.close_hover; + this.closePanel.StyleMouseOver.BackgroundImage = global::TemuKJD.Properties.Resources.close_hover; this.closePanel.TabIndex = 1; this.closePanel.Click += new System.EventHandler(this.closePanel_Click); // @@ -228,7 +228,7 @@ this.panelEx2.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelEx2.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.panelEx2.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.panelEx2.Style.BackgroundImage = global::LittleRabbit.Properties.Resources.login_user_ico; + this.panelEx2.Style.BackgroundImage = global::TemuKJD.Properties.Resources.login_user_ico; this.panelEx2.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; this.panelEx2.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.panelEx2.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; @@ -269,7 +269,7 @@ this.panelEx3.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelEx3.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.panelEx3.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.panelEx3.Style.BackgroundImage = global::LittleRabbit.Properties.Resources.login_input_bg; + this.panelEx3.Style.BackgroundImage = global::TemuKJD.Properties.Resources.login_input_bg; this.panelEx3.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; this.panelEx3.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.panelEx3.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; diff --git a/TEMUKJD/UserForm/LoginForm.cs b/TEMUKJD/UserForm/LoginForm.cs index 029acef..8a7bbd7 100644 --- a/TEMUKJD/UserForm/LoginForm.cs +++ b/TEMUKJD/UserForm/LoginForm.cs @@ -1,7 +1,7 @@ using AllBase; using CefSharp; using CefSharp.WinForms; -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.KJDForms.BaseForms; using System; using System.Collections.Generic; using System.Diagnostics; @@ -14,7 +14,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using Work; -namespace LittleRabbit.UserForm +namespace TemuKJD.UserForm { public partial class LoginForm : Form { diff --git a/TEMUKJD/UserForm/RegeditForm.Designer.cs b/TEMUKJD/UserForm/RegeditForm.Designer.cs index e8d03ce..f3f2196 100644 --- a/TEMUKJD/UserForm/RegeditForm.Designer.cs +++ b/TEMUKJD/UserForm/RegeditForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.UserForm +namespace TemuKJD.UserForm { partial class RegeditForm { @@ -340,7 +340,7 @@ this.regeditPanel.Style.Alignment = System.Drawing.StringAlignment.Center; this.regeditPanel.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.regeditPanel.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.regeditPanel.Style.BackgroundImage = global::LittleRabbit.Properties.Resources.regedit_bg; + this.regeditPanel.Style.BackgroundImage = global::TemuKJD.Properties.Resources.regedit_bg; this.regeditPanel.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; this.regeditPanel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.regeditPanel.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; @@ -363,7 +363,7 @@ this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.panelEx1.Style.BackgroundImage = global::LittleRabbit.Properties.Resources.login_bg; + this.panelEx1.Style.BackgroundImage = global::TemuKJD.Properties.Resources.login_bg; this.panelEx1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; this.panelEx1.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.panelEx1.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; @@ -388,11 +388,11 @@ this.closePanel.Style.BackColor1.Color = System.Drawing.Color.Transparent; this.closePanel.Style.BackColor2.Alpha = ((byte)(0)); this.closePanel.Style.BackColor2.Color = System.Drawing.Color.Transparent; - this.closePanel.Style.BackgroundImage = global::LittleRabbit.Properties.Resources.close; + this.closePanel.Style.BackgroundImage = global::TemuKJD.Properties.Resources.close; this.closePanel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.closePanel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; this.closePanel.Style.GradientAngle = 90; - this.closePanel.StyleMouseOver.BackgroundImage = global::LittleRabbit.Properties.Resources.close_hover; + this.closePanel.StyleMouseOver.BackgroundImage = global::TemuKJD.Properties.Resources.close_hover; this.closePanel.TabIndex = 0; this.closePanel.Click += new System.EventHandler(this.closePanel_Click); // diff --git a/TEMUKJD/UserForm/RegeditForm.cs b/TEMUKJD/UserForm/RegeditForm.cs index 494f959..c01db5f 100644 --- a/TEMUKJD/UserForm/RegeditForm.cs +++ b/TEMUKJD/UserForm/RegeditForm.cs @@ -8,10 +8,10 @@ using System.Text; using System.Threading; using System.Windows.Forms; using AllBase; -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.KJDForms.BaseForms; using Work; -namespace LittleRabbit.UserForm +namespace TemuKJD.UserForm { public partial class RegeditForm : Form { diff --git a/TEMUKJD/UserForm/ResetPasswordForm.Designer.cs b/TEMUKJD/UserForm/ResetPasswordForm.Designer.cs index d0beca4..6d4729b 100644 --- a/TEMUKJD/UserForm/ResetPasswordForm.Designer.cs +++ b/TEMUKJD/UserForm/ResetPasswordForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.UserForm +namespace TemuKJD.UserForm { partial class ResetPasswordForm { @@ -61,7 +61,7 @@ this.panelEx2.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelEx2.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.panelEx2.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.panelEx2.Style.BackgroundImage = global::LittleRabbit.Properties.Resources.login_bg; + this.panelEx2.Style.BackgroundImage = global::TemuKJD.Properties.Resources.login_bg; this.panelEx2.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; this.panelEx2.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.panelEx2.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; @@ -86,12 +86,12 @@ this.closePanel.Style.BackColor1.Color = System.Drawing.Color.Transparent; this.closePanel.Style.BackColor2.Alpha = ((byte)(0)); this.closePanel.Style.BackColor2.Color = System.Drawing.Color.Transparent; - this.closePanel.Style.BackgroundImage = global::LittleRabbit.Properties.Resources.close; + this.closePanel.Style.BackgroundImage = global::TemuKJD.Properties.Resources.close; this.closePanel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.closePanel.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; this.closePanel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; this.closePanel.Style.GradientAngle = 90; - this.closePanel.StyleMouseOver.BackgroundImage = global::LittleRabbit.Properties.Resources.close_hover; + this.closePanel.StyleMouseOver.BackgroundImage = global::TemuKJD.Properties.Resources.close_hover; this.closePanel.TabIndex = 0; this.closePanel.Click += new System.EventHandler(this.closePanel_Click); // @@ -295,7 +295,7 @@ this.regeditPanel.Style.Alignment = System.Drawing.StringAlignment.Center; this.regeditPanel.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.regeditPanel.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; - this.regeditPanel.Style.BackgroundImage = global::LittleRabbit.Properties.Resources.regedit_bg; + this.regeditPanel.Style.BackgroundImage = global::TemuKJD.Properties.Resources.regedit_bg; this.regeditPanel.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; this.regeditPanel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.regeditPanel.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; diff --git a/TEMUKJD/UserForm/ResetPasswordForm.cs b/TEMUKJD/UserForm/ResetPasswordForm.cs index 7627dcf..dcf77e8 100644 --- a/TEMUKJD/UserForm/ResetPasswordForm.cs +++ b/TEMUKJD/UserForm/ResetPasswordForm.cs @@ -3,10 +3,10 @@ using System.Drawing; using System.Threading; using System.Windows.Forms; using AllBase; -using LittleRabbit.LittleRabbitForms.BaseForms; +using TemuKJD.KJDForms.BaseForms; using Work; -namespace LittleRabbit.UserForm +namespace TemuKJD.UserForm { public partial class ResetPasswordForm : Form { diff --git a/TEMUKJD/UserForm/SupportQrCodeForm.Designer.cs b/TEMUKJD/UserForm/SupportQrCodeForm.Designer.cs index 559c9eb..08e0d35 100644 --- a/TEMUKJD/UserForm/SupportQrCodeForm.Designer.cs +++ b/TEMUKJD/UserForm/SupportQrCodeForm.Designer.cs @@ -1,4 +1,4 @@ -namespace LittleRabbit.UserForm +namespace TemuKJD.UserForm { partial class SupportQrCodeForm { @@ -63,7 +63,7 @@ | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.pictureBox1.ErrorImage = null; - this.pictureBox1.Image = global::LittleRabbit.Properties.Resources.qrcode; + this.pictureBox1.Image = global::TemuKJD.Properties.Resources.qrcode; this.pictureBox1.Location = new System.Drawing.Point(17, 12); this.pictureBox1.Name = "pictureBox1"; this.pictureBox1.Size = new System.Drawing.Size(156, 135); diff --git a/TEMUKJD/UserForm/SupportQrCodeForm.cs b/TEMUKJD/UserForm/SupportQrCodeForm.cs index 2365232..6eeb6fe 100644 --- a/TEMUKJD/UserForm/SupportQrCodeForm.cs +++ b/TEMUKJD/UserForm/SupportQrCodeForm.cs @@ -8,9 +8,9 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace LittleRabbit.UserForm +namespace TemuKJD.UserForm { - public partial class SupportQrCodeForm : LittleRabbitForms.BaseForms.LRBaseForm + public partial class SupportQrCodeForm : KJDForms.BaseForms.LRBaseForm { public SupportQrCodeForm() { diff --git a/Work/BLL/Upload/UploadProductBLL.cs b/Work/BLL/Upload/UploadProductBLL.cs index 689e309..18da970 100644 --- a/Work/BLL/Upload/UploadProductBLL.cs +++ b/Work/BLL/Upload/UploadProductBLL.cs @@ -457,7 +457,7 @@ namespace Work.BLL.Upload title = title.Replace(delStr, ""); } - var cookieShops = GlobalConfig.DouShopLoginList.Where(s => s.LoginStatus == "登录成功" && s.ShopAccountId == dShop.ShopAccountId).ToList(); + var cookieShops = GlobalConfig.ShopLoginList.Where(s => s.LoginStatus == "登录成功" && s.ShopId == dShop.ShopId).ToList(); if (cookieShops.Count == 0) { msg = "店铺未登录"; @@ -1007,7 +1007,7 @@ namespace Work.BLL.Upload var apiGetOutIdExist = new DouyinApi(Shop); // 老上货数据判断是否重复铺货 - var shopItems = GlobalConfig.SameProductCheckParamList.Find(sit => sit.ShopId == Shop.ShopAccountId); + var shopItems = GlobalConfig.SameProductCheckParamList.Find(sit => sit.ShopId == Shop.ShopId); var productIdExist = shopItems?.ShopSamePrpductItemList.Find(it => it.outer_product_id.Contains(p.from_id.ToString())); if (productIdExist != null) apiGetOutIdExist.JsonData.Add("product_id", productIdExist.product_id.ToString()); @@ -2243,8 +2243,8 @@ namespace Work.BLL.Upload { Shop.TrialUploadCount++; NaiBa.Util.ConcurrentList shopLoginListCopy = - JsonHelper.DeserializeJsonToObject>(JsonHelper.SerializeObject(GlobalConfig.DouShopLoginList)); - shopLoginListCopy.AddRange(GlobalConfig.DouShopLoginOtherAccountList); + JsonHelper.DeserializeJsonToObject>(JsonHelper.SerializeObject(GlobalConfig.ShopLoginList)); + shopLoginListCopy.AddRange(GlobalConfig.DouShopLoginOtherUserShopList); // 替换掉密码，cookie等敏感参数 foreach (var shop in shopLoginListCopy) { @@ -2267,7 +2267,7 @@ namespace Work.BLL.Upload string url = BaseClass.LoginApiUrl + "?obj=douyin/upload&act=add_upload_log"; string data = "&product_id=" + t.FromId + "&source_id=" + GetPrev(t.FromType).Trim('-') + "&cat_id=" + catId + "&message=" + HttpUtility.UrlEncode((message + "^" + sub_msg).Trim('^'), Encoding.UTF8); - string param = UserLogin.GetSignaturex(Shop.ShopAccountId, Shop.ShopAccount) + data; + string param = UserLogin.GetSignaturex(Shop.ShopId, Shop.ShopAccount) + data; string result = GetHtml.PostUtf8(url, param); } @@ -2338,7 +2338,7 @@ namespace Work.BLL.Upload { string urlx = BaseClass.LoginApiUrl + "?obj=upshopid/upid_dd&act=get"; string datax = "&pid=" + product_id + "&table=" + (product_id % 1024); - string htmlx = GetHtml.PostUtf8(urlx, UserLogin.GetSignaturex(Shop.ShopAccountId, Shop.ShopAccount) + datax); + string htmlx = GetHtml.PostUtf8(urlx, UserLogin.GetSignaturex(Shop.ShopId, Shop.ShopAccount) + datax); if (!string.IsNullOrEmpty(htmlx)) return true; else @@ -2354,17 +2354,17 @@ namespace Work.BLL.Upload } string url = BaseClass.LoginApiUrl + "?obj=upshopid/upid_dd&act=insert"; string data = "&pid=" + pid + "&up_id=" + upProductId + "&table=" + (pid % 1024) + "&up_table=" + (up_table % 1024); - string param = UserLogin.GetSignaturex(Shop.ShopAccountId, Shop.ShopAccount) + data; + string param = UserLogin.GetSignaturex(Shop.ShopId, Shop.ShopAccount) + data; string html = GetHtml.PostUtf8(url, param); if (html != "ok") { Thread.Sleep(15 * 1000); - html = GetHtml.PostUtf8(url, UserLogin.GetSignaturex(Shop.ShopAccountId, Shop.ShopAccount) + data); + html = GetHtml.PostUtf8(url, UserLogin.GetSignaturex(Shop.ShopId, Shop.ShopAccount) + data); } if (html != "ok") { Thread.Sleep(15 * 1000); - html = GetHtml.PostUtf8(url, UserLogin.GetSignaturex(Shop.ShopAccountId, Shop.ShopAccount) + data); + html = GetHtml.PostUtf8(url, UserLogin.GetSignaturex(Shop.ShopId, Shop.ShopAccount) + data); } if (html != "ok") {