Compare commits

...
20 Commits
Author SHA1 Message Date
chfei 2ed5c22ff0 修复 返利金额颜色
修复修改 价格最低价bug
2026-11-18 18:12:34 +08:00
chfei 82ae679dbd 修改 超管,oem 修改和查看每个用户的附加金额 2026-11-18 14:18:14 +08:00
wule b2e75e6e1d 新版本号 2026-11-16 17:22:12 +08:00
wule 6484f74f1e Merge branch 'master' of http://git.ts.e57.cn/chfei/KJD 2026-11-16 17:20:25 +08:00
wule 70732ed466 移除随机token功能 2026-11-16 17:20:00 +08:00
wule 2857a6f13b Merge branch 'master' of http://git.ts.e57.cn/chfei/KJD 2026-11-16 16:31:37 +08:00
chfei b710e7042e 修复获取云端收藏数据分组 错误bug 2026-11-16 16:31:19 +08:00
wule c018899762 新版本号 2026-11-16 13:30:50 +08:00
wule c8f586d8fc 优化部分食品类目上传 2026-11-16 13:23:18 +08:00
wule 0d882571c1 优化店铺类目提审次数查询 逻辑 2026-11-16 10:33:08 +08:00
wule 72064bf345 新版本号 2026-11-16 10:16:34 +08:00
wule b862cfa844 Merge branch 'master' of http://git.ts.e57.cn/chfei/KJD 2026-11-15 23:34:34 +08:00
wule 9947182f98 1修改仓库类型命名 2接口获取店铺类目提审限额 2026-11-15 23:31:12 +08:00
wule 18d8a2f4fe 新版本号 2026-11-15 15:17:13 +08:00
wule_5900x bd72ff2766 调整ai客服显示店铺后台相关信息 2026-11-15 15:15:30 +08:00
wule 8e280bcde1 新版本号 新贴牌 2026-11-15 03:54:27 +08:00
wule b3845d5df2 修复随机曝光查询失败问题
修复食品上货贮存条件问题
2026-11-13 17:21:59 +08:00
chfei 34ea4f8a27 Merge branch 'master' of http://git.ts.e57.cn/chfei/KJD 2026-11-10 15:10:53 +08:00
chfei 8a85c3365b 云商品增加分组 2026-11-10 15:10:47 +08:00
chfei 861732ab7f 移除 商品同步 2026-11-10 10:34:43 +08:00
53 changed files with 8007 additions and 6441 deletions

No files matched your search

+1 -1
View File
@@ -31,7 +31,7 @@ namespace AllBase
/// <summary> /// <summary>
/// 版本ID /// 版本ID
/// </summary> /// </summary>
public static int VersionCount = 1377; public static int VersionCount = 1383;
public static string MainPath = "29wx"; public static string MainPath = "29wx";
//public static string MainPath = "29wx"; //public static string MainPath = "29wx";
//public static string MainPath = "29pdd"; //public static string MainPath = "29pdd";
+68
View File
@@ -0,0 +1,68 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace AllBase.Model;
public class CommonItem : IComparable<CommonItem>
{
/// <summary>
/// 初始化
/// </summary>
/// <param name="text">文本</param>
/// <param name="value">值</param>
/// <param name="sortId">排序号</param>
/// <param name="group">组</param>
/// <param name="disabled">禁用</param>
public CommonItem(string text, object value, string des = "", int? sortId = null, string group = null, bool? disabled = null)
{
Text = text;
Value = value;
Description = des;
SortId = sortId;
Group = group;
Disabled = disabled;
}
/// <summary>
/// 文本
/// </summary>
public string Text { get; }
/// <summary>
/// 值
/// </summary>
public object Value { get; }
/// <summary>
/// 描述
/// </summary>
public string Description { get; set; }
/// <summary>
/// 排序号
/// </summary>
public int? SortId { get; set; }
/// <summary>
/// 组
/// </summary>
public string Group { get; }
/// <summary>
/// 是否选中
/// </summary>
public bool IsSelected { get; set; }
/// <summary>
/// 禁用
/// </summary>
public bool? Disabled { get; }
/// <summary>
/// 比较
/// </summary>
/// <param name="other">其它列表项</param>
public int CompareTo(CommonItem other)
{
return string.Compare(Text, other.Text, StringComparison.CurrentCulture);
}
}
+2 -1
View File
@@ -12,7 +12,8 @@ namespace AllBase.Model.DBModel
public string oem_id { get; set; } public string oem_id { get; set; }
public string oem_name { get; set; } public string oem_name { get; set; }
public string oem_owner { get; set; } public string oem_owner { get; set; }
public string oem_icon { get; set; } public string parent_oem_id { get; set; }
public string oem_icon { get; set; }
public string oem_img { get; set; } public string oem_img { get; set; }
public DateTime add_time { get; set; } public DateTime add_time { get; set; }
public DateTime mdy_time { get; set; } public DateTime mdy_time { get; set; }
+42 -6
View File
@@ -71,6 +71,26 @@ namespace AllBase.Model.DBModel
public enum EnumOrderPaymentType public enum EnumOrderPaymentType
{ {
//充值 = 1,
////采购花费 = 2,
////产品退款到账 = 3,
////运费退款到账 = 4,
////采购收款 = 5,
////产品退款扣除 = 6,
////运费退款扣除 = 7,
//礼物单支出 = 16,
//中转仓扣费支出 = 20,
//中转仓作废返还收入 = 23,
//中转仓超重支出 = 24,
//退货包裹扣费支出 = 26,
//支付宝在线充值 = 30,
//云仓退货支出 = 31,
//礼物单退费 = 34,
//额外订单创建 = 35,
//额外订单作废 = 36,
//同步物流 = 55,
//变动类型,1:充值,2:采购花费,3:产品退款到账,4:运费退款到账,5:采购收款,6:产品退款扣除,7:运费退款扣除, 16:礼物单话费,20:中转仓扣费支出,23:中转仓退款收入,24:中转仓超重扣费支出,26 退货包裹扣费支出30支付宝充值;31 云仓退货支出33 分销退货包裹超重花费32 分销退货包裹发货花费退款34 礼物单退费35 额外包裹创建36 额外包裹作废37 额外订单超重支出38 退货包裹作废返还55 同步物流支出
充值 = 1, 充值 = 1,
//采购花费 = 2, //采购花费 = 2,
//产品退款到账 = 3, //产品退款到账 = 3,
@@ -79,15 +99,31 @@ namespace AllBase.Model.DBModel
//产品退款扣除 = 6, //产品退款扣除 = 6,
//运费退款扣除 = 7, //运费退款扣除 = 7,
礼物单支出 = 16, 礼物单支出 = 16,
中转仓扣费支出 = 20,
中转仓作废返还收入 = 23, 发货包裹扣费支出 = 20,
中转仓超重支出 = 24, 发货包裹作废返还 = 23,
发货包裹超重支出 = 24,
退货包裹扣费支出 = 26, 退货包裹扣费支出 = 26,
退货包裹超重支出 = 28,
退货包裹作废返还 = 38,
支付宝在线充值 = 30, 支付宝在线充值 = 30,
云仓退货支出 = 31,
退货仓退货支出 = 31,
退货仓作废返还 = 32,
退货仓超重支出 = 33,
礼物单退费 = 34, 礼物单退费 = 34,
额外订单创建 = 35,
额外订单作废 = 36, 额外包裹创建支出 = 35,
额外包裹作废返还 = 36,
额外包裹超重支出 = 37,
额外包裹退货拦截创建支出 = 39,
额外包裹退货拦截作废返还 = 40,
额外包裹退货拦截超重支出 = 41,
同步物流 = 55, 同步物流 = 55,
} }
} }
Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

+1
View File
@@ -0,0 +1 @@
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 truncated
Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

+1
View File
@@ -0,0 +1 @@
瀚田云栈MThd瀚田云栈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 truncated
Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 36 KiB

+1
View File
@@ -0,0 +1 @@
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 truncated
Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

+1
View File
@@ -0,0 +1 @@
豫尚供应链MThd豫尚供应链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 truncated
Binary file not shown.

After

Width:  |  Height:  |  Size: 104 KiB

+189
View File
@@ -0,0 +1,189 @@
; 该脚本使用 HM VNISEdit 脚本编辑器向导产生
; 安装程序初始定义常量
!define PRODUCT_NAME "豫尚供应链"
!define PRODUCT_VERSION "v12.61"
;!define PRODUCT_PUBLISHER "${PRODUCT_NAME}软件制作组"
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\29供应链.exe"
!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
;!define PRODUCT_UNINST_ROOT_KEY "HKLM" ;需要管理员权限
!define PRODUCT_UNINST_ROOT_KEY "HKCU"
!define UTILS_PATH ".\Utils"
!define SOURCE_PATH "..\Bin.Oem"
!define OUT_PUT_PATH ".\Bin"
SetCompressor lzma
; ------ MUI 现代界面定义 (1.67 版本以上兼容) ------
!include "MUI.nsh"
; MUI 预定义常量
!define MUI_ABORTWARNING
!define MUI_ICON "${SOURCE_PATH}\favicon.ico"
;!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico"
!define MUI_UNICON "${UTILS_PATH}\uninstall.ico"
; 语言选择窗口常量设置
!define MUI_LANGDLL_REGISTRY_ROOT "${PRODUCT_UNINST_ROOT_KEY}"
!define MUI_LANGDLL_REGISTRY_KEY "${PRODUCT_UNINST_KEY}"
!define MUI_LANGDLL_REGISTRY_VALUENAME "NSIS:Language"
; 欢迎页面
!insertmacro MUI_PAGE_WELCOME
; 许可协议页面
!define MUI_LICENSEPAGE_CHECKBOX
!insertmacro MUI_PAGE_LICENSE "${UTILS_PATH}\Licence.txt"
; 安装目录选择页面
!insertmacro MUI_PAGE_DIRECTORY
; 安装过程页面
!insertmacro MUI_PAGE_INSTFILES
; 安装完成页面
;!define MUI_FINISHPAGE_RUN "$INSTDIR\29供应链.exe" ;win10直接启动会双开,以下改为使用函数启动
;!define MUI_FINISHPAGE_RUN "exe_file" ;指定要运行的可执行文件路径(如 $INSTDIR\MyApp.exe)。文件名含空格时无需加引号 。
;!define MUI_FINISHPAGE_RUN_TEXT "text" ;设置复选框旁的显示文本(例如:“立即运行我的应用”)。
;!define MUI_FINISHPAGE_RUN_PARAMETERS "params" ;传入运行参数。若参数含双引号,需用 \" 转义 。
;!define MUI_FINISHPAGE_RUN_NOTCHECKED ;默认不选中该复选框(即默认不运行)。
;!define MUI_FINISHPAGE_RUN_FUNCTION "func_name" ;替代直接运行 exe,改为调用自定义 NSIS 函数(此时 MUI_FINISHPAGE_RUN 可不带参数),适合需执行多步逻辑的场景 。
;示例================================================================================================================
;!include "MUI2.nsh"
;!define MUI_FINISHPAGE_RUN "$INSTDIR\MyApp.exe"
;!define MUI_FINISHPAGE_RUN_TEXT "启动应用程序"
;!define MUI_FINISHPAGE_RUN_PARAMETERS "/silent"
;;!define MUI_FINISHPAGE_RUN_NOTCHECKED
;!insertmacro MUI_PAGE_FINISH
;示例结束============================================================================================================
!define MUI_FINISHPAGE_RUN
;安装函数定义
!define MUI_FINISHPAGE_RUN_FUNCTION "LaunchExe"
!insertmacro MUI_PAGE_FINISH
; 安装卸载过程页面
!insertmacro MUI_UNPAGE_INSTFILES
; 安装界面包含的语言设置
!insertmacro MUI_LANGUAGE "English"
!insertmacro MUI_LANGUAGE "SimpChinese"
; 安装预释放文件
!insertmacro MUI_RESERVEFILE_LANGDLL
!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
; ------ MUI 现代界面定义结束 ------
Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
OutFile "${OUT_PUT_PATH}\${PRODUCT_NAME} ${PRODUCT_VERSION}.exe"
InstallDir "$PROGRAMFILES\${PRODUCT_NAME}"
;InstallDir "D:\${PRODUCT_NAME}"
;InstallDirRegKey HKLM "${PRODUCT_UNINST_KEY}" "UninstallString"
InstallDirRegKey HKCU "${PRODUCT_UNINST_KEY}" "UninstallString"
ShowInstDetails show
ShowUnInstDetails show
BrandingText "${PRODUCT_NAME}安装程序"
Section "MainSection" SEC01
SetOutPath "$INSTDIR"
;SetOverwrite on|off|try|ifnewer ;强制覆盖|不覆盖|仅覆盖可写文件|仅覆盖旧文件
SetOverwrite on
;/x 排除的目录或文件
;File /r /x "Config.xml" /x "choice.debug.tools" /x "DB.dll" /x "Publish.exe" /x "AllBase.pdb" /x "Work.pdb" /x "29供应链.pdb" /x "data" "${SOURCE_PATH}\*.*"
File /r /x "BaseClass.cs" /x "Config.xml" /x "choice.debug.tools" /x "DB.dll" /x "Publish.exe" /x "*.pdb" /x "*.zip" /x "data" /x "Cache" /x "29wx.lnk" /x "29wx.ico" /x "29pdd.lnk" /x "29pdd.ico" "${SOURCE_PATH}\*.*"
CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}"
CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME}.lnk" "$INSTDIR\29供应链.exe" "" "$INSTDIR\favicon.ico"
CreateShortCut "$DESKTOP\${PRODUCT_NAME}.lnk" "$INSTDIR\29供应链.exe" "" "$INSTDIR\favicon.ico"
File "${SOURCE_PATH}\29供应链.exe"
;SetOutPath "$TEMP"
;File "${UTILS_PATH}\VC_redist_2015_2022.x64.exe"
;ExecWait '$TEMP\vc_redist.x86.exe' # 一般(非静默)VC的安装
;ExecWait '"$TEMP\vc_redist.x86.exe" /q' # silent install 静默安装
SectionEnd
Section -AdditionalIcons
SetOutPath $INSTDIR
CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk" "$INSTDIR\uninst.exe"
SectionEnd
Section -Post
WriteUninstaller "$INSTDIR\uninst.exe"
;WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\29供应链.exe"
WriteRegStr HKCU "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\29供应链.exe"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\29供应链.exe"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_NAME}软件制作组"
SectionEnd
#-- 根据 NSIS 脚本编辑规则,所有 Function 区段必须放置在 Section 区段之后编写,以避免安装程序出现未可预知的问题。--#
Function .onInit
!insertmacro MUI_LANGDLL_DISPLAY
FunctionEnd
;function要写字section之后
Function LaunchExe
;ExecShell "" "$INSTDIR\${PRODUCT_NAME}.exe"
; 启动主程序,ExecWait 会等待程序启动后再继续(推荐用于确保启动成功)
;ExecWait '"$INSTDIR\YourApp.exe"' // 等待也可以用来弹出必要组件安装时等待安装完成再继续运行安装程序。
; 若希望安装程序立即关闭而不等待,可使用 Exec
;Exec '"$INSTDIR\29供应链.exe"'
Exec "$INSTDIR\29供应链.exe"
; 以普通用户权限启动程序(即使安装包是管理员权限)
;System::Call 'shell32::ShellExecute(i 0, t"open", t"explorer.exe", t"/e,$INSTDIR\start.bat", t"", i 0)'
;Exec "$INSTDIR\start.bat"
FunctionEnd
/******************************
* 以下是安装程序的卸载部分 *
******************************/
Section Uninstall
Delete "$INSTDIR\uninst.exe"
Delete "$TEMP\vc_redist.x86.exe"
Delete "$INSTDIR\29供应链.exe"
Delete "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk"
Delete "$DESKTOP\${PRODUCT_NAME}.lnk"
Delete "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME}.lnk"
RMDir "$SMPROGRAMS\${PRODUCT_NAME}"
RMDir /r "$INSTDIR\blob_storage"
RMDir /r "$INSTDIR\Cache"
RMDir /r "$INSTDIR\config"
RMDir /r "$INSTDIR\data"
RMDir /r "$INSTDIR\DawnCache"
RMDir /r "$INSTDIR\GPUCache"
RMDir /r "$INSTDIR\locales"
RMDir /r "$INSTDIR\log"
RMDir /r "$INSTDIR\ru-ru"
RMDir /r "$INSTDIR\static"
RMDir /r "$INSTDIR\taobao"
RMDir /r "$INSTDIR\temp"
RMDir /r "$INSTDIR\upBak"
RMDir /r "$INSTDIR\upTemp"
RMDir /r "$INSTDIR\x64"
RMDir /r "$INSTDIR\x86"
RMDir /r "$INSTDIR"
DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
;DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"
DeleteRegKey HKCU "${PRODUCT_DIR_REGKEY}"
SetAutoClose true
SectionEnd
#-- 根据 NSIS 脚本编辑规则,所有 Function 区段必须放置在 Section 区段之后编写,以避免安装程序出现未可预知的问题。--#
Function un.onInit
!insertmacro MUI_UNGETLANGUAGE
MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "您确实要完全移除 $(^Name) ,及其所有的组件?" IDYES +2
Abort
FunctionEnd
Function un.onUninstSuccess
HideWindow
MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) 已成功地从您的计算机移除。"
FunctionEnd
+189
View File
@@ -0,0 +1,189 @@
; 该脚本使用 HM VNISEdit 脚本编辑器向导产生
; 安装程序初始定义常量
!define PRODUCT_NAME "瀚田云栈"
!define PRODUCT_VERSION "v12.61"
;!define PRODUCT_PUBLISHER "${PRODUCT_NAME}软件制作组"
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\29供应链.exe"
!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
;!define PRODUCT_UNINST_ROOT_KEY "HKLM" ;需要管理员权限
!define PRODUCT_UNINST_ROOT_KEY "HKCU"
!define UTILS_PATH ".\Utils"
!define SOURCE_PATH "..\Bin.Oem"
!define OUT_PUT_PATH ".\Bin"
SetCompressor lzma
; ------ MUI 现代界面定义 (1.67 版本以上兼容) ------
!include "MUI.nsh"
; MUI 预定义常量
!define MUI_ABORTWARNING
!define MUI_ICON "${SOURCE_PATH}\favicon.ico"
;!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico"
!define MUI_UNICON "${UTILS_PATH}\uninstall.ico"
; 语言选择窗口常量设置
!define MUI_LANGDLL_REGISTRY_ROOT "${PRODUCT_UNINST_ROOT_KEY}"
!define MUI_LANGDLL_REGISTRY_KEY "${PRODUCT_UNINST_KEY}"
!define MUI_LANGDLL_REGISTRY_VALUENAME "NSIS:Language"
; 欢迎页面
!insertmacro MUI_PAGE_WELCOME
; 许可协议页面
!define MUI_LICENSEPAGE_CHECKBOX
!insertmacro MUI_PAGE_LICENSE "${UTILS_PATH}\Licence.txt"
; 安装目录选择页面
!insertmacro MUI_PAGE_DIRECTORY
; 安装过程页面
!insertmacro MUI_PAGE_INSTFILES
; 安装完成页面
;!define MUI_FINISHPAGE_RUN "$INSTDIR\29供应链.exe" ;win10直接启动会双开,以下改为使用函数启动
;!define MUI_FINISHPAGE_RUN "exe_file" ;指定要运行的可执行文件路径(如 $INSTDIR\MyApp.exe)。文件名含空格时无需加引号 。
;!define MUI_FINISHPAGE_RUN_TEXT "text" ;设置复选框旁的显示文本(例如:“立即运行我的应用”)。
;!define MUI_FINISHPAGE_RUN_PARAMETERS "params" ;传入运行参数。若参数含双引号,需用 \" 转义 。
;!define MUI_FINISHPAGE_RUN_NOTCHECKED ;默认不选中该复选框(即默认不运行)。
;!define MUI_FINISHPAGE_RUN_FUNCTION "func_name" ;替代直接运行 exe,改为调用自定义 NSIS 函数(此时 MUI_FINISHPAGE_RUN 可不带参数),适合需执行多步逻辑的场景 。
;示例================================================================================================================
;!include "MUI2.nsh"
;!define MUI_FINISHPAGE_RUN "$INSTDIR\MyApp.exe"
;!define MUI_FINISHPAGE_RUN_TEXT "启动应用程序"
;!define MUI_FINISHPAGE_RUN_PARAMETERS "/silent"
;;!define MUI_FINISHPAGE_RUN_NOTCHECKED
;!insertmacro MUI_PAGE_FINISH
;示例结束============================================================================================================
!define MUI_FINISHPAGE_RUN
;安装函数定义
!define MUI_FINISHPAGE_RUN_FUNCTION "LaunchExe"
!insertmacro MUI_PAGE_FINISH
; 安装卸载过程页面
!insertmacro MUI_UNPAGE_INSTFILES
; 安装界面包含的语言设置
!insertmacro MUI_LANGUAGE "English"
!insertmacro MUI_LANGUAGE "SimpChinese"
; 安装预释放文件
!insertmacro MUI_RESERVEFILE_LANGDLL
!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
; ------ MUI 现代界面定义结束 ------
Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
OutFile "${OUT_PUT_PATH}\${PRODUCT_NAME} ${PRODUCT_VERSION}.exe"
InstallDir "$PROGRAMFILES\${PRODUCT_NAME}"
;InstallDir "D:\${PRODUCT_NAME}"
;InstallDirRegKey HKLM "${PRODUCT_UNINST_KEY}" "UninstallString"
InstallDirRegKey HKCU "${PRODUCT_UNINST_KEY}" "UninstallString"
ShowInstDetails show
ShowUnInstDetails show
BrandingText "${PRODUCT_NAME}安装程序"
Section "MainSection" SEC01
SetOutPath "$INSTDIR"
;SetOverwrite on|off|try|ifnewer ;强制覆盖|不覆盖|仅覆盖可写文件|仅覆盖旧文件
SetOverwrite on
;/x 排除的目录或文件
;File /r /x "Config.xml" /x "choice.debug.tools" /x "DB.dll" /x "Publish.exe" /x "AllBase.pdb" /x "Work.pdb" /x "29供应链.pdb" /x "data" "${SOURCE_PATH}\*.*"
File /r /x "BaseClass.cs" /x "Config.xml" /x "choice.debug.tools" /x "DB.dll" /x "Publish.exe" /x "*.pdb" /x "*.zip" /x "data" /x "Cache" /x "29wx.lnk" /x "29wx.ico" /x "29pdd.lnk" /x "29pdd.ico" "${SOURCE_PATH}\*.*"
CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}"
CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME}.lnk" "$INSTDIR\29供应链.exe" "" "$INSTDIR\favicon.ico"
CreateShortCut "$DESKTOP\${PRODUCT_NAME}.lnk" "$INSTDIR\29供应链.exe" "" "$INSTDIR\favicon.ico"
File "${SOURCE_PATH}\29供应链.exe"
;SetOutPath "$TEMP"
;File "${UTILS_PATH}\VC_redist_2015_2022.x64.exe"
;ExecWait '$TEMP\vc_redist.x86.exe' # 一般(非静默)VC的安装
;ExecWait '"$TEMP\vc_redist.x86.exe" /q' # silent install 静默安装
SectionEnd
Section -AdditionalIcons
SetOutPath $INSTDIR
CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk" "$INSTDIR\uninst.exe"
SectionEnd
Section -Post
WriteUninstaller "$INSTDIR\uninst.exe"
;WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\29供应链.exe"
WriteRegStr HKCU "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\29供应链.exe"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\29供应链.exe"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_NAME}软件制作组"
SectionEnd
#-- 根据 NSIS 脚本编辑规则,所有 Function 区段必须放置在 Section 区段之后编写,以避免安装程序出现未可预知的问题。--#
Function .onInit
!insertmacro MUI_LANGDLL_DISPLAY
FunctionEnd
;function要写字section之后
Function LaunchExe
;ExecShell "" "$INSTDIR\${PRODUCT_NAME}.exe"
; 启动主程序,ExecWait 会等待程序启动后再继续(推荐用于确保启动成功)
;ExecWait '"$INSTDIR\YourApp.exe"' // 等待也可以用来弹出必要组件安装时等待安装完成再继续运行安装程序。
; 若希望安装程序立即关闭而不等待,可使用 Exec
;Exec '"$INSTDIR\29供应链.exe"'
Exec "$INSTDIR\29供应链.exe"
; 以普通用户权限启动程序(即使安装包是管理员权限)
;System::Call 'shell32::ShellExecute(i 0, t"open", t"explorer.exe", t"/e,$INSTDIR\start.bat", t"", i 0)'
;Exec "$INSTDIR\start.bat"
FunctionEnd
/******************************
* 以下是安装程序的卸载部分 *
******************************/
Section Uninstall
Delete "$INSTDIR\uninst.exe"
Delete "$TEMP\vc_redist.x86.exe"
Delete "$INSTDIR\29供应链.exe"
Delete "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk"
Delete "$DESKTOP\${PRODUCT_NAME}.lnk"
Delete "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME}.lnk"
RMDir "$SMPROGRAMS\${PRODUCT_NAME}"
RMDir /r "$INSTDIR\blob_storage"
RMDir /r "$INSTDIR\Cache"
RMDir /r "$INSTDIR\config"
RMDir /r "$INSTDIR\data"
RMDir /r "$INSTDIR\DawnCache"
RMDir /r "$INSTDIR\GPUCache"
RMDir /r "$INSTDIR\locales"
RMDir /r "$INSTDIR\log"
RMDir /r "$INSTDIR\ru-ru"
RMDir /r "$INSTDIR\static"
RMDir /r "$INSTDIR\taobao"
RMDir /r "$INSTDIR\temp"
RMDir /r "$INSTDIR\upBak"
RMDir /r "$INSTDIR\upTemp"
RMDir /r "$INSTDIR\x64"
RMDir /r "$INSTDIR\x86"
RMDir /r "$INSTDIR"
DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
;DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"
DeleteRegKey HKCU "${PRODUCT_DIR_REGKEY}"
SetAutoClose true
SectionEnd
#-- 根据 NSIS 脚本编辑规则,所有 Function 区段必须放置在 Section 区段之后编写,以避免安装程序出现未可预知的问题。--#
Function un.onInit
!insertmacro MUI_UNGETLANGUAGE
MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "您确实要完全移除 $(^Name) ,及其所有的组件?" IDYES +2
Abort
FunctionEnd
Function un.onUninstSuccess
HideWindow
MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) 已成功地从您的计算机移除。"
FunctionEnd
+3
View File
@@ -71,6 +71,9 @@
<Compile Update="PDDForms\ProductSelectForms\PDDDBProdGroupManageFrom.cs"> <Compile Update="PDDForms\ProductSelectForms\PDDDBProdGroupManageFrom.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
<Compile Update="UserComponent\InputDialog.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="UserComponent\UcNumericRange.cs"> <Compile Update="UserComponent\UcNumericRange.cs">
<SubType>UserControl</SubType> <SubType>UserControl</SubType>
</Compile> </Compile>
+157
View File
@@ -0,0 +1,157 @@
namespace TemuKJD.UserComponent;
partial class InputDialog
{
private System.ComponentModel.IContainer components = null;
protected override void Dispose(bool disposing)
{
if (disposing && components != null)
components.Dispose();
base.Dispose(disposing);
}
#region Windows Form Designer generated code
private void InitializeComponent()
{
this.layout = new System.Windows.Forms.TableLayoutPanel();
this.lblPrompt = new System.Windows.Forms.Label();
this.txtInput = new System.Windows.Forms.TextBox();
this.buttons = new System.Windows.Forms.FlowLayoutPanel();
this.btnCancel = new System.Windows.Forms.Button();
this.btnOk = new System.Windows.Forms.Button();
this.lblError = new System.Windows.Forms.Label();
this.layout.SuspendLayout();
this.buttons.SuspendLayout();
this.SuspendLayout();
//
// layout
//
this.layout.AutoSize = true;
this.layout.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.layout.ColumnCount = 1;
this.layout.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.layout.Controls.Add(this.lblPrompt, 0, 0);
this.layout.Controls.Add(this.txtInput, 0, 1);
this.layout.Controls.Add(this.buttons, 0, 2);
this.layout.Controls.Add(this.lblError, 0, 3);
this.layout.Dock = System.Windows.Forms.DockStyle.Top;
this.layout.Location = new System.Drawing.Point(0, 0);
this.layout.Name = "layout";
this.layout.Padding = new System.Windows.Forms.Padding(15);
this.layout.RowCount = 4;
this.layout.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.layout.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.layout.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.layout.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.layout.Size = new System.Drawing.Size(360, 143);
this.layout.TabIndex = 0;
//
// lblPrompt
//
this.lblPrompt.AutoSize = true;
this.lblPrompt.Dock = System.Windows.Forms.DockStyle.Fill;
this.lblPrompt.Location = new System.Drawing.Point(15, 15);
this.lblPrompt.Margin = new System.Windows.Forms.Padding(0, 0, 0, 10);
this.lblPrompt.MaximumSize = new System.Drawing.Size(330, 0);
this.lblPrompt.Name = "lblPrompt";
this.lblPrompt.Size = new System.Drawing.Size(330, 12);
this.lblPrompt.TabIndex = 0;
this.lblPrompt.Text = "请输入:";
//
// txtInput
//
this.txtInput.Dock = System.Windows.Forms.DockStyle.Fill;
this.txtInput.Location = new System.Drawing.Point(15, 37);
this.txtInput.Margin = new System.Windows.Forms.Padding(0, 0, 0, 12);
this.txtInput.Name = "txtInput";
this.txtInput.Size = new System.Drawing.Size(330, 21);
this.txtInput.TabIndex = 0;
this.txtInput.TextChanged += new System.EventHandler(this.txtInput_TextChanged);
//
// buttons
//
this.buttons.AutoSize = true;
this.buttons.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.buttons.Controls.Add(this.btnCancel);
this.buttons.Controls.Add(this.btnOk);
this.buttons.Dock = System.Windows.Forms.DockStyle.Fill;
this.buttons.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft;
this.buttons.Location = new System.Drawing.Point(15, 70);
this.buttons.Margin = new System.Windows.Forms.Padding(0);
this.buttons.Name = "buttons";
this.buttons.Size = new System.Drawing.Size(330, 28);
this.buttons.TabIndex = 1;
//
// btnCancel
//
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.btnCancel.Location = new System.Drawing.Point(255, 0);
this.btnCancel.Margin = new System.Windows.Forms.Padding(10, 0, 0, 0);
this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(75, 28);
this.btnCancel.TabIndex = 1;
this.btnCancel.Text = "取消";
this.btnCancel.UseVisualStyleBackColor = true;
//
// btnOk
//
this.btnOk.Location = new System.Drawing.Point(170, 0);
this.btnOk.Margin = new System.Windows.Forms.Padding(0);
this.btnOk.Name = "btnOk";
this.btnOk.Size = new System.Drawing.Size(75, 28);
this.btnOk.TabIndex = 0;
this.btnOk.Text = "确定";
this.btnOk.UseVisualStyleBackColor = true;
this.btnOk.Click += new System.EventHandler(this.btnOk_Click);
//
// lblError
//
this.lblError.AutoSize = true;
this.lblError.Dock = System.Windows.Forms.DockStyle.Fill;
this.lblError.ForeColor = System.Drawing.Color.Firebrick;
this.lblError.Location = new System.Drawing.Point(15, 108);
this.lblError.Margin = new System.Windows.Forms.Padding(0, 10, 0, 0);
this.lblError.MaximumSize = new System.Drawing.Size(330, 0);
this.lblError.MinimumSize = new System.Drawing.Size(0, 20);
this.lblError.Name = "lblError";
this.lblError.Size = new System.Drawing.Size(330, 20);
this.lblError.TabIndex = 2;
//
// InputDialog
//
this.AcceptButton = this.btnOk;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoSize = true;
this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.CancelButton = this.btnCancel;
this.ClientSize = new System.Drawing.Size(360, 144);
this.Controls.Add(this.layout);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.MaximizeBox = false;
this.MinimizeBox = false;
this.MinimumSize = new System.Drawing.Size(376, 39);
this.Name = "InputDialog";
this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "输入";
this.layout.ResumeLayout(false);
this.layout.PerformLayout();
this.buttons.ResumeLayout(false);
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private System.Windows.Forms.TableLayoutPanel layout;
private System.Windows.Forms.Label lblPrompt;
private System.Windows.Forms.TextBox txtInput;
private System.Windows.Forms.FlowLayoutPanel buttons;
private System.Windows.Forms.Button btnOk;
private System.Windows.Forms.Button btnCancel;
private System.Windows.Forms.Label lblError;
}
+130
View File
@@ -0,0 +1,130 @@
using System;
using System.Globalization;
using System.Windows.Forms;
namespace TemuKJD.UserComponent;
public partial class InputDialog : Form
{
private readonly InputDialogType inputType;
private readonly Func<string, string> validator;
/// <summary>用户输入的内容(点确定后有效)</summary>
public string InputText { get; private set; } = string.Empty;
public InputDialog() : this(string.Empty)
{
}
/// <param name="inputType">输入类型,数字按当前区域格式验证。</param>
/// <param name="validator">类型验证通过后调用;返回错误信息,null 或空字符串表示通过。</param>
public InputDialog(string prompt, string title = "输入", string defaultValue = "",
InputDialogType inputType = InputDialogType.Text, Func<string, string> validator = null)
{
if (!Enum.IsDefined(typeof(InputDialogType), inputType))
throw new ArgumentOutOfRangeException(nameof(inputType));
InitializeComponent();
this.inputType = inputType;
this.validator = validator;
Text = title;
lblPrompt.Text = prompt;
txtInput.Text = defaultValue;
txtInput.SelectAll();
}
private void btnOk_Click(object sender, EventArgs e)
{
string value = txtInput.Text;
string error = null;
if (inputType == InputDialogType.Integer && !int.TryParse(value, out _))
error = "请输入有效的整数(-2147483648 至 2147483647)。";
else if (inputType == InputDialogType.Decimal && !decimal.TryParse(value, out _))
error = "请输入有效的小数。";
else if (validator != null)
{
try
{
error = validator(value);
}
catch (Exception ex)
{
error = "验证失败:" + ex.Message;
}
}
lblError.Text = error ?? string.Empty;
if (!string.IsNullOrEmpty(error))
{
txtInput.Focus();
return;
}
InputText = value;
DialogResult = DialogResult.OK;
Close();
}
private void txtInput_TextChanged(object sender, EventArgs e)
{
lblError.Text = string.Empty;
}
/// <summary>弹出输入框并返回输入内容,取消返回 null;validator 返回错误信息,空值表示通过。</summary>
public static string Show(string prompt, string title = "输入", string defaultValue = "",
InputDialogType inputType = InputDialogType.Text, Func<string, string> validator = null)
{
using (var dlg = new InputDialog(prompt, title, defaultValue, inputType, validator))
{
return dlg.ShowDialog() == DialogResult.OK ? dlg.InputText : null;
}
}
/// <summary>输入数值,取消返回 null;支持整数、float、double 和 decimal,按当前区域格式解析。</summary>
/// <param name="validator">接收解析后的数值,返回错误信息;null 或空字符串表示通过。</param>
public static T? Show<T>(string prompt, string title = "输入", T defaultValue = default,
Func<T, string> validator = null) where T : struct, IConvertible
{
var typeCode = Type.GetTypeCode(typeof(T));
if (typeof(T).IsEnum || typeCode < TypeCode.SByte || typeCode > TypeCode.Decimal)
throw new NotSupportedException("仅支持整数、float、double 和 decimal 类型。");
T value = default;
using (var dlg = new InputDialog(prompt, title, defaultValue.ToString(CultureInfo.CurrentCulture),
validator: text => ValidateNumber(text, validator, out value)))
{
return dlg.ShowDialog() == DialogResult.OK ? value : (T?)null;
}
}
private static string ValidateNumber<T>(string text, Func<T, string> validator, out T value)
where T : struct, IConvertible
{
value = default;
try
{
value = (T)Convert.ChangeType(text, typeof(T), CultureInfo.CurrentCulture);
}
catch (FormatException)
{
return $"请输入有效的 {typeof(T).Name} 数值。";
}
catch (OverflowException)
{
return $"输入超出 {typeof(T).Name} 的取值范围。";
}
if (value is float single && (float.IsNaN(single) || float.IsInfinity(single))
|| value is double number && (double.IsNaN(number) || double.IsInfinity(number)))
return "请输入有限数值。";
return validator?.Invoke(value);
}
}
public enum InputDialogType
{
Text,
Integer,
Decimal
}
+120
View File
@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
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
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<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
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
mimetype set.
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
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
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
: 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
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
@@ -451,16 +451,18 @@ namespace TemuKJD.WXForms.AdminForms
// //
this.cmbType.FormattingEnabled = true; this.cmbType.FormattingEnabled = true;
this.cmbType.Items.AddRange(new object[] { this.cmbType.Items.AddRange(new object[] {
"", "",
"充值", "充值",
"管理员充值", "管理员充值",
"支付宝充值", "支付宝充值",
"礼物单支出/礼物单退费", "礼物单支出/礼物单退费",
"拍单扣除/作废返还", "拍单扣除/作废返还",
"超重扣费支出", "额外包裹扣费支出/返还",
"退货包裹扣费支出", "退货包裹扣费支出/返还",
"云仓退货扣费支出"}); "云仓退货扣费支出/返还",
this.cmbType.Location = new System.Drawing.Point(63, 50); "超重扣费支出",
"同步物流"});
this.cmbType.Location = new System.Drawing.Point(63, 50);
this.cmbType.Name = "cmbType"; this.cmbType.Name = "cmbType";
this.cmbType.Size = new System.Drawing.Size(90, 25); this.cmbType.Size = new System.Drawing.Size(90, 25);
this.cmbType.TabIndex = 0; this.cmbType.TabIndex = 0;
@@ -92,23 +92,27 @@ namespace TemuKJD.WXForms.AdminForms
data3 += "&user_name_in=" + txtUserName.Text.Trim(); data3 += "&user_name_in=" + txtUserName.Text.Trim();
data3 += "&create_time_begin=" + dtpTimeBegin.Value.ToString("yyyy-MM-dd HH:mm:ss"); data3 += "&create_time_begin=" + dtpTimeBegin.Value.ToString("yyyy-MM-dd HH:mm:ss");
data3 += "&create_time_end=" + dtpTimeEnd.Value.ToString("yyyy-MM-dd HH:mm:ss"); data3 += "&create_time_end=" + dtpTimeEnd.Value.ToString("yyyy-MM-dd HH:mm:ss");
if (cmbType.Text == "充值") if (cmbType.Text == "充值")
data3 += "&type_in=1,30"; data3 += "&type_in=1,30";
else if (cmbType.Text == "管理员充值") else if (cmbType.Text == "管理员充值")
data3 += "&type_in=1"; data3 += "&type_in=1";
else if (cmbType.Text == "支付宝充值") else if (cmbType.Text == "支付宝充值")
data3 += "&type_in=30"; data3 += "&type_in=30";
else if (cmbType.Text == "礼物单支出/礼物单退费") else if (cmbType.Text == "礼物单支出/礼物单退费")
data3 += "&type_in=16,34"; data3 += "&type_in=16,34";
else if (cmbType.Text == "拍单扣除/作废返还") else if (cmbType.Text == "拍单扣除/作废返还")
data3 += "&type_in=20,23"; data3 += "&type_in=20,23";
else if (cmbType.Text == "超重扣费支出") else if (cmbType.Text == "退货包裹扣费支出/返还")
data3 += "&type_in=24"; data3 += "&type_in=26,38";
else if (cmbType.Text == "退货包裹扣费支出") else if (cmbType.Text == "额外包裹扣费支出/返还")
data3 += "&type_in=26"; data3 += "&type_in=35,36";
else if (cmbType.Text == "云仓退货扣费支出") else if (cmbType.Text == "云仓退货扣费支出")
data3 += "&type_in=31"; data3 += "&type_in=31,32";
else if (!string.IsNullOrEmpty(cmbType.Text)) else if (cmbType.Text == "超重扣费支出")
data3 += "&type_in=24,28,33,37,41";
else if (cmbType.Text == "同步物流")
data3 += "&type_in=55";
else if (!string.IsNullOrEmpty(cmbType.Text))
data3 += "&type_in=" + cmbType.Text; data3 += "&type_in=" + cmbType.Text;
if (!string.IsNullOrEmpty(txtOutOrderId.Text.Trim())) if (!string.IsNullOrEmpty(txtOutOrderId.Text.Trim()))
data3 += "&order_id_in=" + txtOutOrderId.Text.Trim(); data3 += "&order_id_in=" + txtOutOrderId.Text.Trim();
@@ -311,17 +315,17 @@ namespace TemuKJD.WXForms.AdminForms
var checkRows = dgvPayment.Rows.Cast<DataGridViewRow>().Where(r => r.Cells["colCheck"].Value.ParseToBool() == true).ToList(); var checkRows = dgvPayment.Rows.Cast<DataGridViewRow>().Where(r => r.Cells["colCheck"].Value.ParseToBool() == true).ToList();
lblPostageTotal.Text = checkRows lblPostageTotal.Text = checkRows
.Where(r => r.Cells["colType"].Value.ParseToString() == EnumOrderPaymentType.中转仓扣费支出.ParseToString()) .Where(r => r.Cells["colType"].Value.ParseToString() == EnumOrderPaymentType.发货包裹扣费支出.ParseToString())
.Sum(r => r.Cells["colAmount"].Value.ParseToDecimal()).ToString(); .Sum(r => r.Cells["colAmount"].Value.ParseToDecimal()).ToString();
lblPostageReturnTotal.Text = checkRows lblPostageReturnTotal.Text = checkRows
.Where(r => r.Cells["colType"].Value.ParseToString() == EnumOrderPaymentType.中转仓作废返还收入.ParseToString()) .Where(r => r.Cells["colType"].Value.ParseToString() == EnumOrderPaymentType.发货包裹作废返还.ParseToString())
.Sum(r => r.Cells["colAmount"].Value.ParseToDecimal()).ToString(); .Sum(r => r.Cells["colAmount"].Value.ParseToDecimal()).ToString();
lblPostageWeightTotal.Text = checkRows lblPostageWeightTotal.Text = checkRows
.Where(r => r.Cells["colType"].Value.ParseToString() == EnumOrderPaymentType.中转仓超重支出.ParseToString()) .Where(r => r.Cells["colType"].Value.ParseToString() == EnumOrderPaymentType.发货包裹超重支出.ParseToString())
.Sum(r => r.Cells["colAmount"].Value.ParseToDecimal()).ToString(); .Sum(r => r.Cells["colAmount"].Value.ParseToDecimal()).ToString();
lblPostageNotReturnCnt.Text = (checkRows lblPostageNotReturnCnt.Text = (checkRows
.Where(r => r.Cells["colType"].Value.ParseToString() == EnumOrderPaymentType.中转仓扣费支出.ParseToString()).Count() - checkRows .Where(r => r.Cells["colType"].Value.ParseToString() == EnumOrderPaymentType.发货包裹扣费支出.ParseToString()).Count() - checkRows
.Where(r => r.Cells["colType"].Value.ParseToString() == EnumOrderPaymentType.中转仓作废返还收入.ParseToString()).Count()).ToString(); .Where(r => r.Cells["colType"].Value.ParseToString() == EnumOrderPaymentType.发货包裹作废返还.ParseToString()).Count()).ToString();
lblProfit.Text = (lblPostageTotal.Text.ParseToDecimal() - lblPostageReturnTotal.Text.ParseToDecimal() - lblPostageNotReturnCnt.Text.ParseToInt() * 2.2m).ToString(); lblProfit.Text = (lblPostageTotal.Text.ParseToDecimal() - lblPostageReturnTotal.Text.ParseToDecimal() - lblPostageNotReturnCnt.Text.ParseToInt() * 2.2m).ToString();
} }
File diff suppressed because it is too large. Load diff
@@ -275,7 +275,6 @@ namespace TemuKJD.WXForms.AdminForms
private void btnRefresh_Click(object sender, EventArgs e) private void btnRefresh_Click(object sender, EventArgs e)
{ {
ucSplitPage1.CurrentPage = 1; ucSplitPage1.CurrentPage = 1;
GetUser();
} }
private void dgvUser_CellContentClick(object sender, DataGridViewCellEventArgs e) private void dgvUser_CellContentClick(object sender, DataGridViewCellEventArgs e)
File diff suppressed because it is too large. Load diff
+227 -156
View File
@@ -2,6 +2,7 @@
using AllBase.Model.DBModel; using AllBase.Model.DBModel;
using AllBase.Model.Result; using AllBase.Model.Result;
using NaiBa.Util.Extension; using NaiBa.Util.Extension;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@@ -15,190 +16,260 @@ using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
using TemuKJD.BaseForms; using TemuKJD.BaseForms;
using TemuKJD.UserComponent;
using Work; using Work;
using Work.GoodDetail;
namespace TemuKJD.WXForms.AdminForms namespace TemuKJD.WXForms.AdminForms
{ {
public partial class WxAdminOemManageForm : BaseForm public partial class WxAdminOemManageForm : BaseForm
{ {
public CancellationTokenSource cancellationTokenSource { get; set; } = null; public CancellationTokenSource cancellationTokenSource { get; set; } = null;
public WxAdminOemManageForm() private DataGridViewRow SelectedRow { get; set; }
{ public WxAdminOemManageForm()
InitializeComponent(); {
} InitializeComponent();
}
private void WxOemManageForm_Load(object sender, EventArgs e) private void WxOemManageForm_Load(object sender, EventArgs e)
{ {
IsFormLoad = true; IsFormLoad = true;
} }
private void WxOemManageForm_VisibleChanged(object sender, EventArgs e) private void WxOemManageForm_VisibleChanged(object sender, EventArgs e)
{ {
if (IsFirstVisibile) if (IsFirstVisibile)
{ {
btnSearch_Click(null, null); btnSearch_Click(null, null);
IsFirstVisibile = false; IsFirstVisibile = false;
} }
} }
private void btnAddMdy_Click(object sender, EventArgs e) private void btnAddMdy_Click(object sender, EventArgs e)
{ {
StringBuilder data = new StringBuilder(); StringBuilder data = new StringBuilder();
data.Append(UserLogin.GetSignaturex()); data.Append(UserLogin.GetSignaturex());
data.Append("&oem_id=" + GetHtml.UrlEncodeUtf8(txtOemId.Text.Trim())); data.Append("&oem_id=" + GetHtml.UrlEncodeUtf8(txtOemId.Text.Trim()));
data.Append("&oem_name=" + GetHtml.UrlEncodeUtf8(txtOemName.Text.Trim())); data.Append("&oem_name=" + GetHtml.UrlEncodeUtf8(txtOemName.Text.Trim()));
data.Append("&oem_owner=" + GetHtml.UrlEncodeUtf8(txtOemOwner.Text.Trim())); data.Append("&oem_owner=" + GetHtml.UrlEncodeUtf8(txtOemOwner.Text.Trim()));
data.Append("&parent_oemid=" + GetHtml.UrlEncodeUtf8(txtParentOemId.Text.Trim()));
string url = BaseClass.BuildWXObjString("user/add_mdy_oem");
string html = GetHtml.PostUtf8(url, data.ToString()).Trim();
string url = BaseClass.BuildWXObjString("user/add_mdy_oem"); if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
string html = GetHtml.PostUtf8(url, data.ToString()).Trim(); {
var msg = BaseRegex.GetStringJson(ref html, "msg");
if (string.IsNullOrEmpty(msg))
msg = html;
BaseMsgForm.ShowError(msg, "错误");
return;
}
btnCancelEdit_Click(null, null);
btnSearch_Click(null, null);
}
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) private void btnCancelEdit_Click(object sender, EventArgs e)
{ {
var msg = BaseRegex.GetStringJson(ref html, "msg"); txtOemId.Text = "";
if (string.IsNullOrEmpty(msg)) txtOemName.Text = "";
msg = html; txtOemOwner.Text = "";
BaseMsgForm.ShowError(msg, "错误"); txtOemId.ReadOnly = false;
return; txtParentOemId.ReadOnly = false;
} txtParentOemId.Text = "";
if (btnAddMdy.Text != "添加贴牌") btnAddMdy.Text = "添加贴牌";
btnCancelEdit_Click(null, null); }
btnSearch_Click(null, null);
}
private void btnCancelEdit_Click(object sender, EventArgs e) private void lblRandomOemId_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{ {
txtOemId.Text = ""; this.txtOemId.Text = DateTime.Now.ToString("yy") + Randomx.GetNumber(2) + Randomx.GetWordWithNumber(4);
txtOemName.Text = ""; }
txtOemOwner.Text = "";
txtOemId.ReadOnly = false;
btnAddMdy.Text = "添加贴牌";
}
private void lblRandomOemId_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) public string DbId = "";
{ private void dgvOem_CellContentClick(object sender, DataGridViewCellEventArgs e)
this.txtOemId.Text = DateTime.Now.ToString("yy") + Randomx.GetNumber(2) + Randomx.GetWordWithNumber(4); {
} if (e.ColumnIndex < 0 || e.RowIndex < 0)
return;
string columText = dgvOem.Columns[e.ColumnIndex].HeaderText;
string columName = dgvOem.Columns[e.ColumnIndex].Name;
string id = dgvOem.Rows[e.RowIndex].Cells["colId"].Value.ToString();
string oemId = dgvOem.Rows[e.RowIndex].Cells["colOemId"].Value.ToString();
string oemName = dgvOem.Rows[e.RowIndex].Cells["colOemName"].Value.ToString();
string oemOwner = dgvOem.Rows[e.RowIndex].Cells["colOemOwner"].Value.ToString();
string parentOemId = dgvOem.Rows[e.RowIndex].Cells["colParentOemId"].Value.ToString();
var row = dgvOem.Rows[e.RowIndex];
if (columText == "编辑")
{
DbId = id;
txtOemId.ReadOnly = true;
txtParentOemId.ReadOnly = true;
txtOemId.Text = oemId;
txtOemName.Text = oemName;
txtOemOwner.Text = oemOwner;
txtParentOemId.Text = parentOemId;
public string DbId = ""; btnAddMdy.Text = "编辑贴牌";
private void dgvOem_CellContentClick(object sender, DataGridViewCellEventArgs e) }
{ if (columText == "删除")
if (e.ColumnIndex < 0 || e.RowIndex < 0) {
return; if (BaseMsgForm.ShowConfirm("是否删除,删除后无法再次添加", "提示").DialogResult == DialogResult.OK)
string columText = dgvOem.Columns[e.ColumnIndex].HeaderText; {
string columName = dgvOem.Columns[e.ColumnIndex].Name; DeleteOem(id);
string id = dgvOem.Rows[e.RowIndex].Cells["colId"].Value.ToString(); }
string oemId = dgvOem.Rows[e.RowIndex].Cells["colOemId"].Value.ToString(); }
string oemName = dgvOem.Rows[e.RowIndex].Cells["colOemName"].Value.ToString(); if (columText == "选择")
string oemOwner = dgvOem.Rows[e.RowIndex].Cells["colOemOwner"].Value.ToString(); {
var row = dgvOem.Rows[e.RowIndex]; foreach (DataGridViewRow item in dgvOem.Rows)
if (columText == "编辑") {
{ item.Cells["colCheck"].Value = false;
DbId = id; }
txtOemId.ReadOnly = true; SelectedRow = dgvOem.Rows[e.RowIndex];
txtOemId.Text = oemId; SelectedRow.Cells["colCheck"].Value = true;
txtOemName.Text = oemName;
txtOemOwner.Text = oemOwner;
btnAddMdy.Text = "编辑贴牌";
}
if (columText == "删除")
{
if (BaseMsgForm.ShowConfirm("是否删除,删除后无法再次添加", "提示").DialogResult == DialogResult.OK)
{
DeleteOem(id);
}
}
}
private void DeleteOem(string dbId) }
{ }
StringBuilder data = new StringBuilder();
data.Append(UserLogin.GetSignaturex());
data.Append("&db_id=" + dbId);
string url = BaseClass.BuildWXObjString("user/del_oem"); private void DeleteOem(string dbId)
string html = GetHtml.PostUtf8(url, data.ToString()).Trim(); {
StringBuilder data = new StringBuilder();
data.Append(UserLogin.GetSignaturex());
data.Append("&db_id=" + dbId);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) string url = BaseClass.BuildWXObjString("user/del_oem");
{ string html = GetHtml.PostUtf8(url, data.ToString()).Trim();
var msg = BaseRegex.GetStringJson(ref html, "msg");
if (string.IsNullOrEmpty(msg))
msg = html;
BaseMsgForm.ShowError(msg, "错误");
return;
}
btnSearch_Click(null, null);
}
private void btnSearch_Click(object sender, EventArgs e) if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
{ {
if (cancellationTokenSource != null) var msg = BaseRegex.GetStringJson(ref html, "msg");
cancellationTokenSource.Cancel(); if (string.IsNullOrEmpty(msg))
dgvOem.Rows.Clear(); msg = html;
BaseMsgForm.ShowError(msg, "错误");
return;
}
btnSearch_Click(null, null);
}
cancellationTokenSource = new CancellationTokenSource(); private void btnSearch_Click(object sender, EventArgs e)
{
if (cancellationTokenSource != null)
cancellationTokenSource.Cancel();
dgvOem.Rows.Clear();
Task.Run(() => { cancellationTokenSource = new CancellationTokenSource();
var cancelToken = cancellationTokenSource; Task.Run(() =>
{
StringBuilder data = new StringBuilder(); var cancelToken = cancellationTokenSource;
data.Append(UserLogin.GetSignaturex());
data.Append("&oem_id=" + GetHtml.UrlEncodeUtf8(txtSearchOemId.Text.Trim()));
data.Append("&oem_name=" + GetHtml.UrlEncodeUtf8(txtSearchOemName.Text.Trim()));
string url = BaseClass.BuildWXObjString("user/get_oem"); StringBuilder data = new StringBuilder();
string html = GetHtml.PostUtf8(url, data.ToString()).Trim(); data.Append(UserLogin.GetSignaturex());
data.Append("&oem_id=" + GetHtml.UrlEncodeUtf8(txtSearchOemId.Text.Trim()));
data.Append("&oem_name=" + GetHtml.UrlEncodeUtf8(txtSearchOemName.Text.Trim()));
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) string url = BaseClass.BuildWXObjString("user/get_oem");
{ string html = GetHtml.PostUtf8(url, data.ToString()).Trim();
var msg = BaseRegex.GetStringJson(ref html, "msg");
if (string.IsNullOrEmpty(msg))
msg = html;
BaseMsgForm.ShowError(msg, "错误");
return;
}
var jArr = JObject.Parse(html)["data"]; if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
{
var msg = BaseRegex.GetStringJson(ref html, "msg");
if (string.IsNullOrEmpty(msg))
msg = html;
BaseMsgForm.ShowError(msg, "错误");
return;
}
var jArr = JObject.Parse(html)["data"];
try try
{ {
var list = JsonHelper.DeserializeJsonToList<oem>(JsonHelper.SerializeObject(jArr)).ToList(); var list = JsonHelper.DeserializeJsonToList<oem>(JsonHelper.SerializeObject(jArr)).ToList();
Invoke(new Action(() => { dgvOem.Rows.Clear(); })); Invoke(new Action(() => { dgvOem.Rows.Clear(); }));
foreach (var item in list) foreach (var item in list)
{ {
if (cancelToken.IsCancellationRequested) if (cancelToken.IsCancellationRequested)
return; return;
Invoke(new Action(() => Invoke(new Action(() =>
{ {
this.dgvOem.Rows.Add( this.dgvOem.Rows.Add(
false, false,
item.id, item.id,
item.oem_id, item.oem_id,
item.oem_name, item.oem_name,
item.oem_owner, item.oem_owner,
"", item.parent_oem_id,
"", "",
"编辑", "",
"删除" "编辑",
); "删除"
})); );
} }));
} }
catch (Exception ex) }
{ catch (Exception ex)
} {
}, cancellationTokenSource.Token); }
} }, cancellationTokenSource.Token);
}
private void btnClear_Click(object sender, EventArgs e) private void btnClear_Click(object sender, EventArgs e)
{ {
txtSearchOemId.Text = ""; txtSearchOemId.Text = "";
txtSearchOemName.Text = ""; txtSearchOemName.Text = "";
} }
}
private async void btn_SetMarkup_Click(object sender, EventArgs e)
{
try
{
btn_SetMarkup.Enabled = true;
if (SelectedRow == null)
{
BaseMsgForm.ShowError("必须选择一条");
return;
}
string parent_oemId = SelectedRow.Cells["colParentOemId"].Value.ToString();
if (string.IsNullOrEmpty(parent_oemId))
{
BaseMsgForm.ShowError("必须有父级代理");
return;
}
string oemName = SelectedRow.Cells["colOemName"].Value.ToString();
string oemId = SelectedRow.Cells["colOemId"].Value.ToString();
var value = InputDialog.Show<decimal>($"{oemName} 加价 (元)", "所有类型加价", 0, v =>
{
if (v < 0) return "加价不能小于0";
return "";
});
if (value.HasValue == false) return;
string url = BaseClass.BuildWXObjString("user/SetMarkupRule");
var data = UserLogin.GetSignPostData(new
{
TargetType = 1,
TargetId = oemId,
PaymentType = 20,
Markup = (int)(value.Value * 100m)
});
string html = await GetHtml.PostJsonAsync(url, data);
var result = JsonConvert.DeserializeObject<Result>(html);
if (result.Code != 200)
{
throw new Exception(result.Msg);
}
}
catch (Exception ex)
{
BaseMsgForm.ShowError(ex.Message);
}
finally
{
btn_SetMarkup.Enabled = true;
}
}
}
} }
@@ -126,6 +126,9 @@
<metadata name="colOemOwner.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="colOemOwner.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="colParentOemId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="colIco.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="colIco.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
+45 -52
View File
@@ -174,7 +174,7 @@ namespace TemuKJD.WXForms.AiTalkForms
this.splitContainer1.Panel2.Controls.Add(this.panel4); this.splitContainer1.Panel2.Controls.Add(this.panel4);
this.splitContainer1.Panel2MinSize = 0; this.splitContainer1.Panel2MinSize = 0;
this.splitContainer1.Size = new System.Drawing.Size(1498, 618); this.splitContainer1.Size = new System.Drawing.Size(1498, 618);
this.splitContainer1.SplitterDistance = 379; this.splitContainer1.SplitterDistance = 520;
this.splitContainer1.TabIndex = 1; this.splitContainer1.TabIndex = 1;
// //
// splitContainer2 // splitContainer2
@@ -196,13 +196,12 @@ namespace TemuKJD.WXForms.AiTalkForms
// //
this.splitContainer2.Panel2.Controls.Add(this.splitContainer4); this.splitContainer2.Panel2.Controls.Add(this.splitContainer4);
this.splitContainer2.Panel2.Padding = new System.Windows.Forms.Padding(4, 0, 0, 4); this.splitContainer2.Panel2.Padding = new System.Windows.Forms.Padding(4, 0, 0, 4);
this.splitContainer2.Size = new System.Drawing.Size(379, 618); this.splitContainer2.Size = new System.Drawing.Size(520, 618);
this.splitContainer2.SplitterDistance = 31; this.splitContainer2.SplitterDistance = 31;
this.splitContainer2.TabIndex = 0; this.splitContainer2.TabIndex = 0;
// //
// btnRefreshAiStatus // btnRefreshAiStatus
// //
this.btnRefreshAiStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnRefreshAiStatus.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnRefreshAiStatus.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnRefreshAiStatus.Cursor = System.Windows.Forms.Cursors.Hand; this.btnRefreshAiStatus.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnRefreshAiStatus.DisabledBackColor = System.Drawing.Color.Empty; this.btnRefreshAiStatus.DisabledBackColor = System.Drawing.Color.Empty;
@@ -234,7 +233,6 @@ namespace TemuKJD.WXForms.AiTalkForms
// //
// btnBatchBindShop // btnBatchBindShop
// //
this.btnBatchBindShop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnBatchBindShop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnBatchBindShop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnBatchBindShop.Cursor = System.Windows.Forms.Cursors.Hand; this.btnBatchBindShop.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnBatchBindShop.DisabledBackColor = System.Drawing.Color.Empty; this.btnBatchBindShop.DisabledBackColor = System.Drawing.Color.Empty;
@@ -262,7 +260,7 @@ namespace TemuKJD.WXForms.AiTalkForms
this.btnMultiLogin.Cursor = System.Windows.Forms.Cursors.Hand; this.btnMultiLogin.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnMultiLogin.DisabledBackColor = System.Drawing.Color.Empty; this.btnMultiLogin.DisabledBackColor = System.Drawing.Color.Empty;
this.btnMultiLogin.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnMultiLogin.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMultiLogin.Location = new System.Drawing.Point(321, 7); this.btnMultiLogin.Location = new System.Drawing.Point(462, 7);
this.btnMultiLogin.Name = "btnMultiLogin"; this.btnMultiLogin.Name = "btnMultiLogin";
this.btnMultiLogin.Size = new System.Drawing.Size(58, 20); this.btnMultiLogin.Size = new System.Drawing.Size(58, 20);
this.btnMultiLogin.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnMultiLogin.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -311,7 +309,7 @@ namespace TemuKJD.WXForms.AiTalkForms
this.splitContainer4.Panel2.Controls.Add(this.line1); this.splitContainer4.Panel2.Controls.Add(this.line1);
this.splitContainer4.Panel2.Controls.Add(this.label5); this.splitContainer4.Panel2.Controls.Add(this.label5);
this.splitContainer4.Panel2.Controls.Add(this.pbLoading); this.splitContainer4.Panel2.Controls.Add(this.pbLoading);
this.splitContainer4.Size = new System.Drawing.Size(375, 579); this.splitContainer4.Size = new System.Drawing.Size(516, 579);
this.splitContainer4.SplitterDistance = 481; this.splitContainer4.SplitterDistance = 481;
this.splitContainer4.TabIndex = 7; this.splitContainer4.TabIndex = 7;
// //
@@ -324,7 +322,7 @@ namespace TemuKJD.WXForms.AiTalkForms
this.pnlShop.Dock = System.Windows.Forms.DockStyle.Fill; this.pnlShop.Dock = System.Windows.Forms.DockStyle.Fill;
this.pnlShop.Location = new System.Drawing.Point(0, 0); this.pnlShop.Location = new System.Drawing.Point(0, 0);
this.pnlShop.Name = "pnlShop"; this.pnlShop.Name = "pnlShop";
this.pnlShop.Size = new System.Drawing.Size(375, 481); this.pnlShop.Size = new System.Drawing.Size(516, 481);
this.pnlShop.TabIndex = 8; this.pnlShop.TabIndex = 8;
// //
// cmbMessage // cmbMessage
@@ -360,7 +358,7 @@ namespace TemuKJD.WXForms.AiTalkForms
"无"}); "无"});
this.cmbMessage.Location = new System.Drawing.Point(76, 53); this.cmbMessage.Location = new System.Drawing.Point(76, 53);
this.cmbMessage.Name = "cmbMessage"; this.cmbMessage.Name = "cmbMessage";
this.cmbMessage.Size = new System.Drawing.Size(82, 20); this.cmbMessage.Size = new System.Drawing.Size(223, 20);
this.cmbMessage.TabIndex = 193; this.cmbMessage.TabIndex = 193;
this.cmbMessage.Visible = false; this.cmbMessage.Visible = false;
// //
@@ -368,7 +366,7 @@ namespace TemuKJD.WXForms.AiTalkForms
// //
this.chkNotShowMessageWindow.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.chkNotShowMessageWindow.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chkNotShowMessageWindow.AutoSize = true; this.chkNotShowMessageWindow.AutoSize = true;
this.chkNotShowMessageWindow.Location = new System.Drawing.Point(6, 31); this.chkNotShowMessageWindow.Location = new System.Drawing.Point(147, 31);
this.chkNotShowMessageWindow.Name = "chkNotShowMessageWindow"; this.chkNotShowMessageWindow.Name = "chkNotShowMessageWindow";
this.chkNotShowMessageWindow.Size = new System.Drawing.Size(123, 21); this.chkNotShowMessageWindow.Size = new System.Drawing.Size(123, 21);
this.chkNotShowMessageWindow.TabIndex = 201; this.chkNotShowMessageWindow.TabIndex = 201;
@@ -431,7 +429,7 @@ namespace TemuKJD.WXForms.AiTalkForms
this.dgvShop.ReadOnly = true; this.dgvShop.ReadOnly = true;
this.dgvShop.RowHeadersWidth = 25; this.dgvShop.RowHeadersWidth = 25;
this.dgvShop.RowTemplate.Height = 23; this.dgvShop.RowTemplate.Height = 23;
this.dgvShop.Size = new System.Drawing.Size(375, 481); this.dgvShop.Size = new System.Drawing.Size(516, 481);
this.dgvShop.TabIndex = 7; this.dgvShop.TabIndex = 7;
this.dgvShop.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellClick); this.dgvShop.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellClick);
this.dgvShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick); this.dgvShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick);
@@ -525,7 +523,6 @@ namespace TemuKJD.WXForms.AiTalkForms
this.colWaitSend.HeaderText = "待发货"; this.colWaitSend.HeaderText = "待发货";
this.colWaitSend.Name = "colWaitSend"; this.colWaitSend.Name = "colWaitSend";
this.colWaitSend.ReadOnly = true; this.colWaitSend.ReadOnly = true;
this.colWaitSend.Visible = false;
this.colWaitSend.Width = 50; this.colWaitSend.Width = 50;
// //
// colWayBillError // colWayBillError
@@ -533,7 +530,6 @@ namespace TemuKJD.WXForms.AiTalkForms
this.colWayBillError.HeaderText = "物流异常"; this.colWayBillError.HeaderText = "物流异常";
this.colWayBillError.Name = "colWayBillError"; this.colWayBillError.Name = "colWayBillError";
this.colWayBillError.ReadOnly = true; this.colWayBillError.ReadOnly = true;
this.colWayBillError.Visible = false;
this.colWayBillError.Width = 62; this.colWayBillError.Width = 62;
// //
// colAfterSale // colAfterSale
@@ -541,7 +537,6 @@ namespace TemuKJD.WXForms.AiTalkForms
this.colAfterSale.HeaderText = "售后"; this.colAfterSale.HeaderText = "售后";
this.colAfterSale.Name = "colAfterSale"; this.colAfterSale.Name = "colAfterSale";
this.colAfterSale.ReadOnly = true; this.colAfterSale.ReadOnly = true;
this.colAfterSale.Visible = false;
this.colAfterSale.Width = 38; this.colAfterSale.Width = 38;
// //
// colPunishCount // colPunishCount
@@ -549,7 +544,6 @@ namespace TemuKJD.WXForms.AiTalkForms
this.colPunishCount.HeaderText = "店铺违规"; this.colPunishCount.HeaderText = "店铺违规";
this.colPunishCount.Name = "colPunishCount"; this.colPunishCount.Name = "colPunishCount";
this.colPunishCount.ReadOnly = true; this.colPunishCount.ReadOnly = true;
this.colPunishCount.Visible = false;
this.colPunishCount.Width = 62; this.colPunishCount.Width = 62;
// //
// colScore // colScore
@@ -557,7 +551,6 @@ namespace TemuKJD.WXForms.AiTalkForms
this.colScore.HeaderText = "评分"; this.colScore.HeaderText = "评分";
this.colScore.Name = "colScore"; this.colScore.Name = "colScore";
this.colScore.ReadOnly = true; this.colScore.ReadOnly = true;
this.colScore.Visible = false;
this.colScore.Width = 38; this.colScore.Width = 38;
// //
// colCanUse // colCanUse
@@ -613,7 +606,7 @@ namespace TemuKJD.WXForms.AiTalkForms
this.btnRefreshMsgCount.Cursor = System.Windows.Forms.Cursors.Hand; this.btnRefreshMsgCount.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnRefreshMsgCount.DisabledBackColor = System.Drawing.Color.Empty; this.btnRefreshMsgCount.DisabledBackColor = System.Drawing.Color.Empty;
this.btnRefreshMsgCount.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnRefreshMsgCount.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnRefreshMsgCount.Location = new System.Drawing.Point(317, 4); this.btnRefreshMsgCount.Location = new System.Drawing.Point(458, 4);
this.btnRefreshMsgCount.Name = "btnRefreshMsgCount"; this.btnRefreshMsgCount.Name = "btnRefreshMsgCount";
this.btnRefreshMsgCount.Size = new System.Drawing.Size(59, 22); this.btnRefreshMsgCount.Size = new System.Drawing.Size(59, 22);
this.btnRefreshMsgCount.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnRefreshMsgCount.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -685,7 +678,7 @@ namespace TemuKJD.WXForms.AiTalkForms
this.btnRefreshAfterSale.Cursor = System.Windows.Forms.Cursors.Hand; this.btnRefreshAfterSale.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnRefreshAfterSale.DisabledBackColor = System.Drawing.Color.Empty; this.btnRefreshAfterSale.DisabledBackColor = System.Drawing.Color.Empty;
this.btnRefreshAfterSale.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnRefreshAfterSale.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnRefreshAfterSale.Location = new System.Drawing.Point(257, 66); this.btnRefreshAfterSale.Location = new System.Drawing.Point(398, 66);
this.btnRefreshAfterSale.Name = "btnRefreshAfterSale"; this.btnRefreshAfterSale.Name = "btnRefreshAfterSale";
this.btnRefreshAfterSale.Size = new System.Drawing.Size(118, 25); this.btnRefreshAfterSale.Size = new System.Drawing.Size(118, 25);
this.btnRefreshAfterSale.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnRefreshAfterSale.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -714,7 +707,7 @@ namespace TemuKJD.WXForms.AiTalkForms
this.cmbFiltNotes.IntegralHeight = false; this.cmbFiltNotes.IntegralHeight = false;
this.cmbFiltNotes.Location = new System.Drawing.Point(173, 66); this.cmbFiltNotes.Location = new System.Drawing.Point(173, 66);
this.cmbFiltNotes.Name = "cmbFiltNotes"; this.cmbFiltNotes.Name = "cmbFiltNotes";
this.cmbFiltNotes.Size = new System.Drawing.Size(82, 25); this.cmbFiltNotes.Size = new System.Drawing.Size(223, 25);
this.cmbFiltNotes.TabIndex = 0; this.cmbFiltNotes.TabIndex = 0;
this.cmbFiltNotes.Text = "全部"; this.cmbFiltNotes.Text = "全部";
// //
@@ -725,7 +718,7 @@ namespace TemuKJD.WXForms.AiTalkForms
this.btnRestore.Cursor = System.Windows.Forms.Cursors.Hand; this.btnRestore.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnRestore.DisabledBackColor = System.Drawing.Color.Empty; this.btnRestore.DisabledBackColor = System.Drawing.Color.Empty;
this.btnRestore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnRestore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnRestore.Location = new System.Drawing.Point(213, 41); this.btnRestore.Location = new System.Drawing.Point(354, 41);
this.btnRestore.Name = "btnRestore"; this.btnRestore.Name = "btnRestore";
this.btnRestore.Size = new System.Drawing.Size(42, 23); this.btnRestore.Size = new System.Drawing.Size(42, 23);
this.btnRestore.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnRestore.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -755,7 +748,7 @@ namespace TemuKJD.WXForms.AiTalkForms
this.txtFiltShopName.Location = new System.Drawing.Point(57, 41); this.txtFiltShopName.Location = new System.Drawing.Point(57, 41);
this.txtFiltShopName.Name = "txtFiltShopName"; this.txtFiltShopName.Name = "txtFiltShopName";
this.txtFiltShopName.PreventEnterBeep = true; this.txtFiltShopName.PreventEnterBeep = true;
this.txtFiltShopName.Size = new System.Drawing.Size(110, 23); this.txtFiltShopName.Size = new System.Drawing.Size(251, 23);
this.txtFiltShopName.TabIndex = 202; this.txtFiltShopName.TabIndex = 202;
// //
// btnFilterShop // btnFilterShop
@@ -765,7 +758,7 @@ namespace TemuKJD.WXForms.AiTalkForms
this.btnFilterShop.Cursor = System.Windows.Forms.Cursors.Hand; this.btnFilterShop.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnFilterShop.DisabledBackColor = System.Drawing.Color.Empty; this.btnFilterShop.DisabledBackColor = System.Drawing.Color.Empty;
this.btnFilterShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnFilterShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnFilterShop.Location = new System.Drawing.Point(169, 41); this.btnFilterShop.Location = new System.Drawing.Point(310, 41);
this.btnFilterShop.Name = "btnFilterShop"; this.btnFilterShop.Name = "btnFilterShop";
this.btnFilterShop.Size = new System.Drawing.Size(42, 23); this.btnFilterShop.Size = new System.Drawing.Size(42, 23);
this.btnFilterShop.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnFilterShop.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -790,7 +783,7 @@ namespace TemuKJD.WXForms.AiTalkForms
this.btnRefreshShop.Cursor = System.Windows.Forms.Cursors.Hand; this.btnRefreshShop.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnRefreshShop.DisabledBackColor = System.Drawing.Color.Empty; 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.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnRefreshShop.Location = new System.Drawing.Point(257, 41); this.btnRefreshShop.Location = new System.Drawing.Point(398, 41);
this.btnRefreshShop.Name = "btnRefreshShop"; this.btnRefreshShop.Name = "btnRefreshShop";
this.btnRefreshShop.Size = new System.Drawing.Size(118, 23); this.btnRefreshShop.Size = new System.Drawing.Size(118, 23);
this.btnRefreshShop.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnRefreshShop.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -835,7 +828,7 @@ namespace TemuKJD.WXForms.AiTalkForms
this.line1.ForeColor = System.Drawing.Color.Silver; this.line1.ForeColor = System.Drawing.Color.Silver;
this.line1.Location = new System.Drawing.Point(4, 26); this.line1.Location = new System.Drawing.Point(4, 26);
this.line1.Name = "line1"; this.line1.Name = "line1";
this.line1.Size = new System.Drawing.Size(366, 10); this.line1.Size = new System.Drawing.Size(507, 10);
this.line1.TabIndex = 242; this.line1.TabIndex = 242;
this.line1.Text = "line1"; this.line1.Text = "line1";
// //
@@ -853,7 +846,7 @@ namespace TemuKJD.WXForms.AiTalkForms
// //
this.pbLoading.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.pbLoading.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue; this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue;
this.pbLoading.Location = new System.Drawing.Point(291, 2); this.pbLoading.Location = new System.Drawing.Point(432, 2);
this.pbLoading.Name = "pbLoading"; this.pbLoading.Name = "pbLoading";
this.pbLoading.Size = new System.Drawing.Size(25, 25); this.pbLoading.Size = new System.Drawing.Size(25, 25);
this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -870,7 +863,7 @@ namespace TemuKJD.WXForms.AiTalkForms
this.panel4.Dock = System.Windows.Forms.DockStyle.Fill; this.panel4.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel4.Location = new System.Drawing.Point(0, 0); this.panel4.Location = new System.Drawing.Point(0, 0);
this.panel4.Name = "panel4"; this.panel4.Name = "panel4";
this.panel4.Size = new System.Drawing.Size(1115, 618); this.panel4.Size = new System.Drawing.Size(974, 618);
this.panel4.TabIndex = 906; this.panel4.TabIndex = 906;
// //
// btnReload // btnReload
@@ -880,7 +873,7 @@ namespace TemuKJD.WXForms.AiTalkForms
this.btnReload.Cursor = System.Windows.Forms.Cursors.Hand; this.btnReload.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnReload.DisabledBackColor = System.Drawing.Color.Empty; this.btnReload.DisabledBackColor = System.Drawing.Color.Empty;
this.btnReload.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnReload.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnReload.Location = new System.Drawing.Point(929, 12); this.btnReload.Location = new System.Drawing.Point(788, 12);
this.btnReload.Name = "btnReload"; this.btnReload.Name = "btnReload";
this.btnReload.Size = new System.Drawing.Size(88, 23); this.btnReload.Size = new System.Drawing.Size(88, 23);
this.btnReload.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnReload.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -932,7 +925,7 @@ namespace TemuKJD.WXForms.AiTalkForms
this.btnToKfMainPage.Cursor = System.Windows.Forms.Cursors.Hand; this.btnToKfMainPage.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnToKfMainPage.DisabledBackColor = System.Drawing.Color.Empty; this.btnToKfMainPage.DisabledBackColor = System.Drawing.Color.Empty;
this.btnToKfMainPage.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnToKfMainPage.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnToKfMainPage.Location = new System.Drawing.Point(1023, 12); this.btnToKfMainPage.Location = new System.Drawing.Point(882, 12);
this.btnToKfMainPage.Name = "btnToKfMainPage"; this.btnToKfMainPage.Name = "btnToKfMainPage";
this.btnToKfMainPage.Size = new System.Drawing.Size(88, 23); this.btnToKfMainPage.Size = new System.Drawing.Size(88, 23);
this.btnToKfMainPage.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnToKfMainPage.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -966,7 +959,7 @@ namespace TemuKJD.WXForms.AiTalkForms
this.ucTabControl1.Name = "ucTabControl1"; this.ucTabControl1.Name = "ucTabControl1";
this.ucTabControl1.SelectedIndex = 0; this.ucTabControl1.SelectedIndex = 0;
this.ucTabControl1.ShowCloseButton = false; this.ucTabControl1.ShowCloseButton = false;
this.ucTabControl1.Size = new System.Drawing.Size(1115, 618); this.ucTabControl1.Size = new System.Drawing.Size(974, 618);
this.ucTabControl1.TabIndex = 0; this.ucTabControl1.TabIndex = 0;
this.ucTabControl1.TabSelectColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.ucTabControl1.TabSelectColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.ucTabControl1.TabSelectTextColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.ucTabControl1.TabSelectTextColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -979,7 +972,7 @@ namespace TemuKJD.WXForms.AiTalkForms
this.tabPage1.Location = new System.Drawing.Point(2, 40); this.tabPage1.Location = new System.Drawing.Point(2, 40);
this.tabPage1.Name = "tabPage1"; this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(0, 3, 0, 0); this.tabPage1.Padding = new System.Windows.Forms.Padding(0, 3, 0, 0);
this.tabPage1.Size = new System.Drawing.Size(1109, 574); this.tabPage1.Size = new System.Drawing.Size(968, 574);
this.tabPage1.TabIndex = 0; this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "客服窗口"; this.tabPage1.Text = "客服窗口";
this.tabPage1.UseVisualStyleBackColor = true; this.tabPage1.UseVisualStyleBackColor = true;
@@ -1003,7 +996,7 @@ namespace TemuKJD.WXForms.AiTalkForms
// //
this.splitContainer3.Panel2.Controls.Add(this.pnlAiTalk); this.splitContainer3.Panel2.Controls.Add(this.pnlAiTalk);
this.splitContainer3.Panel2MinSize = 0; this.splitContainer3.Panel2MinSize = 0;
this.splitContainer3.Size = new System.Drawing.Size(1109, 571); this.splitContainer3.Size = new System.Drawing.Size(968, 571);
this.splitContainer3.SplitterDistance = 25; this.splitContainer3.SplitterDistance = 25;
this.splitContainer3.TabIndex = 2; this.splitContainer3.TabIndex = 2;
// //
@@ -1068,7 +1061,7 @@ namespace TemuKJD.WXForms.AiTalkForms
this.txtAddress.Location = new System.Drawing.Point(66, 1); this.txtAddress.Location = new System.Drawing.Point(66, 1);
this.txtAddress.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.txtAddress.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txtAddress.Name = "txtAddress"; this.txtAddress.Name = "txtAddress";
this.txtAddress.Size = new System.Drawing.Size(1040, 23); this.txtAddress.Size = new System.Drawing.Size(899, 23);
this.txtAddress.TabIndex = 12; this.txtAddress.TabIndex = 12;
this.txtAddress.Visible = false; this.txtAddress.Visible = false;
this.txtAddress.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtAddress_KeyDown); this.txtAddress.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtAddress_KeyDown);
@@ -1080,7 +1073,7 @@ namespace TemuKJD.WXForms.AiTalkForms
this.pnlAiTalk.Dock = System.Windows.Forms.DockStyle.Fill; this.pnlAiTalk.Dock = System.Windows.Forms.DockStyle.Fill;
this.pnlAiTalk.Location = new System.Drawing.Point(0, 0); this.pnlAiTalk.Location = new System.Drawing.Point(0, 0);
this.pnlAiTalk.Name = "pnlAiTalk"; this.pnlAiTalk.Name = "pnlAiTalk";
this.pnlAiTalk.Size = new System.Drawing.Size(1109, 542); this.pnlAiTalk.Size = new System.Drawing.Size(968, 542);
this.pnlAiTalk.TabIndex = 2; this.pnlAiTalk.TabIndex = 2;
// //
// pnlCover // pnlCover
@@ -1140,7 +1133,7 @@ namespace TemuKJD.WXForms.AiTalkForms
this.tabPage2.Location = new System.Drawing.Point(2, 40); this.tabPage2.Location = new System.Drawing.Point(2, 40);
this.tabPage2.Name = "tabPage2"; this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(0, 3, 0, 0); this.tabPage2.Padding = new System.Windows.Forms.Padding(0, 3, 0, 0);
this.tabPage2.Size = new System.Drawing.Size(1109, 574); this.tabPage2.Size = new System.Drawing.Size(978, 574);
this.tabPage2.TabIndex = 1; this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "店铺后台"; this.tabPage2.Text = "店铺后台";
this.tabPage2.UseVisualStyleBackColor = true; this.tabPage2.UseVisualStyleBackColor = true;
@@ -1150,7 +1143,7 @@ namespace TemuKJD.WXForms.AiTalkForms
this.mainPanel.Dock = System.Windows.Forms.DockStyle.Fill; this.mainPanel.Dock = System.Windows.Forms.DockStyle.Fill;
this.mainPanel.Location = new System.Drawing.Point(0, 3); this.mainPanel.Location = new System.Drawing.Point(0, 3);
this.mainPanel.Name = "mainPanel"; this.mainPanel.Name = "mainPanel";
this.mainPanel.Size = new System.Drawing.Size(1109, 571); this.mainPanel.Size = new System.Drawing.Size(978, 571);
this.mainPanel.TabIndex = 1; this.mainPanel.TabIndex = 1;
// //
// tpBuyerOrder // tpBuyerOrder
@@ -1158,7 +1151,7 @@ namespace TemuKJD.WXForms.AiTalkForms
this.tpBuyerOrder.Location = new System.Drawing.Point(2, 40); this.tpBuyerOrder.Location = new System.Drawing.Point(2, 40);
this.tpBuyerOrder.Name = "tpBuyerOrder"; this.tpBuyerOrder.Name = "tpBuyerOrder";
this.tpBuyerOrder.Padding = new System.Windows.Forms.Padding(0, 3, 0, 0); this.tpBuyerOrder.Padding = new System.Windows.Forms.Padding(0, 3, 0, 0);
this.tpBuyerOrder.Size = new System.Drawing.Size(1109, 574); this.tpBuyerOrder.Size = new System.Drawing.Size(978, 574);
this.tpBuyerOrder.TabIndex = 2; this.tpBuyerOrder.TabIndex = 2;
this.tpBuyerOrder.Text = "订单管理"; this.tpBuyerOrder.Text = "订单管理";
this.tpBuyerOrder.UseVisualStyleBackColor = true; this.tpBuyerOrder.UseVisualStyleBackColor = true;
@@ -1340,27 +1333,27 @@ namespace TemuKJD.WXForms.AiTalkForms
private System.Windows.Forms.Panel pnlAiTalk; private System.Windows.Forms.Panel pnlAiTalk;
private System.Windows.Forms.Panel pnlShop; private System.Windows.Forms.Panel pnlShop;
private DevComponents.DotNetBar.PanelEx btnBatchBindShop; private DevComponents.DotNetBar.PanelEx btnBatchBindShop;
private UserComponent.UcDataGridViewCheckBoxColumn colSelect;
private System.Windows.Forms.DataGridViewTextBoxColumn colShopLoginName;
private System.Windows.Forms.DataGridViewTextBoxColumn colShopId;
private System.Windows.Forms.DataGridViewTextBoxColumn colShopName;
private System.Windows.Forms.DataGridViewTextBoxColumn colGroup;
private System.Windows.Forms.DataGridViewTextBoxColumn colShopNotes;
private System.Windows.Forms.DataGridViewLinkColumn colLoginStatus;
private System.Windows.Forms.DataGridViewTextBoxColumn colAiStatus;
private System.Windows.Forms.DataGridViewTextBoxColumn colMessage;
private System.Windows.Forms.DataGridViewTextBoxColumn colAutoReplyCount;
private System.Windows.Forms.DataGridViewTextBoxColumn colWaitSend;
private System.Windows.Forms.DataGridViewTextBoxColumn colWayBillError;
private System.Windows.Forms.DataGridViewTextBoxColumn colAfterSale;
private System.Windows.Forms.DataGridViewTextBoxColumn colPunishCount;
private System.Windows.Forms.DataGridViewTextBoxColumn colScore;
private System.Windows.Forms.DataGridViewCheckBoxColumn colCanUse;
private System.Windows.Forms.Label lblCurrentShop; private System.Windows.Forms.Label lblCurrentShop;
private System.Windows.Forms.Panel pnlCover; private System.Windows.Forms.Panel pnlCover;
private DevComponents.DotNetBar.PanelEx btnReLogin; private DevComponents.DotNetBar.PanelEx btnReLogin;
private System.Windows.Forms.PictureBox pictureBox1; private System.Windows.Forms.PictureBox pictureBox1;
private DevComponents.DotNetBar.PanelEx btnRefreshAiStatus; private DevComponents.DotNetBar.PanelEx btnRefreshAiStatus;
private DevComponents.DotNetBar.PanelEx btnReload; private DevComponents.DotNetBar.PanelEx btnReload;
} private UserComponent.UcDataGridViewCheckBoxColumn colSelect;
private System.Windows.Forms.DataGridViewTextBoxColumn colShopLoginName;
private System.Windows.Forms.DataGridViewTextBoxColumn colShopId;
private System.Windows.Forms.DataGridViewTextBoxColumn colShopName;
private System.Windows.Forms.DataGridViewTextBoxColumn colGroup;
private System.Windows.Forms.DataGridViewTextBoxColumn colShopNotes;
private System.Windows.Forms.DataGridViewLinkColumn colLoginStatus;
private System.Windows.Forms.DataGridViewTextBoxColumn colAiStatus;
private System.Windows.Forms.DataGridViewTextBoxColumn colMessage;
private System.Windows.Forms.DataGridViewTextBoxColumn colAutoReplyCount;
private System.Windows.Forms.DataGridViewTextBoxColumn colWaitSend;
private System.Windows.Forms.DataGridViewTextBoxColumn colWayBillError;
private System.Windows.Forms.DataGridViewTextBoxColumn colAfterSale;
private System.Windows.Forms.DataGridViewTextBoxColumn colPunishCount;
private System.Windows.Forms.DataGridViewTextBoxColumn colScore;
private System.Windows.Forms.DataGridViewCheckBoxColumn colCanUse;
}
} }
+7 -5
View File
@@ -91,7 +91,7 @@ namespace TemuKJD.WXForms.AiTalkForms
public PDDBuyerOrderListForm orderListForm = null; public PDDBuyerOrderListForm orderListForm = null;
DateTime nextRefreshTime = DateTime.Now.AddMinutes(30); DateTime nextRefreshTime = DateTime.Now.AddMinutes(0);
public WxAiTalkForm() public WxAiTalkForm()
{ {
@@ -176,6 +176,7 @@ namespace TemuKJD.WXForms.AiTalkForms
LoadAiTalk(); LoadAiTalk();
LoadAiTalkAdmin(); LoadAiTalkAdmin();
// 加载其他店铺后台信息
Task.Run(() => Task.Run(() =>
{ {
// 等待店铺初始化 // 等待店铺初始化
@@ -191,7 +192,6 @@ namespace TemuKJD.WXForms.AiTalkForms
})); }));
SetMainBrowserUrl(currentShop); SetMainBrowserUrl(currentShop);
LoadShop(); LoadShop();
RefreshCookie(true);
Invoke(new Action(() => Invoke(new Action(() =>
{ {
foreach (var shopNote in GlobalConfig.ValidShopLoginList.Select(s => s.Notes).Where(s => !s.IsNullOrEmpty()).Distinct()) foreach (var shopNote in GlobalConfig.ValidShopLoginList.Select(s => s.Notes).Where(s => !s.IsNullOrEmpty()).Distinct())
@@ -207,6 +207,8 @@ namespace TemuKJD.WXForms.AiTalkForms
if (lstShopAfterSale == null) if (lstShopAfterSale == null)
lstShopAfterSale = new ConcurrentList<WxTalkFormShopMainInfo>(); lstShopAfterSale = new ConcurrentList<WxTalkFormShopMainInfo>();
})); }));
//刷新店铺cookie
//RefreshCookie(true);
// 加载店铺确认默认店铺后再初始化订单列表读取 // 加载店铺确认默认店铺后再初始化订单列表读取
InitOrderForm(); InitOrderForm();
@@ -251,7 +253,7 @@ namespace TemuKJD.WXForms.AiTalkForms
} }
/// <summary> /// <summary>
/// 初始化买手订单页面 /// 初始化买手订单页面,ai客服已移除,迁移到拍单软件
/// </summary> /// </summary>
void InitOrderForm() void InitOrderForm()
{ {
@@ -1008,7 +1010,7 @@ namespace TemuKJD.WXForms.AiTalkForms
Invoke(new Action(() => Invoke(new Action(() =>
{ {
if (r != null) if (r != null)
r.Cells["colMessage"].Value = "正在刷新店铺"; r.Cells["colMessage"].Value = "正在刷新店铺Cookie";
})); }));
WXShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false); WXShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false);
Invoke(new Action(() => Invoke(new Action(() =>
@@ -1294,7 +1296,7 @@ namespace TemuKJD.WXForms.AiTalkForms
{ {
if (btnClose.Text == ">>") if (btnClose.Text == ">>")
{ {
splitContainer1.SplitterDistance = 379; splitContainer1.SplitterDistance = 520;
btnClose.Text = "<<"; btnClose.Text = "<<";
} }
else else
+161 -47
View File
@@ -29,15 +29,19 @@ namespace TemuKJD.WXForms.ProductForms
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.cm_group = new System.Windows.Forms.ComboBox();
this.label5 = new System.Windows.Forms.Label();
this.cb_safe = new System.Windows.Forms.ComboBox(); this.cb_safe = new System.Windows.Forms.ComboBox();
this.label4 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label();
this.num_price = new TemuKJD.UserComponent.UcNumericRange(); this.num_price = new TemuKJD.UserComponent.UcNumericRange();
this.num_sold = new TemuKJD.UserComponent.UcNumericRange(); this.num_sold = new TemuKJD.UserComponent.UcNumericRange();
this.panel1 = new System.Windows.Forms.Panel(); this.panel1 = new System.Windows.Forms.Panel();
this.btn_delGroup = new DevComponents.DotNetBar.PanelEx();
this.btnSafeDetection = new DevComponents.DotNetBar.PanelEx(); this.btnSafeDetection = new DevComponents.DotNetBar.PanelEx();
this.btn_createGroup = new DevComponents.DotNetBar.PanelEx();
this.btn_removefavorite = new DevComponents.DotNetBar.PanelEx(); this.btn_removefavorite = new DevComponents.DotNetBar.PanelEx();
this.bt_importUploadList = new DevComponents.DotNetBar.PanelEx(); this.bt_importUploadList = new DevComponents.DotNetBar.PanelEx();
this.label5r = new System.Windows.Forms.Label(); this.label5r = new System.Windows.Forms.Label();
@@ -62,12 +66,14 @@ namespace TemuKJD.WXForms.ProductForms
this.Column1 = new System.Windows.Forms.DataGridViewImageColumn(); this.Column1 = new System.Windows.Forms.DataGridViewImageColumn();
this.c_goodsid = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.c_goodsid = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colDetectionResult = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colDetectionResult = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage(); this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage();
this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
this.numericUpDown1 = new System.Windows.Forms.NumericUpDown(); this.numericUpDown1 = new System.Windows.Forms.NumericUpDown();
this.btn_setGroup = new DevComponents.DotNetBar.PanelEx();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout();
@@ -93,6 +99,8 @@ namespace TemuKJD.WXForms.ProductForms
// //
// splitContainer1.Panel1 // splitContainer1.Panel1
// //
this.splitContainer1.Panel1.Controls.Add(this.cm_group);
this.splitContainer1.Panel1.Controls.Add(this.label5);
this.splitContainer1.Panel1.Controls.Add(this.cb_safe); this.splitContainer1.Panel1.Controls.Add(this.cb_safe);
this.splitContainer1.Panel1.Controls.Add(this.label4); this.splitContainer1.Panel1.Controls.Add(this.label4);
this.splitContainer1.Panel1.Controls.Add(this.num_price); this.splitContainer1.Panel1.Controls.Add(this.num_price);
@@ -117,9 +125,28 @@ namespace TemuKJD.WXForms.ProductForms
// //
this.splitContainer1.Panel2.Controls.Add(this.splitContainer2); this.splitContainer1.Panel2.Controls.Add(this.splitContainer2);
this.splitContainer1.Panel2.Margin = new System.Windows.Forms.Padding(4); this.splitContainer1.Panel2.Margin = new System.Windows.Forms.Padding(4);
this.splitContainer1.Size = new System.Drawing.Size(1719, 530); this.splitContainer1.Size = new System.Drawing.Size(1388, 530);
this.splitContainer1.SplitterDistance = 87;
this.splitContainer1.TabIndex = 35; this.splitContainer1.TabIndex = 35;
// //
// cm_group
//
this.cm_group.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cm_group.FormattingEnabled = true;
this.cm_group.Location = new System.Drawing.Point(678, 14);
this.cm_group.Name = "cm_group";
this.cm_group.Size = new System.Drawing.Size(134, 25);
this.cm_group.TabIndex = 938;
//
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(638, 17);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(44, 17);
this.label5.TabIndex = 937;
this.label5.Text = "分组:";
//
// cb_safe // cb_safe
// //
this.cb_safe.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cb_safe.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
@@ -130,15 +157,15 @@ namespace TemuKJD.WXForms.ProductForms
"安全", "安全",
"违规", "违规",
"未检测"}); "未检测"});
this.cb_safe.Location = new System.Drawing.Point(1141, 13); this.cb_safe.Location = new System.Drawing.Point(678, 43);
this.cb_safe.Name = "cb_safe"; this.cb_safe.Name = "cb_safe";
this.cb_safe.Size = new System.Drawing.Size(97, 25); this.cb_safe.Size = new System.Drawing.Size(134, 25);
this.cb_safe.TabIndex = 930; this.cb_safe.TabIndex = 930;
// //
// label4 // label4
// //
this.label4.AutoSize = true; this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(1104, 17); this.label4.Location = new System.Drawing.Point(638, 49);
this.label4.Name = "label4"; this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(44, 17); this.label4.Size = new System.Drawing.Size(44, 17);
this.label4.TabIndex = 929; this.label4.TabIndex = 929;
@@ -146,8 +173,7 @@ namespace TemuKJD.WXForms.ProductForms
// //
// num_price // num_price
// //
this.num_price.Compact = true; this.num_price.Location = new System.Drawing.Point(478, 15);
this.num_price.Location = new System.Drawing.Point(391, 15);
this.num_price.LowerValue = new decimal(new int[] { this.num_price.LowerValue = new decimal(new int[] {
1, 1,
0, 0,
@@ -165,7 +191,7 @@ namespace TemuKJD.WXForms.ProductForms
0}); 0});
this.num_price.Name = "num_price"; this.num_price.Name = "num_price";
this.num_price.SeparatorText = ""; this.num_price.SeparatorText = "";
this.num_price.Size = new System.Drawing.Size(108, 23); this.num_price.Size = new System.Drawing.Size(151, 23);
this.num_price.TabIndex = 922; this.num_price.TabIndex = 922;
this.num_price.UpperValue = new decimal(new int[] { this.num_price.UpperValue = new decimal(new int[] {
9999999, 9999999,
@@ -175,8 +201,7 @@ namespace TemuKJD.WXForms.ProductForms
// //
// num_sold // num_sold
// //
this.num_sold.Compact = true; this.num_sold.Location = new System.Drawing.Point(247, 15);
this.num_sold.Location = new System.Drawing.Point(218, 15);
this.num_sold.LowerValue = new decimal(new int[] { this.num_sold.LowerValue = new decimal(new int[] {
1, 1,
0, 0,
@@ -194,7 +219,7 @@ namespace TemuKJD.WXForms.ProductForms
0}); 0});
this.num_sold.Name = "num_sold"; this.num_sold.Name = "num_sold";
this.num_sold.SeparatorText = ""; this.num_sold.SeparatorText = "";
this.num_sold.Size = new System.Drawing.Size(108, 23); this.num_sold.Size = new System.Drawing.Size(155, 23);
this.num_sold.TabIndex = 921; this.num_sold.TabIndex = 921;
this.num_sold.UpperValue = new decimal(new int[] { this.num_sold.UpperValue = new decimal(new int[] {
9999999, 9999999,
@@ -204,22 +229,49 @@ namespace TemuKJD.WXForms.ProductForms
// //
// panel1 // panel1
// //
this.panel1.Controls.Add(this.btn_setGroup);
this.panel1.Controls.Add(this.btn_delGroup);
this.panel1.Controls.Add(this.btnSafeDetection); this.panel1.Controls.Add(this.btnSafeDetection);
this.panel1.Controls.Add(this.btn_createGroup);
this.panel1.Controls.Add(this.btn_removefavorite); this.panel1.Controls.Add(this.btn_removefavorite);
this.panel1.Controls.Add(this.bt_importUploadList); this.panel1.Controls.Add(this.bt_importUploadList);
this.panel1.Dock = System.Windows.Forms.DockStyle.Right; this.panel1.Dock = System.Windows.Forms.DockStyle.Right;
this.panel1.Location = new System.Drawing.Point(1509, 0); this.panel1.Location = new System.Drawing.Point(1023, 0);
this.panel1.Name = "panel1"; this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(210, 50); this.panel1.Size = new System.Drawing.Size(365, 87);
this.panel1.TabIndex = 914; this.panel1.TabIndex = 914;
// //
// btn_delGroup
//
this.btn_delGroup.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btn_delGroup.Cursor = System.Windows.Forms.Cursors.Hand;
this.btn_delGroup.DisabledBackColor = System.Drawing.Color.Empty;
this.btn_delGroup.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btn_delGroup.Location = new System.Drawing.Point(3, 61);
this.btn_delGroup.Name = "btn_delGroup";
this.btn_delGroup.Size = new System.Drawing.Size(58, 23);
this.btn_delGroup.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btn_delGroup.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btn_delGroup.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btn_delGroup.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
this.btn_delGroup.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
this.btn_delGroup.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
this.btn_delGroup.Style.ForeColor.Color = System.Drawing.Color.White;
this.btn_delGroup.Style.GradientAngle = 90;
this.btn_delGroup.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
this.btn_delGroup.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
this.btn_delGroup.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
this.btn_delGroup.TabIndex = 443;
this.btn_delGroup.Text = "删除分组";
this.btn_delGroup.Click += new System.EventHandler(this.btn_delGroup_Click);
//
// btnSafeDetection // btnSafeDetection
// //
this.btnSafeDetection.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnSafeDetection.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnSafeDetection.Cursor = System.Windows.Forms.Cursors.Hand; this.btnSafeDetection.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnSafeDetection.DisabledBackColor = System.Drawing.Color.Empty; this.btnSafeDetection.DisabledBackColor = System.Drawing.Color.Empty;
this.btnSafeDetection.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSafeDetection.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSafeDetection.Location = new System.Drawing.Point(132, 14); this.btnSafeDetection.Location = new System.Drawing.Point(228, 11);
this.btnSafeDetection.Name = "btnSafeDetection"; this.btnSafeDetection.Name = "btnSafeDetection";
this.btnSafeDetection.Size = new System.Drawing.Size(58, 23); this.btnSafeDetection.Size = new System.Drawing.Size(58, 23);
this.btnSafeDetection.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnSafeDetection.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -237,13 +289,37 @@ namespace TemuKJD.WXForms.ProductForms
this.btnSafeDetection.Text = "AI检测"; this.btnSafeDetection.Text = "AI检测";
this.btnSafeDetection.Click += new System.EventHandler(this.btnSafeDetection_Click); this.btnSafeDetection.Click += new System.EventHandler(this.btnSafeDetection_Click);
// //
// btn_createGroup
//
this.btn_createGroup.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btn_createGroup.Cursor = System.Windows.Forms.Cursors.Hand;
this.btn_createGroup.DisabledBackColor = System.Drawing.Color.Empty;
this.btn_createGroup.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btn_createGroup.Location = new System.Drawing.Point(3, 3);
this.btn_createGroup.Name = "btn_createGroup";
this.btn_createGroup.Size = new System.Drawing.Size(58, 23);
this.btn_createGroup.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btn_createGroup.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btn_createGroup.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btn_createGroup.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
this.btn_createGroup.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
this.btn_createGroup.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
this.btn_createGroup.Style.ForeColor.Color = System.Drawing.Color.White;
this.btn_createGroup.Style.GradientAngle = 90;
this.btn_createGroup.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
this.btn_createGroup.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
this.btn_createGroup.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
this.btn_createGroup.TabIndex = 439;
this.btn_createGroup.Text = "创建分组";
this.btn_createGroup.Click += new System.EventHandler(this.btn_createGroup_Click);
//
// btn_removefavorite // btn_removefavorite
// //
this.btn_removefavorite.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btn_removefavorite.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btn_removefavorite.Cursor = System.Windows.Forms.Cursors.Hand; this.btn_removefavorite.Cursor = System.Windows.Forms.Cursors.Hand;
this.btn_removefavorite.DisabledBackColor = System.Drawing.Color.Empty; this.btn_removefavorite.DisabledBackColor = System.Drawing.Color.Empty;
this.btn_removefavorite.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btn_removefavorite.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btn_removefavorite.Location = new System.Drawing.Point(68, 14); this.btn_removefavorite.Location = new System.Drawing.Point(164, 46);
this.btn_removefavorite.Name = "btn_removefavorite"; this.btn_removefavorite.Name = "btn_removefavorite";
this.btn_removefavorite.Size = new System.Drawing.Size(58, 23); this.btn_removefavorite.Size = new System.Drawing.Size(58, 23);
this.btn_removefavorite.Style.Alignment = System.Drawing.StringAlignment.Center; this.btn_removefavorite.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -267,7 +343,7 @@ namespace TemuKJD.WXForms.ProductForms
this.bt_importUploadList.Cursor = System.Windows.Forms.Cursors.Hand; this.bt_importUploadList.Cursor = System.Windows.Forms.Cursors.Hand;
this.bt_importUploadList.DisabledBackColor = System.Drawing.Color.Empty; this.bt_importUploadList.DisabledBackColor = System.Drawing.Color.Empty;
this.bt_importUploadList.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.bt_importUploadList.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.bt_importUploadList.Location = new System.Drawing.Point(3, 14); this.bt_importUploadList.Location = new System.Drawing.Point(164, 12);
this.bt_importUploadList.Name = "bt_importUploadList"; this.bt_importUploadList.Name = "bt_importUploadList";
this.bt_importUploadList.Size = new System.Drawing.Size(58, 23); this.bt_importUploadList.Size = new System.Drawing.Size(58, 23);
this.bt_importUploadList.Style.Alignment = System.Drawing.StringAlignment.Center; this.bt_importUploadList.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -288,7 +364,7 @@ namespace TemuKJD.WXForms.ProductForms
// label5r // label5r
// //
this.label5r.AutoSize = true; this.label5r.AutoSize = true;
this.label5r.Location = new System.Drawing.Point(942, 16); this.label5r.Location = new System.Drawing.Point(10, 46);
this.label5r.Name = "label5r"; this.label5r.Name = "label5r";
this.label5r.Size = new System.Drawing.Size(44, 17); this.label5r.Size = new System.Drawing.Size(44, 17);
this.label5r.TabIndex = 907; this.label5r.TabIndex = 907;
@@ -303,16 +379,16 @@ namespace TemuKJD.WXForms.ProductForms
"全部", "全部",
"多多", "多多",
"微信"}); "微信"});
this.cb_Platformr.Location = new System.Drawing.Point(992, 13); this.cb_Platformr.Location = new System.Drawing.Point(60, 43);
this.cb_Platformr.Name = "cb_Platformr"; this.cb_Platformr.Name = "cb_Platformr";
this.cb_Platformr.Size = new System.Drawing.Size(97, 25); this.cb_Platformr.Size = new System.Drawing.Size(118, 25);
this.cb_Platformr.TabIndex = 906; this.cb_Platformr.TabIndex = 906;
// //
// cmbCatSelect2 // cmbCatSelect2
// //
this.cmbCatSelect2.DropDownWidth = 150; this.cmbCatSelect2.DropDownWidth = 150;
this.cmbCatSelect2.FormattingEnabled = true; this.cmbCatSelect2.FormattingEnabled = true;
this.cmbCatSelect2.Location = new System.Drawing.Point(639, 12); this.cmbCatSelect2.Location = new System.Drawing.Point(338, 46);
this.cmbCatSelect2.Name = "cmbCatSelect2"; this.cmbCatSelect2.Name = "cmbCatSelect2";
this.cmbCatSelect2.Size = new System.Drawing.Size(97, 25); this.cmbCatSelect2.Size = new System.Drawing.Size(97, 25);
this.cmbCatSelect2.TabIndex = 897; this.cmbCatSelect2.TabIndex = 897;
@@ -321,7 +397,7 @@ namespace TemuKJD.WXForms.ProductForms
// //
this.cmbCatSelect1.DropDownWidth = 150; this.cmbCatSelect1.DropDownWidth = 150;
this.cmbCatSelect1.FormattingEnabled = true; this.cmbCatSelect1.FormattingEnabled = true;
this.cmbCatSelect1.Location = new System.Drawing.Point(542, 12); this.cmbCatSelect1.Location = new System.Drawing.Point(241, 46);
this.cmbCatSelect1.Name = "cmbCatSelect1"; this.cmbCatSelect1.Name = "cmbCatSelect1";
this.cmbCatSelect1.Size = new System.Drawing.Size(97, 25); this.cmbCatSelect1.Size = new System.Drawing.Size(97, 25);
this.cmbCatSelect1.TabIndex = 896; this.cmbCatSelect1.TabIndex = 896;
@@ -330,7 +406,7 @@ namespace TemuKJD.WXForms.ProductForms
// //
this.cmbCatSelect4.DropDownWidth = 150; this.cmbCatSelect4.DropDownWidth = 150;
this.cmbCatSelect4.FormattingEnabled = true; this.cmbCatSelect4.FormattingEnabled = true;
this.cmbCatSelect4.Location = new System.Drawing.Point(833, 12); this.cmbCatSelect4.Location = new System.Drawing.Point(532, 46);
this.cmbCatSelect4.Name = "cmbCatSelect4"; this.cmbCatSelect4.Name = "cmbCatSelect4";
this.cmbCatSelect4.Size = new System.Drawing.Size(97, 25); this.cmbCatSelect4.Size = new System.Drawing.Size(97, 25);
this.cmbCatSelect4.TabIndex = 899; this.cmbCatSelect4.TabIndex = 899;
@@ -339,7 +415,7 @@ namespace TemuKJD.WXForms.ProductForms
// //
this.cmbCatSelect3.DropDownWidth = 150; this.cmbCatSelect3.DropDownWidth = 150;
this.cmbCatSelect3.FormattingEnabled = true; this.cmbCatSelect3.FormattingEnabled = true;
this.cmbCatSelect3.Location = new System.Drawing.Point(736, 12); this.cmbCatSelect3.Location = new System.Drawing.Point(435, 46);
this.cmbCatSelect3.Name = "cmbCatSelect3"; this.cmbCatSelect3.Name = "cmbCatSelect3";
this.cmbCatSelect3.Size = new System.Drawing.Size(97, 25); this.cmbCatSelect3.Size = new System.Drawing.Size(97, 25);
this.cmbCatSelect3.TabIndex = 898; this.cmbCatSelect3.TabIndex = 898;
@@ -347,7 +423,7 @@ namespace TemuKJD.WXForms.ProductForms
// label7 // label7
// //
this.label7.AutoSize = true; this.label7.AutoSize = true;
this.label7.Location = new System.Drawing.Point(332, 17); this.label7.Location = new System.Drawing.Point(408, 17);
this.label7.Name = "label7"; this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(64, 17); this.label7.Size = new System.Drawing.Size(64, 17);
this.label7.TabIndex = 485; this.label7.TabIndex = 485;
@@ -357,7 +433,7 @@ namespace TemuKJD.WXForms.ProductForms
// //
this.label3.AutoSize = true; this.label3.AutoSize = true;
this.label3.ForeColor = System.Drawing.Color.Gray; this.label3.ForeColor = System.Drawing.Color.Gray;
this.label3.Location = new System.Drawing.Point(294, 17); this.label3.Location = new System.Drawing.Point(323, 17);
this.label3.Margin = new System.Windows.Forms.Padding(0); this.label3.Margin = new System.Windows.Forms.Padding(0);
this.label3.Name = "label3"; this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(13, 17); this.label3.Size = new System.Drawing.Size(13, 17);
@@ -383,7 +459,7 @@ namespace TemuKJD.WXForms.ProductForms
// label6 // label6
// //
this.label6.AutoSize = true; this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(504, 17); this.label6.Location = new System.Drawing.Point(197, 51);
this.label6.Name = "label6"; this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(44, 17); this.label6.Size = new System.Drawing.Size(44, 17);
this.label6.TabIndex = 440; this.label6.TabIndex = 440;
@@ -395,7 +471,7 @@ namespace TemuKJD.WXForms.ProductForms
this.btnSearch.Cursor = System.Windows.Forms.Cursors.Hand; this.btnSearch.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnSearch.DisabledBackColor = System.Drawing.Color.Empty; 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.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSearch.Location = new System.Drawing.Point(1257, 14); this.btnSearch.Location = new System.Drawing.Point(829, 15);
this.btnSearch.Name = "btnSearch"; this.btnSearch.Name = "btnSearch";
this.btnSearch.Size = new System.Drawing.Size(58, 23); this.btnSearch.Size = new System.Drawing.Size(58, 23);
this.btnSearch.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnSearch.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -418,7 +494,7 @@ namespace TemuKJD.WXForms.ProductForms
this.pnlEmpty.CanvasColor = System.Drawing.SystemColors.Control; this.pnlEmpty.CanvasColor = System.Drawing.SystemColors.Control;
this.pnlEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.pnlEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.pnlEmpty.DisabledBackColor = System.Drawing.Color.Empty; this.pnlEmpty.DisabledBackColor = System.Drawing.Color.Empty;
this.pnlEmpty.Location = new System.Drawing.Point(1321, 15); this.pnlEmpty.Location = new System.Drawing.Point(829, 46);
this.pnlEmpty.Name = "pnlEmpty"; this.pnlEmpty.Name = "pnlEmpty";
this.pnlEmpty.Size = new System.Drawing.Size(58, 23); this.pnlEmpty.Size = new System.Drawing.Size(58, 23);
this.pnlEmpty.Style.Alignment = System.Drawing.StringAlignment.Center; this.pnlEmpty.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -440,7 +516,7 @@ namespace TemuKJD.WXForms.ProductForms
// label2 // label2
// //
this.label2.AutoSize = true; this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(184, 17); this.label2.Location = new System.Drawing.Point(197, 17);
this.label2.Name = "label2"; this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(44, 17); this.label2.Size = new System.Drawing.Size(44, 17);
this.label2.TabIndex = 373; this.label2.TabIndex = 373;
@@ -466,15 +542,15 @@ namespace TemuKJD.WXForms.ProductForms
// //
this.splitContainer2.Panel2.Controls.Add(this.ucSplitPage1); this.splitContainer2.Panel2.Controls.Add(this.ucSplitPage1);
this.splitContainer2.Panel2.Controls.Add(this.statusBar); this.splitContainer2.Panel2.Controls.Add(this.statusBar);
this.splitContainer2.Size = new System.Drawing.Size(1719, 476); this.splitContainer2.Size = new System.Drawing.Size(1388, 439);
this.splitContainer2.SplitterDistance = 447; this.splitContainer2.SplitterDistance = 410;
this.splitContainer2.TabIndex = 0; this.splitContainer2.TabIndex = 0;
// //
// pbLoading // pbLoading
// //
this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None; this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None;
this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue; this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue;
this.pbLoading.Location = new System.Drawing.Point(834, 198); this.pbLoading.Location = new System.Drawing.Point(669, 207);
this.pbLoading.Name = "pbLoading"; this.pbLoading.Name = "pbLoading";
this.pbLoading.Size = new System.Drawing.Size(50, 50); this.pbLoading.Size = new System.Drawing.Size(50, 50);
this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -485,20 +561,20 @@ namespace TemuKJD.WXForms.ProductForms
// //
this.dgvData.AllowUserToAddRows = false; this.dgvData.AllowUserToAddRows = false;
this.dgvData.AllowUserToDeleteRows = false; this.dgvData.AllowUserToDeleteRows = false;
dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke; dataGridViewCellStyle5.BackColor = System.Drawing.Color.WhiteSmoke;
this.dgvData.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; this.dgvData.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle5;
this.dgvData.AutoRowNumber = true; this.dgvData.AutoRowNumber = true;
this.dgvData.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.dgvData.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
this.dgvData.BackgroundColor = System.Drawing.Color.White; this.dgvData.BackgroundColor = System.Drawing.Color.White;
this.dgvData.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.dgvData.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); dataGridViewCellStyle6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvData.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; this.dgvData.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle6;
this.dgvData.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvData.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvData.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dgvData.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colSelect, this.colSelect,
@@ -506,6 +582,7 @@ namespace TemuKJD.WXForms.ProductForms
this.Column1, this.Column1,
this.c_goodsid, this.c_goodsid,
this.Column2, this.Column2,
this.Column5,
this.Column3, this.Column3,
this.Column4, this.Column4,
this.colDetectionResult}); this.colDetectionResult});
@@ -516,7 +593,7 @@ namespace TemuKJD.WXForms.ProductForms
this.dgvData.ReadOnly = true; this.dgvData.ReadOnly = true;
this.dgvData.RowTemplate.Height = 60; this.dgvData.RowTemplate.Height = 60;
this.dgvData.ShowCellErrors = false; this.dgvData.ShowCellErrors = false;
this.dgvData.Size = new System.Drawing.Size(1711, 447); this.dgvData.Size = new System.Drawing.Size(1380, 410);
this.dgvData.TabIndex = 5; this.dgvData.TabIndex = 5;
// //
// colSelect // colSelect
@@ -566,6 +643,13 @@ namespace TemuKJD.WXForms.ProductForms
this.Column2.Name = "Column2"; this.Column2.Name = "Column2";
this.Column2.ReadOnly = true; this.Column2.ReadOnly = true;
// //
// Column5
//
this.Column5.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
this.Column5.HeaderText = "分组";
this.Column5.Name = "Column5";
this.Column5.ReadOnly = true;
//
// Column3 // Column3
// //
this.Column3.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.Column3.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
@@ -600,7 +684,7 @@ namespace TemuKJD.WXForms.ProductForms
this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Right; this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Right;
this.ucSplitPage1.IsShowPageSize = true; this.ucSplitPage1.IsShowPageSize = true;
this.ucSplitPage1.IsShowTotalCount = true; this.ucSplitPage1.IsShowTotalCount = true;
this.ucSplitPage1.Location = new System.Drawing.Point(1257, 0); this.ucSplitPage1.Location = new System.Drawing.Point(926, 0);
this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0); this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0);
this.ucSplitPage1.MaxPageSizeValue = 2000; this.ucSplitPage1.MaxPageSizeValue = 2000;
this.ucSplitPage1.Name = "ucSplitPage1"; this.ucSplitPage1.Name = "ucSplitPage1";
@@ -618,7 +702,7 @@ namespace TemuKJD.WXForms.ProductForms
this.statusBar.Location = new System.Drawing.Point(0, 0); this.statusBar.Location = new System.Drawing.Point(0, 0);
this.statusBar.Margin = new System.Windows.Forms.Padding(0); this.statusBar.Margin = new System.Windows.Forms.Padding(0);
this.statusBar.Name = "statusBar"; this.statusBar.Name = "statusBar";
this.statusBar.Size = new System.Drawing.Size(1719, 25); this.statusBar.Size = new System.Drawing.Size(1388, 25);
this.statusBar.TabIndex = 1; this.statusBar.TabIndex = 1;
this.statusBar.Visible = false; this.statusBar.Visible = false;
// //
@@ -629,10 +713,34 @@ namespace TemuKJD.WXForms.ProductForms
this.numericUpDown1.Size = new System.Drawing.Size(120, 21); this.numericUpDown1.Size = new System.Drawing.Size(120, 21);
this.numericUpDown1.TabIndex = 7; this.numericUpDown1.TabIndex = 7;
// //
// btn_setGroup
//
this.btn_setGroup.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btn_setGroup.Cursor = System.Windows.Forms.Cursors.Hand;
this.btn_setGroup.DisabledBackColor = System.Drawing.Color.Empty;
this.btn_setGroup.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btn_setGroup.Location = new System.Drawing.Point(3, 32);
this.btn_setGroup.Name = "btn_setGroup";
this.btn_setGroup.Size = new System.Drawing.Size(58, 23);
this.btn_setGroup.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btn_setGroup.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btn_setGroup.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btn_setGroup.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
this.btn_setGroup.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
this.btn_setGroup.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
this.btn_setGroup.Style.ForeColor.Color = System.Drawing.Color.White;
this.btn_setGroup.Style.GradientAngle = 90;
this.btn_setGroup.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
this.btn_setGroup.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
this.btn_setGroup.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
this.btn_setGroup.TabIndex = 447;
this.btn_setGroup.Text = "设置分组";
this.btn_setGroup.Click += new System.EventHandler(this.btn_setGroup_Click);
//
// CloudGoodsFavoriteForm // CloudGoodsFavoriteForm
// //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.ClientSize = new System.Drawing.Size(1719, 530); this.ClientSize = new System.Drawing.Size(1388, 530);
this.Controls.Add(this.splitContainer1); this.Controls.Add(this.splitContainer1);
this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.KeyPreview = true; this.KeyPreview = true;
@@ -687,13 +795,19 @@ namespace TemuKJD.WXForms.ProductForms
private UserComponent.UcNumericRange num_price; private UserComponent.UcNumericRange num_price;
private System.Windows.Forms.Label label4; private System.Windows.Forms.Label label4;
private System.Windows.Forms.ComboBox cb_safe; private System.Windows.Forms.ComboBox cb_safe;
private System.Windows.Forms.ComboBox cm_group;
private System.Windows.Forms.Label label5;
private DevComponents.DotNetBar.PanelEx btn_createGroup;
private DevComponents.DotNetBar.PanelEx btn_delGroup;
private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect; private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect;
private System.Windows.Forms.DataGridViewTextBoxColumn c_Platform; private System.Windows.Forms.DataGridViewTextBoxColumn c_Platform;
private System.Windows.Forms.DataGridViewImageColumn Column1; private System.Windows.Forms.DataGridViewImageColumn Column1;
private System.Windows.Forms.DataGridViewTextBoxColumn c_goodsid; private System.Windows.Forms.DataGridViewTextBoxColumn c_goodsid;
private System.Windows.Forms.DataGridViewTextBoxColumn Column2; private System.Windows.Forms.DataGridViewTextBoxColumn Column2;
private System.Windows.Forms.DataGridViewTextBoxColumn Column5;
private System.Windows.Forms.DataGridViewTextBoxColumn Column3; private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
private System.Windows.Forms.DataGridViewTextBoxColumn Column4; private System.Windows.Forms.DataGridViewTextBoxColumn Column4;
private System.Windows.Forms.DataGridViewTextBoxColumn colDetectionResult; private System.Windows.Forms.DataGridViewTextBoxColumn colDetectionResult;
private DevComponents.DotNetBar.PanelEx btn_setGroup;
} }
} }
@@ -1,5 +1,4 @@
using TemuKJD.BLL; using AllBase;
using AllBase;
using AllBase.Helper; using AllBase.Helper;
using AllBase.Model.Result; using AllBase.Model.Result;
using AllBase.Model.Result.PDDResult; using AllBase.Model.Result.PDDResult;
@@ -24,12 +23,15 @@ using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
using TemuKJD.BaseForms; using TemuKJD.BaseForms;
using TemuKJD.BLL;
using TemuKJD.Extension; using TemuKJD.Extension;
using TemuKJD.ToolForms; using TemuKJD.ToolForms;
using TemuKJD.UserComponent;
using TemuKJD.UserControls; using TemuKJD.UserControls;
using Work; using Work;
using Work.GoodDetail; using Work.GoodDetail;
using Work.Services; using Work.Services;
using static Work.GoodInfo;
namespace TemuKJD.WXForms.ProductForms namespace TemuKJD.WXForms.ProductForms
{ {
@@ -46,7 +48,7 @@ namespace TemuKJD.WXForms.ProductForms
Disposed += (sender, e) => detection?.Cancel(); Disposed += (sender, e) => detection?.Cancel();
} }
private void AdminCardCodeForm_Load(object sender, EventArgs e) private async void AdminCardCodeForm_Load(object sender, EventArgs e)
{ {
pbLoading.Visible = false; pbLoading.Visible = false;
ucSplitPage1.PageChange += UcSplitPage1_PageChange; ucSplitPage1.PageChange += UcSplitPage1_PageChange;
@@ -68,9 +70,18 @@ namespace TemuKJD.WXForms.ProductForms
{ {
txt_title.Text = "连衣裙"; txt_title.Text = "连衣裙";
} }
} await InitGroup();
}
private async Task InitGroup()
{
await CloudGoodsService.GetGroups();
cm_group.DataSource = new List<UserFavoriteGroup>() { new UserFavoriteGroup { Id = 0, GroupName = "全部" } }.Concat(CloudGoodsService.UserGroups).ToList();
cm_group.ValueMember = "Id";
cm_group.DisplayMember = "GroupName";
}
private void InitBindingDataGridView() private void InitBindingDataGridView()
{ {
this.dgvData.AutoGenerateColumns = false; this.dgvData.AutoGenerateColumns = false;
@@ -80,6 +91,7 @@ namespace TemuKJD.WXForms.ProductForms
this.colSelect.DataPropertyName = nameof(CloudGoods.IsSelected); this.colSelect.DataPropertyName = nameof(CloudGoods.IsSelected);
this.colSelect.ReadOnly = false; this.colSelect.ReadOnly = false;
this.Column2.DataPropertyName = nameof(CloudGoods.Title); this.Column2.DataPropertyName = nameof(CloudGoods.Title);
this.Column5.DataPropertyName = nameof(CloudGoods.GroupName);
this.Column3.DataPropertyName = nameof(CloudGoods.Price); this.Column3.DataPropertyName = nameof(CloudGoods.Price);
this.Column4.DataPropertyName = nameof(CloudGoods.SoldQuantity); this.Column4.DataPropertyName = nameof(CloudGoods.SoldQuantity);
this.c_goodsid.DataPropertyName = nameof(CloudGoods.GoodsId); this.c_goodsid.DataPropertyName = nameof(CloudGoods.GoodsId);
@@ -346,7 +358,8 @@ namespace TemuKJD.WXForms.ProductForms
search.PageIndex = ucSplitPage1.CurrentPage; search.PageIndex = ucSplitPage1.CurrentPage;
search.PageSize = ucSplitPage1.PageSize; search.PageSize = ucSplitPage1.PageSize;
var groupId = cm_group.SelectedValue.ParseToInt();
search.GroupId = groupId == 0 ? null : groupId;
await GetGoods(search); await GetGoods(search);
} }
@@ -556,6 +569,87 @@ namespace TemuKJD.WXForms.ProductForms
} }
} }
private async void btn_createGroup_Click(object sender, EventArgs e)
{
string result = InputDialog.Show("新建分组名称:", "分组名", "");
if (result != null)
{
bool ret = await CloudGoodsService.CreateGroup(BaseClass.UserName, result);
if (ret)
{
InitGroup();
MessageBox.Show("分组创建成功");
}
else
{
MessageBox.Show("分组创建失败");
}
}
}
private async void btn_delGroup_Click(object sender, EventArgs e)
{
try
{
if (cm_group.SelectedIndex == 0)
{
MessageBox.Show("禁止删除 全部 分组");
return;
}
string groupName = cm_group.Text;
if (BaseMsgForm.ShowConfirm($"是否要删除 【{groupName}】分组", "提示").DialogResult != DialogResult.OK)
{
return;
}
var ret = await CloudGoodsService.DelGroupAsync(BaseClass.UserName, groupName);
if (ret)
{
InitGroup();
MessageBox.Show($" {groupName} 分组删除成功");
}
else
{
MessageBox.Show($" {groupName} 分组删除失败");
}
}
catch (Exception ex)
{
MessageBox.Show(ex.Message);
}
}
/// <summary>
/// 设置分组
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private async void btn_setGroup_Click(object sender, EventArgs e)
{
try
{
string groupName = cm_group.Text;
if (BaseMsgForm.ShowConfirm($"是否要把选中商品设置为 【{groupName}】分组", "提示").DialogResult != DialogResult.OK)
{
return;
}
var ids = dataList.Where(a => a.IsSelected).Select(a => a.GoodsId);
int groupId = cm_group.SelectedValue.ParseToInt();
var ret = await CloudGoodsService.SetFavoriteGroupAsync(BaseClass.UserName, groupId, ids);
if (ret)
{
MessageBox.Show($" {groupName} 商品分组成功");
}
else
{
MessageBox.Show($" {groupName} 商品分组失败");
}
}
catch (Exception ex)
{
MessageBox.Show(ex.Message);
}
}
} }
@@ -132,6 +132,9 @@
<metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="Column5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
+71 -45
View File
@@ -29,9 +29,11 @@ namespace TemuKJD.WXForms.ProductForms
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.cm_group = new System.Windows.Forms.ComboBox();
this.label5 = new System.Windows.Forms.Label();
this.panel1 = new System.Windows.Forms.Panel(); this.panel1 = new System.Windows.Forms.Panel();
this.btn_favorite = new DevComponents.DotNetBar.PanelEx(); this.btn_favorite = new DevComponents.DotNetBar.PanelEx();
this.bt_importUploadList = new DevComponents.DotNetBar.PanelEx(); this.bt_importUploadList = new DevComponents.DotNetBar.PanelEx();
@@ -96,6 +98,7 @@ namespace TemuKJD.WXForms.ProductForms
// //
this.splitContainer1.Panel1.Controls.Add(this.panel1); this.splitContainer1.Panel1.Controls.Add(this.panel1);
this.splitContainer1.Panel1.Controls.Add(this.label5r); this.splitContainer1.Panel1.Controls.Add(this.label5r);
this.splitContainer1.Panel1.Controls.Add(this.bt_importUploadList);
this.splitContainer1.Panel1.Controls.Add(this.cb_Platform); this.splitContainer1.Panel1.Controls.Add(this.cb_Platform);
this.splitContainer1.Panel1.Controls.Add(this.cmbCatSelect2); this.splitContainer1.Panel1.Controls.Add(this.cmbCatSelect2);
this.splitContainer1.Panel1.Controls.Add(this.cmbCatSelect1); this.splitContainer1.Panel1.Controls.Add(this.cmbCatSelect1);
@@ -119,17 +122,37 @@ namespace TemuKJD.WXForms.ProductForms
// //
this.splitContainer1.Panel2.Controls.Add(this.splitContainer2); this.splitContainer1.Panel2.Controls.Add(this.splitContainer2);
this.splitContainer1.Panel2.Margin = new System.Windows.Forms.Padding(4); this.splitContainer1.Panel2.Margin = new System.Windows.Forms.Padding(4);
this.splitContainer1.Size = new System.Drawing.Size(1643, 530); this.splitContainer1.Size = new System.Drawing.Size(1306, 530);
this.splitContainer1.SplitterDistance = 86;
this.splitContainer1.TabIndex = 35; this.splitContainer1.TabIndex = 35;
// //
// cm_group
//
this.cm_group.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cm_group.FormattingEnabled = true;
this.cm_group.Location = new System.Drawing.Point(62, 12);
this.cm_group.Name = "cm_group";
this.cm_group.Size = new System.Drawing.Size(106, 25);
this.cm_group.TabIndex = 929;
//
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(12, 15);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(44, 17);
this.label5.TabIndex = 928;
this.label5.Text = "分组:";
//
// panel1 // panel1
// //
this.panel1.Controls.Add(this.cm_group);
this.panel1.Controls.Add(this.label5);
this.panel1.Controls.Add(this.btn_favorite); this.panel1.Controls.Add(this.btn_favorite);
this.panel1.Controls.Add(this.bt_importUploadList);
this.panel1.Dock = System.Windows.Forms.DockStyle.Right; this.panel1.Dock = System.Windows.Forms.DockStyle.Right;
this.panel1.Location = new System.Drawing.Point(1507, 0); this.panel1.Location = new System.Drawing.Point(1085, 0);
this.panel1.Name = "panel1"; this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(136, 50); this.panel1.Size = new System.Drawing.Size(221, 86);
this.panel1.TabIndex = 914; this.panel1.TabIndex = 914;
// //
// btn_favorite // btn_favorite
@@ -138,9 +161,9 @@ namespace TemuKJD.WXForms.ProductForms
this.btn_favorite.Cursor = System.Windows.Forms.Cursors.Hand; this.btn_favorite.Cursor = System.Windows.Forms.Cursors.Hand;
this.btn_favorite.DisabledBackColor = System.Drawing.Color.Empty; this.btn_favorite.DisabledBackColor = System.Drawing.Color.Empty;
this.btn_favorite.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btn_favorite.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btn_favorite.Location = new System.Drawing.Point(67, 14); this.btn_favorite.Location = new System.Drawing.Point(3, 50);
this.btn_favorite.Name = "btn_favorite"; this.btn_favorite.Name = "btn_favorite";
this.btn_favorite.Size = new System.Drawing.Size(58, 23); this.btn_favorite.Size = new System.Drawing.Size(165, 23);
this.btn_favorite.Style.Alignment = System.Drawing.StringAlignment.Center; this.btn_favorite.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btn_favorite.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btn_favorite.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btn_favorite.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btn_favorite.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -162,9 +185,9 @@ namespace TemuKJD.WXForms.ProductForms
this.bt_importUploadList.Cursor = System.Windows.Forms.Cursors.Hand; this.bt_importUploadList.Cursor = System.Windows.Forms.Cursors.Hand;
this.bt_importUploadList.DisabledBackColor = System.Drawing.Color.Empty; this.bt_importUploadList.DisabledBackColor = System.Drawing.Color.Empty;
this.bt_importUploadList.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.bt_importUploadList.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.bt_importUploadList.Location = new System.Drawing.Point(3, 14); this.bt_importUploadList.Location = new System.Drawing.Point(645, 50);
this.bt_importUploadList.Name = "bt_importUploadList"; this.bt_importUploadList.Name = "bt_importUploadList";
this.bt_importUploadList.Size = new System.Drawing.Size(58, 23); this.bt_importUploadList.Size = new System.Drawing.Size(149, 23);
this.bt_importUploadList.Style.Alignment = System.Drawing.StringAlignment.Center; this.bt_importUploadList.Style.Alignment = System.Drawing.StringAlignment.Center;
this.bt_importUploadList.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.bt_importUploadList.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.bt_importUploadList.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.bt_importUploadList.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -183,7 +206,7 @@ namespace TemuKJD.WXForms.ProductForms
// label5r // label5r
// //
this.label5r.AutoSize = true; this.label5r.AutoSize = true;
this.label5r.Location = new System.Drawing.Point(1048, 16); this.label5r.Location = new System.Drawing.Point(10, 50);
this.label5r.Name = "label5r"; this.label5r.Name = "label5r";
this.label5r.Size = new System.Drawing.Size(44, 17); this.label5r.Size = new System.Drawing.Size(44, 17);
this.label5r.TabIndex = 907; this.label5r.TabIndex = 907;
@@ -198,16 +221,16 @@ namespace TemuKJD.WXForms.ProductForms
"全部", "全部",
"多多", "多多",
"微信"}); "微信"});
this.cb_Platform.Location = new System.Drawing.Point(1098, 13); this.cb_Platform.Location = new System.Drawing.Point(60, 47);
this.cb_Platform.Name = "cb_Platform"; this.cb_Platform.Name = "cb_Platform";
this.cb_Platform.Size = new System.Drawing.Size(97, 25); this.cb_Platform.Size = new System.Drawing.Size(116, 25);
this.cb_Platform.TabIndex = 906; this.cb_Platform.TabIndex = 906;
// //
// cmbCatSelect2 // cmbCatSelect2
// //
this.cmbCatSelect2.DropDownWidth = 150; this.cmbCatSelect2.DropDownWidth = 150;
this.cmbCatSelect2.FormattingEnabled = true; this.cmbCatSelect2.FormattingEnabled = true;
this.cmbCatSelect2.Location = new System.Drawing.Point(745, 12); this.cmbCatSelect2.Location = new System.Drawing.Point(332, 47);
this.cmbCatSelect2.Name = "cmbCatSelect2"; this.cmbCatSelect2.Name = "cmbCatSelect2";
this.cmbCatSelect2.Size = new System.Drawing.Size(97, 25); this.cmbCatSelect2.Size = new System.Drawing.Size(97, 25);
this.cmbCatSelect2.TabIndex = 897; this.cmbCatSelect2.TabIndex = 897;
@@ -216,7 +239,7 @@ namespace TemuKJD.WXForms.ProductForms
// //
this.cmbCatSelect1.DropDownWidth = 150; this.cmbCatSelect1.DropDownWidth = 150;
this.cmbCatSelect1.FormattingEnabled = true; this.cmbCatSelect1.FormattingEnabled = true;
this.cmbCatSelect1.Location = new System.Drawing.Point(648, 12); this.cmbCatSelect1.Location = new System.Drawing.Point(235, 47);
this.cmbCatSelect1.Name = "cmbCatSelect1"; this.cmbCatSelect1.Name = "cmbCatSelect1";
this.cmbCatSelect1.Size = new System.Drawing.Size(97, 25); this.cmbCatSelect1.Size = new System.Drawing.Size(97, 25);
this.cmbCatSelect1.TabIndex = 896; this.cmbCatSelect1.TabIndex = 896;
@@ -225,7 +248,7 @@ namespace TemuKJD.WXForms.ProductForms
// //
this.cmbCatSelect4.DropDownWidth = 150; this.cmbCatSelect4.DropDownWidth = 150;
this.cmbCatSelect4.FormattingEnabled = true; this.cmbCatSelect4.FormattingEnabled = true;
this.cmbCatSelect4.Location = new System.Drawing.Point(939, 12); this.cmbCatSelect4.Location = new System.Drawing.Point(526, 47);
this.cmbCatSelect4.Name = "cmbCatSelect4"; this.cmbCatSelect4.Name = "cmbCatSelect4";
this.cmbCatSelect4.Size = new System.Drawing.Size(97, 25); this.cmbCatSelect4.Size = new System.Drawing.Size(97, 25);
this.cmbCatSelect4.TabIndex = 899; this.cmbCatSelect4.TabIndex = 899;
@@ -234,7 +257,7 @@ namespace TemuKJD.WXForms.ProductForms
// //
this.cmbCatSelect3.DropDownWidth = 150; this.cmbCatSelect3.DropDownWidth = 150;
this.cmbCatSelect3.FormattingEnabled = true; this.cmbCatSelect3.FormattingEnabled = true;
this.cmbCatSelect3.Location = new System.Drawing.Point(842, 12); this.cmbCatSelect3.Location = new System.Drawing.Point(429, 47);
this.cmbCatSelect3.Name = "cmbCatSelect3"; this.cmbCatSelect3.Name = "cmbCatSelect3";
this.cmbCatSelect3.Size = new System.Drawing.Size(97, 25); this.cmbCatSelect3.Size = new System.Drawing.Size(97, 25);
this.cmbCatSelect3.TabIndex = 898; this.cmbCatSelect3.TabIndex = 898;
@@ -243,7 +266,7 @@ namespace TemuKJD.WXForms.ProductForms
// //
this.label4.AutoSize = true; this.label4.AutoSize = true;
this.label4.ForeColor = System.Drawing.Color.Gray; this.label4.ForeColor = System.Drawing.Color.Gray;
this.label4.Location = new System.Drawing.Point(518, 17); this.label4.Location = new System.Drawing.Point(542, 18);
this.label4.Margin = new System.Windows.Forms.Padding(0); this.label4.Margin = new System.Windows.Forms.Padding(0);
this.label4.Name = "label4"; this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(13, 17); this.label4.Size = new System.Drawing.Size(13, 17);
@@ -252,7 +275,7 @@ namespace TemuKJD.WXForms.ProductForms
// //
// num_maxprice // num_maxprice
// //
this.num_maxprice.Location = new System.Drawing.Point(534, 14); this.num_maxprice.Location = new System.Drawing.Point(553, 15);
this.num_maxprice.Maximum = new decimal(new int[] { this.num_maxprice.Maximum = new decimal(new int[] {
99999, 99999,
0, 0,
@@ -264,7 +287,7 @@ namespace TemuKJD.WXForms.ProductForms
// //
// num_minprice // num_minprice
// //
this.num_minprice.Location = new System.Drawing.Point(447, 14); this.num_minprice.Location = new System.Drawing.Point(471, 15);
this.num_minprice.Maximum = new decimal(new int[] { this.num_minprice.Maximum = new decimal(new int[] {
99999, 99999,
0, 0,
@@ -277,7 +300,7 @@ namespace TemuKJD.WXForms.ProductForms
// label7 // label7
// //
this.label7.AutoSize = true; this.label7.AutoSize = true;
this.label7.Location = new System.Drawing.Point(388, 17); this.label7.Location = new System.Drawing.Point(412, 18);
this.label7.Name = "label7"; this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(64, 17); this.label7.Size = new System.Drawing.Size(64, 17);
this.label7.TabIndex = 485; this.label7.TabIndex = 485;
@@ -287,7 +310,7 @@ namespace TemuKJD.WXForms.ProductForms
// //
this.label3.AutoSize = true; this.label3.AutoSize = true;
this.label3.ForeColor = System.Drawing.Color.Gray; this.label3.ForeColor = System.Drawing.Color.Gray;
this.label3.Location = new System.Drawing.Point(294, 17); this.label3.Location = new System.Drawing.Point(306, 18);
this.label3.Margin = new System.Windows.Forms.Padding(0); this.label3.Margin = new System.Windows.Forms.Padding(0);
this.label3.Name = "label3"; this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(13, 17); this.label3.Size = new System.Drawing.Size(13, 17);
@@ -296,7 +319,7 @@ namespace TemuKJD.WXForms.ProductForms
// //
// num_maxsold // num_maxsold
// //
this.num_maxsold.Location = new System.Drawing.Point(310, 14); this.num_maxsold.Location = new System.Drawing.Point(322, 15);
this.num_maxsold.Maximum = new decimal(new int[] { this.num_maxsold.Maximum = new decimal(new int[] {
9999999, 9999999,
0, 0,
@@ -308,7 +331,7 @@ namespace TemuKJD.WXForms.ProductForms
// //
// num_minsold // num_minsold
// //
this.num_minsold.Location = new System.Drawing.Point(223, 14); this.num_minsold.Location = new System.Drawing.Point(235, 15);
this.num_minsold.Maximum = new decimal(new int[] { this.num_minsold.Maximum = new decimal(new int[] {
9999999, 9999999,
0, 0,
@@ -337,7 +360,7 @@ namespace TemuKJD.WXForms.ProductForms
// label6 // label6
// //
this.label6.AutoSize = true; this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(610, 17); this.label6.Location = new System.Drawing.Point(185, 50);
this.label6.Name = "label6"; this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(44, 17); this.label6.Size = new System.Drawing.Size(44, 17);
this.label6.TabIndex = 440; this.label6.TabIndex = 440;
@@ -349,7 +372,7 @@ namespace TemuKJD.WXForms.ProductForms
this.btnSearch.Cursor = System.Windows.Forms.Cursors.Hand; this.btnSearch.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnSearch.DisabledBackColor = System.Drawing.Color.Empty; 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.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSearch.Location = new System.Drawing.Point(1208, 14); this.btnSearch.Location = new System.Drawing.Point(645, 15);
this.btnSearch.Name = "btnSearch"; this.btnSearch.Name = "btnSearch";
this.btnSearch.Size = new System.Drawing.Size(58, 23); this.btnSearch.Size = new System.Drawing.Size(58, 23);
this.btnSearch.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnSearch.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -372,7 +395,7 @@ namespace TemuKJD.WXForms.ProductForms
this.pnlEmpty.CanvasColor = System.Drawing.SystemColors.Control; this.pnlEmpty.CanvasColor = System.Drawing.SystemColors.Control;
this.pnlEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.pnlEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.pnlEmpty.DisabledBackColor = System.Drawing.Color.Empty; this.pnlEmpty.DisabledBackColor = System.Drawing.Color.Empty;
this.pnlEmpty.Location = new System.Drawing.Point(1272, 14); this.pnlEmpty.Location = new System.Drawing.Point(736, 15);
this.pnlEmpty.Name = "pnlEmpty"; this.pnlEmpty.Name = "pnlEmpty";
this.pnlEmpty.Size = new System.Drawing.Size(58, 23); this.pnlEmpty.Size = new System.Drawing.Size(58, 23);
this.pnlEmpty.Style.Alignment = System.Drawing.StringAlignment.Center; this.pnlEmpty.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -394,7 +417,7 @@ namespace TemuKJD.WXForms.ProductForms
// label2 // label2
// //
this.label2.AutoSize = true; this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(184, 17); this.label2.Location = new System.Drawing.Point(185, 18);
this.label2.Name = "label2"; this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(44, 17); this.label2.Size = new System.Drawing.Size(44, 17);
this.label2.TabIndex = 373; this.label2.TabIndex = 373;
@@ -420,15 +443,15 @@ namespace TemuKJD.WXForms.ProductForms
// //
this.splitContainer2.Panel2.Controls.Add(this.ucSplitPage1); this.splitContainer2.Panel2.Controls.Add(this.ucSplitPage1);
this.splitContainer2.Panel2.Controls.Add(this.statusBar); this.splitContainer2.Panel2.Controls.Add(this.statusBar);
this.splitContainer2.Size = new System.Drawing.Size(1643, 476); this.splitContainer2.Size = new System.Drawing.Size(1306, 440);
this.splitContainer2.SplitterDistance = 447; this.splitContainer2.SplitterDistance = 411;
this.splitContainer2.TabIndex = 0; this.splitContainer2.TabIndex = 0;
// //
// pbLoading // pbLoading
// //
this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None; this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None;
this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue; this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue;
this.pbLoading.Location = new System.Drawing.Point(796, 198); this.pbLoading.Location = new System.Drawing.Point(628, 180);
this.pbLoading.Name = "pbLoading"; this.pbLoading.Name = "pbLoading";
this.pbLoading.Size = new System.Drawing.Size(50, 50); this.pbLoading.Size = new System.Drawing.Size(50, 50);
this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -439,20 +462,20 @@ namespace TemuKJD.WXForms.ProductForms
// //
this.dgvData.AllowUserToAddRows = false; this.dgvData.AllowUserToAddRows = false;
this.dgvData.AllowUserToDeleteRows = false; this.dgvData.AllowUserToDeleteRows = false;
dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke; dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke;
this.dgvData.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; this.dgvData.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
this.dgvData.AutoRowNumber = true; this.dgvData.AutoRowNumber = true;
this.dgvData.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.dgvData.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
this.dgvData.BackgroundColor = System.Drawing.Color.White; this.dgvData.BackgroundColor = System.Drawing.Color.White;
this.dgvData.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.dgvData.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control; dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText; dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False; dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvData.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4; this.dgvData.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
this.dgvData.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvData.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvData.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dgvData.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colSelect, this.colSelect,
@@ -469,7 +492,7 @@ namespace TemuKJD.WXForms.ProductForms
this.dgvData.ReadOnly = true; this.dgvData.ReadOnly = true;
this.dgvData.RowTemplate.Height = 60; this.dgvData.RowTemplate.Height = 60;
this.dgvData.ShowCellErrors = false; this.dgvData.ShowCellErrors = false;
this.dgvData.Size = new System.Drawing.Size(1635, 447); this.dgvData.Size = new System.Drawing.Size(1298, 411);
this.dgvData.TabIndex = 5; this.dgvData.TabIndex = 5;
// //
// colSelect // colSelect
@@ -543,7 +566,7 @@ namespace TemuKJD.WXForms.ProductForms
this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Right; this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Right;
this.ucSplitPage1.IsShowPageSize = true; this.ucSplitPage1.IsShowPageSize = true;
this.ucSplitPage1.IsShowTotalCount = true; this.ucSplitPage1.IsShowTotalCount = true;
this.ucSplitPage1.Location = new System.Drawing.Point(1181, 0); this.ucSplitPage1.Location = new System.Drawing.Point(844, 0);
this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0); this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0);
this.ucSplitPage1.MaxPageSizeValue = 2000; this.ucSplitPage1.MaxPageSizeValue = 2000;
this.ucSplitPage1.Name = "ucSplitPage1"; this.ucSplitPage1.Name = "ucSplitPage1";
@@ -561,14 +584,14 @@ namespace TemuKJD.WXForms.ProductForms
this.statusBar.Location = new System.Drawing.Point(0, 0); this.statusBar.Location = new System.Drawing.Point(0, 0);
this.statusBar.Margin = new System.Windows.Forms.Padding(0); this.statusBar.Margin = new System.Windows.Forms.Padding(0);
this.statusBar.Name = "statusBar"; this.statusBar.Name = "statusBar";
this.statusBar.Size = new System.Drawing.Size(1643, 25); this.statusBar.Size = new System.Drawing.Size(1306, 25);
this.statusBar.TabIndex = 1; this.statusBar.TabIndex = 1;
this.statusBar.Visible = false; this.statusBar.Visible = false;
// //
// CloudGoodsForm // CloudGoodsForm
// //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.ClientSize = new System.Drawing.Size(1643, 530); this.ClientSize = new System.Drawing.Size(1306, 530);
this.Controls.Add(this.splitContainer1); this.Controls.Add(this.splitContainer1);
this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.KeyPreview = true; this.KeyPreview = true;
@@ -581,6 +604,7 @@ namespace TemuKJD.WXForms.ProductForms
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
this.splitContainer1.ResumeLayout(false); this.splitContainer1.ResumeLayout(false);
this.panel1.ResumeLayout(false); this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.num_maxprice)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.num_maxprice)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.num_minprice)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.num_minprice)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.num_maxsold)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.num_maxsold)).EndInit();
@@ -632,5 +656,7 @@ namespace TemuKJD.WXForms.ProductForms
private System.Windows.Forms.Panel panel1; private System.Windows.Forms.Panel panel1;
private DevComponents.DotNetBar.PanelEx btn_favorite; private DevComponents.DotNetBar.PanelEx btn_favorite;
private DevComponents.DotNetBar.PanelEx bt_importUploadList; private DevComponents.DotNetBar.PanelEx bt_importUploadList;
private System.Windows.Forms.ComboBox cm_group;
private System.Windows.Forms.Label label5;
} }
} }
+20 -1
View File
@@ -40,6 +40,16 @@ namespace TemuKJD.WXForms.ProductForms
public CloudGoodsForm() public CloudGoodsForm()
{ {
InitializeComponent(); InitializeComponent();
this.VisibleChanged += CloudGoodsForm_VisibleChanged;
}
private async void CloudGoodsForm_VisibleChanged(object sender, EventArgs e)
{
if (this.Visible == false) return;
await CloudGoodsService.GetGroups(BaseClass.UserName);
cm_group.DataSource = new List<UserFavoriteGroup>() { new UserFavoriteGroup { Id = 0, GroupName = "全部" } }.Concat(CloudGoodsService.UserGroups).ToList();
cm_group.ValueMember = "Id";
cm_group.DisplayMember = "GroupName";
} }
private void AdminCardCodeForm_Load(object sender, EventArgs e) private void AdminCardCodeForm_Load(object sender, EventArgs e)
@@ -63,6 +73,8 @@ namespace TemuKJD.WXForms.ProductForms
{ {
txt_title.Text = "连衣裙"; txt_title.Text = "连衣裙";
} }
} }
@@ -447,6 +459,13 @@ namespace TemuKJD.WXForms.ProductForms
int err = 0; int err = 0;
try try
{ {
string groupName = cm_group.Text;
int groupId = cm_group.SelectedValue.ParseToInt();
if (BaseMsgForm.ShowConfirm($"是否要收藏商品为 【{groupName}】分组", "提示").DialogResult != DialogResult.OK)
{
return;
}
this.pbLoading.Visible = true; this.pbLoading.Visible = true;
btn_favorite.Enabled = false; btn_favorite.Enabled = false;
@@ -456,7 +475,7 @@ namespace TemuKJD.WXForms.ProductForms
BaseMsgForm.ShowInfo($"请勾选商品"); BaseMsgForm.ShowInfo($"请勾选商品");
return; return;
} }
var ret = await CloudGoodsService.Favorite(goodsIds); var ret = await CloudGoodsService.Favorite(goodsIds, groupId);
succ = ret; succ = ret;
if (ret != goodsIds.Count) if (ret != goodsIds.Count)
{ {
File diff suppressed because it is too large. Load diff
@@ -1450,6 +1450,7 @@ namespace TemuKJD.WXForms.ProductForms
if (result.Contains("今日提审次数已用尽,请明日再试") || result.Contains("如需上架请先缴纳足额保证金") || result.Contains("在架商品数已达到上限") || if (result.Contains("今日提审次数已用尽,请明日再试") || result.Contains("如需上架请先缴纳足额保证金") || result.Contains("在架商品数已达到上限") ||
result.Contains("提审次数已达上限") || result.Contains("拥金上货失败:需要开通优选联盟") || result.Contains("本店铺近期提审失败比例较高,已被限")) result.Contains("提审次数已达上限") || result.Contains("拥金上货失败:需要开通优选联盟") || result.Contains("本店铺近期提审失败比例较高,已被限"))
{ {
//已达今日上限
shop.upLimitRetryCount++; shop.upLimitRetryCount++;
if (shop.upLimitRetryCount >= globalShopUploadCntLimitRetryTimes) if (shop.upLimitRetryCount >= globalShopUploadCntLimitRetryTimes)
{ {
@@ -2609,9 +2610,13 @@ namespace TemuKJD.WXForms.ProductForms
} }
} }
} }
// 如果店铺token不可用,随机获取一个上传图片的accessToken // 如果店铺token不可用,提示报错
if (token == null || token.isExpire || string.IsNullOrEmpty(token.accessToken)) if (token == null || token.isExpire || string.IsNullOrEmpty(token.accessToken))
token = new WxApiBLL().GetRandomWxToken(); {
// 如果店铺token不可用,随机获取一个上传图片的accessToken
// token = new WxApiBLL().GetRandomWxToken();
return "{\"success\":false,\"draftId\":0,\"status\":\"未上传\",\"errMsg\":\"店铺接口授权已过期\"}";
}
#endregion #endregion
#region 设置标题 #region 设置标题
@@ -3250,6 +3255,29 @@ namespace TemuKJD.WXForms.ProductForms
#endregion #endregion
#region 检测是否有提审额度
var urlAuditQuota = BaseClass.BuildWXImgObjString("product/wx_api_get_audit_quota");
var checkData = UserLogin.GetSignaturex();
checkData += "&token=" + token.accessToken;
//checkData += "&post_data=" + GetHtml.UrlEncodeUtf8("{\"cat_id\":\"" + leafCatId + "\"}");
checkData += "&post_data=" + GetHtml.UrlEncodeUtf8("{\"cat_id\":" + leafCatId + "}");
var apiRst = GetHtml.PostUtf8(urlAuditQuota, checkData);
if (apiRst.Contains("access_token expired"))
{
return "{\"success\":false,\"draftId\":0,\"status\":\"未上传\",\"errMsg\":\"店铺接口授权已过期\"}";
}
if (!apiRst.Contains("\"errcode\":0"))
{
string errMsg = BaseRegex.GetStringJsonByRegs(ref apiRst, apiRst, "msg", "errMsg", "errorMsg", "err_msg", "error_msg");
return "{\"success\":false,\"draftId\":0,\"status\":\"未上传\",\"errMsg\":\"店铺类目提审次数查询失败 " + errMsg + "\"}";
}
var avail_quota = BaseRegex.GetIntJson(ref apiRst, "avail_quota");
if (avail_quota > 0 == false)
{
return "{\"success\":false,\"draftId\":0,\"status\":\"未上传\",\"errMsg\":\"当前类目店铺提审次数已达上限,请等待明日提审次数重置\"}";
}
#endregion
#region ai短标题 // ai获取短标题 #region ai短标题 // ai获取短标题
if (wxUploadRule.IsAiShortTitle || chkAiImage.Checked) if (wxUploadRule.IsAiShortTitle || chkAiImage.Checked)
{ {
@@ -3821,7 +3849,8 @@ namespace TemuKJD.WXForms.ProductForms
#endregion #endregion
WXUploadProductInfoRecommendParam recommendParamRst = new WXUploadProductInfoRecommendParam(); WXUploadProductInfoRecommendParam recommendParamRst = new WXUploadProductInfoRecommendParam();
if (chkUseRecommand.Checked) WXUploadProductInfoRecommendParam foodRecommendParamRst = new WXUploadProductInfoRecommendParam();
if (chkUseRecommand.Checked || upProdParam.product.info.category.FirstOrDefault()?.name == "食品饮料")
{ {
WXUploadProductInfoRecommendParam recommendParam = new WXUploadProductInfoRecommendParam(); WXUploadProductInfoRecommendParam recommendParam = new WXUploadProductInfoRecommendParam();
//recommendParam.productId = upProdParam.product.productKey.productId; //recommendParam.productId = upProdParam.product.productKey.productId;
@@ -3836,13 +3865,19 @@ namespace TemuKJD.WXForms.ProductForms
var recommendRst = WXUpload.generalProductInfoRecommend(shop, recommendParam); var recommendRst = WXUpload.generalProductInfoRecommend(shop, recommendParam);
if (recommendRst.Contains("\"code\":0")) if (recommendRst.Contains("\"code\":0"))
{ {
recommendParamRst = JsonHelper.DeserializeJsonToObject<WXUploadProductInfoRecommendParam>(recommendRst); if (chkUseRecommand.Checked)
recommendParamRst = JsonHelper.DeserializeJsonToObject<WXUploadProductInfoRecommendParam>(recommendRst);
foodRecommendParamRst = JsonHelper.DeserializeJsonToObject<WXUploadProductInfoRecommendParam>(recommendRst);
} }
} }
if (recommendParamRst.productInfo == null) if (recommendParamRst.productInfo == null)
recommendParamRst.productInfo = new RecommendProductInfoParam(); recommendParamRst.productInfo = new RecommendProductInfoParam();
if (recommendParamRst.productInfo.param == null) if (recommendParamRst.productInfo.param == null)
recommendParamRst.productInfo.param = new List<RecommendProductInfoParamResult>(); recommendParamRst.productInfo.param = new List<RecommendProductInfoParamResult>();
if (foodRecommendParamRst.productInfo == null)
foodRecommendParamRst.productInfo = new RecommendProductInfoParam();
if (foodRecommendParamRst.productInfo.param == null)
foodRecommendParamRst.productInfo.param = new List<RecommendProductInfoParamResult>();
#region 匹配产品属性 #region 匹配产品属性
//真丝、蚕丝、香云纱、羊绒、羊毛、羊羔毛、羽绒、皮草 //真丝、蚕丝、香云纱、羊绒、羊毛、羊羔毛、羽绒、皮草
@@ -3972,7 +4007,9 @@ namespace TemuKJD.WXForms.ProductForms
else if (propInfo.name == "食品生产许可证编号") else if (propInfo.name == "食品生产许可证编号")
attr = productAttr.attr.FirstOrDefault(r => r.name == "食品生产许可证编号"); attr = productAttr.attr.FirstOrDefault(r => r.name == "食品生产许可证编号");
else if (propInfo.name == "产品标准号") else if (propInfo.name == "产品标准号")
{
attr = productAttr.attr.FirstOrDefault(r => r.name == "产品标准号"); attr = productAttr.attr.FirstOrDefault(r => r.name == "产品标准号");
}
else if (propInfo.name == "保质期") else if (propInfo.name == "保质期")
attr = productAttr.attr.FirstOrDefault(r => r.name == "保质期"); attr = productAttr.attr.FirstOrDefault(r => r.name == "保质期");
else if (propInfo.name == "生产日期") else if (propInfo.name == "生产日期")
@@ -4339,9 +4376,14 @@ namespace TemuKJD.WXForms.ProductForms
foreach (var attr in productAttr.attr) foreach (var attr in productAttr.attr)
{ {
if (attr.name == "贮存条件" && upProdParam.product.info.category.FirstOrDefault()?.name == "食品饮料")
{
attr.isRequired = true;
}
if (attr.isRequired != true) if (attr.isRequired != true)
continue; continue;
// 已填写内没有但是必填属性 // 已填写的属性里没有 但 是必填属性
if (upProdParam.product.info.param.Any(p => p.categorys.FirstOrDefault()?.name == attr.name)) if (upProdParam.product.info.param.Any(p => p.categorys.FirstOrDefault()?.name == attr.name))
continue; continue;
@@ -4553,6 +4595,30 @@ namespace TemuKJD.WXForms.ProductForms
wxPropParam.categorys.Add(wxCategoryParam1); wxPropParam.categorys.Add(wxCategoryParam1);
wxPropParam.categorys.Add(wxCategoryParam2); wxPropParam.categorys.Add(wxCategoryParam2);
} }
// 产品标准号单独处理
if (upProdParam.product.info.category.FirstOrDefault()?.name == "食品饮料")
{
List<string> illegalValueList = new List<string> { "见包装", "见外包装", "见详情", "其他" };
foreach (var param in upProdParam.product.info.param.ToList())
{
var propName = param.categorys.FirstOrDefault()?.name;
var propValue = param.categorys.LastOrDefault()?.name.ParseToString();
if (propName == "产品标准号" && (propValue.IsNullOrEmpty() || propValue.Length <= 5 || illegalValueList.Any(v => propValue.Contains(v))))
{
var recommendParam = foodRecommendParamRst.productInfo.param.FirstOrDefault(p => p.categorys?.FirstOrDefault()?.name == propName);
if (recommendParam != null && recommendParam.categorys.Count == 2)
{
if (param.categorys.LastOrDefault() != null)
param.categorys.LastOrDefault().name = recommendParam.categorys[1].name;
}
else if (upProdParam.product.info.category.LastOrDefault()?.name == "巧克力")
{
if (param.categorys.LastOrDefault() != null)
param.categorys.LastOrDefault().name = "QB/T19343";
}
}
}
}
if (upProdParam.product.info.category.FirstOrDefault()?.name == "图书" || prodInfo.detail.cats.FirstOrDefault() == "书籍/杂志/报纸") if (upProdParam.product.info.category.FirstOrDefault()?.name == "图书" || prodInfo.detail.cats.FirstOrDefault() == "书籍/杂志/报纸")
{ {
foreach (var param in upProdParam.product.info.param.ToList()) foreach (var param in upProdParam.product.info.param.ToList())
@@ -5542,16 +5608,17 @@ namespace TemuKJD.WXForms.ProductForms
string address = "地址:见包装"; string address = "地址:见包装";
string Storage = "贮存条件:常温"; string Storage = "贮存条件:常温";
List<string> illegalValueList = new List<string> { "见包装", "见外包装", "见详情", "其他" };
foreach (var propParam in upProdParam.product.info.param) foreach (var propParam in upProdParam.product.info.param)
{ {
if (propParam.categorys[0].name.Contains("食品名称") && !propParam.categorys[1].name.Contains("见包装") && !propParam.categorys[1].name.Contains("见外包装") && if (propParam.categorys[0].name.Contains("食品名称") && !illegalValueList.Any(v => propParam.categorys[1].name.Contains(v)) &&
!propParam.categorys[1].name.Contains("1") && propParam.categorys[1].name.Length > 5) !propParam.categorys[1].name.Contains("1") && propParam.categorys[1].name.Length > 5)
foodName = "食品名称:" + propParam.categorys[1].name; foodName = "食品名称:" + propParam.categorys[1].name;
else if (propParam.categorys[0].name.Contains("生产企业名称") && !propParam.categorys[1].name.Contains("见包装") && !propParam.categorys[1].name.Contains("见外包装")) else if (propParam.categorys[0].name.Contains("生产企业名称") && !illegalValueList.Any(v => propParam.categorys[1].name.Contains(v)))
companyName = "生产商名称:" + propParam.categorys[1].name; companyName = "生产商名称:" + propParam.categorys[1].name;
else if (propParam.categorys[0].name.Contains("食品生产许可证编号") && !propParam.categorys[1].name.Contains("见包装") && !propParam.categorys[1].name.Contains("见外包装")) else if (propParam.categorys[0].name.Contains("食品生产许可证编号") && !illegalValueList.Any(v => propParam.categorys[1].name.Contains(v)))
SCID = "食品生产许可证编号:" + propParam.categorys[1].name; SCID = "食品生产许可证编号:" + propParam.categorys[1].name;
else if (propParam.categorys[0].name.Contains("产品标准号") && !propParam.categorys[1].name.Contains("见包装") && !propParam.categorys[1].name.Contains("见外包装")) else if (propParam.categorys[0].name.Contains("产品标准号") && !illegalValueList.Any(v => propParam.categorys[1].name.Contains(v)))
GBID = "产品标准号:" + propParam.categorys[1].name; GBID = "产品标准号:" + propParam.categorys[1].name;
else if (propParam.categorys[0].name.Contains("保质期")) else if (propParam.categorys[0].name.Contains("保质期"))
ExpDate = "保质期:" + propParam.categorys[1].name; ExpDate = "保质期:" + propParam.categorys[1].name;
@@ -5561,7 +5628,7 @@ namespace TemuKJD.WXForms.ProductForms
NetContent = "净含量:" + propParam.categorys[1].name; NetContent = "净含量:" + propParam.categorys[1].name;
else if (propParam.categorys[0].name.Contains("包装方式")) else if (propParam.categorys[0].name.Contains("包装方式"))
Pack = "包装方式:" + propParam.categorys[1].name; Pack = "包装方式:" + propParam.categorys[1].name;
else if (propParam.categorys[0].name.Contains("配料表")) else if (propParam.categorys[0].name.Contains("配料表") && !illegalValueList.Any(v => propParam.categorys[1].name.Contains(v)))
inList = "配料表:" + propParam.categorys[1].name; inList = "配料表:" + propParam.categorys[1].name;
else if (propParam.categorys[0].name.Contains("联系方式")) else if (propParam.categorys[0].name.Contains("联系方式"))
contact = "联系方式:" + propParam.categorys[1].name; contact = "联系方式:" + propParam.categorys[1].name;
@@ -6738,7 +6805,7 @@ namespace TemuKJD.WXForms.ProductForms
data += "&fission_words=fission_goods_names:"; data += "&fission_words=fission_goods_names:";
if (chkFilterViewUv.Checked) if (chkFilterViewUv.Checked)
data += "&min_view_uv=" + numFilterViewUv.Value; data += "&min_view_uv=" + numFilterViewUv.Value.ParseToInt();
if (chkFilterSaleCountNum.Checked) if (chkFilterSaleCountNum.Checked)
data += "&sale_count_num_more=" + numFilterSaleCountNum.Value; data += "&sale_count_num_more=" + numFilterSaleCountNum.Value;
+17 -21
View File
@@ -38,12 +38,11 @@
System.Windows.Forms.TreeNode treeNode8 = 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 treeNode9 = new System.Windows.Forms.TreeNode("活动报名");
System.Windows.Forms.TreeNode treeNode10 = 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 treeNode11 = new System.Windows.Forms.TreeNode("订单管理");
System.Windows.Forms.TreeNode treeNode12 = 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("订单代发管理"); System.Windows.Forms.TreeNode treeNode13 = new System.Windows.Forms.TreeNode("多多商品采集");
System.Windows.Forms.TreeNode treeNode14 = new System.Windows.Forms.TreeNode("多多商品采集"); System.Windows.Forms.TreeNode treeNode14 = new System.Windows.Forms.TreeNode("1688商品采集");
System.Windows.Forms.TreeNode treeNode15 = new System.Windows.Forms.TreeNode("1688商品采集"); System.Windows.Forms.TreeNode treeNode15 = new System.Windows.Forms.TreeNode("商品管理", new System.Windows.Forms.TreeNode[] {
System.Windows.Forms.TreeNode treeNode16 = new System.Windows.Forms.TreeNode("商品管理", new System.Windows.Forms.TreeNode[] {
treeNode1, treeNode1,
treeNode2, treeNode2,
treeNode3, treeNode3,
@@ -57,8 +56,7 @@
treeNode11, treeNode11,
treeNode12, treeNode12,
treeNode13, treeNode13,
treeNode14, treeNode14});
treeNode15});
this.panel1 = new System.Windows.Forms.Panel(); this.panel1 = new System.Windows.Forms.Panel();
this.panel3 = new System.Windows.Forms.Panel(); this.panel3 = new System.Windows.Forms.Panel();
this.panel2 = new System.Windows.Forms.Panel(); this.panel2 = new System.Windows.Forms.Panel();
@@ -169,20 +167,18 @@
treeNode9.Text = "活动报名"; treeNode9.Text = "活动报名";
treeNode10.Name = "达人广场"; treeNode10.Name = "达人广场";
treeNode10.Text = "达人广场"; treeNode10.Text = "达人广场";
treeNode11.Name = "商品同步"; treeNode11.Name = "订单管理";
treeNode11.Text = "商品同步"; treeNode11.Text = "订单管理";
treeNode12.Name = "订单管理"; treeNode12.Name = "订单代发管理";
treeNode12.Text = "订单管理"; treeNode12.Text = "订单代发管理";
treeNode13.Name = "订单代发管理"; treeNode13.Name = "多多商品采集";
treeNode13.Text = "订单代发管理"; treeNode13.Text = "多多商品采集";
treeNode14.Name = "多多商品采集"; treeNode14.Name = "1688商品采集";
treeNode14.Text = "多多商品采集"; treeNode14.Text = "1688商品采集";
treeNode15.Name = "1688商品采集"; treeNode15.Name = "商品管理";
treeNode15.Text = "1688商品采集"; treeNode15.Text = "商品管理";
treeNode16.Name = "商品管理";
treeNode16.Text = "商品管理";
this.tv.Nodes.AddRange(new System.Windows.Forms.TreeNode[] { this.tv.Nodes.AddRange(new System.Windows.Forms.TreeNode[] {
treeNode16}); treeNode15});
this.tv.OverForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235))))); 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.Size = new System.Drawing.Size(140, 521);
this.tv.TabIndex = 1; this.tv.TabIndex = 1;
@@ -25,7 +25,7 @@ namespace TemuKJD.WXForms.ProductForms
public Lazy<WXProdClearNoVisitForm> wxProdClearNoVisitForm = new Lazy<WXProdClearNoVisitForm>(); public Lazy<WXProdClearNoVisitForm> wxProdClearNoVisitForm = new Lazy<WXProdClearNoVisitForm>();
public Lazy<WXProdClearNoVisit260606Form> wxProdClearNoVisit260606Form = new Lazy<WXProdClearNoVisit260606Form>(); public Lazy<WXProdClearNoVisit260606Form> wxProdClearNoVisit260606Form = new Lazy<WXProdClearNoVisit260606Form>();
public Lazy<WXProdCouponOrderBoomForm> wxProdCouponForm = new Lazy<WXProdCouponOrderBoomForm>(); public Lazy<WXProdCouponOrderBoomForm> wxProdCouponForm = new Lazy<WXProdCouponOrderBoomForm>();
public Lazy<WXProdSyncForm> wxProdSyncForm = new Lazy<WXProdSyncForm>(); //public Lazy<WXProdSyncForm> wxProdSyncForm = new Lazy<WXProdSyncForm>();
public Lazy<WXFinderSquareForm> wxFinderSquareForm = new Lazy<WXFinderSquareForm>(); public Lazy<WXFinderSquareForm> wxFinderSquareForm = new Lazy<WXFinderSquareForm>();
public Lazy<WXActivity618Form> wxActivityForm = new Lazy<WXActivity618Form>(); public Lazy<WXActivity618Form> wxActivityForm = new Lazy<WXActivity618Form>();
public Lazy<WXOrderListForm> orderListForm = new Lazy<WXOrderListForm>(); public Lazy<WXOrderListForm> orderListForm = new Lazy<WXOrderListForm>();
@@ -131,9 +131,9 @@ namespace TemuKJD.WXForms.ProductForms
case "活动报名": case "活动报名":
SetForm(wxActivityForm.Value); SetForm(wxActivityForm.Value);
break; break;
case "商品同步": //case "商品同步":
SetForm(wxProdSyncForm.Value); // SetForm(wxProdSyncForm.Value);
break; // break;
case "订单管理": case "订单管理":
SetForm(orderListForm.Value); SetForm(orderListForm.Value);
break; break;
@@ -30,23 +30,23 @@ namespace TemuKJD.WXForms.ProductForms
private void InitializeComponent() private void InitializeComponent()
{ {
this.components = new System.ComponentModel.Container(); this.components = new System.ComponentModel.Container();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WXUserCollectAuthProdListForm)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WXUserCollectAuthProdListForm));
this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.btn_import_wx = new DevComponents.DotNetBar.PanelEx(); this.btn_import_wx = new DevComponents.DotNetBar.PanelEx();
@@ -1331,20 +1331,20 @@ namespace TemuKJD.WXForms.ProductForms
// //
this.dgvDbProduct.AllowUserToAddRows = false; this.dgvDbProduct.AllowUserToAddRows = false;
this.dgvDbProduct.AllowUserToDeleteRows = false; this.dgvDbProduct.AllowUserToDeleteRows = false;
dataGridViewCellStyle18.BackColor = System.Drawing.Color.WhiteSmoke; dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke;
this.dgvDbProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle18; this.dgvDbProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
this.dgvDbProduct.AutoRowNumber = true; this.dgvDbProduct.AutoRowNumber = true;
this.dgvDbProduct.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.dgvDbProduct.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
this.dgvDbProduct.BackgroundColor = System.Drawing.Color.White; this.dgvDbProduct.BackgroundColor = System.Drawing.Color.White;
this.dgvDbProduct.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.dgvDbProduct.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Control; dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle19.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.WindowText; dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight; dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText; dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.False; dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvDbProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle19; this.dgvDbProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
this.dgvDbProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvDbProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvDbProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dgvDbProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colSelect, this.colSelect,
@@ -1428,8 +1428,8 @@ namespace TemuKJD.WXForms.ProductForms
// //
// col_product_name // col_product_name
// //
dataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.True; dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.col_product_name.DefaultCellStyle = dataGridViewCellStyle20; this.col_product_name.DefaultCellStyle = dataGridViewCellStyle3;
this.col_product_name.FillWeight = 140F; this.col_product_name.FillWeight = 140F;
this.col_product_name.HeaderText = "标题"; this.col_product_name.HeaderText = "标题";
this.col_product_name.Name = "col_product_name"; this.col_product_name.Name = "col_product_name";
@@ -1472,8 +1472,8 @@ namespace TemuKJD.WXForms.ProductForms
// //
// col_spu_id // col_spu_id
// //
dataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.True; dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.col_spu_id.DefaultCellStyle = dataGridViewCellStyle21; this.col_spu_id.DefaultCellStyle = dataGridViewCellStyle4;
this.col_spu_id.HeaderText = "真实商品Id"; this.col_spu_id.HeaderText = "真实商品Id";
this.col_spu_id.Name = "col_spu_id"; this.col_spu_id.Name = "col_spu_id";
this.col_spu_id.ReadOnly = true; this.col_spu_id.ReadOnly = true;
@@ -1495,8 +1495,8 @@ namespace TemuKJD.WXForms.ProductForms
// //
// colMainCate // colMainCate
// //
dataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.True; dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colMainCate.DefaultCellStyle = dataGridViewCellStyle22; this.colMainCate.DefaultCellStyle = dataGridViewCellStyle5;
this.colMainCate.FillWeight = 50F; this.colMainCate.FillWeight = 50F;
this.colMainCate.HeaderText = "主类目"; this.colMainCate.HeaderText = "主类目";
this.colMainCate.Name = "colMainCate"; this.colMainCate.Name = "colMainCate";
@@ -1504,8 +1504,8 @@ namespace TemuKJD.WXForms.ProductForms
// //
// col_cat_name // col_cat_name
// //
dataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.True; dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.col_cat_name.DefaultCellStyle = dataGridViewCellStyle23; this.col_cat_name.DefaultCellStyle = dataGridViewCellStyle6;
this.col_cat_name.FillWeight = 60F; this.col_cat_name.FillWeight = 60F;
this.col_cat_name.HeaderText = "类目"; this.col_cat_name.HeaderText = "类目";
this.col_cat_name.Name = "col_cat_name"; this.col_cat_name.Name = "col_cat_name";
@@ -1520,8 +1520,8 @@ namespace TemuKJD.WXForms.ProductForms
// //
// col_ext_code // col_ext_code
// //
dataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.True; dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.col_ext_code.DefaultCellStyle = dataGridViewCellStyle24; this.col_ext_code.DefaultCellStyle = dataGridViewCellStyle7;
this.col_ext_code.HeaderText = "货号"; this.col_ext_code.HeaderText = "货号";
this.col_ext_code.Name = "col_ext_code"; this.col_ext_code.Name = "col_ext_code";
this.col_ext_code.ReadOnly = true; this.col_ext_code.ReadOnly = true;
@@ -1529,8 +1529,8 @@ namespace TemuKJD.WXForms.ProductForms
// //
// colStyleCode // colStyleCode
// //
dataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.True; dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colStyleCode.DefaultCellStyle = dataGridViewCellStyle25; this.colStyleCode.DefaultCellStyle = dataGridViewCellStyle8;
this.colStyleCode.HeaderText = "资料编码/真实上家"; this.colStyleCode.HeaderText = "资料编码/真实上家";
this.colStyleCode.Name = "colStyleCode"; this.colStyleCode.Name = "colStyleCode";
this.colStyleCode.ReadOnly = true; this.colStyleCode.ReadOnly = true;
@@ -1538,8 +1538,8 @@ namespace TemuKJD.WXForms.ProductForms
// //
// colGroup // colGroup
// //
dataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.True; dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colGroup.DefaultCellStyle = dataGridViewCellStyle26; this.colGroup.DefaultCellStyle = dataGridViewCellStyle9;
this.colGroup.HeaderText = "分组"; this.colGroup.HeaderText = "分组";
this.colGroup.Name = "colGroup"; this.colGroup.Name = "colGroup";
this.colGroup.ReadOnly = true; this.colGroup.ReadOnly = true;
@@ -1547,8 +1547,8 @@ namespace TemuKJD.WXForms.ProductForms
// //
// colPriceText // colPriceText
// //
dataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.True; dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colPriceText.DefaultCellStyle = dataGridViewCellStyle27; this.colPriceText.DefaultCellStyle = dataGridViewCellStyle10;
this.colPriceText.FillWeight = 60F; this.colPriceText.FillWeight = 60F;
this.colPriceText.HeaderText = "母店价格"; this.colPriceText.HeaderText = "母店价格";
this.colPriceText.Name = "colPriceText"; this.colPriceText.Name = "colPriceText";
@@ -1598,8 +1598,8 @@ namespace TemuKJD.WXForms.ProductForms
// //
// col_notes // col_notes
// //
dataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.True; dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.col_notes.DefaultCellStyle = dataGridViewCellStyle28; this.col_notes.DefaultCellStyle = dataGridViewCellStyle11;
this.col_notes.FillWeight = 70F; this.col_notes.FillWeight = 70F;
this.col_notes.HeaderText = "备注"; this.col_notes.HeaderText = "备注";
this.col_notes.Name = "col_notes"; this.col_notes.Name = "col_notes";
@@ -1607,8 +1607,8 @@ namespace TemuKJD.WXForms.ProductForms
// //
// colHeadWords // colHeadWords
// //
dataGridViewCellStyle29.WrapMode = System.Windows.Forms.DataGridViewTriState.True; dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colHeadWords.DefaultCellStyle = dataGridViewCellStyle29; this.colHeadWords.DefaultCellStyle = dataGridViewCellStyle12;
this.colHeadWords.HeaderText = "标题前缀"; this.colHeadWords.HeaderText = "标题前缀";
this.colHeadWords.Name = "colHeadWords"; this.colHeadWords.Name = "colHeadWords";
this.colHeadWords.ReadOnly = true; this.colHeadWords.ReadOnly = true;
@@ -1616,8 +1616,8 @@ namespace TemuKJD.WXForms.ProductForms
// //
// colEndWords // colEndWords
// //
dataGridViewCellStyle30.WrapMode = System.Windows.Forms.DataGridViewTriState.True; dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colEndWords.DefaultCellStyle = dataGridViewCellStyle30; this.colEndWords.DefaultCellStyle = dataGridViewCellStyle13;
this.colEndWords.HeaderText = "标题后缀"; this.colEndWords.HeaderText = "标题后缀";
this.colEndWords.Name = "colEndWords"; this.colEndWords.Name = "colEndWords";
this.colEndWords.ReadOnly = true; this.colEndWords.ReadOnly = true;
@@ -1625,16 +1625,16 @@ namespace TemuKJD.WXForms.ProductForms
// //
// colFissionWords // colFissionWords
// //
dataGridViewCellStyle31.WrapMode = System.Windows.Forms.DataGridViewTriState.True; dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colFissionWords.DefaultCellStyle = dataGridViewCellStyle31; this.colFissionWords.DefaultCellStyle = dataGridViewCellStyle14;
this.colFissionWords.HeaderText = "裂变标题"; this.colFissionWords.HeaderText = "裂变标题";
this.colFissionWords.Name = "colFissionWords"; this.colFissionWords.Name = "colFissionWords";
this.colFissionWords.ReadOnly = true; this.colFissionWords.ReadOnly = true;
// //
// colGetType // colGetType
// //
dataGridViewCellStyle32.WrapMode = System.Windows.Forms.DataGridViewTriState.True; dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colGetType.DefaultCellStyle = dataGridViewCellStyle32; this.colGetType.DefaultCellStyle = dataGridViewCellStyle15;
this.colGetType.FillWeight = 70F; this.colGetType.FillWeight = 70F;
this.colGetType.HeaderText = "采集来源"; this.colGetType.HeaderText = "采集来源";
this.colGetType.Name = "colGetType"; this.colGetType.Name = "colGetType";
@@ -1667,8 +1667,8 @@ namespace TemuKJD.WXForms.ProductForms
// //
// colAddTime // colAddTime
// //
dataGridViewCellStyle33.WrapMode = System.Windows.Forms.DataGridViewTriState.True; dataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colAddTime.DefaultCellStyle = dataGridViewCellStyle33; this.colAddTime.DefaultCellStyle = dataGridViewCellStyle16;
this.colAddTime.FillWeight = 70F; this.colAddTime.FillWeight = 70F;
this.colAddTime.HeaderText = "入库时间"; this.colAddTime.HeaderText = "入库时间";
this.colAddTime.Name = "colAddTime"; this.colAddTime.Name = "colAddTime";
@@ -1676,8 +1676,8 @@ namespace TemuKJD.WXForms.ProductForms
// //
// colMdyTime // colMdyTime
// //
dataGridViewCellStyle34.WrapMode = System.Windows.Forms.DataGridViewTriState.True; dataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colMdyTime.DefaultCellStyle = dataGridViewCellStyle34; this.colMdyTime.DefaultCellStyle = dataGridViewCellStyle17;
this.colMdyTime.FillWeight = 70F; this.colMdyTime.FillWeight = 70F;
this.colMdyTime.HeaderText = "更新时间"; this.colMdyTime.HeaderText = "更新时间";
this.colMdyTime.Name = "colMdyTime"; this.colMdyTime.Name = "colMdyTime";
+11 -10
View File
@@ -395,17 +395,18 @@ namespace Work._29Tools.Forms.UserForms
// //
this.cmbType.FormattingEnabled = true; this.cmbType.FormattingEnabled = true;
this.cmbType.Items.AddRange(new object[] { this.cmbType.Items.AddRange(new object[] {
"", "",
"充值", "充值",
"管理员充值", "管理员充值",
"支付宝充值", "支付宝充值",
"礼物单支出/礼物单退费", "礼物单支出/礼物单退费",
"拍单扣除/作废返还", "拍单扣除/作废返还",
"超重扣费支出", "额外包裹扣费支出/返还",
"退货包裹扣费支出", "退货包裹扣费支出/返还",
"云仓退货扣费支出", "云仓退货扣费支出/返还",
"超重扣费支出",
"同步物流"}); "同步物流"});
this.cmbType.Location = new System.Drawing.Point(55, 20); this.cmbType.Location = new System.Drawing.Point(55, 20);
this.cmbType.Name = "cmbType"; this.cmbType.Name = "cmbType";
this.cmbType.Size = new System.Drawing.Size(121, 25); this.cmbType.Size = new System.Drawing.Size(121, 25);
this.cmbType.TabIndex = 0; this.cmbType.TabIndex = 0;
@@ -135,22 +135,24 @@ namespace Work._29Tools.Forms.UserForms
data3 += "&user_name_in=" + oemUserNames; data3 += "&user_name_in=" + oemUserNames;
data3 += "&create_time_begin=" + dtpTimeBegin.Value.ToString("yyyy-MM-dd HH:mm:ss"); data3 += "&create_time_begin=" + dtpTimeBegin.Value.ToString("yyyy-MM-dd HH:mm:ss");
data3 += "&create_time_end=" + dtpTimeEnd.Value.ToString("yyyy-MM-dd HH:mm:ss"); data3 += "&create_time_end=" + dtpTimeEnd.Value.ToString("yyyy-MM-dd HH:mm:ss");
if (cmbType.Text == "充值") if (cmbType.Text == "充值")
data3 += "&type_in=1,30"; data3 += "&type_in=1,30";
else if (cmbType.Text == "管理员充值") else if (cmbType.Text == "管理员充值")
data3 += "&type_in=1"; data3 += "&type_in=1";
else if (cmbType.Text == "支付宝充值") else if (cmbType.Text == "支付宝充值")
data3 += "&type_in=30"; data3 += "&type_in=30";
else if (cmbType.Text == "礼物单支出/礼物单退费") else if (cmbType.Text == "礼物单支出/礼物单退费")
data3 += "&type_in=16,34"; data3 += "&type_in=16,34";
else if (cmbType.Text == "拍单扣除/作废返还") else if (cmbType.Text == "拍单扣除/作废返还")
data3 += "&type_in=20,23"; data3 += "&type_in=20,23";
else if (cmbType.Text == "超重扣费支出") else if (cmbType.Text == "退货包裹扣费支出/返还")
data3 += "&type_in=24"; data3 += "&type_in=26,38";
else if(cmbType.Text == "退货包裹扣费支出") else if (cmbType.Text == "额外包裹扣费支出/返还")
data3 += "&type_in=26"; data3 += "&type_in=35,36";
else if (cmbType.Text == "云仓退货扣费支出") else if (cmbType.Text == "云仓退货扣费支出")
data3 += "&type_in=31"; data3 += "&type_in=31,32";
else if (cmbType.Text == "超重扣费支出")
data3 += "&type_in=24,28,33,37,41";
else if (cmbType.Text == "同步物流") else if (cmbType.Text == "同步物流")
data3 += "&type_in=55"; data3 += "&type_in=55";
else if (!string.IsNullOrEmpty(cmbType.Text)) else if (!string.IsNullOrEmpty(cmbType.Text))
@@ -229,29 +231,31 @@ namespace Work._29Tools.Forms.UserForms
data3 += "&user_name_in=" + txtUserName.Text.Trim(); data3 += "&user_name_in=" + txtUserName.Text.Trim();
data3 += "&create_time_begin=" + dtpTimeBegin.Value.ToString("yyyy-MM-dd HH:mm:ss"); data3 += "&create_time_begin=" + dtpTimeBegin.Value.ToString("yyyy-MM-dd HH:mm:ss");
data3 += "&create_time_end=" + dtpTimeEnd.Value.ToString("yyyy-MM-dd HH:mm:ss"); data3 += "&create_time_end=" + dtpTimeEnd.Value.ToString("yyyy-MM-dd HH:mm:ss");
if (cmbType.Text == "充值") if (cmbType.Text == "充值")
data3 += "&type_in=1,30"; data3 += "&type_in=1,30";
else if (cmbType.Text == "管理员充值") else if (cmbType.Text == "管理员充值")
data3 += "&type_in=1"; data3 += "&type_in=1";
else if (cmbType.Text == "支付宝充值") else if (cmbType.Text == "支付宝充值")
data3 += "&type_in=30"; data3 += "&type_in=30";
else if (cmbType.Text == "礼物单支出/礼物单退费") else if (cmbType.Text == "礼物单支出/礼物单退费")
data3 += "&type_in=16,34"; data3 += "&type_in=16,34";
else if (cmbType.Text == "拍单扣除/作废返还") else if (cmbType.Text == "拍单扣除/作废返还")
data3 += "&type_in=20,23"; data3 += "&type_in=20,23";
else if (cmbType.Text == "超重扣费支出") else if (cmbType.Text == "退货包裹扣费支出/返还")
data3 += "&type_in=24"; data3 += "&type_in=26,38";
else if (cmbType.Text == "退货包裹扣费支出") else if (cmbType.Text == "额外包裹扣费支出/返还")
data3 += "&type_in=26"; data3 += "&type_in=35,36";
else if (cmbType.Text == "云仓退货扣费支出") else if (cmbType.Text == "云仓退货扣费支出")
data3 += "&type_in=31"; data3 += "&type_in=31,32";
else if (!string.IsNullOrEmpty(cmbType.Text)) else if (cmbType.Text == "超重扣费支出")
data3 += "&type_in=" + cmbType.Text; data3 += "&type_in=24,28,33,37,41";
//if (!string.IsNullOrEmpty(txtOutOrderId.Text.Trim())) else if (cmbType.Text == "同步物流")
// data3 += "&order_id_in=" + txtOutOrderId.Text.Trim(); data3 += "&type_in=55";
//if (!string.IsNullOrEmpty(txtShopOrderNo.Text.Trim())) //if (!string.IsNullOrEmpty(txtOutOrderId.Text.Trim()))
// data3 += "&remark_fulltext=" + txtShopOrderNo.Text.Trim(); // data3 += "&order_id_in=" + txtOutOrderId.Text.Trim();
data3 += "&page=" + ucSplitPage1.CurrentPage; //if (!string.IsNullOrEmpty(txtShopOrderNo.Text.Trim()))
// data3 += "&remark_fulltext=" + txtShopOrderNo.Text.Trim();
data3 += "&page=" + ucSplitPage1.CurrentPage;
data3 += "&page_size=" + ucSplitPage1.PageSize; data3 += "&page_size=" + ucSplitPage1.PageSize;
pageSize = ucSplitPage1.PageSize; pageSize = ucSplitPage1.PageSize;
})); }));
@@ -448,17 +452,17 @@ namespace Work._29Tools.Forms.UserForms
var checkRows = dgvPayment.Rows.Cast<DataGridViewRow>().Where(r => r.Cells["colCheck"].Value.ParseToBool() == true).ToList(); var checkRows = dgvPayment.Rows.Cast<DataGridViewRow>().Where(r => r.Cells["colCheck"].Value.ParseToBool() == true).ToList();
lblPostageTotal.Text = checkRows lblPostageTotal.Text = checkRows
.Where(r => r.Cells["colType"].Value.ParseToString() == EnumOrderPaymentType.中转仓扣费支出.ParseToString()) .Where(r => r.Cells["colType"].Value.ParseToString() == EnumOrderPaymentType.发货包裹扣费支出.ParseToString())
.Sum(r => r.Cells["colAmount"].Value.ParseToDecimal()).ToString(); .Sum(r => r.Cells["colAmount"].Value.ParseToDecimal()).ToString();
lblPostageReturnTotal.Text = checkRows lblPostageReturnTotal.Text = checkRows
.Where(r => r.Cells["colType"].Value.ParseToString() == EnumOrderPaymentType.中转仓作废返还收入.ParseToString()) .Where(r => r.Cells["colType"].Value.ParseToString() == EnumOrderPaymentType.发货包裹作废返还.ParseToString())
.Sum(r => r.Cells["colAmount"].Value.ParseToDecimal()).ToString(); .Sum(r => r.Cells["colAmount"].Value.ParseToDecimal()).ToString();
lblPostageWeightTotal.Text = checkRows lblPostageWeightTotal.Text = checkRows
.Where(r => r.Cells["colType"].Value.ParseToString() == EnumOrderPaymentType.中转仓超重支出.ParseToString()) .Where(r => r.Cells["colType"].Value.ParseToString() == EnumOrderPaymentType.发货包裹超重支出.ParseToString())
.Sum(r => r.Cells["colAmount"].Value.ParseToDecimal()).ToString(); .Sum(r => r.Cells["colAmount"].Value.ParseToDecimal()).ToString();
lblPostageNotReturnCnt.Text = (checkRows lblPostageNotReturnCnt.Text = (checkRows
.Where(r => r.Cells["colType"].Value.ParseToString() == EnumOrderPaymentType.中转仓扣费支出.ParseToString()).Count() - checkRows .Where(r => r.Cells["colType"].Value.ParseToString() == EnumOrderPaymentType.发货包裹扣费支出.ParseToString()).Count() - checkRows
.Where(r => r.Cells["colType"].Value.ParseToString() == EnumOrderPaymentType.中转仓作废返还收入.ParseToString()).Count()).ToString(); .Where(r => r.Cells["colType"].Value.ParseToString() == EnumOrderPaymentType.发货包裹作废返还.ParseToString()).Count()).ToString();
lblProfit.Text = (lblPostageTotal.Text.ParseToDecimal() - lblPostageReturnTotal.Text.ParseToDecimal() - lblPostageNotReturnCnt.Text.ParseToInt() * 2.2m).ToString(); lblProfit.Text = (lblPostageTotal.Text.ParseToDecimal() - lblPostageReturnTotal.Text.ParseToDecimal() - lblPostageNotReturnCnt.Text.ParseToInt() * 2.2m).ToString();
} }
@@ -252,6 +252,7 @@ namespace TemuKJD.WXForms.ShopForms
{ {
if (columName == "colChangePointsPerMonth") if (columName == "colChangePointsPerMonth")
{ {
numShopPointsPerMonth.Minimum = 30;
/* /*
注意注意注意特殊账号 只允许这些账号店铺月续费最少10元,其他默认30 注意注意注意特殊账号 只允许这些账号店铺月续费最少10元,其他默认30
*/ */
@@ -60,6 +60,13 @@ namespace TemuKJD.WXForms.ShopForms
{ {
e.Value = (amountInFen / 100m).ToString("F2"); e.Value = (amountInFen / 100m).ToString("F2");
e.FormattingApplied = true; e.FormattingApplied = true;
if(e.ColumnIndex == this.colRebate.Index)
{
if (amountInFen < 0)
{
e.CellStyle.ForeColor = System.Drawing.Color.Crimson;
}
}
} }
} }
#endregion #endregion
+80 -5
View File
@@ -9,6 +9,7 @@ using System.Linq;
using Work.Store.Api; using Work.Store.Api;
using System.Threading.Tasks; using System.Threading.Tasks;
using Work.Api.Wx; using Work.Api.Wx;
using AllBase.Model;
namespace Work.Services namespace Work.Services
{ {
@@ -17,6 +18,19 @@ namespace Work.Services
/// </summary> /// </summary>
public class CloudGoodsService public class CloudGoodsService
{ {
public static List<UserFavoriteGroup> UserGroups { get; private set; }
static CloudGoodsService()
{
_ = GetGroups();
}
public static async Task<List<UserFavoriteGroup>> GetGroups()
{
if (UserGroups == null)
{
UserGroups = await GetGroups(BaseClass.UserName);
}
return UserGroups;
}
public static async Task<PageData<CloudGoods>> GetGoods(GoodsSearchRequest request) public static async Task<PageData<CloudGoods>> GetGoods(GoodsSearchRequest request)
{ {
return await StoreApiClient.Instance.CloudGoods.GetGoods(request); return await StoreApiClient.Instance.CloudGoods.GetGoods(request);
@@ -178,7 +192,10 @@ namespace Work.Services
} }
logs.Add(new RecordViolationLogRequest logs.Add(new RecordViolationLogRequest
{ {
ShopId = shopId, GoodsId = item.GoodsId, ReasonId = reasonId, Action = ViolationLogAction.Report ShopId = shopId,
GoodsId = item.GoodsId,
ReasonId = reasonId,
Action = ViolationLogAction.Report
}); });
} }
await TryRecordLogs(logs); await TryRecordLogs(logs);
@@ -351,7 +368,10 @@ namespace Work.Services
} }
logs.AddRange(status.ReasonIds.Select(id => new RecordViolationLogRequest logs.AddRange(status.ReasonIds.Select(id => new RecordViolationLogRequest
{ {
ShopId = shopId, GoodsId = status.GoodsId, ReasonId = id, Action = action ShopId = shopId,
GoodsId = status.GoodsId,
ReasonId = id,
Action = action
})); }));
} }
await TryRecordLogs(logs).ConfigureAwait(false); await TryRecordLogs(logs).ConfigureAwait(false);
@@ -409,6 +429,49 @@ namespace Work.Services
} }
#region user #region user
/// <summary>
/// 创建分组
/// </summary>
/// <param name="userName"></param>
/// <param name="groupName"></param>
/// <returns></returns>
public static async Task<bool> CreateGroup(string userName, string groupName)
{
bool ret = await StoreApiClient.Instance.CloudGoods.CreateGroup(userName, groupName);
if (ret)
{
UserGroups = await GetGroups(userName);
}
return ret;
}
public static async Task<bool> DelGroupAsync(string userName, string groupName)
{
bool ret = await StoreApiClient.Instance.CloudGoods.DelGroupAsync(userName, groupName);
if (ret)
{
UserGroups = await GetGroups(userName);
}
return ret;
}
public static async Task<bool> SetFavoriteGroupAsync(string userName, int groupId, IEnumerable<long> goodsIds)
{
bool ret = await StoreApiClient.Instance.CloudGoods.SetFavoriteGroupAsync(userName, groupId, goodsIds);
if (ret)
{
UserGroups = await GetGroups(userName);
}
return ret;
}
/// <summary>
/// 获取分组
/// </summary>
/// <param name="userName"></param>
/// <returns></returns>
public static async Task<List<UserFavoriteGroup>> GetGroups(string userName)
{
return await StoreApiClient.Instance.CloudGoods.GetGroups(userName);
}
/// <summary> /// <summary>
/// 搜索收藏 /// 搜索收藏
/// </summary> /// </summary>
@@ -434,9 +497,9 @@ namespace Work.Services
/// <returns></returns> /// <returns></returns>
/// <exception cref="Exception"></exception> /// <exception cref="Exception"></exception>
public static async Task<int> Favorite(List<long> goodsIds) public static async Task<int> Favorite(List<long> goodsIds, int groupId)
{ {
return await StoreApiClient.Instance.CloudGoods.Favorite(GetUserName(), goodsIds); return await StoreApiClient.Instance.CloudGoods.Favorite(GetUserName(), goodsIds, groupId);
} }
/// <summary> /// <summary>
/// 取消收藏 /// 取消收藏
@@ -537,7 +600,10 @@ namespace Work.Services
/// 标题(模糊搜索) /// 标题(模糊搜索)
/// </summary> /// </summary>
public string Title { get; set; } = string.Empty; public string Title { get; set; } = string.Empty;
/// <summary>
/// 分组ID
/// </summary>
public int? GroupId { get; set; }
/// <summary> /// <summary>
/// 最低价格(元) /// 最低价格(元)
/// </summary> /// </summary>
@@ -663,6 +729,9 @@ namespace Work.Services
/// </summary> /// </summary>
public string Title { get; set; } = string.Empty; public string Title { get; set; } = string.Empty;
public int GroupId { get; set; }
public string GroupName { get; set; }
/// <summary> /// <summary>
/// 描述 /// 描述
/// </summary> /// </summary>
@@ -742,4 +811,10 @@ namespace Work.Services
set => SetValue(value); set => SetValue(value);
} }
} }
public class UserFavoriteGroup
{
public long Id { get; set; }
public string GroupName { get; set; }
}
} }
+4 -2
View File
@@ -131,8 +131,10 @@ public sealed class ApiTransport
private HttpItem CreateRequest(string route, MethodType method, object body, private HttpItem CreateRequest(string route, MethodType method, object body,
IDictionary<string, string> query, int timeoutMilliseconds) IDictionary<string, string> query, int timeoutMilliseconds)
{ {
if (string.IsNullOrWhiteSpace(route) || string pathOnly = route?.Split('?', '#')[0];
!Regex.IsMatch(route, @"\A[A-Za-z0-9_-]+(/[A-Za-z0-9_-]+)*\z"))
if (string.IsNullOrWhiteSpace(pathOnly) ||
!Regex.IsMatch(pathOnly, @"\A[A-Za-z0-9_-]+(/[A-Za-z0-9_-]+)*\z"))
throw new ArgumentException("接口必须使用相对路由,例如 Auth/Login。", nameof(route)); throw new ArgumentException("接口必须使用相对路由,例如 Auth/Login。", nameof(route));
if (body != null) Validator.ValidateObject(body, new ValidationContext(body), true); if (body != null) Validator.ValidateObject(body, new ValidationContext(body), true);
if (timeoutMilliseconds <= 0) throw new ArgumentOutOfRangeException(nameof(timeoutMilliseconds)); if (timeoutMilliseconds <= 0) throw new ArgumentOutOfRangeException(nameof(timeoutMilliseconds));
+28 -2
View File
@@ -49,14 +49,40 @@ public sealed class CloudGoodsApi
public Task<PageData<CloudGoods>> SearchFavorites(UserFavoritesGoodsSearchRequest request) public Task<PageData<CloudGoods>> SearchFavorites(UserFavoritesGoodsSearchRequest request)
=> _transport.GetRequiredAsync<PageData<CloudGoods>>("CloudGoods/SearchFavorites", MethodType.Post, request); => _transport.GetRequiredAsync<PageData<CloudGoods>>("CloudGoods/SearchFavorites", MethodType.Post, request);
public Task<int> Favorite(string userName, List<long> goodsIds) public Task<int> Favorite(string userName, List<long> goodsIds,int groupId)
=> _transport.SendAsync<int>("CloudGoods/AddFavorite", MethodType.Post, => _transport.SendAsync<int>("CloudGoods/AddFavorite", MethodType.Post,
new { UserName = userName, GoodsIds = goodsIds }); new { UserName = userName, GoodsIds = goodsIds, GroupId= groupId });
public Task<int> RemoveFavorites(string userName, List<long> goodsIds) public Task<int> RemoveFavorites(string userName, List<long> goodsIds)
=> _transport.SendAsync<int>("CloudGoods/RemoveFavorites", MethodType.Post, => _transport.SendAsync<int>("CloudGoods/RemoveFavorites", MethodType.Post,
new { UserName = userName, GoodsIds = goodsIds }); new { UserName = userName, GoodsIds = goodsIds });
/// <summary>
/// 创建分组
/// </summary>
/// <param name="userName"></param>
/// <param name="groupName"></param>
/// <returns></returns>
public async Task<bool> CreateGroup(string userName, string groupName)
{
return await _transport.SendAsync<bool>("CloudGoods/CreateGroup", MethodType.Post,
new { UserName = userName, GroupName = groupName });
}
public async Task<bool> DelGroupAsync(string userName, string groupName)
{
return await _transport.SendAsync<bool>("CloudGoods/DelGroup", MethodType.Post,
new { UserName = userName, GroupName = groupName });
}
public async Task<bool> SetFavoriteGroupAsync(string userName, int groupId, IEnumerable<long> goodsIds)
{
return await _transport.SendAsync<bool>("CloudGoods/SetFavoriteGroup", MethodType.Post,
new { UserName = userName, GroupId = groupId, GoodsIds = goodsIds });
}
public async Task<List<UserFavoriteGroup>> GetGroups(string userName)
{
return await _transport.SendAsync<List<UserFavoriteGroup>>($"CloudGoods/GetGroups?UserName={userName}", MethodType.Post);
}
/// <summary>识别上传图片中的文字和品牌 Logo。</summary> /// <summary>识别上传图片中的文字和品牌 Logo。</summary>
public async Task<List<string>> RecognizeAsync(string urlMd5, byte[] jpeg) public async Task<List<string>> RecognizeAsync(string urlMd5, byte[] jpeg)
@@ -0,0 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net462</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
<LangVersion>12</LangVersion>
</PropertyGroup>
<ItemGroup>
<Compile Include="../../TEMUKJD/UserComponent/InputDialog.cs" Link="InputDialog.cs" />
<Compile Include="../../TEMUKJD/UserComponent/InputDialog.Designer.cs" Link="InputDialog.Designer.cs" />
</ItemGroup>
</Project>
+89
View File
@@ -0,0 +1,89 @@
using System;
using System.Globalization;
using System.Threading;
using System.Windows.Forms;
namespace TemuKJD.UserComponent;
public partial class InputDialog
{
[STAThread]
private static void Main()
{
Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
Check(ValidateNumber<int>("123", null, out var integer) == null && integer == 123, "泛型 int");
Check(ValidateNumber<float>("1.25", null, out var single) == null && single == 1.25f, "泛型 float");
Check(ValidateNumber<double>("1e100", null, out var number) == null && number == 1e100, "泛型 double");
Check(ValidateNumber<decimal>("12.50", null, out var amount) == null && amount == 12.50m, "泛型 decimal");
Check(ValidateNumber<long>("9223372036854775807", null, out var large) == null && large == long.MaxValue, "泛型 long");
Check(ValidateNumber<uint>("-1", null, out _) != null, "无符号负数");
Check(ValidateNumber<int>("2147483648", null, out _) != null, "泛型整数溢出");
Check(ValidateNumber<float>("1e100", null, out _) != null, "浮点溢出");
foreach (string invalid in new[] { "", "abc", "NaN", "Infinity", "-Infinity" })
Check(ValidateNumber<double>(invalid, _ => throw new Exception("不应调用"), out _) != null, "无效浮点数:" + invalid);
Check(ValidateNumber<int>("0", value => value > 0 ? null : "必须大于零", out _) == "必须大于零", "类型化回调");
Thread.CurrentThread.CurrentCulture = CultureInfo.GetCultureInfo("fr-FR");
Check(ValidateNumber<double>("1,5", null, out var localized) == null && localized == 1.5, "区域格式");
Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
foreach (string value in new[] { "0", "-2147483648", "2147483647" })
CheckAccepted(InputDialogType.Integer, value);
foreach (string value in new[] { "", "1.5", "abc", "2147483648" })
{
using var dialog = new InputDialog("整数", defaultValue: value,
inputType: InputDialogType.Integer, validator: _ => throw new Exception("不应调用"));
dialog.btnOk_Click(null, EventArgs.Empty);
Check(dialog.DialogResult == DialogResult.None && dialog.lblError.Text.StartsWith("请输入"), "整数拒绝:" + value);
Check(dialog.InputText == "", "失败不能提交输入");
}
CheckAccepted(InputDialogType.Text, "");
CheckAccepted(InputDialogType.Decimal, "-12.50");
using (var dialog = new InputDialog("小数", defaultValue: "79228162514264337593543950336",
inputType: InputDialogType.Decimal))
{
dialog.btnOk_Click(null, EventArgs.Empty);
Check(dialog.DialogResult == DialogResult.None && dialog.lblError.Text != "", "小数溢出");
}
int calls = 0;
using (var dialog = new InputDialog("名称", validator: value =>
{
calls++;
return value == "有效" ? null : "名称无效";
}))
{
dialog.btnOk_Click(null, EventArgs.Empty);
Check(dialog.DialogResult == DialogResult.None && dialog.lblError.Text == "名称无效", "回调错误");
dialog.txtInput.Text = "有效";
Check(dialog.lblError.Text == "", "编辑清除错误");
dialog.btnOk_Click(null, EventArgs.Empty);
Check(dialog.DialogResult == DialogResult.OK && dialog.InputText == "有效" && calls == 2, "回调通过");
}
using (var dialog = new InputDialog("异常", validator: _ => throw new InvalidOperationException("测试异常")))
{
dialog.btnOk_Click(null, EventArgs.Empty);
Check(dialog.DialogResult == DialogResult.None && dialog.lblError.Text.Contains("测试异常"), "回调异常");
Check(((Button)dialog.AcceptButton).DialogResult == DialogResult.None, "确定按钮不得绕过验证");
Check(((Button)dialog.CancelButton).DialogResult == DialogResult.Cancel, "取消按钮");
}
try
{
using var dialog = new InputDialog("非法类型", inputType: (InputDialogType)99);
throw new Exception("非法类型未拒绝");
}
catch (ArgumentOutOfRangeException) { }
Console.WriteLine("InputDialog self-checks passed.");
}
private static void CheckAccepted(InputDialogType type, string value)
{
using var dialog = new InputDialog("输入", defaultValue: value, inputType: type, validator: _ => "");
dialog.btnOk_Click(null, EventArgs.Empty);
Check(dialog.DialogResult == DialogResult.OK && dialog.InputText == value, "接受:" + value);
}
private static void Check(bool condition, string message)
{
if (!condition)
throw new Exception(message);
}
}
+1 -1
View File
@@ -143,7 +143,7 @@ namespace KJD.Test
[Test] [Test]
public void TestWXToPDDV4() public void TestWXToPDDV4()
{ {
string filePath = @"C:\Users\chaih\Documents\xwechat_files\hongfei357_a567\msg\file\2026-10\10001443620622.json"; string filePath = @"C:\Users\chaih\Documents\xwechat_files\hongfei357_a567\msg\file\2026-11\10000087348819.txt";
var frontProdInfo = ConverterToPddFactory.Convert(filePath); var frontProdInfo = ConverterToPddFactory.Convert(filePath);
var isMatch = frontProdInfo != null; var isMatch = frontProdInfo != null;
Console.WriteLine(frontProdInfo.Skus.Count); Console.WriteLine(frontProdInfo.Skus.Count);