1挪动一些老旧文件的位置以备后续删除 2图片显示 3店铺登录信息优化显示

2025-08-15 15:16:59 +08:00
1 parent 011b909bfc
commit 157f7e9f3e
@@ -27,8 +27,8 @@ namespace AllBase
        /// <summary>
        /// 版本ID
        /// </summary>
-        public static int VersionCount = 526;
-        //public static int VersionCount = 526;
+        public static int VersionCount = 527;
+        //public static int VersionCount = 527;

        /// <summary>
        /// 版本号
@@ -376,70 +376,70 @@
    <Compile Include="KJDForms\SystemForms\SystemRemoveRestrictionsForm.Designer.cs">
      <DependentUpon>SystemRemoveRestrictionsForm.cs</DependentUpon>
    </Compile>
-    <Compile Include="KJDForms\ToolForms\CefForm.cs">
+    <Compile Include="KJDForms\ToolForms\Old\CefForm.cs">
      <SubType>Form</SubType>
    </Compile>
-    <Compile Include="KJDForms\ToolForms\CefForm.Designer.cs">
+    <Compile Include="KJDForms\ToolForms\Old\CefForm.Designer.cs">
      <DependentUpon>CefForm.cs</DependentUpon>
    </Compile>
-    <Compile Include="KJDForms\ToolForms\ChangeIPForm.cs">
+    <Compile Include="KJDForms\ToolForms\Old\ChangeIPForm.cs">
      <SubType>Form</SubType>
    </Compile>
-    <Compile Include="KJDForms\ToolForms\ChangeIPForm.designer.cs">
+    <Compile Include="KJDForms\ToolForms\Old\ChangeIPForm.designer.cs">
      <DependentUpon>ChangeIPForm.cs</DependentUpon>
    </Compile>
-    <Compile Include="KJDForms\ToolForms\IeForm.cs">
+    <Compile Include="KJDForms\ToolForms\Old\IeForm.cs">
      <SubType>Form</SubType>
    </Compile>
-    <Compile Include="KJDForms\ToolForms\IeForm.designer.cs">
+    <Compile Include="KJDForms\ToolForms\Old\IeForm.designer.cs">
      <DependentUpon>IeForm.cs</DependentUpon>
    </Compile>
-    <Compile Include="KJDForms\ToolForms\JDVerifyForm\CollectVerifyForm.cs">
+    <Compile Include="KJDForms\ToolForms\Old\JDVerifyForm\CollectVerifyForm.cs">
      <SubType>Form</SubType>
    </Compile>
-    <Compile Include="KJDForms\ToolForms\JDVerifyForm\CollectVerifyForm.designer.cs">
+    <Compile Include="KJDForms\ToolForms\Old\JDVerifyForm\CollectVerifyForm.designer.cs">
      <DependentUpon>CollectVerifyForm.cs</DependentUpon>
    </Compile>
-    <Compile Include="KJDForms\ToolForms\KeywordsForms\KeywordsCatchFrom.cs">
+    <Compile Include="KJDForms\ToolForms\Old\KeywordsForms\KeywordsCatchFrom.cs">
      <SubType>Form</SubType>
    </Compile>
-    <Compile Include="KJDForms\ToolForms\KeywordsForms\KeywordsCatchFrom.Designer.cs">
+    <Compile Include="KJDForms\ToolForms\Old\KeywordsForms\KeywordsCatchFrom.Designer.cs">
      <DependentUpon>KeywordsCatchFrom.cs</DependentUpon>
    </Compile>
-    <Compile Include="KJDForms\ToolForms\MeituMessageDialog.cs">
+    <Compile Include="KJDForms\ToolForms\Old\MeituMessageDialog.cs">
      <SubType>Form</SubType>
    </Compile>
-    <Compile Include="KJDForms\ToolForms\MeituMessageDialog.designer.cs">
+    <Compile Include="KJDForms\ToolForms\Old\MeituMessageDialog.designer.cs">
      <DependentUpon>MeituMessageDialog.cs</DependentUpon>
    </Compile>
-    <Compile Include="KJDForms\ToolForms\PinDuoDuoCaptchaForm.cs">
+    <Compile Include="KJDForms\ToolForms\Old\PinDuoDuoCaptchaForm.cs">
      <SubType>Form</SubType>
    </Compile>
-    <Compile Include="KJDForms\ToolForms\PinDuoDuoCaptchaForm.designer.cs">
+    <Compile Include="KJDForms\ToolForms\Old\PinDuoDuoCaptchaForm.designer.cs">
      <DependentUpon>PinDuoDuoCaptchaForm.cs</DependentUpon>
    </Compile>
-    <Compile Include="KJDForms\ToolForms\PinDuoDuoLoginForm.cs">
+    <Compile Include="KJDForms\ToolForms\Old\PinDuoDuoLoginForm.cs">
      <SubType>Form</SubType>
    </Compile>
-    <Compile Include="KJDForms\ToolForms\PinDuoDuoLoginForm.designer.cs">
+    <Compile Include="KJDForms\ToolForms\Old\PinDuoDuoLoginForm.designer.cs">
      <DependentUpon>PinDuoDuoLoginForm.cs</DependentUpon>
    </Compile>
-    <Compile Include="KJDForms\ToolForms\ProxyForm.cs">
+    <Compile Include="KJDForms\ToolForms\Old\ProxyForm.cs">
      <SubType>Form</SubType>
    </Compile>
-    <Compile Include="KJDForms\ToolForms\ProxyForm.designer.cs">
+    <Compile Include="KJDForms\ToolForms\Old\ProxyForm.designer.cs">
      <DependentUpon>ProxyForm.cs</DependentUpon>
    </Compile>
-    <Compile Include="KJDForms\ToolForms\TextForm.cs">
+    <Compile Include="KJDForms\ToolForms\Old\TextForm.cs">
      <SubType>Form</SubType>
    </Compile>
-    <Compile Include="KJDForms\ToolForms\TextForm.designer.cs">
+    <Compile Include="KJDForms\ToolForms\Old\TextForm.designer.cs">
      <DependentUpon>TextForm.cs</DependentUpon>
    </Compile>
-    <Compile Include="KJDForms\ToolForms\TokenNewForm.cs">
+    <Compile Include="KJDForms\ToolForms\Old\TokenNewForm.cs">
      <SubType>Form</SubType>
    </Compile>
-    <Compile Include="KJDForms\ToolForms\TokenNewForm.designer.cs">
+    <Compile Include="KJDForms\ToolForms\Old\TokenNewForm.designer.cs">
      <DependentUpon>TokenNewForm.cs</DependentUpon>
    </Compile>
    <Compile Include="MainForm.cs">
@@ -462,6 +462,12 @@
    <Compile Include="TaobaoLoginForm.designer.cs">
      <DependentUpon>TaobaoLoginForm.cs</DependentUpon>
    </Compile>
+    <Compile Include="KJDForms\ToolForms\ShowImgForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="KJDForms\ToolForms\ShowImgForm.Designer.cs">
+      <DependentUpon>ShowImgForm.cs</DependentUpon>
+    </Compile>
    <Compile Include="UserComponent\ButtonLc.cs">
      <SubType>Component</SubType>
    </Compile>
@@ -686,37 +692,37 @@
    <EmbeddedResource Include="KJDForms\SystemForms\SystemRemoveRestrictionsForm.resx">
      <DependentUpon>SystemRemoveRestrictionsForm.cs</DependentUpon>
    </EmbeddedResource>
-    <EmbeddedResource Include="KJDForms\ToolForms\CefForm.resx">
+    <EmbeddedResource Include="KJDForms\ToolForms\Old\CefForm.resx">
      <DependentUpon>CefForm.cs</DependentUpon>
    </EmbeddedResource>
-    <EmbeddedResource Include="KJDForms\ToolForms\ChangeIPForm.resx">
+    <EmbeddedResource Include="KJDForms\ToolForms\Old\ChangeIPForm.resx">
      <DependentUpon>ChangeIPForm.cs</DependentUpon>
    </EmbeddedResource>
-    <EmbeddedResource Include="KJDForms\ToolForms\IeForm.resx">
+    <EmbeddedResource Include="KJDForms\ToolForms\Old\IeForm.resx">
      <DependentUpon>IeForm.cs</DependentUpon>
    </EmbeddedResource>
-    <EmbeddedResource Include="KJDForms\ToolForms\JDVerifyForm\CollectVerifyForm.resx">
+    <EmbeddedResource Include="KJDForms\ToolForms\Old\JDVerifyForm\CollectVerifyForm.resx">
      <DependentUpon>CollectVerifyForm.cs</DependentUpon>
    </EmbeddedResource>
-    <EmbeddedResource Include="KJDForms\ToolForms\KeywordsForms\KeywordsCatchFrom.resx">
+    <EmbeddedResource Include="KJDForms\ToolForms\Old\KeywordsForms\KeywordsCatchFrom.resx">
      <DependentUpon>KeywordsCatchFrom.cs</DependentUpon>
    </EmbeddedResource>
-    <EmbeddedResource Include="KJDForms\ToolForms\MeituMessageDialog.resx">
+    <EmbeddedResource Include="KJDForms\ToolForms\Old\MeituMessageDialog.resx">
      <DependentUpon>MeituMessageDialog.cs</DependentUpon>
    </EmbeddedResource>
-    <EmbeddedResource Include="KJDForms\ToolForms\PinDuoDuoCaptchaForm.resx">
+    <EmbeddedResource Include="KJDForms\ToolForms\Old\PinDuoDuoCaptchaForm.resx">
      <DependentUpon>PinDuoDuoCaptchaForm.cs</DependentUpon>
    </EmbeddedResource>
-    <EmbeddedResource Include="KJDForms\ToolForms\PinDuoDuoLoginForm.resx">
+    <EmbeddedResource Include="KJDForms\ToolForms\Old\PinDuoDuoLoginForm.resx">
      <DependentUpon>PinDuoDuoLoginForm.cs</DependentUpon>
    </EmbeddedResource>
-    <EmbeddedResource Include="KJDForms\ToolForms\ProxyForm.resx">
+    <EmbeddedResource Include="KJDForms\ToolForms\Old\ProxyForm.resx">
      <DependentUpon>ProxyForm.cs</DependentUpon>
    </EmbeddedResource>
-    <EmbeddedResource Include="KJDForms\ToolForms\TextForm.resx">
+    <EmbeddedResource Include="KJDForms\ToolForms\Old\TextForm.resx">
      <DependentUpon>TextForm.cs</DependentUpon>
    </EmbeddedResource>
-    <EmbeddedResource Include="KJDForms\ToolForms\TokenNewForm.resx">
+    <EmbeddedResource Include="KJDForms\ToolForms\Old\TokenNewForm.resx">
      <DependentUpon>TokenNewForm.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="MainForm.resx">
@@ -730,6 +736,9 @@
    <EmbeddedResource Include="TaobaoLoginForm.resx">
      <DependentUpon>TaobaoLoginForm.cs</DependentUpon>
    </EmbeddedResource>
+    <EmbeddedResource Include="KJDForms\ToolForms\ShowImgForm.resx">
+      <DependentUpon>ShowImgForm.cs</DependentUpon>
+    </EmbeddedResource>
    <EmbeddedResource Include="UserControls\StatusBarUserControl.resx">
      <DependentUpon>StatusBarUserControl.cs</DependentUpon>
    </EmbeddedResource>
@@ -47,6 +47,14 @@ namespace TemuKJD.KJDForms.ProductForms
            this.splitContainer3 = new System.Windows.Forms.SplitContainer();
            this.splitContainer2 = new System.Windows.Forms.SplitContainer();
            this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx();
+            this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.colShopLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colShopNotes = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colLoginStatus = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.dgvAdjust = new TemuKJD.UserComponent.DataGridViewEx();
            this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn();
            this.colSupplierId = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -68,13 +76,6 @@ namespace TemuKJD.KJDForms.ProductForms
            this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
            this.panelEx1 = new DevComponents.DotNetBar.PanelEx();
            this.btnClear = new DevComponents.DotNetBar.PanelEx();
-            this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.colShopLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.colLoginStatus = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn();
            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
            this.splitContainer1.Panel1.SuspendLayout();
            this.splitContainer1.Panel2.SuspendLayout();
@@ -119,7 +120,7 @@ namespace TemuKJD.KJDForms.ProductForms
            this.splitContainer1.SplitterDistance = 120;
            this.splitContainer1.TabIndex = 10;
            // 
-            // ucGroupBoxEx4
+            // ucGroupBoxEx3
            // 
            this.ucGroupBoxEx3.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
            | System.Windows.Forms.AnchorStyles.Left) 
@@ -129,9 +130,9 @@ namespace TemuKJD.KJDForms.ProductForms
            this.ucGroupBoxEx3.Controls.Add(this.txtScale1);
            this.ucGroupBoxEx3.Controls.Add(this.label10);
            this.ucGroupBoxEx3.Controls.Add(this.btnStartStockUp);
-            this.ucGroupBoxEx3.Location = new System.Drawing.Point(272, 2);
-            this.ucGroupBoxEx3.Name = "ucGroupBoxEx4";
-            this.ucGroupBoxEx3.Size = new System.Drawing.Size(836, 120);
+            this.ucGroupBoxEx3.Location = new System.Drawing.Point(282, 2);
+            this.ucGroupBoxEx3.Name = "ucGroupBoxEx3";
+            this.ucGroupBoxEx3.Size = new System.Drawing.Size(826, 120);
            this.ucGroupBoxEx3.TabIndex = 666;
            this.ucGroupBoxEx3.TabStop = false;
            this.ucGroupBoxEx3.Text = "拒绝跟价";
@@ -187,7 +188,7 @@ namespace TemuKJD.KJDForms.ProductForms
            this.ucGroupBoxEx2.Controls.Add(this.btnSearchPrice);
            this.ucGroupBoxEx2.Location = new System.Drawing.Point(147, 2);
            this.ucGroupBoxEx2.Name = "ucGroupBoxEx2";
-            this.ucGroupBoxEx2.Size = new System.Drawing.Size(125, 120);
+            this.ucGroupBoxEx2.Size = new System.Drawing.Size(135, 120);
            this.ucGroupBoxEx2.TabIndex = 469;
            this.ucGroupBoxEx2.TabStop = false;
            this.ucGroupBoxEx2.Text = "读取调价";
@@ -209,7 +210,7 @@ namespace TemuKJD.KJDForms.ProductForms
            this.btnSearchPrice.Cursor = System.Windows.Forms.Cursors.Hand;
            this.btnSearchPrice.DisabledBackColor = System.Drawing.Color.Empty;
            this.btnSearchPrice.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnSearchPrice.Location = new System.Drawing.Point(25, 32);
+            this.btnSearchPrice.Location = new System.Drawing.Point(30, 32);
            this.btnSearchPrice.Name = "btnSearchPrice";
            this.btnSearchPrice.Size = new System.Drawing.Size(70, 23);
            this.btnSearchPrice.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -302,7 +303,7 @@ namespace TemuKJD.KJDForms.ProductForms
            this.splitContainer2.Panel2.Controls.Add(this.dgvAdjust);
            this.splitContainer2.Panel2.Padding = new System.Windows.Forms.Padding(0, 0, 4, 0);
            this.splitContainer2.Size = new System.Drawing.Size(1110, 443);
-            this.splitContainer2.SplitterDistance = 270;
+            this.splitContainer2.SplitterDistance = 280;
            this.splitContainer2.TabIndex = 0;
            // 
            // dgvShop
@@ -327,6 +328,7 @@ namespace TemuKJD.KJDForms.ProductForms
            this.colShopLoginName,
            this.colShopId,
            this.colShopName,
+            this.colShopNotes,
            this.colLoginStatus,
            this.colCanUse,
            this.colMessage});
@@ -334,13 +336,75 @@ namespace TemuKJD.KJDForms.ProductForms
            this.dgvShop.Location = new System.Drawing.Point(4, 0);
            this.dgvShop.Name = "dgvShop";
            this.dgvShop.ReadOnly = true;
-            this.dgvShop.RowHeadersWidth = 30;
+            this.dgvShop.RowHeadersWidth = 25;
            this.dgvShop.RowTemplate.Height = 23;
-            this.dgvShop.Size = new System.Drawing.Size(266, 443);
+            this.dgvShop.Size = new System.Drawing.Size(276, 443);
            this.dgvShop.TabIndex = 6;
            this.dgvShop.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellClick);
            this.dgvShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick);
            // 
+            // colSelect
+            // 
+            this.colSelect.HeaderText = "全选";
+            this.colSelect.Name = "colSelect";
+            this.colSelect.ReadOnly = true;
+            this.colSelect.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.colSelect.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.colSelect.Width = 28;
+            // 
+            // colShopLoginName
+            // 
+            this.colShopLoginName.HeaderText = "店铺登录名";
+            this.colShopLoginName.Name = "colShopLoginName";
+            this.colShopLoginName.ReadOnly = true;
+            this.colShopLoginName.Visible = false;
+            // 
+            // colShopId
+            // 
+            this.colShopId.HeaderText = "店铺Id";
+            this.colShopId.Name = "colShopId";
+            this.colShopId.ReadOnly = true;
+            this.colShopId.Visible = false;
+            this.colShopId.Width = 55;
+            // 
+            // colShopName
+            // 
+            this.colShopName.HeaderText = "店铺名称";
+            this.colShopName.Name = "colShopName";
+            this.colShopName.ReadOnly = true;
+            this.colShopName.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.colShopName.Width = 70;
+            // 
+            // colShopNotes
+            // 
+            this.colShopNotes.HeaderText = "分组";
+            this.colShopNotes.Name = "colShopNotes";
+            this.colShopNotes.ReadOnly = true;
+            this.colShopNotes.Width = 70;
+            // 
+            // colLoginStatus
+            // 
+            this.colLoginStatus.HeaderText = "状态";
+            this.colLoginStatus.Name = "colLoginStatus";
+            this.colLoginStatus.ReadOnly = true;
+            this.colLoginStatus.Width = 38;
+            // 
+            // colCanUse
+            // 
+            this.colCanUse.HeaderText = "可用";
+            this.colCanUse.Name = "colCanUse";
+            this.colCanUse.ReadOnly = true;
+            this.colCanUse.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.colCanUse.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.colCanUse.Visible = false;
+            this.colCanUse.Width = 28;
+            // 
+            // colMessage
+            // 
+            this.colMessage.HeaderText = "消息";
+            this.colMessage.Name = "colMessage";
+            this.colMessage.ReadOnly = true;
+            // 
            // dgvAdjust
            // 
            this.dgvAdjust.AllowUserToAddRows = false;
@@ -380,7 +444,7 @@ namespace TemuKJD.KJDForms.ProductForms
            this.dgvAdjust.Name = "dgvAdjust";
            this.dgvAdjust.ReadOnly = true;
            this.dgvAdjust.RowTemplate.Height = 23;
-            this.dgvAdjust.Size = new System.Drawing.Size(832, 443);
+            this.dgvAdjust.Size = new System.Drawing.Size(822, 443);
            this.dgvAdjust.TabIndex = 187;
            this.dgvAdjust.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvStock_CellContentClick);
            // 
@@ -586,61 +650,6 @@ namespace TemuKJD.KJDForms.ProductForms
            this.btnClear.Text = "清空结果";
            this.btnClear.Visible = false;
            // 
-            // colSelect
-            // 
-            this.colSelect.HeaderText = "全选";
-            this.colSelect.Name = "colSelect";
-            this.colSelect.ReadOnly = true;
-            this.colSelect.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-            this.colSelect.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
-            this.colSelect.Width = 28;
-            // 
-            // colShopLoginName
-            // 
-            this.colShopLoginName.HeaderText = "店铺登录名";
-            this.colShopLoginName.Name = "colShopLoginName";
-            this.colShopLoginName.ReadOnly = true;
-            this.colShopLoginName.Visible = false;
-            // 
-            // colShopId
-            // 
-            this.colShopId.HeaderText = "店铺Id";
-            this.colShopId.Name = "colShopId";
-            this.colShopId.ReadOnly = true;
-            this.colShopId.Visible = false;
-            this.colShopId.Width = 55;
-            // 
-            // colShopName
-            // 
-            this.colShopName.FillWeight = 150F;
-            this.colShopName.HeaderText = "店铺名称";
-            this.colShopName.Name = "colShopName";
-            this.colShopName.ReadOnly = true;
-            this.colShopName.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-            this.colShopName.Width = 75;
-            // 
-            // colLoginStatus
-            // 
-            this.colLoginStatus.HeaderText = "登录状态";
-            this.colLoginStatus.Name = "colLoginStatus";
-            this.colLoginStatus.ReadOnly = true;
-            this.colLoginStatus.Width = 65;
-            // 
-            // colCanUse
-            // 
-            this.colCanUse.HeaderText = "可用";
-            this.colCanUse.Name = "colCanUse";
-            this.colCanUse.ReadOnly = true;
-            this.colCanUse.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-            this.colCanUse.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
-            this.colCanUse.Width = 28;
-            // 
-            // colMessage
-            // 
-            this.colMessage.HeaderText = "消息";
-            this.colMessage.Name = "colMessage";
-            this.colMessage.ReadOnly = true;
-            // 
            // PriceManageForm
            // 
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -719,6 +728,7 @@ namespace TemuKJD.KJDForms.ProductForms
        private System.Windows.Forms.DataGridViewTextBoxColumn colShopLoginName;
        private System.Windows.Forms.DataGridViewTextBoxColumn colShopId;
        private System.Windows.Forms.DataGridViewTextBoxColumn colShopName;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colShopNotes;
        private System.Windows.Forms.DataGridViewTextBoxColumn colLoginStatus;
        private System.Windows.Forms.DataGridViewCheckBoxColumn colCanUse;
        private System.Windows.Forms.DataGridViewTextBoxColumn colMessage;
@@ -103,22 +103,27 @@ namespace TemuKJD.KJDForms.ProductForms
            var row = dgvShop.Rows.Cast<DataGridViewRow>().FirstOrDefault(p => p.Cells.GetCellValueFromColumnName("colShopId").ParseToString() == shopEntity.ShopId);
            if (row == null)
            {
-                this.dgvShop.Rows.Add(
+                int id = this.dgvShop.Rows.Add(
                    selectShopId.Contains(shopEntity.ShopId) && canUse,
                    shopEntity.LoginName,
                    shopEntity.ShopId,
                    shopEntity.ShopAccount,
-                    shopEntity.LoginStatus2 == "国际版在线" ? "在线" : "未登录",
+                    shopEntity.Notes,
+                    canUse ? "在线" : "掉线",
                    canUse,
                    string.Empty
                );
+                row = dgvShop.Rows[id];
+                row.Cells["colLoginStatus"].Style.ForeColor = canUse ? Color.Green : Color.Red;
            }
            else
            {
                row.Cells["colSelect"].Value = selectShopId.Contains(shopEntity.ShopId) && canUse;
                row.Cells["colShopLoginName"].Value = shopEntity.LoginName;
                row.Cells["colShopName"].Value = shopEntity.ShopAccount;
-                row.Cells["colLoginStatus"].Value = shopEntity.LoginStatus2 == "国际版在线" ? "在线" : "未登录";
+                row.Cells["colShopNotes"].Value = shopEntity.Notes;
+                row.Cells["colLoginStatus"].Value = canUse ? "在线" : "掉线";
+                row.Cells["colLoginStatus"].Style.ForeColor = canUse ? Color.Green : Color.Red;
                row.Cells["colCanUse"].Value = canUse;
            }
        }
@@ -126,6 +126,9 @@
  <metadata name="colShopId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>True</value>
  </metadata>
+  <metadata name="colShopNotes.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
  <metadata name="colLoginStatus.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>True</value>
  </metadata>
@@ -30,9 +30,9 @@
        {
            System.Windows.Forms.TreeNode treeNode1 = new System.Windows.Forms.TreeNode("备货管理");
            System.Windows.Forms.TreeNode treeNode2 = new System.Windows.Forms.TreeNode("调价管理");
-            System.Windows.Forms.TreeNode treeNode3 = new System.Windows.Forms.TreeNode("商品认领");
-            System.Windows.Forms.TreeNode treeNode4 = new System.Windows.Forms.TreeNode("库存上传");
-            System.Windows.Forms.TreeNode treeNode5 = new System.Windows.Forms.TreeNode("活动报名");
+            System.Windows.Forms.TreeNode treeNode3 = new System.Windows.Forms.TreeNode("活动报名");
+            System.Windows.Forms.TreeNode treeNode4 = new System.Windows.Forms.TreeNode("商品认领");
+            System.Windows.Forms.TreeNode treeNode5 = new System.Windows.Forms.TreeNode("库存上传");
            System.Windows.Forms.TreeNode treeNode6 = new System.Windows.Forms.TreeNode("商品发布");
            System.Windows.Forms.TreeNode treeNode7 = new System.Windows.Forms.TreeNode("佣金设置");
            System.Windows.Forms.TreeNode treeNode8 = new System.Windows.Forms.TreeNode("净化数据");
@@ -155,12 +155,12 @@
            treeNode1.Text = "备货管理";
            treeNode2.Name = "调价管理";
            treeNode2.Text = "调价管理";
-            treeNode3.Name = "商品认领";
-            treeNode3.Text = "商品认领";
-            treeNode4.Name = "库存上传";
-            treeNode4.Text = "库存上传";
-            treeNode5.Name = "活动报名";
-            treeNode5.Text = "活动报名";
+            treeNode3.Name = "活动报名";
+            treeNode3.Text = "活动报名";
+            treeNode4.Name = "商品认领";
+            treeNode4.Text = "商品认领";
+            treeNode5.Name = "库存上传";
+            treeNode5.Text = "库存上传";
            treeNode6.Name = "商品发布";
            treeNode6.Text = "商品发布";
            treeNode7.Name = "佣金设置";
@@ -74,6 +74,7 @@ namespace TemuKJD.KJDForms.ProductForms
            this.colShopLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colShopNotes = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.colLoginStatus = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn();
            this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -212,9 +213,9 @@ namespace TemuKJD.KJDForms.ProductForms
            this.ucGroupBoxEx4.Controls.Add(this.label16);
            this.ucGroupBoxEx4.Controls.Add(this.label17);
            this.ucGroupBoxEx4.Controls.Add(this.label18);
-            this.ucGroupBoxEx4.Location = new System.Drawing.Point(397, 2);
+            this.ucGroupBoxEx4.Location = new System.Drawing.Point(417, 2);
            this.ucGroupBoxEx4.Name = "ucGroupBoxEx4";
-            this.ucGroupBoxEx4.Size = new System.Drawing.Size(749, 120);
+            this.ucGroupBoxEx4.Size = new System.Drawing.Size(729, 120);
            this.ucGroupBoxEx4.TabIndex = 666;
            this.ucGroupBoxEx4.TabStop = false;
            this.ucGroupBoxEx4.Text = "创建备货单";
@@ -223,7 +224,7 @@ namespace TemuKJD.KJDForms.ProductForms
            // 
            this.ucCheckBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
            this.ucCheckBox1.AutoSize = true;
-            this.ucCheckBox1.Location = new System.Drawing.Point(557, 34);
+            this.ucCheckBox1.Location = new System.Drawing.Point(537, 34);
            this.ucCheckBox1.Name = "ucCheckBox1";
            this.ucCheckBox1.Size = new System.Drawing.Size(87, 21);
            this.ucCheckBox1.TabIndex = 713;
@@ -379,7 +380,7 @@ namespace TemuKJD.KJDForms.ProductForms
            this.btnStartStockUp.Cursor = System.Windows.Forms.Cursors.Hand;
            this.btnStartStockUp.DisabledBackColor = System.Drawing.Color.Empty;
            this.btnStartStockUp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnStartStockUp.Location = new System.Drawing.Point(647, 32);
+            this.btnStartStockUp.Location = new System.Drawing.Point(627, 32);
            this.btnStartStockUp.Name = "btnStartStockUp";
            this.btnStartStockUp.Size = new System.Drawing.Size(80, 23);
            this.btnStartStockUp.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -442,9 +443,9 @@ namespace TemuKJD.KJDForms.ProductForms
            this.ucGroupBoxEx3.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
            this.ucGroupBoxEx3.Controls.Add(this.btnCancelSubPurchaseOrder);
            this.ucGroupBoxEx3.Controls.Add(this.panelEx2);
-            this.ucGroupBoxEx3.Location = new System.Drawing.Point(272, 2);
+            this.ucGroupBoxEx3.Location = new System.Drawing.Point(282, 2);
            this.ucGroupBoxEx3.Name = "ucGroupBoxEx3";
-            this.ucGroupBoxEx3.Size = new System.Drawing.Size(125, 120);
+            this.ucGroupBoxEx3.Size = new System.Drawing.Size(135, 120);
            this.ucGroupBoxEx3.TabIndex = 665;
            this.ucGroupBoxEx3.TabStop = false;
            this.ucGroupBoxEx3.Text = "取消待创建";
@@ -455,7 +456,7 @@ namespace TemuKJD.KJDForms.ProductForms
            this.btnCancelSubPurchaseOrder.Cursor = System.Windows.Forms.Cursors.Hand;
            this.btnCancelSubPurchaseOrder.DisabledBackColor = System.Drawing.Color.Empty;
            this.btnCancelSubPurchaseOrder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnCancelSubPurchaseOrder.Location = new System.Drawing.Point(27, 32);
+            this.btnCancelSubPurchaseOrder.Location = new System.Drawing.Point(32, 32);
            this.btnCancelSubPurchaseOrder.Name = "btnCancelSubPurchaseOrder";
            this.btnCancelSubPurchaseOrder.Size = new System.Drawing.Size(70, 23);
            this.btnCancelSubPurchaseOrder.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -478,7 +479,7 @@ namespace TemuKJD.KJDForms.ProductForms
            this.panelEx2.CanvasColor = System.Drawing.SystemColors.Control;
            this.panelEx2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
            this.panelEx2.DisabledBackColor = System.Drawing.Color.Empty;
-            this.panelEx2.Location = new System.Drawing.Point(27, 71);
+            this.panelEx2.Location = new System.Drawing.Point(32, 71);
            this.panelEx2.Name = "panelEx2";
            this.panelEx2.Size = new System.Drawing.Size(70, 23);
            this.panelEx2.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -508,7 +509,7 @@ namespace TemuKJD.KJDForms.ProductForms
            this.ucGroupBoxEx2.Controls.Add(this.btnSearch);
            this.ucGroupBoxEx2.Location = new System.Drawing.Point(147, 2);
            this.ucGroupBoxEx2.Name = "ucGroupBoxEx2";
-            this.ucGroupBoxEx2.Size = new System.Drawing.Size(125, 120);
+            this.ucGroupBoxEx2.Size = new System.Drawing.Size(135, 120);
            this.ucGroupBoxEx2.TabIndex = 469;
            this.ucGroupBoxEx2.TabStop = false;
            this.ucGroupBoxEx2.Text = "读取待创建";
@@ -516,7 +517,7 @@ namespace TemuKJD.KJDForms.ProductForms
            // chkHasCreate
            // 
            this.chkHasCreate.AutoSize = true;
-            this.chkHasCreate.Location = new System.Drawing.Point(11, 73);
+            this.chkHasCreate.Location = new System.Drawing.Point(16, 73);
            this.chkHasCreate.Name = "chkHasCreate";
            this.chkHasCreate.Size = new System.Drawing.Size(111, 21);
            this.chkHasCreate.TabIndex = 658;
@@ -530,7 +531,7 @@ namespace TemuKJD.KJDForms.ProductForms
            this.btnSearch.Cursor = System.Windows.Forms.Cursors.Hand;
            this.btnSearch.DisabledBackColor = System.Drawing.Color.Empty;
            this.btnSearch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnSearch.Location = new System.Drawing.Point(25, 32);
+            this.btnSearch.Location = new System.Drawing.Point(30, 32);
            this.btnSearch.Name = "btnSearch";
            this.btnSearch.Size = new System.Drawing.Size(70, 23);
            this.btnSearch.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -631,7 +632,7 @@ namespace TemuKJD.KJDForms.ProductForms
            this.splitContainer2.Panel2.Controls.Add(this.dgvStock);
            this.splitContainer2.Panel2.Padding = new System.Windows.Forms.Padding(0, 0, 4, 0);
            this.splitContainer2.Size = new System.Drawing.Size(1148, 435);
-            this.splitContainer2.SplitterDistance = 270;
+            this.splitContainer2.SplitterDistance = 280;
            this.splitContainer2.TabIndex = 0;
            // 
            // txtPid
@@ -735,6 +736,7 @@ namespace TemuKJD.KJDForms.ProductForms
            this.colShopLoginName,
            this.colShopId,
            this.colShopName,
+            this.colShopNotes,
            this.colLoginStatus,
            this.colCanUse,
            this.colMessage});
@@ -742,9 +744,9 @@ namespace TemuKJD.KJDForms.ProductForms
            this.dgvShop.Location = new System.Drawing.Point(4, 0);
            this.dgvShop.Name = "dgvShop";
            this.dgvShop.ReadOnly = true;
-            this.dgvShop.RowHeadersWidth = 30;
+            this.dgvShop.RowHeadersWidth = 25;
            this.dgvShop.RowTemplate.Height = 23;
-            this.dgvShop.Size = new System.Drawing.Size(266, 435);
+            this.dgvShop.Size = new System.Drawing.Size(276, 435);
            this.dgvShop.TabIndex = 6;
            this.dgvShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick);
            // 
@@ -779,14 +781,21 @@ namespace TemuKJD.KJDForms.ProductForms
            this.colShopName.Name = "colShopName";
            this.colShopName.ReadOnly = true;
            this.colShopName.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-            this.colShopName.Width = 75;
+            this.colShopName.Width = 70;
+            // 
+            // colShopNotes
+            // 
+            this.colShopNotes.HeaderText = "分组";
+            this.colShopNotes.Name = "colShopNotes";
+            this.colShopNotes.ReadOnly = true;
+            this.colShopNotes.Width = 70;
            // 
            // colLoginStatus
            // 
-            this.colLoginStatus.HeaderText = "登录状态";
+            this.colLoginStatus.HeaderText = "状态";
            this.colLoginStatus.Name = "colLoginStatus";
            this.colLoginStatus.ReadOnly = true;
-            this.colLoginStatus.Width = 65;
+            this.colLoginStatus.Width = 38;
            // 
            // colCanUse
            // 
@@ -795,6 +804,7 @@ namespace TemuKJD.KJDForms.ProductForms
            this.colCanUse.ReadOnly = true;
            this.colCanUse.Resizable = System.Windows.Forms.DataGridViewTriState.True;
            this.colCanUse.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.colCanUse.Visible = false;
            this.colCanUse.Width = 28;
            // 
            // colMessage
@@ -826,7 +836,7 @@ namespace TemuKJD.KJDForms.ProductForms
            this.ucGroupBoxEx99.Controls.Add(this.chkLimited);
            this.ucGroupBoxEx99.Location = new System.Drawing.Point(296, 46);
            this.ucGroupBoxEx99.Name = "ucGroupBoxEx99";
-            this.ucGroupBoxEx99.Size = new System.Drawing.Size(550, 180);
+            this.ucGroupBoxEx99.Size = new System.Drawing.Size(540, 180);
            this.ucGroupBoxEx99.TabIndex = 470;
            this.ucGroupBoxEx99.TabStop = false;
            this.ucGroupBoxEx99.Text = "创建备货单";
@@ -1107,7 +1117,7 @@ namespace TemuKJD.KJDForms.ProductForms
            this.panel2.Controls.Add(this.btnSetNotArea);
            this.panel2.Location = new System.Drawing.Point(151, 59);
            this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(295, 23);
+            this.panel2.Size = new System.Drawing.Size(285, 23);
            this.panel2.TabIndex = 638;
            // 
            // textBox2
@@ -1117,7 +1127,7 @@ namespace TemuKJD.KJDForms.ProductForms
            this.textBox2.Location = new System.Drawing.Point(0, 0);
            this.textBox2.Name = "textBox2";
            this.textBox2.ReadOnly = true;
-            this.textBox2.Size = new System.Drawing.Size(229, 23);
+            this.textBox2.Size = new System.Drawing.Size(219, 23);
            this.textBox2.TabIndex = 638;
            // 
            // btnSetNotArea
@@ -1127,7 +1137,7 @@ namespace TemuKJD.KJDForms.ProductForms
            this.btnSetNotArea.Cursor = System.Windows.Forms.Cursors.Hand;
            this.btnSetNotArea.DisabledBackColor = System.Drawing.Color.Empty;
            this.btnSetNotArea.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnSetNotArea.Location = new System.Drawing.Point(235, 2);
+            this.btnSetNotArea.Location = new System.Drawing.Point(225, 2);
            this.btnSetNotArea.Name = "btnSetNotArea";
            this.btnSetNotArea.Size = new System.Drawing.Size(56, 19);
            this.btnSetNotArea.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -1249,7 +1259,7 @@ namespace TemuKJD.KJDForms.ProductForms
            this.btnAdd.Cursor = System.Windows.Forms.Cursors.Hand;
            this.btnAdd.DisabledBackColor = System.Drawing.Color.Empty;
            this.btnAdd.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnAdd.Location = new System.Drawing.Point(454, 29);
+            this.btnAdd.Location = new System.Drawing.Point(444, 29);
            this.btnAdd.Name = "btnAdd";
            this.btnAdd.Size = new System.Drawing.Size(80, 23);
            this.btnAdd.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -1272,7 +1282,7 @@ namespace TemuKJD.KJDForms.ProductForms
            this.btnStopAdd.CanvasColor = System.Drawing.SystemColors.Control;
            this.btnStopAdd.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
            this.btnStopAdd.DisabledBackColor = System.Drawing.Color.Empty;
-            this.btnStopAdd.Location = new System.Drawing.Point(454, 59);
+            this.btnStopAdd.Location = new System.Drawing.Point(444, 59);
            this.btnStopAdd.Name = "btnStopAdd";
            this.btnStopAdd.Size = new System.Drawing.Size(80, 23);
            this.btnStopAdd.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -1342,7 +1352,7 @@ namespace TemuKJD.KJDForms.ProductForms
            this.dgvStock.Name = "dgvStock";
            this.dgvStock.ReadOnly = true;
            this.dgvStock.RowTemplate.Height = 23;
-            this.dgvStock.Size = new System.Drawing.Size(870, 435);
+            this.dgvStock.Size = new System.Drawing.Size(860, 435);
            this.dgvStock.TabIndex = 187;
            this.dgvStock.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvStock_CellContentClick);
            // 
@@ -1738,6 +1748,7 @@ namespace TemuKJD.KJDForms.ProductForms
        private System.Windows.Forms.DataGridViewTextBoxColumn colShopLoginName;
        private System.Windows.Forms.DataGridViewTextBoxColumn colShopId;
        private System.Windows.Forms.DataGridViewTextBoxColumn colShopName;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colShopNotes;
        private System.Windows.Forms.DataGridViewTextBoxColumn colLoginStatus;
        private System.Windows.Forms.DataGridViewCheckBoxColumn colCanUse;
        private System.Windows.Forms.DataGridViewTextBoxColumn colMessage;
@@ -118,26 +118,31 @@ namespace TemuKJD.KJDForms.ProductForms
            if (selectShopId == null)
                selectShopId = new List<string>();

-            bool canUse = shopEntity.LoginStatus == "登录成功";
+            bool canUse = shopEntity.LoginStatus == "登录成功" && shopEntity.LoginStatus2 == "国际版在线";
            var row = dgvShop.Rows.Cast<DataGridViewRow>().FirstOrDefault(p => p.Cells.GetCellValueFromColumnName("colShopId").ParseToString() == shopEntity.ShopId);
            if (row == null)
            {
-                this.dgvShop.Rows.Add(
+                int id = this.dgvShop.Rows.Add(
                    selectShopId.Contains(shopEntity.ShopId) && canUse,
                    shopEntity.LoginName,
                    shopEntity.ShopId,
                    shopEntity.ShopAccount,
-                    shopEntity.LoginStatus,
+                    shopEntity.Notes,
+                    canUse ? "在线" : "掉线",
                    canUse,
                    string.Empty
                );
+                row = dgvShop.Rows[id];
+                row.Cells["colLoginStatus"].Style.ForeColor = canUse ? Color.Green : Color.Red;
            }
            else
            {
                row.Cells["colSelect"].Value = selectShopId.Contains(shopEntity.ShopId) && canUse;
                row.Cells["colShopLoginName"].Value = shopEntity.LoginName;
                row.Cells["colShopName"].Value = shopEntity.ShopAccount;
-                row.Cells["colLoginStatus"].Value = shopEntity.LoginStatus;
+                row.Cells["colShopNotes"].Value = shopEntity.Notes;
+                row.Cells["colLoginStatus"].Value = canUse ? "在线" : "掉线";
+                row.Cells["colLoginStatus"].Style.ForeColor = canUse ? Color.Green : Color.Red;
                row.Cells["colCanUse"].Value = canUse;
            }
        }
@@ -126,6 +126,9 @@
  <metadata name="colShopId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>True</value>
  </metadata>
+  <metadata name="colShopNotes.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
  <metadata name="colLoginStatus.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>True</value>
  </metadata>
@@ -15,6 +15,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using TemuKJD.KJDForms.BaseForms;
+using TemuKJD.KJDForms.ToolForms;
 using Work;

 namespace TemuKJD.KJDForms.ProductSelectForms
@@ -313,6 +314,10 @@ namespace TemuKJD.KJDForms.ProductSelectForms
                    dgvDbProduct.Rows[e.RowIndex].Cells["colEndWords"].Value = dbProduct.end_words;
                    dgvDbProduct.Rows[e.RowIndex].Cells["colFissionWords"].Value = dbProduct.fission_words;
                    break;
+                case "主图":
+                    ShowImgForm imgFrom = new ShowImgForm(dgvDbProduct.Rows[e.RowIndex].Cells["colImgUrl"].Value.ParseToString());
+                    imgFrom.ShowDialog();
+                    break;
                case "认领":
                    Task.Run(() => { SelectProduct(new TemuDBProduct[] { dbProduct }); });
                    break;
@@ -113,6 +113,7 @@
            this.colOpResult = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage();
            this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
+            this.chkOriginalPriceMarkUp = new TemuKJD.UserComponent.UcCheckBox(this.components);
            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
            this.splitContainer1.Panel1.SuspendLayout();
            this.splitContainer1.Panel2.SuspendLayout();
@@ -470,6 +471,7 @@
            this.flowLayoutPanel1.Controls.Add(this.chkSkuRandomPrice);
            this.flowLayoutPanel1.Controls.Add(this.numSkuRandomPrice);
            this.flowLayoutPanel1.Controls.Add(this.label11);
+            this.flowLayoutPanel1.Controls.Add(this.chkOriginalPriceMarkUp);
            this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 36);
            this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(0);
            this.flowLayoutPanel1.Name = "flowLayoutPanel1";
@@ -493,7 +495,7 @@
            this.txtSkuHeadText.Location = new System.Drawing.Point(55, 3);
            this.txtSkuHeadText.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
            this.txtSkuHeadText.Name = "txtSkuHeadText";
-            this.txtSkuHeadText.Size = new System.Drawing.Size(91, 23);
+            this.txtSkuHeadText.Size = new System.Drawing.Size(85, 23);
            this.txtSkuHeadText.TabIndex = 452;
            this.txtSkuHeadText.TextChanged += new System.EventHandler(this.txtSkuHeadText_TextChanged);
            // 
@@ -501,7 +503,7 @@
            // 
            this.label10.Anchor = System.Windows.Forms.AnchorStyles.None;
            this.label10.AutoSize = true;
-            this.label10.Location = new System.Drawing.Point(149, 6);
+            this.label10.Location = new System.Drawing.Point(143, 6);
            this.label10.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
            this.label10.Name = "label10";
            this.label10.Size = new System.Drawing.Size(52, 17);
@@ -511,10 +513,10 @@
            // txtSkuEndText
            // 
            this.txtSkuEndText.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtSkuEndText.Location = new System.Drawing.Point(201, 3);
+            this.txtSkuEndText.Location = new System.Drawing.Point(195, 3);
            this.txtSkuEndText.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
            this.txtSkuEndText.Name = "txtSkuEndText";
-            this.txtSkuEndText.Size = new System.Drawing.Size(92, 23);
+            this.txtSkuEndText.Size = new System.Drawing.Size(85, 23);
            this.txtSkuEndText.TabIndex = 454;
            this.txtSkuEndText.TextChanged += new System.EventHandler(this.txtSkuEndText_TextChanged);
            // 
@@ -522,7 +524,7 @@
            // 
            this.chkFission.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
            this.chkFission.AutoSize = true;
-            this.chkFission.Location = new System.Drawing.Point(299, 4);
+            this.chkFission.Location = new System.Drawing.Point(286, 4);
            this.chkFission.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
            this.chkFission.Name = "chkFission";
            this.chkFission.Size = new System.Drawing.Size(75, 21);
@@ -534,8 +536,8 @@
            // 
            this.chkHeadWords.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
            this.chkHeadWords.AutoSize = true;
-            this.chkHeadWords.Location = new System.Drawing.Point(376, 4);
-            this.chkHeadWords.Margin = new System.Windows.Forms.Padding(2, 0, 0, 0);
+            this.chkHeadWords.Location = new System.Drawing.Point(361, 4);
+            this.chkHeadWords.Margin = new System.Windows.Forms.Padding(0);
            this.chkHeadWords.Name = "chkHeadWords";
            this.chkHeadWords.Size = new System.Drawing.Size(75, 21);
            this.chkHeadWords.TabIndex = 473;
@@ -546,8 +548,8 @@
            // 
            this.chkEndWords.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
            this.chkEndWords.AutoSize = true;
-            this.chkEndWords.Location = new System.Drawing.Point(453, 4);
-            this.chkEndWords.Margin = new System.Windows.Forms.Padding(2, 0, 0, 0);
+            this.chkEndWords.Location = new System.Drawing.Point(436, 4);
+            this.chkEndWords.Margin = new System.Windows.Forms.Padding(0);
            this.chkEndWords.Name = "chkEndWords";
            this.chkEndWords.Size = new System.Drawing.Size(75, 21);
            this.chkEndWords.TabIndex = 474;
@@ -558,8 +560,8 @@
            // 
            this.chkReFissionAllProdName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
            this.chkReFissionAllProdName.AutoSize = true;
-            this.chkReFissionAllProdName.Location = new System.Drawing.Point(530, 4);
-            this.chkReFissionAllProdName.Margin = new System.Windows.Forms.Padding(2, 0, 0, 0);
+            this.chkReFissionAllProdName.Location = new System.Drawing.Point(511, 4);
+            this.chkReFissionAllProdName.Margin = new System.Windows.Forms.Padding(0);
            this.chkReFissionAllProdName.Name = "chkReFissionAllProdName";
            this.chkReFissionAllProdName.Size = new System.Drawing.Size(99, 21);
            this.chkReFissionAllProdName.TabIndex = 472;
@@ -571,8 +573,8 @@
            // 
            this.chkRandomSkuOrder.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
            this.chkRandomSkuOrder.AutoSize = true;
-            this.chkRandomSkuOrder.Location = new System.Drawing.Point(631, 4);
-            this.chkRandomSkuOrder.Margin = new System.Windows.Forms.Padding(2, 0, 0, 0);
+            this.chkRandomSkuOrder.Location = new System.Drawing.Point(610, 4);
+            this.chkRandomSkuOrder.Margin = new System.Windows.Forms.Padding(0);
            this.chkRandomSkuOrder.Name = "chkRandomSkuOrder";
            this.chkRandomSkuOrder.Size = new System.Drawing.Size(95, 21);
            this.chkRandomSkuOrder.TabIndex = 469;
@@ -583,11 +585,10 @@
            // chkSkuRandomPrice
            // 
            this.chkSkuRandomPrice.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.chkSkuRandomPrice.AutoSize = true;
-            this.chkSkuRandomPrice.Location = new System.Drawing.Point(728, 4);
+            this.chkSkuRandomPrice.Location = new System.Drawing.Point(707, 4);
            this.chkSkuRandomPrice.Margin = new System.Windows.Forms.Padding(2, 0, 0, 0);
            this.chkSkuRandomPrice.Name = "chkSkuRandomPrice";
-            this.chkSkuRandomPrice.Size = new System.Drawing.Size(119, 21);
+            this.chkSkuRandomPrice.Size = new System.Drawing.Size(110, 21);
            this.chkSkuRandomPrice.TabIndex = 468;
            this.chkSkuRandomPrice.Text = "sku随机价格变化";
            this.chkSkuRandomPrice.UseVisualStyleBackColor = true;
@@ -601,7 +602,7 @@
            0,
            0,
            131072});
-            this.numSkuRandomPrice.Location = new System.Drawing.Point(847, 3);
+            this.numSkuRandomPrice.Location = new System.Drawing.Point(817, 3);
            this.numSkuRandomPrice.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
            this.numSkuRandomPrice.Name = "numSkuRandomPrice";
            this.numSkuRandomPrice.Size = new System.Drawing.Size(44, 23);
@@ -617,8 +618,8 @@
            // 
            this.label11.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
            this.label11.AutoSize = true;
-            this.label11.Location = new System.Drawing.Point(897, 6);
-            this.label11.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
+            this.label11.Location = new System.Drawing.Point(861, 6);
+            this.label11.Margin = new System.Windows.Forms.Padding(0);
            this.label11.Name = "label11";
            this.label11.Size = new System.Drawing.Size(20, 17);
            this.label11.TabIndex = 471;
@@ -1087,6 +1088,18 @@
            this.statusBar.Size = new System.Drawing.Size(1558, 25);
            this.statusBar.TabIndex = 5;
            // 
+            // chkOriginalPriceMarkUp
+            // 
+            this.chkOriginalPriceMarkUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.chkOriginalPriceMarkUp.AutoSize = true;
+            this.chkOriginalPriceMarkUp.Location = new System.Drawing.Point(883, 4);
+            this.chkOriginalPriceMarkUp.Margin = new System.Windows.Forms.Padding(2, 0, 0, 0);
+            this.chkOriginalPriceMarkUp.Name = "chkOriginalPriceMarkUp";
+            this.chkOriginalPriceMarkUp.Size = new System.Drawing.Size(95, 21);
+            this.chkOriginalPriceMarkUp.TabIndex = 469;
+            this.chkOriginalPriceMarkUp.Text = "sku原价加价";
+            this.chkOriginalPriceMarkUp.UseVisualStyleBackColor = true;
+            // 
            // DbProductSelectListManageForm
            // 
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -1196,5 +1209,6 @@
        private System.Windows.Forms.Label label13;
        private System.Windows.Forms.ComboBox cmbNotes;
        private DevComponents.DotNetBar.PanelEx btnDel;
+        private UserComponent.UcCheckBox chkOriginalPriceMarkUp;
    }
 }
@@ -22,6 +22,7 @@ using System.Threading;
 using TemuKJD.KJDForms.AdminForms;
 using TemuKJD.KJDForms.ShopForms;
 using System.Globalization;
+using TemuKJD.KJDForms.ToolForms;

 namespace TemuKJD.KJDForms.ProductSelectForms
 {
@@ -306,7 +307,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
            var dbId = dgvSelectProduct.Rows[e.RowIndex].Cells["colSelectId"].Value.ParseToString();
            var dbSelectProduct = lstAdminTemuDBProductSelect.FirstOrDefault(p => p.id.ToString() == dbId);
            var shopId = dgvSelectProduct.Rows[e.RowIndex].Cells["colSupplierId"].Value.ParseToString();
-            var draftId = dgvSelectProduct.Rows[e.RowIndex].Cells["colDraftId"].Value.ParseToString();
+            var draftId = dgvSelectProduct.Rows[e.RowIndex].Cells["colDraftId"].Value.ParseToString(); 

            switch (headerText)
            {
@@ -325,6 +326,10 @@ namespace TemuKJD.KJDForms.ProductSelectForms
                    dgvSelectProduct.Rows[e.RowIndex].Cells["colNotes"].Value = dbSelectProduct.notes;
                    dgvSelectProduct.Rows[e.RowIndex].Cells["colProductName"].Value = dbSelectProduct.fission_product_name;
                    break;
+                case "Skc图片":
+                    ShowImgForm imgFrom = new ShowImgForm(dgvSelectProduct.Rows[e.RowIndex].Cells["colImgUrl"].Value.ParseToString());
+                    imgFrom.ShowDialog();
+                    break;
                case "认领":
                    //Task.Run(() => { SelectProduct(new TemuDBProduct[] { dbProduct }); });
                    break;
@@ -1160,9 +1165,13 @@ namespace TemuKJD.KJDForms.ProductSelectForms
                            JsonHelper.SerializeObject(skuInfo.productSkuWhExtAttr.productSkuWeight)),
                    };
                    skuItem.supplierPrice = skuInfo.supplierPrice;
-                    //var dbPrice = lstDbPrice.FirstOrDefault(p => p.ext_code == dbProd.ext_code);
-                    //if (dbPrice != null)
-                    //    skuItem.supplierPrice = dbPrice.original_price * dbPrice.markup_times + dbPrice.extra_price;
+                    // 按照批号原价取商品原价和加价规则并修改商品上传价格
+                    if (chkOriginalPriceMarkUp.Checked)
+                    {
+                        var dbPrice = lstDbPrice.FirstOrDefault(p => p.ext_code == dbProd.ext_code);
+                        if (dbPrice != null)
+                            skuItem.supplierPrice = dbPrice.original_price * dbPrice.markup_times + dbPrice.extra_price;
+                    }

                    #region 使用随机sku价格上传(第一个sku价格不变，此处有bug，平台最后的sku排列不是按照提交上去的顺序排的)
                    if (skuCount != 1 && chkSkuRandomPrice.Checked)
@@ -67,8 +67,9 @@ namespace TemuKJD.KJDForms.ProductSelectForms
            this.colShopLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.colLoginStatus = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colShopNotes = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.colSelectProduct = new System.Windows.Forms.DataGridViewLinkColumn();
+            this.colLoginStatus = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn();
            this.colRemaining = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -82,6 +83,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
            this.colLogin = new System.Windows.Forms.DataGridViewLinkColumn();
            this.colSpuId = new System.Windows.Forms.DataGridViewLinkColumn();
            this.colSkcId = new System.Windows.Forms.DataGridViewLinkColumn();
+            this.colImgUrl = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.colProductSkcPic = new System.Windows.Forms.DataGridViewImageColumn();
            this.colProductName = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.colProductCat = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -507,7 +509,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
            this.splitContainer2.Panel2.Controls.Add(this.dgvSelectProduct);
            this.splitContainer2.Panel2.Padding = new System.Windows.Forms.Padding(0, 0, 4, 0);
            this.splitContainer2.Size = new System.Drawing.Size(1284, 392);
-            this.splitContainer2.SplitterDistance = 270;
+            this.splitContainer2.SplitterDistance = 300;
            this.splitContainer2.TabIndex = 0;
            // 
            // dgvShop
@@ -532,8 +534,9 @@ namespace TemuKJD.KJDForms.ProductSelectForms
            this.colShopLoginName,
            this.colShopId,
            this.colShopName,
-            this.colLoginStatus,
+            this.colShopNotes,
            this.colSelectProduct,
+            this.colLoginStatus,
            this.colCanUse,
            this.colRemaining,
            this.colMessage});
@@ -541,9 +544,9 @@ namespace TemuKJD.KJDForms.ProductSelectForms
            this.dgvShop.Location = new System.Drawing.Point(4, 0);
            this.dgvShop.Name = "dgvShop";
            this.dgvShop.ReadOnly = true;
-            this.dgvShop.RowHeadersWidth = 30;
+            this.dgvShop.RowHeadersWidth = 25;
            this.dgvShop.RowTemplate.Height = 23;
-            this.dgvShop.Size = new System.Drawing.Size(266, 392);
+            this.dgvShop.Size = new System.Drawing.Size(296, 392);
            this.dgvShop.TabIndex = 6;
            this.dgvShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick);
            // 
@@ -578,14 +581,14 @@ namespace TemuKJD.KJDForms.ProductSelectForms
            this.colShopName.Name = "colShopName";
            this.colShopName.ReadOnly = true;
            this.colShopName.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-            this.colShopName.Width = 75;
+            this.colShopName.Width = 70;
            // 
-            // colLoginStatus
+            // colShopNotes
            // 
-            this.colLoginStatus.HeaderText = "登录状态";
-            this.colLoginStatus.Name = "colLoginStatus";
-            this.colLoginStatus.ReadOnly = true;
-            this.colLoginStatus.Visible = false;
+            this.colShopNotes.HeaderText = "分组";
+            this.colShopNotes.Name = "colShopNotes";
+            this.colShopNotes.ReadOnly = true;
+            this.colShopNotes.Width = 70;
            // 
            // colSelectProduct
            // 
@@ -594,7 +597,14 @@ namespace TemuKJD.KJDForms.ProductSelectForms
            this.colSelectProduct.ReadOnly = true;
            this.colSelectProduct.Resizable = System.Windows.Forms.DataGridViewTriState.True;
            this.colSelectProduct.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
-            this.colSelectProduct.Width = 65;
+            this.colSelectProduct.Width = 62;
+            // 
+            // colLoginStatus
+            // 
+            this.colLoginStatus.HeaderText = "登录状态";
+            this.colLoginStatus.Name = "colLoginStatus";
+            this.colLoginStatus.ReadOnly = true;
+            this.colLoginStatus.Visible = false;
            // 
            // colCanUse
            // 
@@ -622,7 +632,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
            // 
            this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None;
            this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue;
-            this.pbLoading.Location = new System.Drawing.Point(480, 171);
+            this.pbLoading.Location = new System.Drawing.Point(465, 171);
            this.pbLoading.Name = "pbLoading";
            this.pbLoading.Size = new System.Drawing.Size(50, 50);
            this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -656,6 +666,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
            this.colLogin,
            this.colSpuId,
            this.colSkcId,
+            this.colImgUrl,
            this.colProductSkcPic,
            this.colProductName,
            this.colProductCat,
@@ -670,9 +681,10 @@ namespace TemuKJD.KJDForms.ProductSelectForms
            this.dgvSelectProduct.Name = "dgvSelectProduct";
            this.dgvSelectProduct.ReadOnly = true;
            this.dgvSelectProduct.RowTemplate.Height = 23;
-            this.dgvSelectProduct.Size = new System.Drawing.Size(1006, 392);
+            this.dgvSelectProduct.Size = new System.Drawing.Size(976, 392);
            this.dgvSelectProduct.TabIndex = 187;
            this.dgvSelectProduct.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvSelectProduct_CellContentClick);
+            this.dgvSelectProduct.Scroll += new System.Windows.Forms.ScrollEventHandler(this.dgvSelectProduct_Scroll);
            // 
            // colCheck
            // 
@@ -745,6 +757,13 @@ namespace TemuKJD.KJDForms.ProductSelectForms
            this.colSkcId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
            this.colSkcId.Width = 80;
            // 
+            // colImgUrl
+            // 
+            this.colImgUrl.HeaderText = "图片地址";
+            this.colImgUrl.Name = "colImgUrl";
+            this.colImgUrl.ReadOnly = true;
+            this.colImgUrl.Visible = false;
+            // 
            // colProductSkcPic
            // 
            this.colProductSkcPic.HeaderText = "图片";
@@ -961,15 +980,6 @@ namespace TemuKJD.KJDForms.ProductSelectForms
        private System.Windows.Forms.ComboBox cmbStatus;
        private System.Windows.Forms.Label label8;
        private DevComponents.DotNetBar.PanelEx btnDelSelect;
-        private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect;
-        private System.Windows.Forms.DataGridViewTextBoxColumn colShopLoginName;
-        private System.Windows.Forms.DataGridViewTextBoxColumn colShopId;
-        private System.Windows.Forms.DataGridViewTextBoxColumn colShopName;
-        private System.Windows.Forms.DataGridViewTextBoxColumn colLoginStatus;
-        private System.Windows.Forms.DataGridViewLinkColumn colSelectProduct;
-        private System.Windows.Forms.DataGridViewCheckBoxColumn colCanUse;
-        private System.Windows.Forms.DataGridViewTextBoxColumn colRemaining;
-        private System.Windows.Forms.DataGridViewTextBoxColumn colMessage;
        private System.Windows.Forms.Label label13;
        private System.Windows.Forms.Label label6;
        private System.Windows.Forms.ComboBox cmbNotes;
@@ -986,6 +996,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
        private System.Windows.Forms.TextBox txtSKC;
        private System.Windows.Forms.TextBox txtSPU;
        private System.Windows.Forms.Label label1;
+        private DevComponents.DotNetBar.PanelEx pnlEmpty;
        private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck;
        private System.Windows.Forms.DataGridViewTextBoxColumn colSelectId;
        private System.Windows.Forms.DataGridViewTextBoxColumn colSupplierId;
@@ -994,6 +1005,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
        private System.Windows.Forms.DataGridViewLinkColumn colLogin;
        private System.Windows.Forms.DataGridViewLinkColumn colSpuId;
        private System.Windows.Forms.DataGridViewLinkColumn colSkcId;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colImgUrl;
        private System.Windows.Forms.DataGridViewImageColumn colProductSkcPic;
        private System.Windows.Forms.DataGridViewTextBoxColumn colProductName;
        private System.Windows.Forms.DataGridViewTextBoxColumn colProductCat;
@@ -1003,6 +1015,15 @@ namespace TemuKJD.KJDForms.ProductSelectForms
        private System.Windows.Forms.DataGridViewTextBoxColumn colNotes;
        private System.Windows.Forms.DataGridViewLinkColumn colUserNotes;
        private System.Windows.Forms.DataGridViewLinkColumn ColDelete;
-        private DevComponents.DotNetBar.PanelEx pnlEmpty;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colShopLoginName;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colShopId;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colShopName;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colShopNotes;
+        private System.Windows.Forms.DataGridViewLinkColumn colSelectProduct;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colLoginStatus;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn colCanUse;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colRemaining;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colMessage;
    }
 }
@@ -19,6 +19,7 @@ using System.Windows.Forms;
 using TemuKJD.Extension;
 using TemuKJD.KJDForms.BaseForms;
 using TemuKJD.KJDForms.ShopForms;
+using TemuKJD.KJDForms.ToolForms;
 using Work;

 namespace TemuKJD.KJDForms.ProductSelectForms
@@ -124,8 +125,9 @@ namespace TemuKJD.KJDForms.ProductSelectForms
                    shopEntity.LoginName,
                    shopEntity.ShopId,
                    shopEntity.ShopAccount,
-                    shopEntity.LoginStatus,
+                    shopEntity.Notes,
                    "选择商品",
+                    canUse ? "在线" : "掉线",
                    canUse,
                    shopEntity.AddProductRemaining,
                    string.Empty
@@ -136,7 +138,9 @@ namespace TemuKJD.KJDForms.ProductSelectForms
                row.Cells["colSelect"].Value = !isInit || (selectShopId.Contains(shopEntity.ShopId) && canUse);
                row.Cells["colShopLoginName"].Value = shopEntity.LoginName;
                row.Cells["colShopName"].Value = shopEntity.ShopAccount;
-                row.Cells["colLoginStatus"].Value = shopEntity.LoginStatus;
+                row.Cells["colShopNotes"].Value = shopEntity.Notes;
+                row.Cells["colLoginStatus"].Value = canUse ? "在线" : "掉线";
+                row.Cells["colLoginStatus"].Style.ForeColor = canUse ? Color.Green : Color.Red;
                row.Cells["colCanUse"].Value = canUse;
                row.Cells["colRemaining"].Value = shopEntity.AddProductRemaining;
            }
@@ -223,13 +227,13 @@ namespace TemuKJD.KJDForms.ProductSelectForms

                foreach (var prodSelect in lstTemuDBProductSelect)
                {
-                    Image image = null;
-                    string imgUrl = prodSelect?.main_img?.Replace("https", "http");
-                    string rst = "";
-                    if (!string.IsNullOrWhiteSpace(imgUrl))
-                        image = GetHtml.GetUrlImg(imgUrl, out rst);
-                    if (!string.IsNullOrEmpty(rst))
-                        BaseMsgForm.ShowError(rst);
+                    //Image image = null;
+                    //string imgUrl = prodSelect?.main_img?.Replace("https", "http");
+                    //string rst = "";
+                    //if (!string.IsNullOrWhiteSpace(imgUrl))
+                    //    image = GetHtml.GetUrlImg(imgUrl, out rst);
+                    //if (!string.IsNullOrEmpty(rst))
+                    //    BaseMsgForm.ShowError(rst);

                    Invoke(new Action(() =>
                    {
@@ -242,7 +246,8 @@ namespace TemuKJD.KJDForms.ProductSelectForms
                            "登录",
                            prodSelect.spu_id,
                            prodSelect.skc_id,
-                            image,//prod.main_img,
+                            prodSelect.main_img,
+                            defaultBitmap,
                            prodSelect.product_name, // 用户端显示商品原名
                            prodSelect.cat_name,
                            prodSelect.ext_code,
@@ -258,6 +263,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms

                Invoke(new Action(() =>
                {
+                    ShowDgvImg();
                    this.pbLoading.Visible = false;
                }));
            });
@@ -377,6 +383,10 @@ namespace TemuKJD.KJDForms.ProductSelectForms
                    //    shopLoginForm.ShowDialog();
                    //}
                    break;
+                case "图片":
+                    ShowImgForm imgFrom = new ShowImgForm(dgvSelectProduct.Rows[e.RowIndex].Cells["colImgUrl"].Value.ParseToString());
+                    imgFrom.ShowDialog();
+                    break;
                case "":
                    dgvSelectProduct.Rows[e.RowIndex].Cells["colCheck"].Value = !(bool)dgvSelectProduct.Rows[e.RowIndex].Cells["colCheck"].Value;
                    break;
@@ -464,5 +474,57 @@ namespace TemuKJD.KJDForms.ProductSelectForms
            this.cmbNotes.Text = "全部";
            this.cmbUserNotes.Text = "全部";
        }
+
+        Bitmap defaultBitmap = new Bitmap(80, 80);
+        void ShowDgvImg()
+        {
+            Task.Run(() =>
+            {
+                foreach (DataGridViewRow row in this.dgvSelectProduct.Rows)
+                {
+                    if (row.Index > 0 && row.Cells["colProductSkcPic"].Displayed == false)
+                    {
+                        try
+                        {
+                            Invoke(new Action(() =>
+                            {
+                                row.Cells["colProductSkcPic"].Value = defaultBitmap;
+                            }));
+                        }
+                        catch
+                        {
+                        }
+                        continue;
+                    }
+
+                    if (row.Cells["colProductSkcPic"].Value != null && row.Cells["colProductSkcPic"].Value != defaultBitmap)
+                        continue;
+
+                    Image image = null;
+                    string imgUrl = row.Cells["colImgUrl"]?.Value.ParseToString();
+                    string getImgError = "";
+                    if (!string.IsNullOrWhiteSpace(imgUrl))
+                        image = GetHtml.GetUrlImg(imgUrl, out getImgError);
+                    if (!string.IsNullOrEmpty(getImgError))
+                        BaseMsgForm.ShowError(getImgError);
+
+                    try
+                    {
+                        Invoke(new Action(() =>
+                        {
+                            row.Cells["colProductSkcPic"].Value = image;
+                        }));
+                    }
+                    catch
+                    {
+                    }
+                }
+            });
+        }
+
+        private void dgvSelectProduct_Scroll(object sender, ScrollEventArgs e)
+        {
+            ShowDgvImg();
+        }
    }
 }
@@ -126,12 +126,15 @@
  <metadata name="colShopId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>True</value>
  </metadata>
-  <metadata name="colLoginStatus.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="colShopNotes.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>True</value>
  </metadata>
  <metadata name="colSelectProduct.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>True</value>
  </metadata>
+  <metadata name="colLoginStatus.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
  <metadata name="colCanUse.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>True</value>
  </metadata>
@@ -162,6 +165,9 @@
  <metadata name="colSpuId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>True</value>
  </metadata>
+  <metadata name="colImgUrl.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
  <metadata name="colProductSkcPic.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>True</value>
  </metadata>
@@ -264,7 +264,7 @@
            "全部",
            "重上",
            "已买"});
-            this.cmbUserNotes.Location = new System.Drawing.Point(1044, 8);
+            this.cmbUserNotes.Location = new System.Drawing.Point(1044, 5);
            this.cmbUserNotes.Margin = new System.Windows.Forms.Padding(0);
            this.cmbUserNotes.Name = "cmbUserNotes";
            this.cmbUserNotes.Size = new System.Drawing.Size(65, 25);
@@ -281,7 +281,7 @@
            "核价成功",
            "核价成功（重复）",
            "重复"});
-            this.cmbNotes.Location = new System.Drawing.Point(917, 8);
+            this.cmbNotes.Location = new System.Drawing.Point(917, 5);
            this.cmbNotes.Margin = new System.Windows.Forms.Padding(0);
            this.cmbNotes.Name = "cmbNotes";
            this.cmbNotes.Size = new System.Drawing.Size(65, 25);
@@ -308,7 +308,7 @@
            "已上传",
            "草稿箱",
            "全部"});
-            this.cmbStatus.Location = new System.Drawing.Point(814, 8);
+            this.cmbStatus.Location = new System.Drawing.Point(814, 5);
            this.cmbStatus.Margin = new System.Windows.Forms.Padding(0);
            this.cmbStatus.Name = "cmbStatus";
            this.cmbStatus.Size = new System.Drawing.Size(65, 25);
@@ -354,14 +354,14 @@
            this.txtSkuHeadText.Location = new System.Drawing.Point(55, 3);
            this.txtSkuHeadText.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
            this.txtSkuHeadText.Name = "txtSkuHeadText";
-            this.txtSkuHeadText.Size = new System.Drawing.Size(91, 23);
+            this.txtSkuHeadText.Size = new System.Drawing.Size(85, 23);
            this.txtSkuHeadText.TabIndex = 452;
            // 
            // label10
            // 
            this.label10.Anchor = System.Windows.Forms.AnchorStyles.None;
            this.label10.AutoSize = true;
-            this.label10.Location = new System.Drawing.Point(149, 6);
+            this.label10.Location = new System.Drawing.Point(143, 6);
            this.label10.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
            this.label10.Name = "label10";
            this.label10.Size = new System.Drawing.Size(52, 17);
@@ -371,17 +371,17 @@
            // txtSkuEndText
            // 
            this.txtSkuEndText.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtSkuEndText.Location = new System.Drawing.Point(201, 3);
+            this.txtSkuEndText.Location = new System.Drawing.Point(195, 3);
            this.txtSkuEndText.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
            this.txtSkuEndText.Name = "txtSkuEndText";
-            this.txtSkuEndText.Size = new System.Drawing.Size(92, 23);
+            this.txtSkuEndText.Size = new System.Drawing.Size(85, 23);
            this.txtSkuEndText.TabIndex = 454;
            // 
            // chkFission
            // 
            this.chkFission.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
            this.chkFission.AutoSize = true;
-            this.chkFission.Location = new System.Drawing.Point(299, 4);
+            this.chkFission.Location = new System.Drawing.Point(286, 4);
            this.chkFission.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
            this.chkFission.Name = "chkFission";
            this.chkFission.Size = new System.Drawing.Size(75, 21);
@@ -393,8 +393,8 @@
            // 
            this.chkHeadWords.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
            this.chkHeadWords.AutoSize = true;
-            this.chkHeadWords.Location = new System.Drawing.Point(376, 4);
-            this.chkHeadWords.Margin = new System.Windows.Forms.Padding(2, 0, 0, 0);
+            this.chkHeadWords.Location = new System.Drawing.Point(361, 4);
+            this.chkHeadWords.Margin = new System.Windows.Forms.Padding(0);
            this.chkHeadWords.Name = "chkHeadWords";
            this.chkHeadWords.Size = new System.Drawing.Size(75, 21);
            this.chkHeadWords.TabIndex = 473;
@@ -405,8 +405,8 @@
            // 
            this.chkEndWords.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
            this.chkEndWords.AutoSize = true;
-            this.chkEndWords.Location = new System.Drawing.Point(453, 4);
-            this.chkEndWords.Margin = new System.Windows.Forms.Padding(2, 0, 0, 0);
+            this.chkEndWords.Location = new System.Drawing.Point(436, 4);
+            this.chkEndWords.Margin = new System.Windows.Forms.Padding(0);
            this.chkEndWords.Name = "chkEndWords";
            this.chkEndWords.Size = new System.Drawing.Size(75, 21);
            this.chkEndWords.TabIndex = 474;
@@ -419,8 +419,8 @@
            this.chkDeleteLowPriceSku.AutoSize = true;
            this.chkDeleteLowPriceSku.Checked = true;
            this.chkDeleteLowPriceSku.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.chkDeleteLowPriceSku.Location = new System.Drawing.Point(530, 4);
-            this.chkDeleteLowPriceSku.Margin = new System.Windows.Forms.Padding(2, 0, 0, 0);
+            this.chkDeleteLowPriceSku.Location = new System.Drawing.Point(511, 4);
+            this.chkDeleteLowPriceSku.Margin = new System.Windows.Forms.Padding(0);
            this.chkDeleteLowPriceSku.Name = "chkDeleteLowPriceSku";
            this.chkDeleteLowPriceSku.Size = new System.Drawing.Size(95, 21);
            this.chkDeleteLowPriceSku.TabIndex = 472;
@@ -431,8 +431,8 @@
            // 
            this.chkRandomSkuOrder.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
            this.chkRandomSkuOrder.AutoSize = true;
-            this.chkRandomSkuOrder.Location = new System.Drawing.Point(627, 4);
-            this.chkRandomSkuOrder.Margin = new System.Windows.Forms.Padding(2, 0, 0, 0);
+            this.chkRandomSkuOrder.Location = new System.Drawing.Point(606, 4);
+            this.chkRandomSkuOrder.Margin = new System.Windows.Forms.Padding(0);
            this.chkRandomSkuOrder.Name = "chkRandomSkuOrder";
            this.chkRandomSkuOrder.Size = new System.Drawing.Size(95, 21);
            this.chkRandomSkuOrder.TabIndex = 469;
@@ -442,11 +442,10 @@
            // chkSkuRandomPrice
            // 
            this.chkSkuRandomPrice.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.chkSkuRandomPrice.AutoSize = true;
-            this.chkSkuRandomPrice.Location = new System.Drawing.Point(724, 4);
-            this.chkSkuRandomPrice.Margin = new System.Windows.Forms.Padding(2, 0, 0, 0);
+            this.chkSkuRandomPrice.Location = new System.Drawing.Point(701, 4);
+            this.chkSkuRandomPrice.Margin = new System.Windows.Forms.Padding(0);
            this.chkSkuRandomPrice.Name = "chkSkuRandomPrice";
-            this.chkSkuRandomPrice.Size = new System.Drawing.Size(119, 21);
+            this.chkSkuRandomPrice.Size = new System.Drawing.Size(110, 21);
            this.chkSkuRandomPrice.TabIndex = 468;
            this.chkSkuRandomPrice.Text = "sku随机价格变化";
            this.chkSkuRandomPrice.UseVisualStyleBackColor = true;
@@ -459,7 +458,7 @@
            0,
            0,
            131072});
-            this.numSkuRandomPrice.Location = new System.Drawing.Point(843, 3);
+            this.numSkuRandomPrice.Location = new System.Drawing.Point(811, 3);
            this.numSkuRandomPrice.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
            this.numSkuRandomPrice.Name = "numSkuRandomPrice";
            this.numSkuRandomPrice.Size = new System.Drawing.Size(44, 23);
@@ -474,8 +473,8 @@
            // 
            this.label11.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
            this.label11.AutoSize = true;
-            this.label11.Location = new System.Drawing.Point(893, 6);
-            this.label11.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
+            this.label11.Location = new System.Drawing.Point(855, 6);
+            this.label11.Margin = new System.Windows.Forms.Padding(0);
            this.label11.Name = "label11";
            this.label11.Size = new System.Drawing.Size(20, 17);
            this.label11.TabIndex = 471;
@@ -24,6 +24,7 @@ using TemuKJD.KJDForms.ShopForms;
 using TemuKJD.KJDForms.ProductSelectForms;
 using System.Text.RegularExpressions;
 using System.Globalization;
+using TemuKJD.KJDForms.ToolForms;

 namespace TemuKJD.KJDForms.ProductThirdSelectForms
 {
@@ -327,6 +328,10 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
                    editForm.ShowDialog();
                    dgvSelectProduct.Rows[e.RowIndex].Cells["colNotes"].Value = dbSelectProduct.notes;
                    break;
+                case "Skc图片":
+                    ShowImgForm imgFrom = new ShowImgForm(dgvSelectProduct.Rows[e.RowIndex].Cells["colImgUrl"].Value.ParseToString());
+                    imgFrom.ShowDialog();
+                    break;
                case "认领":
                    //Task.Run(() => { SelectProduct(new TemuDBProduct[] { dbProduct }); });
                    break;
@@ -67,6 +67,7 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
            this.colShopLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colShopNotes = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.colLoginStatus = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.colSelectProduct = new System.Windows.Forms.DataGridViewLinkColumn();
            this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn();
@@ -82,6 +83,7 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
            this.colLogin = new System.Windows.Forms.DataGridViewLinkColumn();
            this.colSpuId = new System.Windows.Forms.DataGridViewLinkColumn();
            this.colSkcId = new System.Windows.Forms.DataGridViewLinkColumn();
+            this.colImgUrl = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.colProductSkcPic = new System.Windows.Forms.DataGridViewImageColumn();
            this.colProductName = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.colProductCat = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -507,7 +509,7 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
            this.splitContainer2.Panel2.Controls.Add(this.dgvSelectProduct);
            this.splitContainer2.Panel2.Padding = new System.Windows.Forms.Padding(0, 0, 4, 0);
            this.splitContainer2.Size = new System.Drawing.Size(1284, 392);
-            this.splitContainer2.SplitterDistance = 270;
+            this.splitContainer2.SplitterDistance = 300;
            this.splitContainer2.TabIndex = 0;
            // 
            // dgvShop
@@ -532,6 +534,7 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
            this.colShopLoginName,
            this.colShopId,
            this.colShopName,
+            this.colShopNotes,
            this.colLoginStatus,
            this.colSelectProduct,
            this.colCanUse,
@@ -541,9 +544,9 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
            this.dgvShop.Location = new System.Drawing.Point(4, 0);
            this.dgvShop.Name = "dgvShop";
            this.dgvShop.ReadOnly = true;
-            this.dgvShop.RowHeadersWidth = 30;
+            this.dgvShop.RowHeadersWidth = 25;
            this.dgvShop.RowTemplate.Height = 23;
-            this.dgvShop.Size = new System.Drawing.Size(266, 392);
+            this.dgvShop.Size = new System.Drawing.Size(296, 392);
            this.dgvShop.TabIndex = 6;
            this.dgvShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick);
            // 
@@ -578,7 +581,13 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
            this.colShopName.Name = "colShopName";
            this.colShopName.ReadOnly = true;
            this.colShopName.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-            this.colShopName.Width = 120;
+            // 
+            // colShopNotes
+            // 
+            this.colShopNotes.HeaderText = "分组";
+            this.colShopNotes.Name = "colShopNotes";
+            this.colShopNotes.ReadOnly = true;
+            this.colShopNotes.Width = 70;
            // 
            // colLoginStatus
            // 
@@ -623,7 +632,7 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
            // 
            this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None;
            this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue;
-            this.pbLoading.Location = new System.Drawing.Point(480, 171);
+            this.pbLoading.Location = new System.Drawing.Point(465, 171);
            this.pbLoading.Name = "pbLoading";
            this.pbLoading.Size = new System.Drawing.Size(50, 50);
            this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -657,6 +666,7 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
            this.colLogin,
            this.colSpuId,
            this.colSkcId,
+            this.colImgUrl,
            this.colProductSkcPic,
            this.colProductName,
            this.colProductCat,
@@ -671,9 +681,10 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
            this.dgvSelectProduct.Name = "dgvSelectProduct";
            this.dgvSelectProduct.ReadOnly = true;
            this.dgvSelectProduct.RowTemplate.Height = 23;
-            this.dgvSelectProduct.Size = new System.Drawing.Size(1006, 392);
+            this.dgvSelectProduct.Size = new System.Drawing.Size(976, 392);
            this.dgvSelectProduct.TabIndex = 187;
            this.dgvSelectProduct.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvSelectProduct_CellContentClick);
+            this.dgvSelectProduct.Scroll += new System.Windows.Forms.ScrollEventHandler(this.dgvSelectProduct_Scroll);
            // 
            // colCheck
            // 
@@ -742,6 +753,13 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
            this.colSkcId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
            this.colSkcId.Width = 80;
            // 
+            // colImgUrl
+            // 
+            this.colImgUrl.HeaderText = "图片地址";
+            this.colImgUrl.Name = "colImgUrl";
+            this.colImgUrl.ReadOnly = true;
+            this.colImgUrl.Visible = false;
+            // 
            // colProductSkcPic
            // 
            this.colProductSkcPic.HeaderText = "图片";
@@ -959,15 +977,6 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
        private System.Windows.Forms.ComboBox cmbStatus;
        private System.Windows.Forms.Label label8;
        private DevComponents.DotNetBar.PanelEx btnDelSelect;
-        private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect;
-        private System.Windows.Forms.DataGridViewTextBoxColumn colShopLoginName;
-        private System.Windows.Forms.DataGridViewTextBoxColumn colShopId;
-        private System.Windows.Forms.DataGridViewTextBoxColumn colShopName;
-        private System.Windows.Forms.DataGridViewTextBoxColumn colLoginStatus;
-        private System.Windows.Forms.DataGridViewLinkColumn colSelectProduct;
-        private System.Windows.Forms.DataGridViewCheckBoxColumn colCanUse;
-        private System.Windows.Forms.DataGridViewTextBoxColumn colRemaining;
-        private System.Windows.Forms.DataGridViewTextBoxColumn colMessage;
        private System.Windows.Forms.Label label2;
        private System.Windows.Forms.TextBox txtExtCode;
        private System.Windows.Forms.Label label13;
@@ -984,6 +993,7 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
        private System.Windows.Forms.TextBox txtSKC;
        private System.Windows.Forms.TextBox txtSPU;
        private System.Windows.Forms.Label label1;
+        private DevComponents.DotNetBar.PanelEx pnlEmpty;
        private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck;
        private System.Windows.Forms.DataGridViewTextBoxColumn colSelectId;
        private System.Windows.Forms.DataGridViewTextBoxColumn colSupplierId;
@@ -992,6 +1002,7 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
        private System.Windows.Forms.DataGridViewLinkColumn colLogin;
        private System.Windows.Forms.DataGridViewLinkColumn colSpuId;
        private System.Windows.Forms.DataGridViewLinkColumn colSkcId;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colImgUrl;
        private System.Windows.Forms.DataGridViewImageColumn colProductSkcPic;
        private System.Windows.Forms.DataGridViewTextBoxColumn colProductName;
        private System.Windows.Forms.DataGridViewTextBoxColumn colProductCat;
@@ -1001,6 +1012,15 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
        private System.Windows.Forms.DataGridViewTextBoxColumn colNotes;
        private System.Windows.Forms.DataGridViewLinkColumn colUserNotes;
        private System.Windows.Forms.DataGridViewLinkColumn ColDelete;
-        private DevComponents.DotNetBar.PanelEx pnlEmpty;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colShopLoginName;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colShopId;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colShopName;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colShopNotes;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colLoginStatus;
+        private System.Windows.Forms.DataGridViewLinkColumn colSelectProduct;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn colCanUse;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colRemaining;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colMessage;
    }
 }
@@ -19,6 +19,7 @@ using TemuKJD.Extension;
 using TemuKJD.KJDForms.BaseForms;
 using TemuKJD.KJDForms.ProductSelectForms;
 using TemuKJD.KJDForms.ShopForms;
+using TemuKJD.KJDForms.ToolForms;
 using Work;

 namespace TemuKJD.KJDForms.ProductThirdSelectForms
@@ -127,8 +128,9 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
                    shopEntity.LoginName,
                    shopEntity.ShopId,
                    shopEntity.ShopAccount,
-                    shopEntity.LoginStatus,
+                    shopEntity.Notes,
                    "选择商品",
+                    canUse ? "在线" : "掉线",
                    canUse,
                    shopEntity.AddProductRemaining,
                    string.Empty
@@ -139,7 +141,9 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
                row.Cells["colSelect"].Value = !isInit || (selectShopId.Contains(shopEntity.ShopId) && canUse);
                row.Cells["colShopLoginName"].Value = shopEntity.LoginName;
                row.Cells["colShopName"].Value = shopEntity.ShopAccount;
-                row.Cells["colLoginStatus"].Value = shopEntity.LoginStatus;
+                row.Cells["colShopNotes"].Value = shopEntity.Notes;
+                row.Cells["colLoginStatus"].Value = canUse ? "在线" : "掉线";
+                row.Cells["colLoginStatus"].Style.ForeColor = canUse ? Color.Green : Color.Red;
                row.Cells["colCanUse"].Value = canUse;
                row.Cells["colRemaining"].Value = shopEntity.AddProductRemaining;
            }
@@ -226,13 +230,13 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms

                foreach (var prodSelect in lstTemuDBProductSelect)
                {
-                    Image image = null;
-                    string imgUrl = prodSelect?.main_img?.Replace("https", "http");
-                    string rst = "";
-                    if (!string.IsNullOrWhiteSpace(imgUrl))
-                        image = GetHtml.GetUrlImg(imgUrl, out rst);
-                    if (!string.IsNullOrEmpty(rst))
-                        BaseMsgForm.ShowError(rst);
+                    //Image image = null;
+                    //string imgUrl = prodSelect?.main_img?.Replace("https", "http");
+                    //string rst = "";
+                    //if (!string.IsNullOrWhiteSpace(imgUrl))
+                    //    image = GetHtml.GetUrlImg(imgUrl, out rst);
+                    //if (!string.IsNullOrEmpty(rst))
+                    //    BaseMsgForm.ShowError(rst);

                    Invoke(new Action(() =>
                    {
@@ -245,7 +249,8 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
                            "登录",
                            prodSelect.spu_id,
                            prodSelect.skc_id,
-                            image,//prod.main_img,
+                            prodSelect.main_img,
+                            defaultBitmap,
                            prodSelect.product_name,
                            prodSelect.cat_name,
                            prodSelect.ext_code,
@@ -261,6 +266,7 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms

                Invoke(new Action(() =>
                {
+                    ShowDgvImg();
                    this.pbLoading.Visible = false;
                }));
            });
@@ -384,6 +390,10 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
                        dgvSelectProduct.Rows[e.RowIndex].Cells["colUserNotes"].Value = (dbProduct.user_notes + "  编辑").Trim();
                    }
                    break;
+                case "图片":
+                    ShowImgForm imgFrom = new ShowImgForm(dgvSelectProduct.Rows[e.RowIndex].Cells["colImgUrl"].Value.ParseToString());
+                    imgFrom.ShowDialog();
+                    break;
                case "":
                    dgvSelectProduct.Rows[e.RowIndex].Cells["colCheck"].Value = !(bool)dgvSelectProduct.Rows[e.RowIndex].Cells["colCheck"].Value;
                    break;
@@ -471,5 +481,56 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
            this.cmbNotes.Text = "全部";
            this.cmbUserNotes.Text = "全部";
        }
+        Bitmap defaultBitmap = new Bitmap(80, 80);
+        void ShowDgvImg()
+        {
+            Task.Run(() =>
+            {
+                foreach (DataGridViewRow row in this.dgvSelectProduct.Rows)
+                {
+                    if (row.Index > 0 && row.Cells["colProductSkcPic"].Displayed == false)
+                    {
+                        try
+                        {
+                            Invoke(new Action(() =>
+                            {
+                                row.Cells["colProductSkcPic"].Value = defaultBitmap;
+                            }));
+                        }
+                        catch
+                        {
+                        }
+                        continue;
+                    }
+
+                    if (row.Cells["colProductSkcPic"].Value != null && row.Cells["colProductSkcPic"].Value != defaultBitmap)
+                        continue;
+
+                    Image image = null;
+                    string imgUrl = row.Cells["colImgUrl"]?.Value.ParseToString();
+                    string getImgError = "";
+                    if (!string.IsNullOrWhiteSpace(imgUrl))
+                        image = GetHtml.GetUrlImg(imgUrl, out getImgError);
+                    if (!string.IsNullOrEmpty(getImgError))
+                        BaseMsgForm.ShowError(getImgError);
+
+                    try
+                    {
+                        Invoke(new Action(() =>
+                        {
+                            row.Cells["colProductSkcPic"].Value = image;
+                        }));
+                    }
+                    catch
+                    {
+                    }
+                }
+            });
+        }
+
+        private void dgvSelectProduct_Scroll(object sender, ScrollEventArgs e)
+        {
+            ShowDgvImg();
+        }
    }
 }
@@ -126,6 +126,9 @@
  <metadata name="colShopId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>True</value>
  </metadata>
+  <metadata name="colShopNotes.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
  <metadata name="colLoginStatus.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>True</value>
  </metadata>
@@ -162,6 +165,9 @@
  <metadata name="colSpuId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>True</value>
  </metadata>
+  <metadata name="colImgUrl.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
  <metadata name="colProductSkcPic.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>True</value>
  </metadata>
@@ -40,6 +40,12 @@ namespace TemuKJD.KJDForms.SalesCenterForms
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
            this.splitContainer1 = new System.Windows.Forms.SplitContainer();
+            this.splitContainer3 = new System.Windows.Forms.SplitContainer();
+            this.splitContainer2 = new System.Windows.Forms.SplitContainer();
+            this.splitContainer5 = new System.Windows.Forms.SplitContainer();
+            this.splitContainer4 = new System.Windows.Forms.SplitContainer();
+            this.panelEx1 = new DevComponents.DotNetBar.PanelEx();
+            this.btnClear = new DevComponents.DotNetBar.PanelEx();
            this.ucGroupBoxEx3 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
            this.actDiscount80 = new TemuKJD.KJDForms.SalesCenterForms.UcActivityDiscountCtrl();
            this.object_6dcc57fe_428d_475c_90c2_d99d71a7014f = new TemuKJD.UserComponent.UcCheckBox(this.components);
@@ -67,10 +73,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
            this.ucGroupBoxEx2 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
            this.chkGetDiscount = new TemuKJD.UserComponent.UcCheckBox(this.components);
            this.btnSearchActivity = new DevComponents.DotNetBar.PanelEx();
-            this.splitContainer3 = new System.Windows.Forms.SplitContainer();
-            this.splitContainer2 = new System.Windows.Forms.SplitContainer();
            this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx();
-            this.splitContainer5 = new System.Windows.Forms.SplitContainer();
            this.dgvActivity = new TemuKJD.UserComponent.DataGridViewEx();
            this.colCheckActivity = new System.Windows.Forms.DataGridViewCheckBoxColumn();
            this.colActivityType = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -97,15 +100,12 @@ namespace TemuKJD.KJDForms.SalesCenterForms
            this.colPrcie = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.colInventory = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.colMsg = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.splitContainer4 = new System.Windows.Forms.SplitContainer();
            this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
-            this.panelEx1 = new DevComponents.DotNetBar.PanelEx();
-            this.btnClear = new DevComponents.DotNetBar.PanelEx();
            this.colSelect = new TemuKJD.UserComponent.UcDataGridViewCheckBoxColumn(this.components);
            this.colShopLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.colNotes = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colShopNotes = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.colLoginStatus = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn();
            this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -113,6 +113,22 @@ namespace TemuKJD.KJDForms.SalesCenterForms
            this.splitContainer1.Panel1.SuspendLayout();
            this.splitContainer1.Panel2.SuspendLayout();
            this.splitContainer1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).BeginInit();
+            this.splitContainer3.Panel1.SuspendLayout();
+            this.splitContainer3.Panel2.SuspendLayout();
+            this.splitContainer3.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit();
+            this.splitContainer2.Panel1.SuspendLayout();
+            this.splitContainer2.Panel2.SuspendLayout();
+            this.splitContainer2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer5)).BeginInit();
+            this.splitContainer5.Panel1.SuspendLayout();
+            this.splitContainer5.Panel2.SuspendLayout();
+            this.splitContainer5.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer4)).BeginInit();
+            this.splitContainer4.Panel1.SuspendLayout();
+            this.splitContainer4.Panel2.SuspendLayout();
+            this.splitContainer4.SuspendLayout();
            this.ucGroupBoxEx3.SuspendLayout();
            this.actDiscount80.SuspendLayout();
            this.actDiscount85.SuspendLayout();
@@ -122,25 +138,9 @@ namespace TemuKJD.KJDForms.SalesCenterForms
            ((System.ComponentModel.ISupportInitialize)(this.numOnSaleDays)).BeginInit();
            this.ucGroupBoxEx1.SuspendLayout();
            this.ucGroupBoxEx2.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).BeginInit();
-            this.splitContainer3.Panel1.SuspendLayout();
-            this.splitContainer3.Panel2.SuspendLayout();
-            this.splitContainer3.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit();
-            this.splitContainer2.Panel1.SuspendLayout();
-            this.splitContainer2.Panel2.SuspendLayout();
-            this.splitContainer2.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.dgvShop)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer5)).BeginInit();
-            this.splitContainer5.Panel1.SuspendLayout();
-            this.splitContainer5.Panel2.SuspendLayout();
-            this.splitContainer5.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.dgvActivity)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.dgvProduct)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer4)).BeginInit();
-            this.splitContainer4.Panel1.SuspendLayout();
-            this.splitContainer4.Panel2.SuspendLayout();
-            this.splitContainer4.SuspendLayout();
            this.SuspendLayout();
            // 
            // splitContainer1
@@ -164,6 +164,132 @@ namespace TemuKJD.KJDForms.SalesCenterForms
            this.splitContainer1.SplitterDistance = 120;
            this.splitContainer1.TabIndex = 11;
            // 
+            // splitContainer3
+            // 
+            this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitContainer3.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
+            this.splitContainer3.Location = new System.Drawing.Point(0, 0);
+            this.splitContainer3.Name = "splitContainer3";
+            this.splitContainer3.Orientation = System.Windows.Forms.Orientation.Horizontal;
+            // 
+            // splitContainer3.Panel1
+            // 
+            this.splitContainer3.Panel1.Controls.Add(this.splitContainer2);
+            // 
+            // splitContainer3.Panel2
+            // 
+            this.splitContainer3.Panel2.Controls.Add(this.splitContainer4);
+            this.splitContainer3.Size = new System.Drawing.Size(1424, 405);
+            this.splitContainer3.SplitterDistance = 375;
+            this.splitContainer3.TabIndex = 1;
+            // 
+            // splitContainer2
+            // 
+            this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitContainer2.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
+            this.splitContainer2.Location = new System.Drawing.Point(0, 0);
+            this.splitContainer2.Name = "splitContainer2";
+            // 
+            // splitContainer2.Panel1
+            // 
+            this.splitContainer2.Panel1.Controls.Add(this.dgvShop);
+            this.splitContainer2.Panel1.Padding = new System.Windows.Forms.Padding(4, 0, 0, 0);
+            // 
+            // splitContainer2.Panel2
+            // 
+            this.splitContainer2.Panel2.Controls.Add(this.splitContainer5);
+            this.splitContainer2.Panel2.Padding = new System.Windows.Forms.Padding(0, 0, 4, 0);
+            this.splitContainer2.Size = new System.Drawing.Size(1424, 375);
+            this.splitContainer2.SplitterDistance = 280;
+            this.splitContainer2.TabIndex = 0;
+            // 
+            // splitContainer5
+            // 
+            this.splitContainer5.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitContainer5.Location = new System.Drawing.Point(0, 0);
+            this.splitContainer5.Name = "splitContainer5";
+            this.splitContainer5.Orientation = System.Windows.Forms.Orientation.Horizontal;
+            // 
+            // splitContainer5.Panel1
+            // 
+            this.splitContainer5.Panel1.Controls.Add(this.dgvActivity);
+            // 
+            // splitContainer5.Panel2
+            // 
+            this.splitContainer5.Panel2.Controls.Add(this.dgvProduct);
+            this.splitContainer5.Size = new System.Drawing.Size(1136, 375);
+            this.splitContainer5.SplitterDistance = 128;
+            this.splitContainer5.TabIndex = 0;
+            // 
+            // splitContainer4
+            // 
+            this.splitContainer4.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitContainer4.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
+            this.splitContainer4.Location = new System.Drawing.Point(0, 0);
+            this.splitContainer4.Name = "splitContainer4";
+            // 
+            // splitContainer4.Panel1
+            // 
+            this.splitContainer4.Panel1.Controls.Add(this.statusBar);
+            // 
+            // splitContainer4.Panel2
+            // 
+            this.splitContainer4.Panel2.Controls.Add(this.panelEx1);
+            this.splitContainer4.Panel2.Controls.Add(this.btnClear);
+            this.splitContainer4.Size = new System.Drawing.Size(1424, 26);
+            this.splitContainer4.SplitterDistance = 1146;
+            this.splitContainer4.TabIndex = 3;
+            // 
+            // panelEx1
+            // 
+            this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control;
+            this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty;
+            this.panelEx1.Location = new System.Drawing.Point(155, 0);
+            this.panelEx1.Name = "panelEx1";
+            this.panelEx1.Size = new System.Drawing.Size(115, 21);
+            this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.panelEx1.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+            this.panelEx1.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+            this.panelEx1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+            this.panelEx1.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.panelEx1.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+            this.panelEx1.Style.GradientAngle = 90;
+            this.panelEx1.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
+            this.panelEx1.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+            this.panelEx1.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.panelEx1.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.panelEx1.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
+            this.panelEx1.TabIndex = 668;
+            this.panelEx1.Text = "停止当前操作";
+            this.panelEx1.Click += new System.EventHandler(this.btnStop_Click);
+            // 
+            // btnClear
+            // 
+            this.btnClear.Anchor = System.Windows.Forms.AnchorStyles.Right;
+            this.btnClear.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnClear.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.btnClear.DisabledBackColor = System.Drawing.Color.Empty;
+            this.btnClear.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnClear.Location = new System.Drawing.Point(47, 0);
+            this.btnClear.Name = "btnClear";
+            this.btnClear.Size = new System.Drawing.Size(90, 21);
+            this.btnClear.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnClear.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnClear.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnClear.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            this.btnClear.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+            this.btnClear.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
+            this.btnClear.Style.ForeColor.Color = System.Drawing.Color.White;
+            this.btnClear.Style.GradientAngle = 90;
+            this.btnClear.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnClear.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+            this.btnClear.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+            this.btnClear.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
+            this.btnClear.TabIndex = 440;
+            this.btnClear.Text = "清空结果";
+            this.btnClear.Visible = false;
+            // 
            // ucGroupBoxEx3
            // 
            this.ucGroupBoxEx3.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
@@ -523,45 +649,6 @@ namespace TemuKJD.KJDForms.SalesCenterForms
            this.btnSearchActivity.Text = "查询活动";
            this.btnSearchActivity.Click += new System.EventHandler(this.btnSearchActivity_Click);
            // 
-            // splitContainer3
-            // 
-            this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.splitContainer3.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
-            this.splitContainer3.Location = new System.Drawing.Point(0, 0);
-            this.splitContainer3.Name = "splitContainer3";
-            this.splitContainer3.Orientation = System.Windows.Forms.Orientation.Horizontal;
-            // 
-            // splitContainer3.Panel1
-            // 
-            this.splitContainer3.Panel1.Controls.Add(this.splitContainer2);
-            // 
-            // splitContainer3.Panel2
-            // 
-            this.splitContainer3.Panel2.Controls.Add(this.splitContainer4);
-            this.splitContainer3.Size = new System.Drawing.Size(1424, 405);
-            this.splitContainer3.SplitterDistance = 375;
-            this.splitContainer3.TabIndex = 1;
-            // 
-            // splitContainer2
-            // 
-            this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.splitContainer2.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
-            this.splitContainer2.Location = new System.Drawing.Point(0, 0);
-            this.splitContainer2.Name = "splitContainer2";
-            // 
-            // splitContainer2.Panel1
-            // 
-            this.splitContainer2.Panel1.Controls.Add(this.dgvShop);
-            this.splitContainer2.Panel1.Padding = new System.Windows.Forms.Padding(4, 0, 0, 0);
-            // 
-            // splitContainer2.Panel2
-            // 
-            this.splitContainer2.Panel2.Controls.Add(this.splitContainer5);
-            this.splitContainer2.Panel2.Padding = new System.Windows.Forms.Padding(0, 0, 4, 0);
-            this.splitContainer2.Size = new System.Drawing.Size(1424, 375);
-            this.splitContainer2.SplitterDistance = 280;
-            this.splitContainer2.TabIndex = 0;
-            // 
            // dgvShop
            // 
            this.dgvShop.AllowUserToAddRows = false;
@@ -584,7 +671,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
            this.colShopLoginName,
            this.colShopId,
            this.colShopName,
-            this.colNotes,
+            this.colShopNotes,
            this.colLoginStatus,
            this.colCanUse,
            this.colMessage});
@@ -607,24 +694,6 @@ namespace TemuKJD.KJDForms.SalesCenterForms
            this.dgvShop.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellClick);
            this.dgvShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick);
            // 
-            // splitContainer5
-            // 
-            this.splitContainer5.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.splitContainer5.Location = new System.Drawing.Point(0, 0);
-            this.splitContainer5.Name = "splitContainer5";
-            this.splitContainer5.Orientation = System.Windows.Forms.Orientation.Horizontal;
-            // 
-            // splitContainer5.Panel1
-            // 
-            this.splitContainer5.Panel1.Controls.Add(this.dgvActivity);
-            // 
-            // splitContainer5.Panel2
-            // 
-            this.splitContainer5.Panel2.Controls.Add(this.dgvProduct);
-            this.splitContainer5.Size = new System.Drawing.Size(1136, 375);
-            this.splitContainer5.SplitterDistance = 128;
-            this.splitContainer5.TabIndex = 0;
-            // 
            // dgvActivity
            // 
            this.dgvActivity.AllowUserToAddRows = false;
@@ -895,25 +964,6 @@ namespace TemuKJD.KJDForms.SalesCenterForms
            this.colMsg.ReadOnly = true;
            this.colMsg.Width = 400;
            // 
-            // splitContainer4
-            // 
-            this.splitContainer4.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.splitContainer4.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
-            this.splitContainer4.Location = new System.Drawing.Point(0, 0);
-            this.splitContainer4.Name = "splitContainer4";
-            // 
-            // splitContainer4.Panel1
-            // 
-            this.splitContainer4.Panel1.Controls.Add(this.statusBar);
-            // 
-            // splitContainer4.Panel2
-            // 
-            this.splitContainer4.Panel2.Controls.Add(this.panelEx1);
-            this.splitContainer4.Panel2.Controls.Add(this.btnClear);
-            this.splitContainer4.Size = new System.Drawing.Size(1424, 26);
-            this.splitContainer4.SplitterDistance = 1146;
-            this.splitContainer4.TabIndex = 3;
-            // 
            // statusBar
            // 
            this.statusBar.BackColor = System.Drawing.Color.White;
@@ -925,56 +975,6 @@ namespace TemuKJD.KJDForms.SalesCenterForms
            this.statusBar.Size = new System.Drawing.Size(1146, 26);
            this.statusBar.TabIndex = 2;
            // 
-            // panelEx1
-            // 
-            this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control;
-            this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty;
-            this.panelEx1.Location = new System.Drawing.Point(155, 0);
-            this.panelEx1.Name = "panelEx1";
-            this.panelEx1.Size = new System.Drawing.Size(115, 21);
-            this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center;
-            this.panelEx1.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
-            this.panelEx1.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
-            this.panelEx1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
-            this.panelEx1.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            this.panelEx1.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
-            this.panelEx1.Style.GradientAngle = 90;
-            this.panelEx1.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
-            this.panelEx1.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
-            this.panelEx1.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            this.panelEx1.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            this.panelEx1.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
-            this.panelEx1.TabIndex = 668;
-            this.panelEx1.Text = "停止当前操作";
-            this.panelEx1.Click += new System.EventHandler(this.btnStop_Click);
-            // 
-            // btnClear
-            // 
-            this.btnClear.Anchor = System.Windows.Forms.AnchorStyles.Right;
-            this.btnClear.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.btnClear.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.btnClear.DisabledBackColor = System.Drawing.Color.Empty;
-            this.btnClear.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnClear.Location = new System.Drawing.Point(47, 0);
-            this.btnClear.Name = "btnClear";
-            this.btnClear.Size = new System.Drawing.Size(90, 21);
-            this.btnClear.Style.Alignment = System.Drawing.StringAlignment.Center;
-            this.btnClear.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            this.btnClear.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            this.btnClear.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
-            this.btnClear.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
-            this.btnClear.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
-            this.btnClear.Style.ForeColor.Color = System.Drawing.Color.White;
-            this.btnClear.Style.GradientAngle = 90;
-            this.btnClear.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
-            this.btnClear.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
-            this.btnClear.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
-            this.btnClear.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
-            this.btnClear.TabIndex = 440;
-            this.btnClear.Text = "清空结果";
-            this.btnClear.Visible = false;
-            // 
            // colSelect
            // 
            this.colSelect.HeaderText = "全选";
@@ -1008,12 +1008,12 @@ namespace TemuKJD.KJDForms.SalesCenterForms
            this.colShopName.Resizable = System.Windows.Forms.DataGridViewTriState.True;
            this.colShopName.Width = 70;
            // 
-            // colNotes
+            // colShopNotes
            // 
-            this.colNotes.HeaderText = "备注";
-            this.colNotes.Name = "colNotes";
-            this.colNotes.ReadOnly = true;
-            this.colNotes.Width = 70;
+            this.colShopNotes.HeaderText = "分组";
+            this.colShopNotes.Name = "colShopNotes";
+            this.colShopNotes.ReadOnly = true;
+            this.colShopNotes.Width = 70;
            // 
            // colLoginStatus
            // 
@@ -1053,6 +1053,22 @@ namespace TemuKJD.KJDForms.SalesCenterForms
            this.splitContainer1.Panel2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
            this.splitContainer1.ResumeLayout(false);
+            this.splitContainer3.Panel1.ResumeLayout(false);
+            this.splitContainer3.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).EndInit();
+            this.splitContainer3.ResumeLayout(false);
+            this.splitContainer2.Panel1.ResumeLayout(false);
+            this.splitContainer2.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit();
+            this.splitContainer2.ResumeLayout(false);
+            this.splitContainer5.Panel1.ResumeLayout(false);
+            this.splitContainer5.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer5)).EndInit();
+            this.splitContainer5.ResumeLayout(false);
+            this.splitContainer4.Panel1.ResumeLayout(false);
+            this.splitContainer4.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer4)).EndInit();
+            this.splitContainer4.ResumeLayout(false);
            this.ucGroupBoxEx3.ResumeLayout(false);
            this.ucGroupBoxEx3.PerformLayout();
            this.actDiscount80.ResumeLayout(false);
@@ -1068,25 +1084,9 @@ namespace TemuKJD.KJDForms.SalesCenterForms
            this.ucGroupBoxEx1.ResumeLayout(false);
            this.ucGroupBoxEx2.ResumeLayout(false);
            this.ucGroupBoxEx2.PerformLayout();
-            this.splitContainer3.Panel1.ResumeLayout(false);
-            this.splitContainer3.Panel2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).EndInit();
-            this.splitContainer3.ResumeLayout(false);
-            this.splitContainer2.Panel1.ResumeLayout(false);
-            this.splitContainer2.Panel2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit();
-            this.splitContainer2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.dgvShop)).EndInit();
-            this.splitContainer5.Panel1.ResumeLayout(false);
-            this.splitContainer5.Panel2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer5)).EndInit();
-            this.splitContainer5.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.dgvActivity)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.dgvProduct)).EndInit();
-            this.splitContainer4.Panel1.ResumeLayout(false);
-            this.splitContainer4.Panel2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitContainer4)).EndInit();
-            this.splitContainer4.ResumeLayout(false);
            this.ResumeLayout(false);

        }
@@ -1159,7 +1159,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
        private System.Windows.Forms.DataGridViewTextBoxColumn colShopLoginName;
        private System.Windows.Forms.DataGridViewTextBoxColumn colShopId;
        private System.Windows.Forms.DataGridViewTextBoxColumn colShopName;
-        private System.Windows.Forms.DataGridViewTextBoxColumn colNotes;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colShopNotes;
        private System.Windows.Forms.DataGridViewTextBoxColumn colLoginStatus;
        private System.Windows.Forms.DataGridViewCheckBoxColumn colCanUse;
        private System.Windows.Forms.DataGridViewTextBoxColumn colMessage;
@@ -115,20 +115,21 @@ namespace TemuKJD.KJDForms.SalesCenterForms
                    shopEntity.ShopId,
                    shopEntity.ShopAccount,
                    shopEntity.Notes,
-                    shopEntity.LoginStatus2 == "国际版在线" ? "在线" : "掉线",
+                    canUse ? "在线" : "掉线",
                    canUse,
                    string.Empty
                );
-                this.dgvShop.Rows[id].Cells["colLoginStatus"].Style.ForeColor = shopEntity.LoginStatus2 == "国际版在线" ? Color.Green : Color.Red;
+                row = dgvShop.Rows[id];
+                row.Cells["colLoginStatus"].Style.ForeColor = canUse ? Color.Green : Color.Red;
            }
            else
            {
                row.Cells["colSelect"].Value = selectShopId.Contains(shopEntity.ShopId) && canUse;
                row.Cells["colShopLoginName"].Value = shopEntity.LoginName;
                row.Cells["colShopName"].Value = shopEntity.ShopAccount;
-                row.Cells["colNotes"].Value = shopEntity.ShopAccount;
-                row.Cells["colLoginStatus"].Value = shopEntity.LoginStatus2 == "国际版在线" ? "在线" : "掉线";
-                row.Cells["colLoginStatus"].Style.ForeColor = shopEntity.LoginStatus2 == "国际版在线" ? Color.Green : Color.Red;
+                row.Cells["colShopNotes"].Value = shopEntity.Notes;
+                row.Cells["colLoginStatus"].Value = canUse ? "在线" : "掉线";
+                row.Cells["colLoginStatus"].Style.ForeColor = canUse ? Color.Green : Color.Red;
                row.Cells["colCanUse"].Value = canUse;
            }
        }
@@ -126,7 +126,7 @@
  <metadata name="colShopId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>True</value>
  </metadata>
-  <metadata name="colNotes.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="colShopNotes.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>True</value>
  </metadata>
  <metadata name="colLoginStatus.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -0,0 +1,127 @@
+
+namespace TemuKJD.KJDForms.ToolForms
+{
+    partial class ShowImgForm
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ShowImgForm));
+            this.splitContainer1 = new System.Windows.Forms.SplitContainer();
+            this.pictureBox1 = new System.Windows.Forms.PictureBox();
+            this.btnSave = new DevComponents.DotNetBar.PanelEx();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
+            this.splitContainer1.Panel1.SuspendLayout();
+            this.splitContainer1.Panel2.SuspendLayout();
+            this.splitContainer1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // splitContainer1
+            // 
+            this.splitContainer1.BackColor = System.Drawing.Color.White;
+            this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
+            this.splitContainer1.Location = new System.Drawing.Point(1, 33);
+            this.splitContainer1.Name = "splitContainer1";
+            this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal;
+            // 
+            // splitContainer1.Panel1
+            // 
+            this.splitContainer1.Panel1.Controls.Add(this.pictureBox1);
+            // 
+            // splitContainer1.Panel2
+            // 
+            this.splitContainer1.Panel2.Controls.Add(this.btnSave);
+            this.splitContainer1.Size = new System.Drawing.Size(648, 686);
+            this.splitContainer1.SplitterDistance = 648;
+            this.splitContainer1.TabIndex = 1;
+            this.splitContainer1.TabStop = false;
+            // 
+            // pictureBox1
+            // 
+            this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pictureBox1.Location = new System.Drawing.Point(0, 0);
+            this.pictureBox1.Name = "pictureBox1";
+            this.pictureBox1.Size = new System.Drawing.Size(648, 648);
+            this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
+            this.pictureBox1.TabIndex = 0;
+            this.pictureBox1.TabStop = false;
+            // 
+            // btnSave
+            // 
+            this.btnSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnSave.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnSave.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.btnSave.DisabledBackColor = System.Drawing.Color.Empty;
+            this.btnSave.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnSave.Location = new System.Drawing.Point(584, 3);
+            this.btnSave.Name = "btnSave";
+            this.btnSave.Size = new System.Drawing.Size(56, 26);
+            this.btnSave.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnSave.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnSave.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnSave.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            this.btnSave.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+            this.btnSave.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
+            this.btnSave.Style.ForeColor.Color = System.Drawing.Color.White;
+            this.btnSave.Style.GradientAngle = 90;
+            this.btnSave.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnSave.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+            this.btnSave.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+            this.btnSave.TabIndex = 481;
+            this.btnSave.Text = "关闭";
+            this.btnSave.Click += new System.EventHandler(this.btnClose_Click);
+            // 
+            // ShowImgForm
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(650, 720);
+            this.Controls.Add(this.splitContainer1);
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.KeyPreview = true;
+            this.Name = "ShowImgForm";
+            this.Text = "图片查看";
+            this.TitleText = "图片查看";
+            this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ShowImgForm_KeyDown);
+            this.Controls.SetChildIndex(this.splitContainer1, 0);
+            this.splitContainer1.Panel1.ResumeLayout(false);
+            this.splitContainer1.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
+            this.splitContainer1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.SplitContainer splitContainer1;
+        private System.Windows.Forms.PictureBox pictureBox1;
+        private DevComponents.DotNetBar.PanelEx btnSave;
+    }
+}
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using TemuKJD.KJDForms.BaseForms;
+
+namespace TemuKJD.KJDForms.ToolForms
+{
+    public partial class ShowImgForm : LRBaseForm
+    {
+        string currentImgUrl = null;
+        Dictionary<string, string> imgDic = new Dictionary<string, string>();
+
+        public ShowImgForm(string picUrl, Dictionary<string, string> picDic = null)
+        {
+            InitializeComponent();
+            currentImgUrl = picUrl;
+            if (picDic != null)
+                imgDic = picDic;
+
+            if (!string.IsNullOrEmpty(currentImgUrl))
+            {
+                this.pictureBox1.ImageLocation = currentImgUrl.Replace("https", "http");
+            }
+        }
+
+        private void btnClose_Click(object sender, EventArgs e)
+        {
+            this.Close();
+        }
+
+        private void ShowImgForm_KeyDown(object sender, KeyEventArgs e)
+        {
+            switch (e.KeyCode)
+            {
+                //case Keys.A: MessageBox.Show("您按下的是A"); break;
+                //case Keys.B: MessageBox.Show("您按下的是B"); break;
+                case Keys.Enter: break;
+                case Keys.Escape: this.Close(); break;
+            }
+        }
+    }
+}
@@ -0,0 +1,298 @@
+<?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>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAABAAEAgIAQAAAAAABoKAAAFgAAACgAAACAAAAAAAEAAAEABAAAAAAAACgAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAgICAAMDAwAAAAP8AAP8AAAD//wD/AAAA/wD/AP//
+        AAD///8AAAAAAAAAAAAAAAAzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMQ
+        AAAAAAAAAAAAAAAAAAAAAAAAABM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZkzEAAAAAAAAAAAAAAAAAAAAAADOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZMwAAAAAAAAAAAAAAAAAAABOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZkzAAAAAAAAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmTEAAAAAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAAAA5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAADmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAA5mZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAADmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAGZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAJmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZAAAAAA
+        OZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmT
+        AAAAAZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmRAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZkwAAAZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZkwAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZMAAJmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZEAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTADmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkwCZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkRmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZOZmZOZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmP+JmZmZmZmZj///////
+        ///4OZmZj/eZmZmZmZmZmPg5OZmZmZuI//iIuZmZmZmZmZmZmZM5mZmZmZmZmZmZmb//+JmZmZmZmP//
+        //////////OZmP//uZmZmZmZmY//+ZmZOZf///////h5k5mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZ
+        mZ/////////////4mZ///4mZmZmZmZP///uZmZmP////////+JmZmZmZmZmZkzmZmZmZmZmZmZmZj//4
+        mZmZmZmf////////////+Jmf//+JmZmZmZmb///4mZmY//////////+JmZmZmZmZmZM5mZmZmZmZmZmZ
+        mY//+JmZmZmZn/////////////mZmP//iZmZmZmZk///+5mZj/////iP////+JmZmZmZmZmTOZmZmZmZ
+        mZmZmZmP//iZmZmZmZ////iIiIiIiIiZOZj//4mZmZmZmZP///uZmf////eZmT////+ZmZmZmZmZkzmZ
+        mZmZmZmZmZmZj//4mZmZmZmf//+JmZmZmZmZk5mY//+JmZmZmZmT///7mZj///+ZmZmZj///uZmZmZmZ
+        mZM5mZmZmZmZmZmZmY//+JmZmZmZn///iZmZmZmZmZmZmP//iZmZN5k5k///+5mY///zk5mZOT///4mZ
+        mZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZmZ///4mZmZmZmZmZmZj//4mZmP/5k5P///uZmP//+ZmZmZmY
+        //+JmZmZmZmZkzmZmZmZmZmZmZmZj//4mZmZmZmf///4iIiIiIg5mZmY//+JOb//+JmT///7mZj//4mZ
+        mZmZmP//+ZmZmZmZmZM5mZmZmZmZmZmZmY//+JmZmZmZn///////////85mZmP//iZn///+Jk///+5mf
+        //+JmZmZmZj///mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZmZ////////////+ZmZj//4mY////85v/
+        //uZmP//iZmZmZmY///5mZmZmZmZkzmZmZmZmZmZmZmZj//4mZmZmZmf////////////mZmY//+Jv///
+        //+Z///7mZj//4mZmZmZmP//+ZmZmZmZmZM5mZmZmZmZmZmZmY//+JmZmZmZn///////////+JmZmP//
+        if//////if//+5mY//+JmZmZmZj///mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZmZ///////////4mZ
+        mZj//4j///////j///uZmP//iZmZmZmY///5mZmZmZmZkzmZmZmZmZmZmZmZj//4mZmZmZmf//+JMzMz
+        MzOZOZmY//////+D///////7mZj//4mZmZmZmP//+ZmZmZmZmZM5mZmZmZmZmZmZmY//+JmZmZmZn///
+        iZmZmZmZmZmZmP//////mY//////+5mY//+JmZmZmZj///mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZ
+        mZ///4mZmZmZmZmZmZj/////+5mf//////uZmP//iZmZmZmY///5mZmZmZmZkzmZmZmZmZmZMzM5j//4
+        kzMzmZmf//+JMzMzMzM5mZmY/////4mTk//////7mZj//4mZmZmZmP//+ZmZmZmZmZM5mZmZmZmZmP//
+        /////////4mZn////////////4mZmP////+ZmZmP////+5mY//+JmZmZmZj///mZmZmZmZmTOZmZmZmZ
+        mY/////////////4mZ/////////////7mZj////7mZmZn/////uZmP//iZmZmZmY///5mZmZmZmZkzmZ
+        mZmZmZn//////////////5mf////////////+Jmf////iZmZk5P////4mZ///4mZmZmZmP//+ZmZmZmZ
+        mZM5mZmZmZmZj/////////////iZn/////////////iZmP///5mZmZmZj///+5mY//+JmZmZmZj//4mZ
+        mZmZmZmTOZmZmZmZmZ/////////////zmZP///////////+JmZP///uTmZmZmZj//4mZm///mZmZmZmZ
+        //85mZmZmZmZkzmZmZmZmZOZiIiIiIiIiIiImTmZOIiIiIiIiIiImTmZOIi5mZmZmZOZiIuZmZk4iZOZ
+        mZmZOZiDmZmZmZmZmZM5mZmZmZmZOZmZmZmZmZmZmZOZmZmZmZmZmZmZmZOZmZmZmZmZmZmZOZmZmZmZ
+        mZk5mZmZmZOZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmTuIiIiIs5mZmZmZmZ
+        mTu4i7mZmZmZmZmZmTMzmZOZmZkzOZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmTmbj///////+HmT
+        mZmZk4j/////iJmZmZk4iP////iZOZmZj/mZOZOIiIiIiIiIiDmZmZmZmZmZkzmZmZmZmZmZj///////
+        ///4mZk5k4///4iI///4OZOY////////iZOZmb/5mZmP///////////4mZmZmZmZmZM5mZmZmZmZn///
+        //////////mZmY///5mZmZP///iZmP////////+ZOZk/iZmY/////////////4mZmZmZmZmTOZmZmZmZ
+        mZ/////////////5mZ////+JmZmY////iZl/////////+ZmZP4mZP//////////////7mZmZmZmZkzmZ
+        mZmZmZmb////////////uZP/j///+HM3j/////+ZmYj///////iZmT+JmY//////////////+JmZmZmZ
+        mZM5mZmZmZmZmY//////////+JmT+Jv///////////iPmTmZOI/4mP//uTk/iZmP//////////////iZ
+        mZmZmZmTOZmZmZmZmZmf//////////mZmZmZ///////////5mZmZmZmTOZk///mZP4mZj///////////
+        ///4mZmZmZmZkzmZmZmZmZmTmP////////+JOZmZOY//////////iZmZmZmZmZk5mf/4mT+JmY//////
+        ////////+JmZmZmZmZM5mZmZmZmZmZn/////////mZmZmZk//////////zmZmZmZmZmZmTmP/zm/iZmP
+        //////////////iZmZmZmZmTOZmZmZmZmZk5v///////85OZmZkzmP////////iZmZmZmZmZmZmZn//4
+        /4mZj/////hzN4/////4mZmZmZmZkzmZmZmZmZmZmZj//////4mZmTmY/4j////////4mZmZmZmZmZmZ
+        mZj///+JmY////+JmZmY////+JmZmZmZmZM5mZmZmZmZmZmZ//////+ZmZmZj////////////4mZmZmZ
+        mZmZmZmb////+ZmP///4mZu5mY////iZmZmZmZmTOZmZmZmZmZmZOb/////4k5mZmP/////////////7
+        mZmZmZmZmZmZk/////OZv///+ZmP+Jmf///4mZmZmZmZkzmZmZmZmZmZmZmf////+ZmZmZj////////4
+        eI//+JmZmZmZmZmZmZP////4mb///4mY//+JmP//+5mZmZmZmZM5mZmZmZmZmZk5v/////uTmZmb////
+        ///4mZmX//iZmZmZmZmZmZmZ////+Jmf//95n///+Zj///OZmZmZmZmTOZmZmZmZmZmZmf//////mZmZ
+        mY//////+ZOZmZiJmZmZmZmZmZmZmY////+ZmP//+I////iP//+JmZmZmZmZkzmZmZmZmZmZmZj/////
+        /4mZmZmf/////5k5mZOZmTmZmZmZmZmZmZmP///4mZP/////////////OZmZmZmZmZM5mZmZmZmZmZk/
+        ///////zmZmZm/////iZmZmZmZmZmZmZmZmZmZmZj///85mZj///////////+JmZmZmZmZmTOZmZmZmZ
+        mZmZv///////+5mZmZmP///5mZmZmZmZmZmZmZmZmZmZmZ///3mZmZj//////////4mZmZmZmZmZkzmZ
+        mZmZmZmZmb///4j///uZmZmZmP//mTmZmZmZmZmZmZmZmZmZmZmY/4OZmZmZeP///////4eZmZmZmZmZ
+        mZM5mZmZmZmZmZmY/4OZOP+JmZmZmZmIiZOZmZmZmZmZmZmZmZmZmZmZmYiZmZmZmZk4iIiIiIOZmZmZ
+        mZmZmZmTOZmZmZmZmZmZmTOZmZkzmZmZmZmZmZk5mZmZmZmZmZmZmZmZmZmZmZmZk5mZmZmZmZmZmZmZ
+        mZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmTGZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZkwmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZADmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZkwA5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZMACZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmQAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAABmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTAAADmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAJmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmRAAAAA5mZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAACZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmQAAAAAAGZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAOZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkwAAAAAA
+        AAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTAA
+        AAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZMAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZkwAAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmTAAAAAAAAAAAAAAGZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZEAAAAAAAAAAAAAAAA5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAAAAAAAATmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZMQAAAAAAAAAAAAAAAAAAABOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZMQAAAAAAAAAAAAAAAAAAAAAAAzmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTMAAAAAAAAAAAAAAAAAAAAAAAAAAAEzMzMzMzMzMzMzMzMzMz
+        MzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMxAAAAAAAAAAAAAAD////////////////////////4AAAA
+        AAAAAAAAAB//////wAAAAAAAAAAAAAAD/////wAAAAAAAAAAAAAAAP////wAAAAAAAAAAAAAAAA////w
+        AAAAAAAAAAAAAAAAD///4AAAAAAAAAAAAAAAAAf//8AAAAAAAAAAAAAAAAAD//+AAAAAAAAAAAAAAAAA
+        Af//AAAAAAAAAAAAAAAAAAD//gAAAAAAAAAAAAAAAAAAf/wAAAAAAAAAAAAAAAAAAD/4AAAAAAAAAAAA
+        AAAAAAAf+AAAAAAAAAAAAAAAAAAAH/AAAAAAAAAAAAAAAAAAAA/wAAAAAAAAAAAAAAAAAAAP4AAAAAAA
+        AAAAAAAAAAAAB+AAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAADwAAAAAAAAAAAAAAAAAAAA8AA
+        AAAAAAAAAAAAAAAAAAOAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
+        AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
+        AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
+        AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA
+        AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
+        AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
+        AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
+        AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA
+        AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
+        AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
+        AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
+        AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA
+        AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
+        AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
+        AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
+        AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA
+        AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
+        AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
+        AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
+        AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA
+        AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
+        AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
+        AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
+        AAAAAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAPAAAAAAAAAAAAAAAAAAAAD4AAAAAAAAAAAAAAAAAAAA+AA
+        AAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAH8AAAAAAAAAAAAAAAAAAAD/AAAAAAAAAAAAAAAAAA
+        AA/4AAAAAAAAAAAAAAAAAAAf/AAAAAAAAAAAAAAAAAAAH/wAAAAAAAAAAAAAAAAAAD/+AAAAAAAAAAAA
+        AAAAAAB//wAAAAAAAAAAAAAAAAAA//+AAAAAAAAAAAAAAAAAAf//wAAAAAAAAAAAAAAAAAP//+AAAAAA
+        AAAAAAAAAAAH///4AAAAAAAAAAAAAAAAD////AAAAAAAAAAAAAAAAD////8AAAAAAAAAAAAAAAD/////
+        wAAAAAAAAAAAAAAD//////wAAAAAAAAAAAAAH////////////////////////w==
+</value>
+  </data>
+</root>