界面修改 功能修改

.gitignore

@@ -10,3 +10,4 @@ bin
 *.rar
 *.zip
 /Update/Update/*.user
+*.user

29WxOrder.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.36128.20
+# Visual Studio Version 17
+VisualStudioVersion = 17.14.36221.1 d17.14
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "29WxOrderAllBase", "AllBase\29WxOrderAllBase.csproj", "{6461D807-B1C8-45F0-B388-E0CA1A418DE0}"
 EndProject

29WxOrder/29WxOrder.csproj

@@ -22,7 +22,7 @@
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>

29WxOrder/FactoryExportForms/FactoryExportForm.cs

@@ -17,6 +17,7 @@ using System.Windows.Forms;
 using Work;
 using Work.Api;
 using Work.BaseForms;
+using AllBase.Helper;
 
 namespace _29WxOrder.FactoryExportForms
 {
@@ -214,7 +215,7 @@ namespace _29WxOrder.FactoryExportForms
         public void UpdateOrderStatusAndEncrypt(string orderId)
         {
             DouYinOrderModel douYinOrderModel = this.lstDouYinOrder.Find(x => x.order_id == orderId);
-            DouShopLoginInfo shop = CollectionClass.DouShopLoginList.Find(x => x.ShopId == douYinOrderModel.shop_id.ToString());
+            ShopLoginInfo shop = GlobalConfig.ShopLoginList.Find(x => x.ShopId == douYinOrderModel.shop_id.ToString());
             if (douYinOrderModel != null && shop != null)
             {
                 DouyinApi dyapi = new DouyinApi(shop);

29WxOrder/MainForm.cs

@@ -683,7 +683,7 @@ namespace _29WxOrder
                                 dic.Add("company", expressbase.name); // 物流公司名称
                                 dic.Add("company_code", expressbase.code); // 物流公司code
                                 dic.Add("logistics_code", trackingNumber); // 快递单号
-                                DouShopLoginInfo shop = CollectionClass.DouShopLoginList.FirstOrDefault(v => v.ShopId == item.shop_id.ToString());
+                                ShopLoginInfo shop = GlobalConfig.ShopLoginList.FirstOrDefault(v => v.ShopId == item.shop_id.ToString());
                                 DouyinApi apix = new DouyinApi(shop);
                                 apix.JsonData = dic;
                                 html = apix.OrderLogisticsAdd();
@@ -834,7 +834,7 @@ namespace _29WxOrder
                 dic.Add("company", expname);//物流公司名称
                 dic.Add("company_code", expressbase.code);//物流公司code
                 dic.Add("logistics_code", expno);//快递单号
-                DouShopLoginInfo shop = CollectionClass.DouShopLoginList.FirstOrDefault(v => v.ShopId == ordermodel.shop_id.ToString());
+                ShopLoginInfo shop = GlobalConfig.ShopLoginList.FirstOrDefault(v => v.ShopId == ordermodel.shop_id.ToString());
                 DouyinApi apix = new DouyinApi(shop);
                 apix.JsonData = dic;
                 html = apix.OrderLogisticsAdd();
@@ -1241,7 +1241,7 @@ namespace _29WxOrder
         {
             Task.Run(() =>
             {
-                foreach (DouShopLoginInfo shop in CollectionClass.DouShopLoginList)
+                foreach (ShopLoginInfo shop in GlobalConfig.ShopLoginList)
                 {
                     string url = "https://fxg.jinritemai.com/ffa/morder/order/list";
                     if (shop.LoginStatus == "登录成功")
@@ -1334,7 +1334,7 @@ namespace _29WxOrder
         /// </summary>
         /// <param name="shop"></param>
         /// <param name="order"></param>
-        public void GetRealAddressSim(DouShopLoginInfo shop, DouYinOrderModel order)
+        public void GetRealAddressSim(ShopLoginInfo shop, DouYinOrderModel order)
         {
             addressOrderIdList.Remove(order.order_id);
             var url = "https://fxg.jinritemai.com/ffa/morder/order/detail?id=" + order.order_id;
@@ -1625,7 +1625,7 @@ namespace _29WxOrder
                         var response_data = responseData;
                         var cookie = CEFBrowser.GetCookie("", cefWebBrowser.GetCookieManager());
                         var passport_csrf_token = BaseRegex.GetMatchRegexString(ref cookie, "passport_csrf_token=([\\s\\S]+?);");
-                        var shop = CollectionClass.DouShopLoginList.FirstOrDefault(s => s.Cookies.Contains(passport_csrf_token));
+                        var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.Cookies.Contains(passport_csrf_token));
                         if (shop != null && response_data.Contains("\"st\":0") && response_data.Contains("\"data\":"))
                         {
                             JObject jObj = JObject.Parse(response_data);
@@ -1816,7 +1816,7 @@ namespace _29WxOrder
                         foreach (DouYinOrderModel getOrderShop in onelist)
                         {
                             if (BaseClass.is_read_commission == 1) { break; }
-                            DouShopLoginInfo shop = CollectionClass.DouShopLoginList.Find(x => x.ShopId == getOrderShop.shop_id.ToString());
+                            ShopLoginInfo shop = GlobalConfig.ShopLoginList.Find(x => x.ShopId == getOrderShop.shop_id.ToString());
                             if (shop != null && !string.IsNullOrEmpty(shop.Cookies))
                             {
                                 var td = CEFBrowser.DeleteCookieAsync(cefJuLiangWebBrowser.RequestContext.GetCookieManager(null));
@@ -2147,7 +2147,7 @@ namespace _29WxOrder
                 {
                     try
                     {
-                        foreach (DouShopLoginInfo shop in Work.CollectionClass.DouShopLoginList)
+                        foreach (ShopLoginInfo shop in GlobalConfig.ShopLoginList)
                         {
                             if (!shopIds.Contains(shop.ShopId))
                             {
@@ -2413,15 +2413,15 @@ namespace _29WxOrder
 
         #region 店铺
         bool readshop = false;
-        public List<DouShopLoginInfo> GetServerDouShop()
+        public List<ShopLoginInfo> GetServerDouShop()
         {
-            List<DouShopLoginInfo> list = new List<DouShopLoginInfo>();
+            List<ShopLoginInfo> list = new List<ShopLoginInfo>();
             if (readshop == false)
             {
                 this.Invoke(new Action(() =>
                 {
                     dgvShop.Rows.Clear();
-                    Work.CollectionClass.DouShopLoginList.Clear();
+                    GlobalConfig.ShopLoginList.Clear();
                     lbsqcount.Text = "0";
                     lbwsqcount.Text = "0";
                     splitMain.Panel1.Enabled = false;
@@ -2451,7 +2451,7 @@ namespace _29WxOrder
                     foreach (JObject jObj in jArr)
                     {
                         string shopStr = jObj.ToString();
-                        DouShopLoginInfo shop = new DouShopLoginInfo();
+                        ShopLoginInfo shop = new ShopLoginInfo();
                         shop.DbId = BaseRegex.GetStringJson(ref shopStr, "id");
                         if (shop.DbId == null)
                             continue;
@@ -2499,7 +2499,7 @@ namespace _29WxOrder
                     }
                 }
 
-                foreach (DouShopLoginInfo shop in list)
+                foreach (ShopLoginInfo shop in list)
                 {
                 }
 
@@ -2581,7 +2581,7 @@ namespace _29WxOrder
                     }
                     #endregion
                 }
-                CollectionClass.DouShopLoginList = list;
+                GlobalConfig.ShopLoginList = list;
                 CheckShopLogin(list);
                 readshop = false;
 
@@ -2593,7 +2593,7 @@ namespace _29WxOrder
             return list;
         }
 
-        public void ShowShopStatus(DouShopLoginInfo shop)
+        public void ShowShopStatus(ShopLoginInfo shop)
         {
             var row = this.dgvShop.Rows.Cast<DataGridViewRow>().FirstOrDefault(r => r.Cells["colShopId"].Value?.ToString() == shop.ShopId);
             if (row == null)
@@ -2627,16 +2627,16 @@ namespace _29WxOrder
         }
 
         //查询授权
-        public void CheckShopLogin(List<DouShopLoginInfo> shoplists, bool isShowProgress = true)
+        public void CheckShopLogin(List<ShopLoginInfo> shoplists, bool isShowProgress = true)
         {
             for (int i = 0; i < shoplists.Count; i++)
             {
-                DouShopLoginInfo doushop = shoplists[i];
+                ShopLoginInfo doushop = shoplists[i];
                 var url = BaseClass.Build29WxObjString("authorization&act=order_author");
                 var data = UserLogin.GetSignaturex() + "&timestamp=" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "&shop_id=" + doushop.ShopId;
                 var result = GetHtml.PostUtf8(url, data);
 
-                var shop = Work.CollectionClass.DouShopLoginList.FirstOrDefault(v => v.ShopName == doushop.ShopName);
+                var shop = GlobalConfig.ShopLoginList.FirstOrDefault(v => v.ShopName == doushop.ShopName);
                 if (shop != null)
                 {
                     var loginResult = GetShopStatus(shop);
@@ -2730,7 +2730,7 @@ namespace _29WxOrder
                 }));
             }
         }
-        private string GetShopStatus(DouShopLoginInfo shop)
+        private string GetShopStatus(ShopLoginInfo shop)
         {
             var timeStamp = AllBase.BaseClass.ConvertDateTimeInt(DateTime.Now);
             var _lid = timeStamp.ToString().Substring(5) + Randomx.GetId(10) + Randomx.GetId(10) + Randomx.GetId(10) + Randomx.GetId(10);
@@ -3055,7 +3055,7 @@ namespace _29WxOrder
         /// <param name="shopid">店铺ID</param>
         public void chaqi(string orderid, int color, string shopid)
         {
-            DouShopLoginInfo shop = CollectionClass.DouShopLoginList.Find(x => x.ShopId == shopid);
+            ShopLoginInfo shop = GlobalConfig.ShopLoginList.Find(x => x.ShopId == shopid);
             if (shop != null)
             {
                 DouyinApi apix = new DouyinApi(shop);
@@ -3238,7 +3238,7 @@ namespace _29WxOrder
             if (text == "店铺账号")
             {
                 string shopname = dgvShop.Rows[e.RowIndex].Cells[e.ColumnIndex].Value.ToString();
-                DouShopLoginInfo shop = CollectionClass.DouShopLoginList.Find(x => x.UserName == shopname);
+                ShopLoginInfo shop = GlobalConfig.ShopLoginList.Find(x => x.UserName == shopname);
                 ShopBrower shopBrower = new ShopBrower();
                 shopBrower.TitleText = "店铺后台";
                 shopBrower.shop = shop;
@@ -3721,7 +3721,7 @@ namespace _29WxOrder
         {
             //3513538240521087498
 
-            var shop = Work.CollectionClass.DouShopLoginList.FirstOrDefault(s => s.ShopId == "20445141");
+            var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == "20445141");
             if (shop == null)
                 return;
             //\"shop_order_list\":[]
@@ -3821,7 +3821,7 @@ namespace _29WxOrder
 
         private void btn电子面单测试_Click(object sender, EventArgs e)
         {
-            foreach (DouShopLoginInfo shop in Work.CollectionClass.DouShopLoginList)
+            foreach (ShopLoginInfo shop in GlobalConfig.ShopLoginList)
             {
                 if (shop.ShopName == "开箱小店")
                 {

29WxOrder/OrderForms/AfterSaleOrderListForm.cs

@@ -1,8 +1,9 @@
-using AllBase;
-using AllBase.DouYinModel.Result;
-using AllBase.Model.Result;
-using _29WxOrder.BuyForms;
+using _29WxOrder.BuyForms;
 using _29WxOrder.ShopForms;
+using AllBase;
+using AllBase.DouYinModel.Result;
+using AllBase.Helper;
+using AllBase.Model.Result;
 using NaiBa.Util;
 using NaiBa.Util.Helper;
 using Newtonsoft.Json;
@@ -108,7 +109,7 @@ namespace _29WxOrder.OrderForms
             LstFinishedOrderId.Clear();
 
             isread = true;
-            foreach (var shop in CollectionClass.DouShopLoginList)
+            foreach (var shop in GlobalConfig.ShopLoginList)
             {
                 Invoke(new Action(() => { this.mainform.lblMsg.Text = "正在读取售后：" + shop.ShopName; }));
                 int size = 10;
@@ -604,7 +605,7 @@ namespace _29WxOrder.OrderForms
                 string name = DgvSaleOrderList.Columns[e.ColumnIndex].HeaderText;
                 if (name == "售后订单编号")
                 {
-                    DouShopLoginInfo shop = CollectionClass.DouShopLoginList.Find(x => x.ShopId == shopid);
+                    ShopLoginInfo shop = GlobalConfig.ShopLoginList.Find(x => x.ShopId == shopid);
                     ShopBrower shopBrower = new ShopBrower();
                     shopBrower.TitleText = "店铺后台-售后";
                     shopBrower.shop = shop;
@@ -614,7 +615,7 @@ namespace _29WxOrder.OrderForms
                 }
                 else if (name == "订单号")
                 {
-                    DouShopLoginInfo shop = CollectionClass.DouShopLoginList.Find(x => x.ShopId == shopid);
+                    ShopLoginInfo shop = GlobalConfig.ShopLoginList.Find(x => x.ShopId == shopid);
                     if (shop != null)
                     {
                         ShopForms.ShopBrower shopBrower = new ShopForms.ShopBrower();
@@ -752,7 +753,7 @@ namespace _29WxOrder.OrderForms
         {
             IEnumerable<DataGridViewRow> enumerableList = this.DgvSaleOrderList.Rows.Cast<DataGridViewRow>();
             List<DataGridViewRow> list = (from item in enumerableList where item.Cells["col_order_id"].Value.ToString() == orderid select item).ToList();
-            DouShopLoginInfo shop = CollectionClass.DouShopLoginList.Find(x => x.ShopId == DgvSaleOrderList.Rows[mouseEvent.RowIndex].Cells["shopId"].Value.ToString());
+            ShopLoginInfo shop = GlobalConfig.ShopLoginList.Find(x => x.ShopId == DgvSaleOrderList.Rows[mouseEvent.RowIndex].Cells["shopId"].Value.ToString());
             if (shop != null)
             {
                 DouyinApi dyapi = new DouyinApi(shop);
@@ -897,7 +898,7 @@ namespace _29WxOrder.OrderForms
             }
             var shopid = DgvSaleOrderList.Rows[mouseEvent.RowIndex].Cells["shopId"].Value.ToString();
             string aftersale_id = DgvSaleOrderList.Rows[mouseEvent.RowIndex].Cells["col_aftersale_id"].Value.ToString();
-            DouShopLoginInfo shop = CollectionClass.DouShopLoginList.Find(x => x.ShopId == shopid);
+            ShopLoginInfo shop = GlobalConfig.ShopLoginList.Find(x => x.ShopId == shopid);
             ShopBrower shopBrower = new ShopBrower();
             shopBrower.TitleText = "店铺后台-售后";
             shopBrower.shop = shop;

29WxOrder/OrderForms/AfterSaleReturnRefundForm.cs

@@ -1,4 +1,5 @@
 using AllBase;
+using AllBase.Helper;
 using AllBase.Model.Result;
 using DevComponents.DotNetBar;
 using Newtonsoft.Json.Linq;
@@ -81,7 +82,7 @@ namespace _29WxOrder.OrderForms
         {
             if (lstProvince.Count == 0)
             {
-                DouShopLoginInfo shop = CollectionClass.DouShopLoginList.Find(x => x.ShopId == _shopId);
+                ShopLoginInfo shop = GlobalConfig.ShopLoginList.Find(x => x.ShopId == _shopId);
                 DouyinApi api = new DouyinApi(shop);
                 var address = api.GetAddressProvince();
                 //{"code":10000,"data":[{"province":"安徽省","province_id":34},{"province":"澳门特别行政区","province_id":82},{"province":"北京市","province_id":11},{"province":"重庆市","province_id":50},{"province":"福建省","province_id":35},{"province":"广东省","province_id":44},{"province":"甘肃省","province_id":62},{"province":"广西壮族自治区","province_id":45},{"province":"贵州省","province_id":52},{"province":"河北省","province_id":13},{"province":"湖北省","province_id":42},{"province":"黑龙江省","province_id":23},{"province":"河南省","province_id":41},{"province":"湖南省","province_id":43},{"province":"海南省","province_id":46},{"province":"吉林省","province_id":22},{"province":"江苏省","province_id":32},{"province":"江西省","province_id":36},{"province":"辽宁省","province_id":21},{"province":"内蒙古自治区","province_id":15},{"province":"宁夏回族自治区","province_id":64},{"province":"青海省","province_id":63},{"province":"四川省","province_id":51},{"province":"山东省","province_id":37},{"province":"上海市","province_id":31},{"province":"山西省","province_id":14},{"province":"陕西省","province_id":61},{"province":"天津市","province_id":12},{"province":"台湾省","province_id":71},{"province":"香港特别行政区","province_id":81},{"province":"新疆维吾尔自治区","province_id":65},{"province":"西藏自治区","province_id":54},{"province":"云南省","province_id":53},{"province":"浙江省","province_id":33}],"err_no":0,"log_id":"20220715142943010208016085061166AE","message":"success","msg":"success","sub_code":"","sub_msg":""}
@@ -264,7 +265,7 @@ namespace _29WxOrder.OrderForms
             var prov = lstArea.FirstOrDefault(a => a.code.ToString() == item.Name);
             if (prov == null)
             {
-                DouShopLoginInfo shop = CollectionClass.DouShopLoginList.Find(x => x.ShopId == _shopId);
+                ShopLoginInfo shop = GlobalConfig.ShopLoginList.Find(x => x.ShopId == _shopId);
                 DouyinApi api = new DouyinApi(shop);
                 var area = api.GetAreasByProvince(item.Name.ToString());
                 if (area.Contains("\"message\":\"success\"") || area.Contains("\"code\":10000"))
@@ -345,7 +346,7 @@ namespace _29WxOrder.OrderForms
 
         private void btnAcceptReturnRefund_Click(object sender, EventArgs e)
         {
-            DouShopLoginInfo shop = CollectionClass.DouShopLoginList.Find(x => x.ShopId == _shopId);
+            ShopLoginInfo shop = GlobalConfig.ShopLoginList.Find(x => x.ShopId == _shopId);
 
             var type = "101";
 

29WxOrder/OrderForms/BuyOrderForms.cs

@@ -43,7 +43,7 @@ namespace _29WxOrder.OrderForms
         public delegate void delegateClick(object sender, EventArgs e);
         public string order_id;
         public DouYinOrderModel orderDetail;
-        public AllBase.Model.Result.DouShopLoginInfo shop;
+        public AllBase.Model.Result.ShopLoginInfo shop;
         public string webUrl = "https://yangkeduo.com/goods.html?goods_id=";
         public static string PddUid = "";
         public string detailHtml = "";//商品详情
@@ -254,7 +254,7 @@ namespace _29WxOrder.OrderForms
 
 
             #region 更新订单
-            shop = CollectionClass.DouShopLoginList.Find(x => x.ShopId == orderDetail.shop_id.ToString());
+            shop = GlobalConfig.ShopLoginList.Find(x => x.ShopId == orderDetail.shop_id.ToString());
             this.buyOrderListForm.UpdateOrderStatusAndEncrypt(orderDetail);
             #endregion
 

29WxOrder/OrderForms/BuyOrderListForm.cs

@@ -1,5 +1,6 @@
 using AllBase;
 using AllBase.DouYinModel.Result;
+using AllBase.Helper;
 using AllBase.Model.Result;
 using NaiBa.Util.Extension;
 using Newtonsoft.Json;
@@ -77,7 +78,7 @@ namespace _29WxOrder.OrderForms
                 for (int i = 0; i < CollectionClass.orderDataList.Count; i++)
                 {
                     DouYinOrderModel dymodel = CollectionClass.orderDataList[i];
-                    DouShopLoginInfo shop = CollectionClass.DouShopLoginList.Find(x => x.ShopId == dymodel.shop_id.ToString());
+                    ShopLoginInfo shop = GlobalConfig.ShopLoginList.Find(x => x.ShopId == dymodel.shop_id.ToString());
                     if (BaseClass.isUseSimGetRealAddress && (dymodel.name.Contains("解密失败") || dymodel.mobile.Contains("#1##") || dymodel.mobile == "******"))
                     {
                         isdecryption = false;
@@ -1002,7 +1003,7 @@ namespace _29WxOrder.OrderForms
         /// </summary>
         public void UpdateOrderStatusAndEncrypt(DouYinOrderModel douYinOrderModel, UpdateOrderType updateOrderType = UpdateOrderType.UpdateAll)
         {
-            DouShopLoginInfo shop = CollectionClass.DouShopLoginList.Find(x => x.ShopId == douYinOrderModel.shop_id.ToString());
+            ShopLoginInfo shop = GlobalConfig.ShopLoginList.Find(x => x.ShopId == douYinOrderModel.shop_id.ToString());
             if (douYinOrderModel != null)
             {
                 if (shop != null)
@@ -1341,7 +1342,7 @@ namespace _29WxOrder.OrderForms
                 string districtId = "";
                 BuyOrderForms.MatchAddress(ref address, ref province, ref provinceId, ref city, ref cityId, ref district, ref districtId);
 
-                var shop = CollectionClass.DouShopLoginList.Find(x => x.ShopId == shopid);
+                var shop = GlobalConfig.ShopLoginList.Find(x => x.ShopId == shopid);
                 string data = @"{""order_id"":""" + orderid +
                     @""",""shop_name"":""" + GetHtml.UrlEncodeUtf8(shop.ShopName) +
                     @""",""up_goods_id"":""" + upproductid.Replace("pdd-", "").Replace("pd-", "") +
@@ -1403,7 +1404,7 @@ namespace _29WxOrder.OrderForms
             }
             else if (name == "订单号")
             {
-                DouShopLoginInfo shop = CollectionClass.DouShopLoginList.Find(x => x.ShopId == shopid);
+                ShopLoginInfo shop = GlobalConfig.ShopLoginList.Find(x => x.ShopId == shopid);
                 if (shop != null)
                 {
                     ShopForms.ShopBrower shopBrower = new ShopForms.ShopBrower();
@@ -1418,7 +1419,7 @@ namespace _29WxOrder.OrderForms
         string GetOrderStatusl(string orderid)
         {
             DouYinOrderModel douYinOrderModel = CollectionClass.orderDataList.Find(x => x.order_id == orderid);
-            DouShopLoginInfo shop = CollectionClass.DouShopLoginList.Find(x => x.ShopId == douYinOrderModel.shop_id.ToString());
+            ShopLoginInfo shop = GlobalConfig.ShopLoginList.Find(x => x.ShopId == douYinOrderModel.shop_id.ToString());
             if (douYinOrderModel != null)
             {
                 if (shop != null)

29WxOrder/OrderForms/OrderEdit.cs

@@ -1,5 +1,6 @@
 using AllBase;
 using AllBase.DouYinModel.Result;
+using AllBase.Helper;
 using AllBase.Model.Result;
 using Newtonsoft.Json.Linq;
 using System;
@@ -190,7 +191,7 @@ namespace _29WxOrder.OrderForms
             sb.Append("&remark=" + tbremark.Text);
             sb.Append("&is_update_order=0"); // 1修改状态0不修改状态
 
-            DouShopLoginInfo shop = Work.CollectionClass.DouShopLoginList.Find(x => x.ShopId == orderDetail.shop_id.ToString());
+            ShopLoginInfo shop = GlobalConfig.ShopLoginList.Find(x => x.ShopId == orderDetail.shop_id.ToString());
             if (shop != null)
             {
                 orderDetail.remark = tbremark.Text.ToString();

29WxOrder/OrderForms/RemarkEditForm.cs

@@ -1,5 +1,6 @@
 using AllBase;
 using AllBase.DouYinModel.Result;
+using AllBase.Helper;
 using AllBase.Model.Result;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -44,7 +45,7 @@ namespace _29WxOrder.OrderForms
                 return;
             }
 
-            DouShopLoginInfo shop = Work.CollectionClass.DouShopLoginList.Find(x => x.ShopId == douYinOrderModel.shop_id.ToString());
+            ShopLoginInfo shop = GlobalConfig.ShopLoginList.Find(x => x.ShopId == douYinOrderModel.shop_id.ToString());
             if (shop != null)
             {
                 douYinOrderModel.remark = tbremark.Text.ToString();

29WxOrder/OrderForms/SendOrderListForms.cs

@@ -1,7 +1,8 @@
-using AllBase;
+using _29WxOrder.BuyForms;
+using AllBase;
 using AllBase.DouYinModel.Result;
+using AllBase.Helper;
 using AllBase.Model.Result;
-using _29WxOrder.BuyForms;
 using NaiBa.Util.Extension;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -464,7 +465,7 @@ namespace _29WxOrder.OrderForms
 
                     #region 更新订单
                     DouYinOrderModel douYinOrderModel = CollectionClass.orderSenderDataList.Find(x => x.order_id == orderid);
-                    DouShopLoginInfo shop = CollectionClass.DouShopLoginList.Find(x => x.ShopId == douYinOrderModel.shop_id.ToString());
+                    ShopLoginInfo shop = GlobalConfig.ShopLoginList.Find(x => x.ShopId == douYinOrderModel.shop_id.ToString());
                     if (douYinOrderModel != null)
                     {
                         if (shop != null)
@@ -808,7 +809,7 @@ namespace _29WxOrder.OrderForms
             {
                 string orderid = DgvSendOrderList.Rows[e.RowIndex].Cells["col_order_id"].Value.ToString();
                 string shopid = DgvSendOrderList.Rows[e.RowIndex].Cells["col_shop_id"].Value.ToString();
-                DouShopLoginInfo shop = CollectionClass.DouShopLoginList.Find(x => x.ShopId == shopid);
+                ShopLoginInfo shop = GlobalConfig.ShopLoginList.Find(x => x.ShopId == shopid);
                 if (shop != null)
                 {
                     ShopForms.ShopBrower shopBrower = new ShopForms.ShopBrower();

29WxOrder/OrderForms/SuccessOrderListForm.cs

@@ -67,7 +67,7 @@ namespace _29WxOrder.OrderForms
             }
 
             List<DouYinOrderModel> orderList = new List<DouYinOrderModel>();
-            List<DouShopLoginInfo> shopList = new List<DouShopLoginInfo>();
+            List<ShopLoginInfo> shopList = new List<ShopLoginInfo>();
 
             string urlx = BaseClass.LoginApiUrl + "?obj=douyin/order&act=get";
             string datax = "&order_status_buy=0,4&page=" + page + "&pageSize=100";
@@ -92,7 +92,7 @@ namespace _29WxOrder.OrderForms
                 CollectionClass.successOrderDataList.Add(douYinOrderModel);
                 orderList.Add(douYinOrderModel);
 
-                DouShopLoginInfo shop = CollectionClass.DouShopLoginList.Find(x => x.ShopId == douYinOrderModel.shop_id.ToString());
+                ShopLoginInfo shop = GlobalConfig.ShopLoginList.Find(x => x.ShopId == douYinOrderModel.shop_id.ToString());
                 if (shop != null && douYinOrderModel.order_status != 4) // 订单状态不为4的放入列表，后面按时间段查询更新订单。
                 {
                     if (!shopList.Contains(shop))
@@ -283,7 +283,7 @@ namespace _29WxOrder.OrderForms
                 {
                     try
                     {
-                        foreach (DouShopLoginInfo shop in CollectionClass.DouShopLoginList)
+                        foreach (ShopLoginInfo shop in GlobalConfig.ShopLoginList)
                         {
                             if (!shopIds.Contains(shop.ShopId) || shop.ApiAuthStatus != "授权成功")
                                 continue;
@@ -653,7 +653,7 @@ namespace _29WxOrder.OrderForms
             }
             else if (name == "订单号")
             {
-                DouShopLoginInfo shop = CollectionClass.DouShopLoginList.Find(x => x.ShopId == shopid);
+                ShopLoginInfo shop = GlobalConfig.ShopLoginList.Find(x => x.ShopId == shopid);
                 if (shop != null)
                 {
                     ShopForms.ShopBrower shopBrower = new ShopForms.ShopBrower();

29WxOrder/ShopForms/ShopBrower.cs

@@ -31,7 +31,7 @@ namespace _29WxOrder.ShopForms
         public ChromiumWebBrowser cefWebBrowser = null;
         public string webUrl = "";
         public string cookies = "";
-        public DouShopLoginInfo shop;
+        public ShopLoginInfo shop;
         private void ShopBrower_Load(object sender, EventArgs e)
         {
             this.TitleText = this.TitleText = this.Text = "后台";

29WxOrderWpf/29WxOrderWpf.csproj

@@ -7,7 +7,7 @@
     <ProjectGuid>{D7884375-E42F-4B89-AA3A-D8E75508D8C7}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <RootNamespace>_29WxOrderWpf</RootNamespace>
-    <AssemblyName>29WxOrderWpf</AssemblyName>
+    <AssemblyName>29WxFindOrder</AssemblyName>
     <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -35,7 +35,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath>..\..\KJD Cef138\Bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -44,7 +44,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\..\KJD Cef138\Bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -118,10 +118,26 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Styles\BaseButtonStyle.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles\BaseComboBoxStyle.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles\BaseTextBoxStyle.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Styles\BaseWindowStyle.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Styles\StaticColorBrushDictionary.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Styles\StaticImageBrushDictionary.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -212,5 +228,14 @@
     <Resource Include="Resources\BaseMsgInfo.png" />
     <Resource Include="Resources\BaseMsgQue.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\order_weishop_icon.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\main_29weixin_icon.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\close_gray.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

29WxOrderWpf/29WxOrderWpf.csproj.user

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PublishUrlHistory>publish\</PublishUrlHistory>
@@ -9,5 +9,6 @@
     <ErrorReportUrlHistory />
     <FallbackCulture>zh-CN</FallbackCulture>
     <VerifyUploadedFiles>false</VerifyUploadedFiles>
+    <ProjectView>ShowAllFiles</ProjectView>
   </PropertyGroup>
 </Project>

29WxOrderWpf/App.xaml

@@ -6,10 +6,14 @@
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="Styles/StaticImageBrushDictionary.xaml" />
-                <ResourceDictionary Source="Styles/StaticImageDictionary.xaml" />
-                <ResourceDictionary Source="Styles/UcImageButtonStyle.xaml" />
                 <ResourceDictionary Source="Styles/BaseWindowStyle.xaml" />
+                <ResourceDictionary Source="Styles/BaseButtonStyle.xaml" />
+                <ResourceDictionary Source="Styles/BaseTextBoxStyle.xaml" />
+                <ResourceDictionary Source="Styles/BaseComboBoxStyle.xaml" /> 
+                <ResourceDictionary Source="Styles/UcImageButtonStyle.xaml" />
+                <ResourceDictionary Source="Styles/StaticImageDictionary.xaml" />
+                <ResourceDictionary Source="Styles/StaticColorBrushDictionary.xaml" />
+                <ResourceDictionary Source="Styles/StaticImageBrushDictionary.xaml" />
                 <!-- 可以添加更多资源字典 -->
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>

29WxOrderWpf/App.xaml.cs

@@ -5,6 +5,7 @@ using System.Data;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
+using System.Windows.Media.Imaging;
 
 namespace _29WxOrderWpf
 {
@@ -13,5 +14,24 @@ namespace _29WxOrderWpf
     /// </summary>
     public partial class App : Application
     {
+        public static string[] args = new List<string>().ToArray();
+        protected override void OnStartup(StartupEventArgs e)
+        {
+            base.OnStartup(e);
+            if (e.Args.Length > 0)
+            {
+                args = e.Args;
+            }
+
+            #region 后台修改logo
+            //// 替换字典程序logo等
+            //Uri imageUri = new Uri("pack://application:,,,/Resources/WindowBoxes/close.hover.png"); // 新的图片路径
+            //BitmapImage newBitmapImage = new BitmapImage(imageUri);
+            //// 获取资源字典
+            //ResourceDictionary dict = Application.Current.Resources;
+            //// 添加或更新资源
+            //dict["main29WeixinIcon"] = newBitmapImage;
+            #endregion
+        }
     }
 }

29WxOrderWpf/BaseWindows/BaseMsgWindow.xaml

@@ -16,18 +16,18 @@
         <Border Margin="2,0,2,2" Grid.Row="1" Background="White">
             <Grid>
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="120"></ColumnDefinition>
+                    <ColumnDefinition Width="100"></ColumnDefinition>
                     <ColumnDefinition Width="*"></ColumnDefinition>
                 </Grid.ColumnDefinitions>
-                <Image x:Name="imgTip" Source="{StaticResource imgBaseMsgInfo}" Stretch="Uniform" Width="64" Height="64" VerticalAlignment="Top" Margin="0,30" />
+                <Image x:Name="imgTip" Source="{StaticResource imgBaseMsgInfo}" Stretch="Uniform" Width="64" Height="64" VerticalAlignment="Top" Margin="0,25" />
                 <Grid Grid.Column="1">
                     <Grid.RowDefinitions>
                         <RowDefinition Height="*"></RowDefinition>
-                        <RowDefinition Height="80"></RowDefinition>
+                        <RowDefinition Height="70"></RowDefinition>
                     </Grid.RowDefinitions>
-                    <Label x:Name="lblMsg" Content="message" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="0,30,30,30"/>
-                    <Button x:Name="btnCancel" Content="取消" HorizontalAlignment="Right" Margin="0,20,30,0" Grid.Row="1" VerticalAlignment="Top" Width="75" Height="26" Click="btnCancel_Click"/>
-                    <Button x:Name="btnOk" Content="确定" HorizontalAlignment="Right" Margin="0,20,130,0" Grid.Row="1" VerticalAlignment="Top" Width="75" Height="26" Click="btnOk_Click"/>
+                    <TextBlock TextWrapping="Wrap" x:Name="tbkMsg" Text="message" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="0,30,20,0" Padding="0"/>
+                    <Button x:Name="btnCancel" Content="取消" Style="{StaticResource BaseButtonLightStyle}" HorizontalAlignment="Right" Margin="0,20,30,0" Grid.Row="1" VerticalAlignment="Top" Width="75" Height="26" Click="btnCancel_Click"/>
+                    <Button x:Name="btnOk" Content="确定" Style="{StaticResource BaseButtonStyle}" HorizontalAlignment="Right" Margin="0,20,130,0" Grid.Row="1" VerticalAlignment="Top" Width="75" Height="26" Click="btnOk_Click"/>
                 </Grid>
             </Grid>
         </Border>

29WxOrderWpf/BaseWindows/BaseMsgWindow.xaml.cs

@@ -11,6 +11,7 @@ using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
+using Work.BaseForms;
 
 namespace _29WxOrderWpf.BaseWindows
 {
@@ -25,10 +26,10 @@ namespace _29WxOrderWpf.BaseWindows
             this.DataContext = this;
         }
 
-        private static BaseMsgWindow CreateMsgForm(string msg, string caption, MsgWindowLevel fl)
+        private static BaseMsgWindow CreateMsgForm(string msg, string caption, MsgWindowLevel wl)
         {
-            BaseMsgWindow msgBox = new BaseMsgWindow { lblTitle = { Content = caption }, lblMsg = { Content = msg } };
-            if (fl.Equals(MsgWindowLevel.LARGE))
+            BaseMsgWindow msgBox = new BaseMsgWindow { lblTitle = { Content = caption }, tbkMsg = { Text = msg } };
+            if (wl.Equals(MsgWindowLevel.LARGE))
             {
                 msgBox.Width = (int)MsgWindowLevel.LARGE;
                 msgBox.Height = 500;
@@ -38,13 +39,35 @@ namespace _29WxOrderWpf.BaseWindows
             return msgBox;
         }
 
+        public static BaseMsgWindow ShowInfo(Window window, string msg, string caption = "", MsgWindowLevel wl = MsgWindowLevel.MEDIUM)
+        {
+            string title = string.IsNullOrEmpty(caption) ? "系统提示" : caption;
+            BaseMsgWindow msgBox = CreateMsgForm(msg, title, wl);
+            msgBox.imgTip.Source = Application.Current.Resources["imgBaseMsgInfo"] as ImageSource;
+            if (window != null)
+                msgBox.Owner = window;
+            msgBox.ShowDialog();
+            return msgBox;
+        }
+
+        public static BaseMsgWindow ShowError(Window window, string msg, string caption = "", MsgWindowLevel wl = MsgWindowLevel.MEDIUM)
+        {
+            string title = string.IsNullOrEmpty(caption) ? "系统错误" : caption;
+            BaseMsgWindow msgBox = CreateMsgForm(msg, title, wl);
+            msgBox.imgTip.Source = Application.Current.Resources["imgBaseMsgErr"] as ImageSource;
+            if (window != null)
+                msgBox.Owner = window;
+            msgBox.ShowDialog();
+            return msgBox;
+        }
+
         public static BaseMsgWindow ShowConfirm(Window window, string msg, string caption = "", MsgWindowLevel fl = MsgWindowLevel.MEDIUM)
         {
             string title = string.IsNullOrEmpty(caption) ? "确认系统提示" : caption;
             BaseMsgWindow msgBox = new BaseMsgWindow
             {
                 lblTitle = { Content = title },
-                lblMsg = { Content = msg },
+                tbkMsg = { Text = msg },
                 imgTip = { Source = Application.Current.Resources["imgBaseMsgQue"] as ImageSource },
             };
             if (fl.Equals(MsgWindowLevel.LARGE))

29WxOrderWpf/BaseWindows/BaseWindow.cs

@@ -5,6 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Interop;
+using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Shell;
 
@@ -14,7 +15,8 @@ namespace _29WxOrderWpf.BaseWindows
     {
         public BaseWindow()
         {
-            this.Icon = new BitmapImage(new Uri("pack://application:,,,/Resources/29wx.ico"));
+            //this.Icon = new BitmapImage(new Uri("pack://application:,,,/Resources/29wx.ico"));
+            this.Icon = Application.Current.Resources["main29WeixinIcon"] as ImageSource;
             this.WindowStartupLocation = WindowStartupLocation.CenterScreen;
             WindowChrome.SetWindowChrome(this, new WindowChrome() { CaptionHeight = 8, ResizeBorderThickness = new Thickness(4), });
 

29WxOrderWpf/LoginWindows/LoginWindow.xaml

@@ -6,15 +6,61 @@
         xmlns:local="clr-namespace:_29WxOrderWpf.LoginWindows"
         xmlns:userctrls="clr-namespace:_29WxOrderWpf.UserControls" 
         mc:Ignorable="d" Style="{StaticResource BaseNoneBorderWindowStyle}"
-        Title="LoginWindow" Height="300" Width="400" ResizeMode="NoResize" Closing="BaseWindow_Closing">
+        x:Name="loginWindow" Title="登录" Height="300" Width="400" ResizeMode="NoResize" Loaded="loginWindow_Loaded" Closing="BaseWindow_Closing">
     <Grid Background="Transparent">
         <Grid.RowDefinitions>
-            <RowDefinition Height="150"></RowDefinition>
+            <RowDefinition Height="120"></RowDefinition>
             <RowDefinition Height="*"></RowDefinition>
         </Grid.RowDefinitions>
+        <Border Background="{StaticResource mainForegroundLinearColorBrush}"></Border>
         <Grid Grid.Row="1" Margin="2,0,2,2" Background="White">
-
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition></ColumnDefinition>
+                <ColumnDefinition Width="180"></ColumnDefinition>
+                <ColumnDefinition></ColumnDefinition>
+            </Grid.ColumnDefinitions>
+            <Grid Grid.Column="1">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="20"></RowDefinition>
+                    <RowDefinition></RowDefinition>
+                    <RowDefinition></RowDefinition>
+                    <RowDefinition></RowDefinition>
+                    <RowDefinition></RowDefinition>
+                    <RowDefinition Height="20"></RowDefinition>
+                </Grid.RowDefinitions>
+                <Border Grid.Row="1" BorderBrush="{StaticResource mainColorBrush}" BorderThickness="1" CornerRadius="4" Height="26">
+                    <Grid>
+                        <ComboBox x:Name="cmbUserNameMobile" Margin="3,0" VerticalContentAlignment="Center" Style="{StaticResource BaseComboBoxStyle}"
+                                  SelectionChanged="cmbUserNameMobile_SelectionChanged">
+                            <ComboBox.ItemTemplate>
+                                <DataTemplate>
+                                    <!--<Grid HorizontalAlignment="Stretch" Width="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ComboBox}, Path=Width}">
+                                        <TextBlock Text="{Binding}"/>
+                                        <Button x:Name="btnDeleteItem" HorizontalAlignment="Right" Content="X" Click="btnDeleteItem_Click"/>
+                                    </Grid>-->
+                                    <Grid HorizontalAlignment="Stretch" Width="140">
+                                        <TextBlock x:Name="txtName" Text="{Binding}" Padding="0" VerticalAlignment="Center"/>
+                                        <userctrls:UcImageButton Width="17" Height="17" ButtonImage="{StaticResource imgCloseGray}" BorderThickness="0" Cursor="Hand"
+                                            MouseOverButtonImage="{StaticResource imgCloseGray}" MousePressButtonImage="{StaticResource imgCloseGray}" Background="Transparent"
+                                            x:Name="btnDeleteItem" Tag="{Binding ElementName=txtName, Path=Text}" HorizontalAlignment="Right" Click="btnDeleteItem_Click"/>
+                                    </Grid>
+                                </DataTemplate>
+                            </ComboBox.ItemTemplate>
+                        </ComboBox>
+                    </Grid>
+                </Border>
+                <Border Grid.Row="2" BorderBrush="{StaticResource mainColorBrush}" BorderThickness="1" CornerRadius="4" Height="26">
+                    <PasswordBox x:Name="txtPassword" Margin="6,0" VerticalContentAlignment="Center" Style="{StaticResource BasePasswordBoxStyle}"></PasswordBox>
+                </Border>
+                <Button x:Name="btnLogin" Style="{StaticResource BaseButtonStyle}" Grid.Row="4" Content="安 全 登 录" Height="26" Click="btnLogin_Click"></Button>
+                <CheckBox Content="记住密码" x:Name="chkRemember" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" HorizontalAlignment="Left" Grid.Row="3" VerticalAlignment="Center" Checked="chkRemember_Checked"/>
+            </Grid>
         </Grid>
+
+        <Label x:Name="lblAppName" FontSize="28" Margin="0,14,0,0" Foreground="{StaticResource mainColorLightBrush}" HorizontalAlignment="Center"
+               VerticalAlignment="Center" Content="拍单软件"></Label>
+        <Image Source="{StaticResource main29WeixinIcon}" Height="24" Width="24" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="4"></Image>
+        <Label x:Name="lblTitle" Margin="30,2" Foreground="White" Content="{Binding ElementName=loginWindow, Path=Title}"></Label>
         <userctrls:UcWindowBoxes VerticalAlignment="Top" HorizontalAlignment="Right" Margin="4" MaxBoxVisibility="Collapsed" MinBoxVisibility="Collapsed"/>
     </Grid>
 </basewindows:BaseWindow>

29WxOrderWpf/LoginWindows/LoginWindow.xaml.cs

@@ -1,4 +1,10 @@
 using _29WxOrderWpf.BaseWindows;
+using _29WxOrderWpf.UserControls;
+using AllBase;
+using AllBase.DouYinModel.Param.LoginManage;
+using NaiBa.Util;
+using NaiBa.Util.Extension;
+using NaiBa.Util.Helper;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -9,10 +15,12 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Documents;
+using System.Windows.Forms;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
+using Work;
 using Work.BaseForms;
 
 namespace _29WxOrderWpf.LoginWindows
@@ -22,22 +30,168 @@ namespace _29WxOrderWpf.LoginWindows
     /// </summary>
     public partial class LoginWindow : BaseWindow
     {
-        public LoginWindow()
+        public static ConcurrentList<UserParam> UserParamList { get; set; } = new ConcurrentList<UserParam>();
+
+        bool isLogin = false;
+
+        string[] argsuser;
+
+        public LoginWindow(string[] args)
         {
             InitializeComponent();
+
+            if (!string.IsNullOrEmpty(BaseClass.ProgramName))
+            {
+                lblAppName.Content = BaseClass.ProgramName;
+            }
+
+            this.Title = "用户登录";
+            argsuser = args;
         }
 
+        private void loginWindow_Loaded(object sender, RoutedEventArgs e)
+        {
+            GetUserList();
+            foreach (var user in UserParamList)
+            {
+                cmbUserNameMobile.Items.Insert(0, user.UserName);
+            }
+
+            this.Title = "登录";
+            if (BaseClass.Remember)
+            {
+                chkRemember.IsChecked = true;
+                cmbUserNameMobile.Text = BaseClass.UserName;
+                if (!string.IsNullOrEmpty(BaseClass.PassWord))
+                    txtPassword.Password = "******";
+            }
+
+            if (argsuser.Length > 1)
+            {
+                cmbUserNameMobile.Text = argsuser[0].Replace(" ", "");
+                txtPassword.Password = "******";
+                BaseClass.PassWord = argsuser[1].Replace(" ", "");
+                btnLogin_Click(null, null);
+            }
+        }
+
+
         private void BaseWindow_Closing(object sender, System.ComponentModel.CancelEventArgs e)
         {
             //if (BaseMsgForm.ShowConfirm("是否关闭软件？\r\n必须登录账户才能使用，无账户请先注册一个", "请先登录或者注册").DialogResult == System.Windows.Forms.DialogResult.OK)
             //    Process.GetCurrentProcess().Kill();
             //else
             //    e.Cancel = true;
+             
+            if (!isLogin)
+            {
+                if (BaseMsgWindow.ShowConfirm(this, "是否关闭软件？\r\n必须登录账户才能使用，无账户请先注册一个。", "请先登录或者注册").DialogResult == true)
+                    Process.GetCurrentProcess().Kill();
+                else
+                    e.Cancel = true;
+            }
+        }
 
-            if (BaseMsgWindow.ShowConfirm(this, "是否关闭软件？\r\n必须登录账户才能使用，无账户请先注册一个", "请先登录或者注册").DialogResult == true)
-                Process.GetCurrentProcess().Kill();
-            else
-                e.Cancel = true;
+        private void btnLogin_Click(object sender, RoutedEventArgs e)
+        {
+            UserLogin ul = new UserLogin();
+            ul.Mobile = cmbUserNameMobile.Text;
+            ul.Password = txtPassword.Password;
+
+            if (cmbUserNameMobile.Text.Length != 11)
+            {
+                BaseMsgWindow.ShowError(this, "手机号不正确", "提示");
+                cmbUserNameMobile.Focus();
+                return;
+            }
+            if (txtPassword.Password.Length < 6)
+            {
+                BaseMsgWindow.ShowError(this, "密码长度不正确", "提示");
+                txtPassword.Password = "";
+                txtPassword.Focus();
+                return;
+            }
+            string message = "";
+            int weakPassword = 0;
+            int lockUserName = 0;
+            string messageInfo = "";
+            bool ok = ul.Get(ref message, out lockUserName, out weakPassword, out messageInfo);
+            if (!ok)
+            {
+                BaseMsgForm.ShowError(message, "登录失败");
+                return;
+            }
+            if (BaseClass.Remember)
+            {
+                Initialization i = new Initialization();
+                i.SaveConfig();
+
+                var eUser = UserParamList.FirstOrDefault(u => u.UserName == BaseClass.UserName);
+                if (eUser != null)
+                    UserParamList.Remove(eUser);
+                UserParamList.Add(new UserParam()
+                {
+                    UserName = BaseClass.UserName,
+                    PasswordMd5 = BaseClass.PassWord
+                });
+                SaveUserList();
+            }
+            this.isLogin = true;
+            this.Close();
+        }
+
+        public static void SaveUserList()
+        {
+            ConfigHelper.SaveConfig("user_login_config", UserParamList);
+        }
+        public static void GetUserList()
+        {
+            #region 用户账户记忆功能
+            UserParamList = ConfigHelper.LoadConfig<ConcurrentList<UserParam>>("user_login_config");
+            if (UserParamList == null)
+                UserParamList = new ConcurrentList<UserParam>();
+            #endregion
+        }
+
+        private void btnDeleteItem_Click(object sender, RoutedEventArgs e)
+        {
+            var imgButton = sender as UcImageButton;
+            if (imgButton != null)
+            {
+                var userName = imgButton.Tag.ParseToString();
+                if (!string.IsNullOrEmpty(userName))
+                {
+                    UserParamList.RemoveAll(u => u.UserName == userName);
+                    SaveUserList();
+                    foreach (var item in cmbUserNameMobile.Items.Cast<string>().ToList())
+                    {
+                        if (item.ParseToString() == userName)
+                        {
+                            cmbUserNameMobile.Items.Remove(item);
+                        }
+
+                    }
+                    //ShowUserDropDown();
+                }
+            }
+        }
+
+        private void cmbUserNameMobile_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            var userName = cmbUserNameMobile.SelectedItem.ParseToString();
+            var user = UserParamList.FirstOrDefault(u => u.UserName == userName);
+            if (user != null)
+            {
+                BaseClass.UserName = user.UserName;
+                BaseClass.PassWord = user.PasswordMd5;
+                this.cmbUserNameMobile.Text = user.UserName;
+                this.txtPassword.Password = "******";
+            }
+        }
+
+        private void chkRemember_Checked(object sender, RoutedEventArgs e)
+        {
+            BaseClass.Remember = chkRemember.IsChecked.ParseToBool();
         }
     }
 }

29WxOrderWpf/MainWindow.xaml

@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:_29WxOrderWpf"
         xmlns:orderctrls="clr-namespace:_29WxOrderWpf.OrderCtrls"
-        xmlns:uc="clr-namespace:_29WxOrderWpf.UserControls"
+        xmlns:userctrls="clr-namespace:_29WxOrderWpf.UserControls"
         mc:Ignorable="d" Style="{StaticResource BaseNoneBorderWindowStyle}"
         Title="MainWindow" Height="450" Width="800" Loaded="Window_Loaded" Closing="BaseWindow_Closing">
 
@@ -17,6 +17,6 @@
         <Grid x:Name="gridContainer" Grid.Row="1" Background="White" Margin="2,0,2,2">
             <orderctrls:OrderListWindow x:Name="OrderListWindow" Visibility="Hidden"></orderctrls:OrderListWindow>
         </Grid>
-        <uc:UcWindowBoxes VerticalAlignment="Top" HorizontalAlignment="Right" Margin="4" MaxBoxVisibility="Visible"/>
+        <userctrls:UcWindowBoxes VerticalAlignment="Top" HorizontalAlignment="Right" Margin="4" MaxBoxVisibility="Visible"/>
     </Grid>
 </basewindows:BaseWindow>

29WxOrderWpf/MainWindow.xaml.cs

@@ -21,6 +21,7 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Documents;
+using System.Windows.Forms;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
@@ -49,17 +50,12 @@ namespace _29WxOrderWpf
             new Thread(AutoAntiGrabbingMechanism).Start();  // 反抓包
 
             #region 弹出登录窗口
-            LoginWindows.LoginWindow loginWindow = new LoginWindows.LoginWindow();
+            LoginWindows.LoginWindow loginWindow = new LoginWindows.LoginWindow(App.args);
             loginWindow.Owner = this;
             loginWindow.ShowDialog();
             #endregion
         }
 
-        private void BaseWindow_Closing(object sender, System.ComponentModel.CancelEventArgs e)
-        {
-
-        }
-
         #region 反抓包功能
         private void AutoAntiGrabbingMechanism()
         {
@@ -171,5 +167,13 @@ namespace _29WxOrderWpf
             return true;
         }
         #endregion
+
+        private void BaseWindow_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+        {
+            if (BaseMsgWindow.ShowConfirm(this, "是否关闭软件？", "退出微信小店订单管理").DialogResult == true)
+                Process.GetCurrentProcess().Kill();
+            else
+                e.Cancel = true;
+        }
     }
 }

29WxOrderWpf/Properties/AssemblyInfo.cs

@@ -7,11 +7,11 @@ using System.Windows;
 // 有关程序集的一般信息由以下
 // 控制。更改这些特性值可修改
 // 与程序集关联的信息。
-[assembly: AssemblyTitle("29WxOrderWpf")]
+[assembly: AssemblyTitle("29供应连-微信小店订单管理")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("29WxOrderWpf")]
+[assembly: AssemblyProduct("29供应连-微信小店订单管理")]
 [assembly: AssemblyCopyright("Copyright ©  2026")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

29WxOrderWpf/Properties/Resources.Designer.cs

@@ -1,68 +1,61 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
-//     运行时版本: 4.0.30319.42000
+//     运行时版本:4.0.30319.42000
 //
-//     对此文件的更改可能导致不正确的行为，如果
-//     重新生成代码，则所做更改将丢失。
+//     对此文件的更改可能会导致不正确的行为，并且如果
+//     重新生成代码，这些更改将会丢失。
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-
-namespace _29WxOrderWpf.Properties
-{
+namespace _29WxOrderWpf.Properties {
+    using System;
+    
+    
     /// <summary>
-    ///   强类型资源类，用于查找本地化字符串等。
+    ///   一个强类型的资源类，用于查找本地化的字符串等。
     /// </summary>
     // 此类是由 StronglyTypedResourceBuilder
     // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
-    // 若要添加或删除成员，请编辑 .ResX 文件，然后重新运行 ResGen
+    // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
     // (以 /str 作为命令选项)，或重新生成 VS 项目。
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources
-    {
-
+    internal class Resources {
+        
         private static global::System.Resources.ResourceManager resourceMan;
-
+        
         private static global::System.Globalization.CultureInfo resourceCulture;
-
+        
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources()
-        {
+        internal Resources() {
         }
-
+        
         /// <summary>
-        ///   返回此类使用的缓存 ResourceManager 实例。
+        ///   返回此类使用的缓存的 ResourceManager 实例。
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager
-        {
-            get
-            {
-                if ((resourceMan == null))
-                {
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("_29WxOrderWpf.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
             }
         }
-
+        
         /// <summary>
         ///   重写当前线程的 CurrentUICulture 属性，对
         ///   使用此强类型资源类的所有资源查找执行重写。
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture
-        {
-            get
-            {
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
                 return resourceCulture;
             }
-            set
-            {
+            set {
                 resourceCulture = value;
             }
         }

29WxOrderWpf/Properties/Settings.Designer.cs

@@ -1,27 +1,24 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     此代码由工具生成。
+//     运行时版本:4.0.30319.42000
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     对此文件的更改可能会导致不正确的行为，并且如果
+//     重新生成代码，这些更改将会丢失。
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-
-namespace _29WxOrderWpf.Properties
-{
+namespace _29WxOrderWpf.Properties {
+    
+    
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
-    {
-
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.14.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+        
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-
-        public static Settings Default
-        {
-            get
-            {
+        
+        public static Settings Default {
+            get {
                 return defaultInstance;
             }
         }

29WxOrderWpf/Styles/BaseButtonStyle.xaml

@@ -0,0 +1,101 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!--使用自定义属性模板去除Button高亮显示框-->
+    <!--<Style TargetType="Button">
+        <Setter Property="Cursor" Value="Hand"></Setter>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <ContentPresenter Content="{TemplateBinding Content}"
+                                      ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                      ContentTemplate="{TemplateBinding ContentTemplate}" />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>-->
+    <!--<Style TargetType="Button">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Padding="{TemplateBinding Padding}">
+                        <Grid Background="Transparent">
+                            <ContentPresenter  Content="{TemplateBinding Content}"
+                                               ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                               ContentTemplate="{TemplateBinding ContentTemplate}"
+                                               HorizontalAlignment="Center"
+                                               VerticalAlignment="Center">
+                            </ContentPresenter>
+                        </Grid>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>-->
+    <Style x:Key="BaseButtonStyle" TargetType="Button">
+        <Setter Property="Foreground" Value="{DynamicResource mainColorLightBrush}"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border x:Name="buttonBorder" Background="{DynamicResource mainColorBrush}" Cursor="Hand"
+                                                  BorderBrush="{DynamicResource mainColorDarkBrush}"
+                                                  BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}">
+                        <ContentPresenter Content="{TemplateBinding Content}"
+                                          ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                        </ContentPresenter>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Background" TargetName="buttonBorder" Value="{DynamicResource mainColorDarkBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter Property="Background" TargetName="buttonBorder" Value="{DynamicResource mainColorDarkBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Opacity" Value="0.5" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="BaseButtonLightStyle" TargetType="Button">
+        <Setter Property="Foreground" Value="{DynamicResource mainColorBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border x:Name="buttonBorder" Background="{DynamicResource mainColorLightBrush}" Cursor="Hand"
+                            BorderBrush="{DynamicResource mainColorBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}">
+                        <ContentPresenter Content="{TemplateBinding Content}"
+                                          ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                        </ContentPresenter>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Background" TargetName="buttonBorder" Value="{DynamicResource mainColorDarkBrush}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource mainColorLightBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter Property="Background" TargetName="buttonBorder" Value="{DynamicResource mainColorDarkBrush}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource mainColorLightBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Opacity" Value="0.5" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>

29WxOrderWpf/Styles/BaseComboBoxStyle.xaml

@@ -0,0 +1,322 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <!--xmlns:theme="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero"-->
+    <Style x:Key="FocusVisual">
+        <Setter Property="Control.Template">
+            <Setter.Value>
+                <ControlTemplate>
+                    <Rectangle Margin="2" StrokeDashArray="1 2" Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" SnapsToDevicePixels="true" StrokeThickness="1"/>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <!--<SolidColorBrush x:Key="TextBox.Static.Background" Color="#FFFFFFFF"/>-->
+    <SolidColorBrush x:Key="TextBox.Static.Background" Color="Transparent"/>
+    <Style x:Key="ComboBoxEditableTextBox" TargetType="{x:Type TextBox}">
+        <Setter Property="OverridesDefaultStyle" Value="true"/>
+        <Setter Property="AllowDrop" Value="true"/>
+        <Setter Property="MinWidth" Value="0"/>
+        <Setter Property="MinHeight" Value="0"/>
+        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+        <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst"/>
+        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type TextBox}">
+                    <ScrollViewer x:Name="PART_ContentHost" Background="Transparent" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <!--<LinearGradientBrush x:Key="ComboBox.Static.Background" EndPoint="0,1" StartPoint="0,0">
+            <GradientStop Color="#FFF0F0F0" Offset="0.0"/>
+            <GradientStop Color="#FFE5E5E5" Offset="1.0"/>
+        </LinearGradientBrush>-->
+    <SolidColorBrush x:Key="ComboBox.Static.Background" Color="Transparent"/>
+    <SolidColorBrush x:Key="ComboBox.Static.Editable.Background" Color="Transparent"/>
+    <SolidColorBrush x:Key="ComboBox.Static.Border" Color="#FFACACAC"/>
+    <SolidColorBrush x:Key="ComboBox.Static.Glyph" Color="#FF606060"/>
+    <SolidColorBrush x:Key="ComboBox.Static.Editable.Border" Color="#FFABADB3"/>
+    <SolidColorBrush x:Key="ComboBox.Static.Editable.Button.Background" Color="Transparent"/>
+    <SolidColorBrush x:Key="ComboBox.Static.Editable.Button.Border" Color="Transparent"/>
+    <LinearGradientBrush x:Key="ComboBox.MouseOver.Background" EndPoint="0,1" StartPoint="0,0">
+        <GradientStop Color="#FFECF4FC" Offset="0.0"/>
+        <GradientStop Color="#FFDCECFC" Offset="1.0"/>
+    </LinearGradientBrush>
+    <SolidColorBrush x:Key="ComboBox.MouseOver.Border" Color="#FF7EB4EA"/>
+    <SolidColorBrush x:Key="ComboBox.MouseOver.Glyph" Color="#FF000000"/>
+    <SolidColorBrush x:Key="ComboBox.MouseOver.Editable.Background" Color="#FFFFFFFF"/>
+    <SolidColorBrush x:Key="ComboBox.MouseOver.Editable.Border" Color="#FF7EB4EA"/>
+    <LinearGradientBrush x:Key="ComboBox.MouseOver.Editable.Button.Background" EndPoint="0,1" StartPoint="0,0">
+        <GradientStop Color="#FFEBF4FC" Offset="0.0"/>
+        <GradientStop Color="#FFDCECFC" Offset="1.0"/>
+    </LinearGradientBrush>
+    <SolidColorBrush x:Key="ComboBox.MouseOver.Editable.Button.Border" Color="#FF7EB4EA"/>
+    <LinearGradientBrush x:Key="ComboBox.Pressed.Background" EndPoint="0,1" StartPoint="0,0">
+        <GradientStop Color="#FFDAECFC" Offset="0.0"/>
+        <GradientStop Color="#FFC4E0FC" Offset="1.0"/>
+    </LinearGradientBrush>
+    <SolidColorBrush x:Key="ComboBox.Pressed.Border" Color="#FF569DE5"/>
+    <SolidColorBrush x:Key="ComboBox.Pressed.Glyph" Color="#FF000000"/>
+    <SolidColorBrush x:Key="ComboBox.Pressed.Editable.Background" Color="#FFFFFFFF"/>
+    <SolidColorBrush x:Key="ComboBox.Pressed.Editable.Border" Color="#FF569DE5"/>
+    <LinearGradientBrush x:Key="ComboBox.Pressed.Editable.Button.Background" EndPoint="0,1" StartPoint="0,0">
+        <GradientStop Color="#FFDAEBFC" Offset="0.0"/>
+        <GradientStop Color="#FFC4E0FC" Offset="1.0"/>
+    </LinearGradientBrush>
+    <SolidColorBrush x:Key="ComboBox.Pressed.Editable.Button.Border" Color="#FF569DE5"/>
+    <SolidColorBrush x:Key="ComboBox.Disabled.Background" Color="#FFF0F0F0"/>
+    <SolidColorBrush x:Key="ComboBox.Disabled.Border" Color="#FFD9D9D9"/>
+    <SolidColorBrush x:Key="ComboBox.Disabled.Glyph" Color="#FFBFBFBF"/>
+    <SolidColorBrush x:Key="ComboBox.Disabled.Editable.Background" Color="#FFFFFFFF"/>
+    <SolidColorBrush x:Key="ComboBox.Disabled.Editable.Border" Color="#FFBFBFBF"/>
+    <SolidColorBrush x:Key="ComboBox.Disabled.Editable.Button.Background" Color="Transparent"/>
+    <SolidColorBrush x:Key="ComboBox.Disabled.Editable.Button.Border" Color="Transparent"/>
+    <Style x:Key="ComboBoxToggleButton" TargetType="{x:Type ToggleButton}">
+        <Setter Property="OverridesDefaultStyle" Value="true"/>
+        <Setter Property="IsTabStop" Value="false"/>
+        <Setter Property="Focusable" Value="false"/>
+        <Setter Property="ClickMode" Value="Press"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ToggleButton}">
+                    <Border x:Name="templateRoot" Background="{StaticResource ComboBox.Static.Background}" BorderBrush="{StaticResource ComboBox.Static.Border}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="true">
+                        <Border x:Name="splitBorder" BorderBrush="Transparent" BorderThickness="1" HorizontalAlignment="Right" Margin="0" SnapsToDevicePixels="true" Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
+                            <Path x:Name="arrow" Data="F1 M 0,0 L 2.667,2.66665 L 5.3334,0 L 5.3334,-1.78168 L 2.6667,0.88501 L0,-1.78168 L0,0 Z" Fill="{StaticResource ComboBox.Static.Glyph}" HorizontalAlignment="Center" Margin="0" VerticalAlignment="Center"/>
+                        </Border>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" Value="true"/>
+                                <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="false"/>
+                                <Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}" Value="false"/>
+                                <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="true"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="Background" TargetName="templateRoot" Value="{StaticResource ComboBox.Static.Editable.Background}"/>
+                            <Setter Property="BorderBrush" TargetName="templateRoot" Value="{StaticResource ComboBox.Static.Editable.Border}"/>
+                            <Setter Property="Background" TargetName="splitBorder" Value="{StaticResource ComboBox.Static.Editable.Button.Background}"/>
+                            <Setter Property="BorderBrush" TargetName="splitBorder" Value="{StaticResource ComboBox.Static.Editable.Button.Border}"/>
+                        </MultiDataTrigger>
+                        <Trigger Property="IsMouseOver" Value="true">
+                            <Setter Property="Fill" TargetName="arrow" Value="{StaticResource ComboBox.MouseOver.Glyph}"/>
+                        </Trigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="true"/>
+                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" Value="false"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="Background" TargetName="templateRoot" Value="{StaticResource ComboBox.MouseOver.Background}"/>
+                            <Setter Property="BorderBrush" TargetName="templateRoot" Value="{StaticResource ComboBox.MouseOver.Border}"/>
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="true"/>
+                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" Value="true"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="Background" TargetName="templateRoot" Value="{StaticResource ComboBox.MouseOver.Editable.Background}"/>
+                            <Setter Property="BorderBrush" TargetName="templateRoot" Value="{StaticResource ComboBox.MouseOver.Editable.Border}"/>
+                            <Setter Property="Background" TargetName="splitBorder" Value="{StaticResource ComboBox.MouseOver.Editable.Button.Background}"/>
+                            <Setter Property="BorderBrush" TargetName="splitBorder" Value="{StaticResource ComboBox.MouseOver.Editable.Button.Border}"/>
+                        </MultiDataTrigger>
+                        <Trigger Property="IsPressed" Value="true">
+                            <Setter Property="Fill" TargetName="arrow" Value="{StaticResource ComboBox.Pressed.Glyph}"/>
+                        </Trigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}" Value="true"/>
+                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" Value="false"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="Background" TargetName="templateRoot" Value="{StaticResource ComboBox.Pressed.Background}"/>
+                            <Setter Property="BorderBrush" TargetName="templateRoot" Value="{StaticResource ComboBox.Pressed.Border}"/>
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}" Value="true"/>
+                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" Value="true"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="Background" TargetName="templateRoot" Value="{StaticResource ComboBox.Pressed.Editable.Background}"/>
+                            <Setter Property="BorderBrush" TargetName="templateRoot" Value="{StaticResource ComboBox.Pressed.Editable.Border}"/>
+                            <Setter Property="Background" TargetName="splitBorder" Value="{StaticResource ComboBox.Pressed.Editable.Button.Background}"/>
+                            <Setter Property="BorderBrush" TargetName="splitBorder" Value="{StaticResource ComboBox.Pressed.Editable.Button.Border}"/>
+                        </MultiDataTrigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Fill" TargetName="arrow" Value="{StaticResource ComboBox.Disabled.Glyph}"/>
+                        </Trigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="false"/>
+                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" Value="false"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="Background" TargetName="templateRoot" Value="{StaticResource ComboBox.Disabled.Background}"/>
+                            <Setter Property="BorderBrush" TargetName="templateRoot" Value="{StaticResource ComboBox.Disabled.Border}"/>
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="false"/>
+                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource AncestorType={x:Type ComboBox}}}" Value="true"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="Background" TargetName="templateRoot" Value="{StaticResource ComboBox.Disabled.Editable.Background}"/>
+                            <Setter Property="BorderBrush" TargetName="templateRoot" Value="{StaticResource ComboBox.Disabled.Editable.Border}"/>
+                            <Setter Property="Background" TargetName="splitBorder" Value="{StaticResource ComboBox.Disabled.Editable.Button.Background}"/>
+                            <Setter Property="BorderBrush" TargetName="splitBorder" Value="{StaticResource ComboBox.Disabled.Editable.Button.Border}"/>
+                        </MultiDataTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <ControlTemplate x:Key="ComboBoxEditableTemplate" TargetType="{x:Type ComboBox}">
+        <Grid x:Name="templateRoot" SnapsToDevicePixels="true">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition MinWidth="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}" Width="0"/>
+            </Grid.ColumnDefinitions>
+            <!--<Popup x:Name="PART_Popup" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" Placement="Bottom" PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}">
+                <theme:SystemDropShadowChrome x:Name="shadow" Color="Transparent" MinWidth="{Binding ActualWidth, ElementName=templateRoot}" MaxHeight="{TemplateBinding MaxDropDownHeight}">
+                    <Border x:Name="dropDownBorder" Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}" BorderThickness="1">
+                        <ScrollViewer x:Name="DropDownScrollViewer">
+                            <Grid x:Name="grid" RenderOptions.ClearTypeHint="Enabled">
+                                <Canvas x:Name="canvas" HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
+                                    <Rectangle x:Name="opaqueRect" Fill="{Binding Background, ElementName=dropDownBorder}" Height="{Binding ActualHeight, ElementName=dropDownBorder}" Width="{Binding ActualWidth, ElementName=dropDownBorder}"/>
+                                </Canvas>
+                                <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                            </Grid>
+                        </ScrollViewer>
+                    </Border>
+                </theme:SystemDropShadowChrome>
+            </Popup>-->
+            <ToggleButton x:Name="toggleButton" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxToggleButton}"/>
+            <Border x:Name="border" Background="{StaticResource TextBox.Static.Background}" Margin="{TemplateBinding BorderThickness}">
+                <TextBox x:Name="PART_EditableTextBox" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}" Style="{StaticResource ComboBoxEditableTextBox}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
+            </Border>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsEnabled" Value="false">
+                <Setter Property="Opacity" TargetName="border" Value="0.56"/>
+            </Trigger>
+            <Trigger Property="IsKeyboardFocusWithin" Value="true">
+                <Setter Property="Foreground" Value="Black"/>
+            </Trigger>
+            <!--<Trigger Property="HasDropShadow" SourceName="PART_Popup" Value="true">
+                <Setter Property="Margin" TargetName="shadow" Value="0,0,5,5"/>
+               <Setter Property="Color" TargetName="shadow" Value="#71000000"/>
+            </Trigger>-->
+            <Trigger Property="HasItems" Value="false">
+                <!--<Setter Property="Height" TargetName="dropDownBorder" Value="95"/>-->
+            </Trigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsGrouping" Value="true"/>
+                    <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
+            </MultiTrigger>
+            <!--<Trigger Property="ScrollViewer.CanContentScroll" SourceName="DropDownScrollViewer" Value="false">
+                <Setter Property="Canvas.Top" TargetName="opaqueRect" Value="{Binding VerticalOffset, ElementName=DropDownScrollViewer}"/>
+                <Setter Property="Canvas.Left" TargetName="opaqueRect" Value="{Binding HorizontalOffset, ElementName=DropDownScrollViewer}"/>
+            </Trigger>-->
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+    <ControlTemplate x:Key="ComboBoxTemplate" TargetType="{x:Type ComboBox}">
+        <Grid x:Name="templateRoot" SnapsToDevicePixels="true">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition MinWidth="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}" Width="0"/>
+            </Grid.ColumnDefinitions>
+            <Popup x:Name="PART_Popup" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" Placement="Bottom" PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}">
+                <!--<theme:SystemDropShadowChrome x:Name="shadow" Color="Transparent" MinWidth="{Binding ActualWidth, ElementName=templateRoot}" MaxHeight="{TemplateBinding MaxDropDownHeight}">
+                    <Border x:Name="dropDownBorder" Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}" BorderThickness="1">
+                        <ScrollViewer x:Name="DropDownScrollViewer">
+                            <Grid x:Name="grid" RenderOptions.ClearTypeHint="Enabled">
+                                <Canvas x:Name="canvas" HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
+                                    <Rectangle x:Name="opaqueRect" Fill="{Binding Background, ElementName=dropDownBorder}" Height="{Binding ActualHeight, ElementName=dropDownBorder}" Width="{Binding ActualWidth, ElementName=dropDownBorder}"/>
+                                </Canvas>
+                                <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                            </Grid>
+                        </ScrollViewer>
+                    </Border>
+                </theme:SystemDropShadowChrome>-->
+            </Popup>
+            <ToggleButton x:Name="toggleButton" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxToggleButton}"/>
+            <ContentPresenter x:Name="contentPresenter" ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}" ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" Content="{TemplateBinding SelectionBoxItem}" ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" IsHitTestVisible="false" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="HasDropShadow" SourceName="PART_Popup" Value="true">
+                <!--<Setter Property="Margin" TargetName="shadow" Value="0,0,5,5"/>-->
+                <!--<Setter Property="Color" TargetName="shadow" Value="#71000000"/>-->
+            </Trigger>
+            <Trigger Property="HasItems" Value="false">
+                <!--<Setter Property="Height" TargetName="dropDownBorder" Value="95"/>-->
+            </Trigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsGrouping" Value="true"/>
+                    <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
+            </MultiTrigger>
+            <!--<Trigger Property="ScrollViewer.CanContentScroll" SourceName="DropDownScrollViewer" Value="false">
+                <Setter Property="Canvas.Top" TargetName="opaqueRect" Value="{Binding VerticalOffset, ElementName=DropDownScrollViewer}"/>
+                <Setter Property="Canvas.Left" TargetName="opaqueRect" Value="{Binding HorizontalOffset, ElementName=DropDownScrollViewer}"/>
+            </Trigger>-->
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+    <Style x:Key="BaseCrystalComboBoxStyle" TargetType="{x:Type ComboBox}">
+        <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
+        <Setter Property="Background" Value="{StaticResource ComboBox.Static.Background}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource ComboBox.Static.Border}"/>
+        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
+        <Setter Property="Padding" Value="6,3,5,3"/>
+        <Setter Property="ScrollViewer.CanContentScroll" Value="true"/>
+        <Setter Property="ScrollViewer.PanningMode" Value="Both"/>
+        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
+        <Setter Property="Template" Value="{StaticResource ComboBoxTemplate}"/>
+        <Style.Triggers>
+            <Trigger Property="IsEditable" Value="true">
+                <Setter Property="IsTabStop" Value="false"/>
+                <Setter Property="Padding" Value="2"/>
+                <Setter Property="Template" Value="{StaticResource ComboBoxEditableTemplate}"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+    <Style x:Key="BaseComboBoxStyle" TargetType="ComboBox">
+        <Setter Property="IsEditable" Value="True"></Setter>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderBrush" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Style.Triggers>
+            <Trigger Property="IsKeyboardFocusWithin" Value="True">
+                <Setter Property="BorderBrush" Value="Transparent"/>
+                <Setter Property="BorderThickness" Value="0"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    
+    
+    
+    
+    
+    
+    
+    <ControlTemplate x:Key="ComboBoxTemplate1" TargetType="{x:Type ComboBox}">
+        <Border BorderBrush="Black" BorderThickness="1">
+            <ToggleButton x:Name="toggleButton" ClickMode="Press">
+                <!-- 自定义下拉按钮的外观 -->
+                <ToggleButton.Template>
+                    <ControlTemplate TargetType="ToggleButton">
+                        <Border Background="LightGray" BorderBrush="Gray" BorderThickness="1" Padding="5">
+                            <Path Data="M0,0 L8,8 16,0z" Fill="Black" HorizontalAlignment="Right"/>
+                        </Border>
+                    </ControlTemplate>
+                </ToggleButton.Template>
+            </ToggleButton>
+            <!-- 省略其他部分以保持简洁 -->
+        </Border>
+    </ControlTemplate>
+</ResourceDictionary>

29WxOrderWpf/Styles/BaseTextBoxStyle.xaml

@@ -0,0 +1,27 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Style x:Key="BaseTextBoxStyle" TargetType="TextBox">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderBrush" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Style.Triggers>
+            <Trigger Property="IsKeyboardFocusWithin" Value="True">
+                <Setter Property="BorderBrush" Value="Transparent"/>
+                <Setter Property="BorderThickness" Value="0"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+    <Style x:Key="BasePasswordBoxStyle" TargetType="PasswordBox">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderBrush" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Style.Triggers>
+            <Trigger Property="IsKeyboardFocusWithin" Value="True">
+                <Setter Property="BorderBrush" Value="Transparent"/>
+                <Setter Property="BorderThickness" Value="0"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    
+</ResourceDictionary>

29WxOrderWpf/Styles/BaseWindowStyle.xaml

@@ -2,53 +2,19 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <Style x:Key="BaseWindowStyle" TargetType="Window">
-        <Setter Property="Background" Value="#FF98638f"/>
-        <Setter Property="Foreground" Value="#FF666666"/>
+        <Setter Property="Background" Value="{DynamicResource mainColorBrush}"/>
+        <Setter Property="Foreground" Value="{DynamicResource mainForegroundColorBrush}"/>
         <Setter Property="FontSize" Value="14"/>
         <!-- 其他样式设置 -->
 
     </Style>
     <Style x:Key="BaseNoneBorderWindowStyle" TargetType="Window">
-        <Setter Property="Background" Value="#FF98638f"/>
-        <Setter Property="BorderBrush" Value="#6b5393"/>
+        <Setter Property="Background" Value="{DynamicResource mainColorBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource mainColorDarkBrush}"/>
+        <Setter Property="Foreground" Value="{DynamicResource mainForegroundColorBrush}"/>
         <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="Foreground" Value="#FF666666"/>
         <Setter Property="FontSize" Value="14"/>
         <Setter Property="WindowStyle" Value="None"/>
         <Setter Property="AllowsTransparency" Value="True"/>
     </Style>
-    <!--使用自定义属性模板去除Button高亮显示框-->
-    <!--<Style TargetType="Button">
-        <Setter Property="Cursor" Value="Hand"></Setter>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="Button">
-                    <ContentPresenter Content="{TemplateBinding Content}"
-                                      ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                                      ContentTemplate="{TemplateBinding ContentTemplate}" />
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>-->
-    <!--<Style TargetType="Button">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="Button">
-                    <Border Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            Padding="{TemplateBinding Padding}">
-                        <Grid Background="Transparent">
-                            <ContentPresenter  Content="{TemplateBinding Content}"
-                                               ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                                               ContentTemplate="{TemplateBinding ContentTemplate}"
-                                               HorizontalAlignment="Center"
-                                               VerticalAlignment="Center">
-                            </ContentPresenter>
-                        </Grid>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>-->
 </ResourceDictionary>

29WxOrderWpf/Styles/StaticColorBrushDictionary.xaml

@@ -0,0 +1,11 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="mainColorBrush" Color="#FF98638f"/>
+    <SolidColorBrush x:Key="mainColorLightBrush" Color="#f5ebff"/>
+    <SolidColorBrush x:Key="mainColorDarkBrush" Color="#FF6b5393"/>
+    <SolidColorBrush x:Key="mainForegroundColorBrush" Color="#FF666666"/>
+    <LinearGradientBrush x:Key="mainForegroundLinearColorBrush" StartPoint="0,0" EndPoint="1,0" >
+        <GradientStop Color="#FF98638f" Offset="0.0"/>
+        <GradientStop Color="#FF6b5393" Offset="1.0"/>
+    </LinearGradientBrush>
+</ResourceDictionary>

29WxOrderWpf/Styles/StaticImageDictionary.xaml

@@ -1,5 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <BitmapImage x:Key="main29WeixinIcon" UriSource="/Resources/main_29weixin_icon.png"/>
     <BitmapImage x:Key="imgMin" UriSource="/Resources/WindowBoxes/min.png"/>
     <BitmapImage x:Key="imgMinHover" UriSource="/Resources/WindowBoxes/min.hover.png"/>
     <BitmapImage x:Key="imgNormal" UriSource="/Resources/WindowBoxes/normal.png"/>
@@ -8,6 +9,7 @@
     <BitmapImage x:Key="imgMaxHover" UriSource="/Resources/WindowBoxes/max.hover.png"/>
     <BitmapImage x:Key="imgClose" UriSource="/Resources/WindowBoxes/close.png"/>
     <BitmapImage x:Key="imgCloseHover" UriSource="/Resources/WindowBoxes/close.hover.png"/>
+    <BitmapImage x:Key="imgCloseGray" UriSource="/Resources/close_gray.png"/>
     <BitmapImage x:Key="imgBaseMsgErr" UriSource="/Resources/BaseMsgErr.png"/>
     <BitmapImage x:Key="imgBaseMsgInfo" UriSource="/Resources/BaseMsgInfo.png"/>
     <BitmapImage x:Key="imgBaseMsgQue" UriSource="/Resources/BaseMsgQue.png"/>

AllBase/29WxOrderAllBase.csproj

@@ -58,7 +58,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
@@ -122,7 +122,7 @@
     <Compile Include="DouYinModel\Param\ShopManage\DouShopSettingParam.cs" />
     <Compile Include="DouYinModel\Result\DouGoodsInfo.cs" />
     <Compile Include="DouYinModel\Result\DouOrderListInfo.cs" />
-    <Compile Include="DouYinModel\Result\DouShopLoginInfo.cs" />
+    <Compile Include="DouYinModel\Result\ShopLoginInfo.cs" />
     <Compile Include="DouYinModel\Result\DouSubAccountModel.cs" />
     <Compile Include="DouYinModel\Result\DouYinAfterSaleOrderModel.cs" />
     <Compile Include="DouYinModel\Result\DouYinOrderModel.cs" />

AllBase/BaseClass.cs

@@ -247,7 +247,7 @@ namespace AllBase
         public static bool MustGetShopInfo = false;
         public static bool MustGetFormAlive = false;
         public static string ChromeChatHtml = "";
-        public static string ChromeUserAgent = "";
+        public static string ChromeUserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/138.0.0.0 Safari/537.36";
         public static string PddShopChromeUserAgent = "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.4.45 Safari/537.36 PddWorkbench-Online PddBrowser pdd_windows_version/2.6.0.26";
         public static string ChromeCookies = "";
         public static string ChromeJinBaoCookies = "";

AllBase/DouYinModel/Result/ShopLoginInfo.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace AllBase.Model.Result
 {
-    public class DouShopLoginInfo
+    public class ShopLoginInfo
     {
         public string DbId { get; set; }
         public string UserName { get; set; }

AllBase/Helper/GlobalConfig.cs

@@ -1,5 +1,6 @@
 using AllBase.DouYinModel.Param.ConfigManage;
 using AllBase.Model;
+using AllBase.Model.Result;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -10,13 +11,18 @@ namespace AllBase.Helper
 {
     public class GlobalConfig
     {
+        /// <summary>
+        /// 店铺列表
+        /// </summary>
+        public static List<ShopLoginInfo> ShopLoginList { get; set; } = new List<ShopLoginInfo>();
+
         public static SystemSettings SystemSettings { get; set; }
 
         public static System.Dynamic.ExpandoObject dicLocalStorage { get; set; }
 
         public static Dictionary<string, List<string>> dicDgvHeadersSetting { get; set; }
 
-        public static List<Model.PddPifaShopInfo> LstPddPifaShop { get; set; }
+        public static List<PddPifaShopInfo> LstPddPifaShop { get; set; }
 
         /// <summary>
         /// 拼多多 多买手拍单 账户列表

Work/Api/DouYinApi.cs

@@ -13,11 +13,11 @@ namespace Work.Api
     {
         public Dictionary<string, string> Data = new Dictionary<string, string>();
         public Dictionary<string, string> JsonData = new Dictionary<string, string>();
-        public DouShopLoginInfo Shop = null;
+        public ShopLoginInfo Shop = null;
         public string Type, Name;
         public string path = "";
         public static string Gate = "https://openapi-fxg.jinritemai.com/";
-        public DouyinApi(DouShopLoginInfo shop)
+        public DouyinApi(ShopLoginInfo shop)
         {
             Shop = shop;
         }

Work/CollectionClass.cs

@@ -12,10 +12,6 @@ namespace Work
 {
     public  class CollectionClass
     {
-        /// <summary>
-        /// 店铺列表
-        /// </summary>
-        public static List<DouShopLoginInfo> DouShopLoginList = new List<DouShopLoginInfo>();
         public static List<ExpressBase> ExpressList = new List<ExpressBase>();
         //地址集合
         public static Dictionary<string, ProvinceBase> Province = new Dictionary<string, ProvinceBase>();