用户列表页面完成 订单列表页面开始 10%

Work/29WxOrderWork.csproj

@@ -193,6 +193,7 @@
     <Compile Include="BaseForms\UserComponents\UcTreeView.designer.cs">
       <DependentUpon>UcTreeView.cs</DependentUpon>
     </Compile>
+    <Compile Include="BLL\ShopBLL.cs" />
     <Compile Include="BoundJs.cs" />
     <Compile Include="BuyUsers\ALBuyUser.cs" />
     <Compile Include="BuyUsers\CookieVisitor.cs" />

Work/BLL/ShopBLL.cs

@@ -0,0 +1,59 @@
+using AllBase;
+using AllBase.Model.Result;
+using NaiBa.Util.Extension;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Work.BLL
+{
+    public class ShopBLL
+    {
+        public static List<ShopLoginInfo> DeserializationShop(string shopJson, string shopDataName = "data")
+        {
+            List<ShopLoginInfo> list = new List<ShopLoginInfo>();
+            if (!shopJson.Contains(shopDataName))
+                return list;
+
+            var jArr = JObject.Parse(shopJson)[shopDataName];
+            if (jArr.Count() == 0)
+                return list;
+
+            foreach (JObject jObj in jArr)
+            {
+                var shop = DeserializationShop(jObj);
+                if (shop != null)
+                    list.Add(shop);
+            }
+            return list;
+        }
+
+        public static ShopLoginInfo DeserializationShop(JObject shopObj)
+        {
+            string shopStr = shopObj.ToString();
+            ShopLoginInfo shop = new ShopLoginInfo();
+            shop.DbId = BaseRegex.GetStringJson(ref shopStr, "id");
+            if (shop.DbId == null)
+                return null;
+            shop.LoginName = BaseRegex.GetStringJson(ref shopStr, "login_name");
+            shop.Password = BaseRegex.GetStringJson(ref shopStr, "login_pass");
+            shop.ShopId = BaseRegex.GetStringJson(ref shopStr, "shop_id");
+            shop.ShopAccount = BaseRegex.GetStringJson(ref shopStr, "shop_account");
+            shop.SubUserName = BaseRegex.GetStringJson(ref shopStr, "sub_user_name");
+            shop.GroupName = BaseRegex.GetStringJson(ref shopStr, "group_name");
+            shop.Cookies = shopObj["cookie"].ParseToString().Replace("＆", "&").Replace("％", "%").Replace("＋", "+").Replace("＂", "\"");
+            shop.CompanyName = BaseRegex.GetStringJson(ref shopStr, "company_name");
+            shop.Notes = BaseRegex.GetStringJson(ref shopStr, "notes");
+            shop.LoginStatus = BaseRegex.GetStringJson(ref shopStr, "login_status");
+            shop.AddTime = BaseRegex.GetStringJson(ref shopStr, "add_time") == null ? DateTime.MinValue : Convert.ToDateTime(BaseRegex.GetStringJson(ref shopStr, "add_time"));
+            shop.is_point_shop_expire = BaseRegex.GetBoolJson(ref shopStr, "is_point_shop_expire");
+            shop.expire_time = BaseRegex.GetIntJson(ref shopStr, "expire_time");
+            shop.ErpShopId = BaseRegex.GetStringJson(ref shopStr, "erp_shop_id");
+
+            return shop;
+        }
+    }
+}

Work/Initialization.cs

@@ -34,14 +34,14 @@ namespace Work
                 BaseClass.IsMainCompany = true;
             }
             BaseClass.IsBuyer = FileBase.Exists(Application.StartupPath + "\\buyer.ini");
-            new Thread(Update).Start();//--------检查更新
-            new Thread(GetAuthConfig).Start();
-            new Thread(new JumpUpProductNew().Ini).Start();
-            new Thread(CheckFiles).Start();
-            new Thread(UpdateTime).Start();
-            new Thread(GetMacCode).Start();
+            //new Thread(Update).Start();//--------检查更新
+            //new Thread(GetAuthConfig).Start();
+            //new Thread(new JumpUpProductNew().Ini).Start();
+            //new Thread(CheckFiles).Start();
+            //new Thread(UpdateTime).Start();
+            //new Thread(GetMacCode).Start();
 
-            //new Thread(CheckUpdataFile).Start();
+            //////new Thread(CheckUpdataFile).Start();
             CheckHecker r = new CheckHecker();
             new Thread(r.Check).Start();//防止破解
             if (!File.Exists(ConfigFilePach))
@@ -64,7 +64,8 @@ namespace Work
                 MessageBox.Show("配置文件异常，自动重置");
                 WriteFile();
             }
-            GetPublicIp();
+            // 获取本机IP
+            //GetPublicIp();
         }
 
 
@@ -140,7 +141,10 @@ namespace Work
                 }
             }
             else//如果自动更新文件不存在，则强制更新主文件
+            {
                 GetHtml.DownloadFile("http://dl.qixiaoke.com/Update3.1.exe", upfilepath);
+            }
+
             try
             {
                 Process.Start(upfilepath);

Work/UserLogin.cs

@@ -311,7 +311,7 @@ namespace Work
                 return time1;
             }
             return GetSignature(isPhoneOrder) + "&version=" + BaseClass.VersionCount + "&uid=" + BaseClass.UserId + "&key=" + BaseClass.UserKey +
-                   "&cid=" + BaseClass.CompanyId + "&company=" + GetHtml.UrlEncodeUtf8(BaseClass.CompanyName) +
+                   "&cid=" + BaseClass.CompanyId + "&company=" + GetHtml.UrlEncodeUtf8(BaseClass.CompanyName) + "&user_name=" + BaseClass.UserName +
                    "&sid=" + shopId + "&shop=" + GetHtml.UrlEncodeUtf8(shopName);
         }