chfei/KJD_WebService
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

切换成64位软件

Browse Source
This commit is contained in:
wule committed 2026-07-04 10:29:33 +08:00
1 parent bc3e314a0a
commit b029cfdd92
15 files changed
+111 -45
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

AllBase/AllBase.csproj
+1 -1
View File
@@ -90,7 +90,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<DebugType>full</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<PlatformTarget>x64</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
AllBase/BaseClass.cs
+1 -1
View File
@@ -27,7 +27,7 @@ namespace AllBase
/// <summary>
/// 版本ID
/// </summary>
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";
KJDService/KJD_WebService/BLL/KJD/UpdateManage.cs
+2 -2
View File
@@ -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;
PackTools/package260701wx x64.nsi
+1 -1
View File
@@ -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}"
TEMUKJD CEFv138.sln
+2 -2
View File
@@ -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
TEMUKJD/ChangeForm.cs
+7 -1
View File
@@ -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;
TEMUKJD/KJD.csproj
+1 -1
View File
@@ -62,7 +62,7 @@
<OutputPath>..\bin\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<PlatformTarget>x64</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>false</Prefer32Bit>
TEMUKJD/Resources/icon.ico
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 66 KiB

After

Width:  |  Height:  |  Size: 224 KiB

TEMUKJD/WXForms/AiTalkForms/WxAiTalkForm.cs
+3 -3
View File
@@ -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<string> { shop.ShopId });
});
@@ -1243,7 +1243,7 @@ namespace TemuKJD.WXForms.AiTalkForms
{
if (btnClose.Text == ">>")
{
splitContainer1.SplitterDistance = 496;
splitContainer1.SplitterDistance = 379;
btnClose.Text = "<<";
}
else
TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs
+3 -2
View File
@@ -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;
TEMUKJD/WXForms/ShopForms/WXShopLoginForm.Designer.cs
Generated
+3 -3
View File
@@ -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;
//
TEMUKJD/WXForms/ShopForms/WXSubAccountListForm.Designer.cs
Generated
+36
View File
@@ -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;
}
}
TEMUKJD/WXForms/ShopForms/WXSubAccountListForm.cs
+23
View File
@@ -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;
}
}
}
}
}
TEMUKJD/WXForms/ShopForms/WXSubAccountListForm.resx
+27 -27
View File
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
Work/Work.csproj
+1 -1
View File
@@ -44,7 +44,7 @@
<OutputPath>..\bin\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<PlatformTarget>x64</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>