diff --git a/AllBase/AllBase.csproj b/AllBase/AllBase.csproj
index a6feb7d..6105b12 100644
--- a/AllBase/AllBase.csproj
+++ b/AllBase/AllBase.csproj
@@ -90,7 +90,7 @@
DEBUG;TRACE
true
full
- AnyCPU
+ x64
false
7.3
prompt
diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs
index bcc859c..f2146e3 100644
--- a/AllBase/BaseClass.cs
+++ b/AllBase/BaseClass.cs
@@ -27,7 +27,7 @@ namespace AllBase
///
/// 鐗堟湰ID
///
- public static int VersionCount = 1200;
+ public static int VersionCount = 1203;
public static string MainPath = "29wx";
//public static string MainPath = "29wx";
//public static string MainPath = "29pdd";
diff --git a/KJDService/KJD_WebService/BLL/KJD/UpdateManage.cs b/KJDService/KJD_WebService/BLL/KJD/UpdateManage.cs
index 0bb1118..2dbf444 100644
--- a/KJDService/KJD_WebService/BLL/KJD/UpdateManage.cs
+++ b/KJDService/KJD_WebService/BLL/KJD/UpdateManage.cs
@@ -73,8 +73,8 @@ namespace KJD_Web.BLL
var LowVersion = System.Configuration.ConfigurationManager.ConnectionStrings["LowVersion"].ConnectionString;
int MaxVersion = 999999;
- //if (version <= 1198)
- // MaxVersion = 1198;
+ if (version <= 1200)
+ MaxVersion = 1200;
if (version <= 1159)
MaxVersion = 1159;
diff --git a/PackTools/package260701wx x64.nsi b/PackTools/package260701wx x64.nsi
index 6aeaa81..e0c2d76 100644
--- a/PackTools/package260701wx x64.nsi
+++ b/PackTools/package260701wx x64.nsi
@@ -2,7 +2,7 @@
; 安装程序初始定义常量
!define PRODUCT_NAME "29供应链-微信小店管理工具"
-!define PRODUCT_VERSION "v12.00"
+!define PRODUCT_VERSION "v12.02"
!define PRODUCT_PUBLISHER "29供应链软件制作组"
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\29供应链.exe"
!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
diff --git a/TEMUKJD CEFv138.sln b/TEMUKJD CEFv138.sln
index 771d1a1..abd89ff 100644
--- a/TEMUKJD CEFv138.sln
+++ b/TEMUKJD CEFv138.sln
@@ -45,8 +45,8 @@ Global
{38E74D4C-2D8D-47D2-8A23-417C3C57ADE5}.Release|x86.Build.0 = Release|x86
{B8EE868D-56CD-4647-BBA5-04BEF24FF9F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B8EE868D-56CD-4647-BBA5-04BEF24FF9F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {B8EE868D-56CD-4647-BBA5-04BEF24FF9F6}.Debug|x64.ActiveCfg = Debug|Any CPU
- {B8EE868D-56CD-4647-BBA5-04BEF24FF9F6}.Debug|x64.Build.0 = Debug|Any CPU
+ {B8EE868D-56CD-4647-BBA5-04BEF24FF9F6}.Debug|x64.ActiveCfg = Debug|x64
+ {B8EE868D-56CD-4647-BBA5-04BEF24FF9F6}.Debug|x64.Build.0 = Debug|x64
{B8EE868D-56CD-4647-BBA5-04BEF24FF9F6}.Debug|x86.ActiveCfg = Debug|Any CPU
{B8EE868D-56CD-4647-BBA5-04BEF24FF9F6}.Debug|x86.Build.0 = Debug|Any CPU
{B8EE868D-56CD-4647-BBA5-04BEF24FF9F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/TEMUKJD/ChangeForm.cs b/TEMUKJD/ChangeForm.cs
index 071a4d2..7ffc610 100644
--- a/TEMUKJD/ChangeForm.cs
+++ b/TEMUKJD/ChangeForm.cs
@@ -46,7 +46,7 @@ namespace TemuKJD
if (BaseClass.MainPath != "29wx") // 鍦ㄦ澶勫垏鎹㈡槸鍚︽樉绀虹櫥褰曞鏈嶉夐」鍔熻兘
{
label1.Visible = true;
- pnlChat.Visible = pnlUploadGoods.Visible = false;
+ pnlChat.Visible = pnlUploadGoods.Visible = pnlAiTalk.Visible = pnlPurchase.Visible = false;
Task.Run(() =>
{
System.Threading.Thread.Sleep(100);
@@ -63,6 +63,7 @@ namespace TemuKJD
if (BaseClass.ForbiddenPage.Contains("瀹㈡湇"))
{
pnlChat.Visible = false;
+ pnlAiTalk.Visible = false;
//pnlUpload_Click(null, null);
}
if (BaseClass.ForbiddenPage.Contains("鎷嶅崟"))
@@ -70,6 +71,11 @@ namespace TemuKJD
pnlPurchase.Visible = false;
//pnlUpload_Click(null, null);
}
+ if (BaseClass.ForbiddenPage.Contains("涓婅揣"))
+ {
+ pnlUploadGoods.Visible = false;
+ //pnlUpload_Click(null, null);
+ }
}
this.pnlChat.StyleMouseOver.BorderColor.Color = GlobalConfig.BorderColor;
this.pnlUploadGoods.StyleMouseOver.BorderColor.Color = GlobalConfig.BorderColor;
diff --git a/TEMUKJD/KJD.csproj b/TEMUKJD/KJD.csproj
index b89ea19..feb8b7a 100644
--- a/TEMUKJD/KJD.csproj
+++ b/TEMUKJD/KJD.csproj
@@ -62,7 +62,7 @@
..\bin\
DEBUG;TRACE
full
- AnyCPU
+ x64
7.3
prompt
false
diff --git a/TEMUKJD/Resources/icon.ico b/TEMUKJD/Resources/icon.ico
index ecb3eea..059d46c 100644
Binary files a/TEMUKJD/Resources/icon.ico and b/TEMUKJD/Resources/icon.ico differ
diff --git a/TEMUKJD/WXForms/AiTalkForms/WxAiTalkForm.cs b/TEMUKJD/WXForms/AiTalkForms/WxAiTalkForm.cs
index 7231e3c..9f376ad 100644
--- a/TEMUKJD/WXForms/AiTalkForms/WxAiTalkForm.cs
+++ b/TEMUKJD/WXForms/AiTalkForms/WxAiTalkForm.cs
@@ -421,7 +421,7 @@ namespace TemuKJD.WXForms.AiTalkForms
{
if (aiTalkWebBrowser == null)
{
- aiTalkWebBrowser = CEFBrowser.CreateChromiumWebBrowser("about:blank", false);
+ aiTalkWebBrowser = CEFBrowser.CreateChromiumWebBrowser("about:blank", true);
CustomResourceRequestHandler resourceRequestHandler = new CustomResourceRequestHandler();
var handler = resourceRequestHandler;
handler.ResourceLoadCompleteEvent += RequestHandler_ResourceLoadComplete;
@@ -863,7 +863,7 @@ namespace TemuKJD.WXForms.AiTalkForms
shopLoginFrom.btnSaveAppSecret.Text = "鎴戝凡鎺ュ叆锛屽叧闂獥鍙";
Task.Run(() =>
- {
+ {
Thread.Sleep(500);
BatchBindShop(new List { shop.ShopId });
});
@@ -1243,7 +1243,7 @@ namespace TemuKJD.WXForms.AiTalkForms
{
if (btnClose.Text == ">>")
{
- splitContainer1.SplitterDistance = 496;
+ splitContainer1.SplitterDistance = 379;
btnClose.Text = "<<";
}
else
diff --git a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs
index 96698ee..126181b 100644
--- a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs
+++ b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs
@@ -485,7 +485,7 @@ namespace TemuKJD.WXForms.ProductForms
return;
}
}
- if (itemObj["serviceName"].ParseToString() == "涓滃唴閮")
+ if (itemObj["serviceName"].ParseToString() == "涓滃唴閮" || itemObj["serviceName"].ParseToString() == "29ERP")
{
var expiresTick = itemObj["expireTime"].ParseToLong();
var WxShopAuthInfo = new AuthInfo() { ShopId = shop.ShopId, UpdateTime = DateTime.Now, ExpiresTime = BaseClass.StampToDateTime(expiresTick.ParseToInt()) };
@@ -841,7 +841,8 @@ namespace TemuKJD.WXForms.ProductForms
WXShopLoginForm shopLoginForm = new WXShopLoginForm(shop);
shopLoginForm.openType = EnumOpenType.manage;
shopLoginForm.WindowState = FormWindowState.Maximized;
- shopLoginForm.InitUrl = "https://store.weixin.qq.com/shop/servicemarket/detail?serviceId=3984039898079707139";
+ //shopLoginForm.InitUrl = "https://store.weixin.qq.com/shop/servicemarket/detail?serviceId=3984039898079707139";
+ shopLoginForm.InitUrl = "https://store.weixin.qq.com/shop/servicemarket/detail?serviceId=4431685489938137094";
shopLoginForm.Show();
}
break;
diff --git a/TEMUKJD/WXForms/ShopForms/WXShopLoginForm.Designer.cs b/TEMUKJD/WXForms/ShopForms/WXShopLoginForm.Designer.cs
index 464e502..b2669fa 100644
--- a/TEMUKJD/WXForms/ShopForms/WXShopLoginForm.Designer.cs
+++ b/TEMUKJD/WXForms/ShopForms/WXShopLoginForm.Designer.cs
@@ -95,7 +95,7 @@
this.splitContainer1.Panel2.Controls.Add(this.btnReload);
this.splitContainer1.Panel2.Controls.Add(this.chkCloseAfterLogin);
this.splitContainer1.Size = new System.Drawing.Size(1438, 736);
- this.splitContainer1.SplitterDistance = 672;
+ this.splitContainer1.SplitterDistance = 673;
this.splitContainer1.SplitterWidth = 3;
this.splitContainer1.TabIndex = 4;
//
@@ -182,7 +182,7 @@
this.btnSaveAppSecret.Font = new System.Drawing.Font("寰蒋闆呴粦", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSaveAppSecret.Location = new System.Drawing.Point(927, 5);
this.btnSaveAppSecret.Name = "btnSaveAppSecret";
- this.btnSaveAppSecret.Size = new System.Drawing.Size(92, 24);
+ this.btnSaveAppSecret.Size = new System.Drawing.Size(120, 24);
this.btnSaveAppSecret.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnSaveAppSecret.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnSaveAppSecret.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -215,7 +215,7 @@
//
this.txtSecret.Location = new System.Drawing.Point(522, 31);
this.txtSecret.Name = "txtSecret";
- this.txtSecret.Size = new System.Drawing.Size(497, 23);
+ this.txtSecret.Size = new System.Drawing.Size(525, 23);
this.txtSecret.TabIndex = 470;
this.txtSecret.Visible = false;
//
diff --git a/TEMUKJD/WXForms/ShopForms/WXSubAccountListForm.Designer.cs b/TEMUKJD/WXForms/ShopForms/WXSubAccountListForm.Designer.cs
index aa55b2c..443ad1a 100644
--- a/TEMUKJD/WXForms/ShopForms/WXSubAccountListForm.Designer.cs
+++ b/TEMUKJD/WXForms/ShopForms/WXSubAccountListForm.Designer.cs
@@ -32,6 +32,8 @@
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
this.splitContainer5 = new System.Windows.Forms.SplitContainer();
+ this.buttonEx2 = new TemuKJD.UserControls.ButtonEx();
+ this.buttonEx1 = new TemuKJD.UserControls.ButtonEx();
this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
this.ucCheckBox1 = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.ucCheckBox2 = new TemuKJD.UserComponent.UcCheckBox(this.components);
@@ -84,6 +86,8 @@
//
// splitContainer5.Panel1
//
+ this.splitContainer5.Panel1.Controls.Add(this.buttonEx2);
+ this.splitContainer5.Panel1.Controls.Add(this.buttonEx1);
this.splitContainer5.Panel1.Controls.Add(this.flowLayoutPanel1);
this.splitContainer5.Panel1.Controls.Add(this.lblForbiddenPage);
this.splitContainer5.Panel1.Controls.Add(this.label1);
@@ -116,6 +120,36 @@
this.splitContainer5.SplitterWidth = 1;
this.splitContainer5.TabIndex = 2;
//
+ // buttonEx2
+ //
+ this.buttonEx2.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+ this.buttonEx2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.buttonEx2.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.buttonEx2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+ this.buttonEx2.ForeColor = System.Drawing.Color.White;
+ this.buttonEx2.Location = new System.Drawing.Point(210, 232);
+ this.buttonEx2.Name = "buttonEx2";
+ this.buttonEx2.Size = new System.Drawing.Size(50, 25);
+ this.buttonEx2.TabIndex = 42;
+ this.buttonEx2.Text = "鍏ㄧ┖";
+ this.buttonEx2.UseVisualStyleBackColor = false;
+ this.buttonEx2.Click += new System.EventHandler(this.btnEmptyAll_Click);
+ //
+ // buttonEx1
+ //
+ this.buttonEx1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+ this.buttonEx1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.buttonEx1.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.buttonEx1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+ this.buttonEx1.ForeColor = System.Drawing.Color.White;
+ this.buttonEx1.Location = new System.Drawing.Point(154, 232);
+ this.buttonEx1.Name = "buttonEx1";
+ this.buttonEx1.Size = new System.Drawing.Size(50, 25);
+ this.buttonEx1.TabIndex = 41;
+ this.buttonEx1.Text = "鍏ㄩ";
+ this.buttonEx1.UseVisualStyleBackColor = false;
+ this.buttonEx1.Click += new System.EventHandler(this.btnSelectAll_Click);
+ //
// flowLayoutPanel1
//
this.flowLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
@@ -536,5 +570,7 @@
private System.Windows.Forms.DataGridViewTextBoxColumn shopCountColumn;
private System.Windows.Forms.DataGridViewLinkColumn editColumn;
private System.Windows.Forms.DataGridViewLinkColumn deleteColumn;
+ private UserControls.ButtonEx buttonEx2;
+ private UserControls.ButtonEx buttonEx1;
}
}
\ No newline at end of file
diff --git a/TEMUKJD/WXForms/ShopForms/WXSubAccountListForm.cs b/TEMUKJD/WXForms/ShopForms/WXSubAccountListForm.cs
index 3db41e5..522f830 100644
--- a/TEMUKJD/WXForms/ShopForms/WXSubAccountListForm.cs
+++ b/TEMUKJD/WXForms/ShopForms/WXSubAccountListForm.cs
@@ -241,6 +241,7 @@ namespace TemuKJD.WXForms.ShopForms
void GetForbiddenCheckBoxes()
{
this.flowLayoutPanel1.Controls.Clear();
+ this.flowLayoutPanel1.Controls.Add(new UcCheckBox() { Name = "涓婅揣", Text = "涓婅揣", AutoSize = true });
this.flowLayoutPanel1.Controls.Add(new UcCheckBox() { Name = "瀹㈡湇", Text = "瀹㈡湇", AutoSize = true });
this.flowLayoutPanel1.Controls.Add(new UcCheckBox() { Name = "鎷嶅崟", Text = "鎷嶅崟", AutoSize = true });
this.flowLayoutPanel1.Controls.Add(new Label() { Text = "-------------------------------------", AutoSize = true });
@@ -277,5 +278,27 @@ namespace TemuKJD.WXForms.ShopForms
{
GetUser();
}
+
+ private void btnEmptyAll_Click(object sender, EventArgs e)
+ {
+ foreach (Control ctrl in flowLayoutPanel1.Controls)
+ {
+ if (ctrl is UcCheckBox chk)
+ {
+ chk.Checked = false;
+ }
+ }
+ }
+
+ private void btnSelectAll_Click(object sender, EventArgs e)
+ {
+ foreach (Control ctrl in flowLayoutPanel1.Controls)
+ {
+ if (ctrl is UcCheckBox chk)
+ {
+ chk.Checked = true;
+ }
+ }
+ }
}
}
diff --git a/TEMUKJD/WXForms/ShopForms/WXSubAccountListForm.resx b/TEMUKJD/WXForms/ShopForms/WXSubAccountListForm.resx
index 19ec4de..8f494ed 100644
--- a/TEMUKJD/WXForms/ShopForms/WXSubAccountListForm.resx
+++ b/TEMUKJD/WXForms/ShopForms/WXSubAccountListForm.resx
@@ -1,17 +1,17 @@
锘
-
diff --git a/Work/Work.csproj b/Work/Work.csproj
index f93803d..57d4ce0 100644
--- a/Work/Work.csproj
+++ b/Work/Work.csproj
@@ -44,7 +44,7 @@
..\bin\
DEBUG;TRACE
full
- AnyCPU
+ x64
prompt
MinimumRecommendedRules.ruleset