最新版本后台代码

AppStart/Alipay/AlipayFunction.cs

@@ -1,327 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Aop.Api;
-using Library;
-using Microsoft.AspNetCore.Http;
-using Aop.Api.Request;
-using Aop.Api.Response;
-using Aop.Api.Util;
-
-namespace MySystem
-{
-    public class AlipayFunction
-    {
-        private HttpContext _context;
-        private string AppId = "2021003116616751";
-        private string PrivateKey = "MIIEpAIBAAKCAQEA1KjMzZJIRG6QQ3+c/euVrc+8RR0xMw6A+EONSKhJq4Bg+rtxQPCfdF2bpZ4NMaSqfalSiLoxrZSYBYOZhpDP67i9LXGUoFCWdRL7ROTqJvuU6KyEeMplQ6Q3uwWbuKbh9COt0vhqn/pjlUsomTwq+DRQv10awynkZikqceXdP0EH4iGZG0hyerEP5yLHpHiggf4f7TOsovHX+fGLPmWFO1zUTHHbz7HxU4BQKn3yuje4yMhoyv5h/wZzeVwvj+Qti8Hlh351rF0f5BHwN1YMGIrWuPU5bF8OMHS/UXPxh7Bs795ZZyplYztTz26QfKfLWVVsLOng4pvgPS+OgzZydwIDAQABAoIBAEu6mMQT9Zw46zK+PP/HZxPwSBEsphqSbab7F1LqauGh4+cl3NzNU1szAnxl3jjxdK0vIO8DrzErGz/Lb16WLxS4QtXt/olgaVPjoIsWIbQkHxEEbmA9YvZFgnsdMij9dLVmBz57rCywE8pUa262GG8u4hpjY2Zggq9GtZC91J3zOeETBG828gU+FLHGcDpfz7pD1jC0noDfDRxmIImOMZvChIvvY+tm6MpySXN8lw1vxhLc0aZbKSQkuVyCyB4fIsdJJvh2dRPiY+BA0jXNK3mWwnnHzac/9JXqWFlwk6iPIIjXPUldz7Zq3EpCI+9p+UqLtIu6BAUbk1biFTt8xMECgYEA+2iIxZfdl1N1suA/aEbUdjd0kxeeOsGv7Ps0rOYn+4/q1dkUukg2V6VRy3E8BUt+9zLPTR8DmL7oBi+kDsGehjHlH7U6Pe8qKszB4ufQBDHc71yg9liqOWa4s9VoBD0VIU9CO0HtYjRor7rVuUzp+j58SLP7wIEPGEwdgjeYENECgYEA2IsYEyHiwhjy5rx7fmv3duZC5zyesIqxdAz79AuZ7gnpNEhddi5cEpcibnVmwZliCe6SoLzXZ6difEfD4VmLsYEAWqf5sqJ2PswZmHtA9F4We9WUe2zj+pFG0yCCVrcbDZXzQYaLmyuMNe/jpgyY178czohpnvQlr++bYa9DYMcCgYEAqGX6xy/UM9qpiel/T1+yTIUUxroZOI4oQvp47B82ROC/kgJYSfa4v7hys2zjoUBSiU41YRkXFac6T3p1z5SNlKGzMav4mSer/QMuE8jmowirToGjJ594Vf6iVYLqq3wmvSsT2BFu6krknGDva7FDQGW+Zgx44xcPf1zsnx6R8yECgYEAtfFA3Cp3lbBSvy4U8ScUOPHFuvbDOwB9k02pkOcCgfAP4p7+8GKJeBFGm9rG6NnQdxneV3Hz5yLL7DJ8UebkKdODEajbc41vntnsk6LT877uU0QkSwQ2FX1lLdW9zdBxyZt5VVAQEuOnHlaeRxGEhpoMQTh6zlTDKa1AN/aDvVcCgYApytvSEdTpKcQuEyPOfbQv2pXYujCacMFIRHvJW/HvX7yaZSAvSYK+lw8l53bTbJpJ3pq/1Tol6tyjY7HRsVvQ68Jn1MApARMlldn1GoAPcgDFzlJCB0JCOUAE1rBS5lA97wQ1YhI8qBRqaE7Qrtf4D5oZdEjbtq8VCeIaD9huIQ==";
-        private string PublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1KjMzZJIRG6QQ3+c/euVrc+8RR0xMw6A+EONSKhJq4Bg+rtxQPCfdF2bpZ4NMaSqfalSiLoxrZSYBYOZhpDP67i9LXGUoFCWdRL7ROTqJvuU6KyEeMplQ6Q3uwWbuKbh9COt0vhqn/pjlUsomTwq+DRQv10awynkZikqceXdP0EH4iGZG0hyerEP5yLHpHiggf4f7TOsovHX+fGLPmWFO1zUTHHbz7HxU4BQKn3yuje4yMhoyv5h/wZzeVwvj+Qti8Hlh351rF0f5BHwN1YMGIrWuPU5bF8OMHS/UXPxh7Bs795ZZyplYztTz26QfKfLWVVsLOng4pvgPS+OgzZydwIDAQAB";
-        private string AlipayPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxycehrmnTl2IaIAECP+0HWc1eWGM/T6x022K7K6fdf+xoyC97TBJaG4G3Bcon4gsJX+Sad5IA9OJIQ4eN1joM35hIlwcFZ6MmCuVXx/SMAKThIjK0jsRc6aTxVQG+GVCgS7dXMKb4Sm+vK2wEM6xtDeqcfYMB0BqGZRvxbIV59a2ooPrha4FkV6nNC9DQefzC0picHXV64oYUjMM2ed4ASTQVds7HP9BZfalz//APZcWdBV08f+xv7n79Twz/gNtVAadfuTAlcjsS6aK+G/OrZtr/diuemeRPRUKlVhcr5xOQDhqBgtdIw8M9Wp6I4ULXRlthKVBWToH9j6n9vDIiwIDAQAB";
-        public AlipayFunction(HttpContext context)
-        {
-            _context = context;
-        }
-
-
-        #region 代商家签约
-
-        //（开启事务）接口创建应用事务，返回生成代商户操作事务编号 batch_no
-        public string GetBatchNo(string AlipayAccount, string Name, string Mobile, string Email)
-        {
-            IAopClient client = new DefaultAopClient("https://openapi.alipay.com/gateway.do", AppId, PrivateKey, "json", "1.0", "RSA2", AlipayPublicKey, "utf-8", false);
-            AlipayOpenAgentCreateRequest request = new AlipayOpenAgentCreateRequest();
-            request.BizContent = "{" +
-            "\"account\":\"" + AlipayAccount + "\"," +
-            "\"contact_info\":{" +
-            "\"contact_name\":\"" + Name + "\"," +
-            "\"contact_mobile\":\"" + Mobile + "\"," +
-            "\"contact_email\":\"" + Email + "\"" +
-            "}" +
-            "}";
-            string result = "";
-            try
-            {
-                AlipayOpenAgentCreateResponse response = client.Execute(request);
-                result = response.Body;
-                //{"alipay_open_agent_create_response":{"code":"10000","msg":"Success","batch_no":"2022021011321326200059849","batch_status":"init"},"sign":"su+weyK1CZEXES8mdckalg16J4BELTQeVNJSpXVYg3nh5g3E7jDh/mQctkjH8HbM0RybQSahZ2j60aUTossPMXqdq2nPRkR4c/kM34toFFNU/2p7jqo9k/MbB1JotW+qFI+C/GCX/9mZQqm2tSQdYIiZlCsEtP13ZP2EQ6momEZrApyLQYUl1H54PojJgqo6zGKDXTnXuZcpi/VPP5YoWhYMx8WPFMS6+T3zr+LNPDOI94j5vDdUHQdjFAGiQMyyhfNOBcFFi18bAfWhPqlLWwblCZamTHN/QaOHo+fkBZeo9uKqrnSHPn8XW0tDAIf1qNUfY2eBzYZUIqWKbz509A=="}
-            }
-            catch (Exception ex)
-            {
-                function.WriteLog(ex.ToString(), "接口创建应用事务异常");
-                result = "";
-            }
-            return result;
-        }
-        //代签约产品通用接口，代商家发起签约产品申请
-        public string CommonSign(string BatchNo, string MccCode, string BusinessLicenseNo = "", string BusinessLicensePicPath = "", string ShopScenePicPath = "", string ShopSignBoardPicPath = "")
-        { 
-            IAopClient client = new DefaultAopClient("https://openapi.alipay.com/gateway.do", AppId, PrivateKey, "json", "1.0", "RSA2", AlipayPublicKey, "utf-8", false);
-            AlipayOpenAgentCommonSignRequest request = new AlipayOpenAgentCommonSignRequest();
-            request.BatchNo = BatchNo;
-            request.MccCode = MccCode; //软件系统商 D_D05_7372
-            FileItem SpecialLicensePic = new FileItem(BusinessLicensePicPath);
-            request.SpecialLicensePic = SpecialLicensePic;
-            if (!string.IsNullOrEmpty(BusinessLicenseNo))
-            {
-                request.BusinessLicenseNo = BusinessLicenseNo;  //营业执照号码
-            }
-            if (!string.IsNullOrEmpty(BusinessLicensePicPath))
-            {
-                FileItem BusinessLicensePic = new FileItem(BusinessLicensePicPath);
-                request.BusinessLicensePic = BusinessLicensePic; //营业执照图片。被代创建商户运营主体为个人账户必填，企业账户无需填写
-            }
-            FileItem BusinessLicenseAuthPic = new FileItem(BusinessLicensePicPath);
-            request.BusinessLicenseAuthPic = BusinessLicenseAuthPic;
-            request.LongTerm = true;
-            request.DateLimitation = "长期";
-            if (!string.IsNullOrEmpty(ShopScenePicPath))
-            {
-                FileItem ShopScenePic = new FileItem(ShopScenePicPath);
-                request.ShopScenePic = ShopScenePic;
-            }
-            if (!string.IsNullOrEmpty(ShopSignBoardPicPath))
-            {
-                FileItem ShopSignBoardPic = new FileItem(ShopSignBoardPicPath);
-                request.ShopSignBoardPic = ShopSignBoardPic;
-            }
-            request.ProductCode = "QUICK_WAP_WAY"; //isv要代商户签约产品码，产品码是支付宝内部对产品的唯一标识
-            request.AppName = "客小爽";
-            // FileItem AppDemo = new FileItem(BusinessLicensePicPath);
-            // request.AppDemo = AppDemo;
-            List<string> WebSites = new List<string>();
-            WebSites.Add("www.kexiaoshuang.com");
-            request.WebSites = WebSites;
-            request.AlipayLifeName = "客小爽";
-            request.WechatOfficialAccountName = "客小爽";
-            // FileItem WebSitesLoa = new FileItem(BusinessLicensePicPath);
-            // request.WebSitesLoa = WebSitesLoa;
-            request.WebTestAccount = "testAccount";
-            request.WebTestAccountPassword = "testPassword";
-            FileItem WebHomeScreenshot = new FileItem(BusinessLicensePicPath);
-            request.WebHomeScreenshot = WebHomeScreenshot;
-            FileItem WebItemScreenshot = new FileItem(BusinessLicensePicPath);
-            request.WebItemScreenshot = WebItemScreenshot;
-            FileItem WebPayScreenshot = new FileItem(BusinessLicensePicPath);
-            request.WebPayScreenshot = WebPayScreenshot;
-            request.WebStatus = "已上线";
-            string result = "";
-            try
-            {
-                AlipayOpenAgentCommonSignResponse response = client.Execute(request);
-                result = response.Body;
-                //{"alipay_open_agent_common_sign_response":{"code":"10000","msg":"Success"},"sign":"qt0DiXFXIJ7mX+W2+IX+cyYXx8ROGe8yxesXHGNltxpEv/s/zW16xzf4HQLtUlaAiWf3DiD2QV7Hj+REyoZw9AcktDAmlobcjQ28lTYufPECZoUJHpkn9VpGB932FC0hScVwCbsxQakH84MGT4cmjr1hCuSs7+XogdhlCTIKjau1e7ZglLnt7f1NqT8JnljVhmvkkE9gJTLq5H+Zq6XbFfBVptvM9w09HdjfhrsxAXJyQ4yU6JYX2tUYsRGz8ZrveDQMvXKTN9jnwKE9hh8ik6Sq49eUqfutV9GkKqhC96+Vy3nOTOTnPoECXZkco1wP5jsqHottWVsRV+NxdylnTw=="}
-            }
-            catch (Exception ex)
-            {
-                function.WriteLog(ex.ToString(), "代签约产品通用接口异常");
-                result = "";
-            }
-            return result;
-        }
-        //代商户签约，提交信息确认接口
-        public string CommonSignConfirm(string BatchNo)
-        {
-            IAopClient client = new DefaultAopClient("https://openapi.alipay.com/gateway.do", AppId, PrivateKey, "json", "1.0", "RSA2", AlipayPublicKey, "utf-8", false);
-            AlipayOpenAgentCommonsignConfirmRequest request= new AlipayOpenAgentCommonsignConfirmRequest();
-            request.BizContent="{" +
-            "\"batch_no\":\"" + BatchNo + "\"" +
-            "}";
-            string result = "";
-            try
-            {
-                AlipayOpenAgentCommonsignConfirmResponse response = client.Execute(request);
-                result = response.Body;
-                //{"alipay_open_agent_order_query_response":{"code":"10000","msg":"Success","order_no":"20220210034000100000015895929361","product_agent_status_infos":[{"product_code":"QUICK_WAP_WAY","product_name":"手机网站支付","status":"WAIT_CONFIRM"}],"order_status":"MERCHANT_CONFIRM","confirm_url":"https:\/\/openhome.alipay.com\/isv\/settling\/confirm.htm?orderNo=20220210034000100000015895929361","merchant_pid":"2088012934025363"},"sign":"mgdhauHMV9352S3FVrQmesXvHOrk633FX/EOXRYdc2ix5phCBZJ2KZRRP9MWJ566YEtWbnQlAJzHVS9X29hjgiJWOQ/wCidql4AoSAYYeqPtxiqKAZw/QEM/du5AdbWC0xBmmkQljXF9Hx8cm+IrOyPMSJXIw4Tqpm/T96YBwhsjw4Xr5dcUcvF6HX9h/i5FSdIJODxQ26PJcqQ98GQ3Y50YhTpPQkIPDFVE2QzcL6dvuhBOpwu5KbTxvgzS8Wtm3G6nMbzJ33Cv/I2lhTCIMHz90c9bvyjJpWxPWBzywO2zzv7+EZCbDkZGkdRic9l5s6qac+ZVMHkPbveaZ2wyig=="}
-            }
-            catch (Exception ex)
-            {
-                function.WriteLog(ex.ToString(), "接口创建应用事务异常");
-                result = "";
-            }
-            return result;
-        }
-
-        #endregion
-
-        #region （查询申请单状态）查询签约申请的结果
-        public string QuerySignStatus(string BatchNo)
-        {
-            IAopClient client = new DefaultAopClient("https://openapi.alipay.com/gateway.do", AppId, PrivateKey, "json", "1.0", "RSA2", AlipayPublicKey, "utf-8", false);
-            AlipayOpenAgentOrderQueryRequest  request= new AlipayOpenAgentOrderQueryRequest() ;
-            request.BizContent="{" +
-            "  \"batch_no\":\"" + BatchNo + "\"" +
-            "}";
-            string result = "";
-            try
-            {
-                AlipayOpenAgentOrderQueryResponse response = client.Execute(request);
-                result = response.Body;
-            }
-            catch (Exception ex)
-            {
-                function.WriteLog(ex.ToString(), "查询签约申请的结果异常");
-                result = "";
-            }
-            return result;
-        }
-
-        #endregion
-        
-        #region 小程序支付请调用MySystemLib下的统一收单交易创建，返回交易号返给小程序请求支付my.tradePay
-        public string GetToken()
-        {
-            IAopClient client = new DefaultAopClient("https://openapi.alipay.com/gateway.do", AppId, PrivateKey, "json", "1.0", "RSA2", AlipayPublicKey, "utf-8", false);
-            AlipayOpenAuthTokenAppRequest request = new AlipayOpenAuthTokenAppRequest();
-            request.BizContent = "{" +
-            "\"grant_type\":\"authorization_code\"," +
-            "\"code\":\"P16be77ee92264acc99553528b8a7103\"" +
-            "  }";
-            string result = "";
-            try
-            {
-                AlipayOpenAuthTokenAppResponse response = client.Execute(request);
-                result = response.Body;
-                //{"alipay_open_auth_token_app_response":{"code":"10000","msg":"Success","tokens":[{"app_auth_token":"202202BBd8c1365cd09b4a27a0c0f0b7f8cabX03","app_refresh_token":"202202BB539f0f5aa99f4b509aa3628b0af25X03","auth_app_id":"2021003116654736","expires_in":31536000,"re_expires_in":32140800,"user_id":"2088141704579033"}]},"sign":"VZINXguZZFvVDyhVp/iMK5BWXYnDYLvxYEMEZTZOVUl9MUy6xQesDzpwBBUclLLU+QgrKpeekaxj9zgwRXdh7cKlVot2lkVPkGdfkqcK/B9t8kxPXa13WIszcROCqIutlcBZW9pCIUAbWRjorDvzRCc5rLNfSBAjEldZDA0rGOPeWJXM/5uLi/70oTwyO6eaEbKdRyHLjUwp0qtolhXIvyf9HL1HbZMGtyY/Hzq35BmhB/jQ4XIVdcOEpFtNoC/1S/viLOsBCD2m4aNCGUY0i24lr92dRsEinZlCxAQq+FK6ILNUnDmBUjNkPTycDrJFw+w9sEC6AcZodNB6OC8XTw=="}
-            }
-            catch (Exception ex)
-            {
-                function.WriteLog(ex.ToString(), "支付宝统一收单交易创建(获取authtoken)异常");
-                result = "";
-            }
-            return result;
-        }
-
-        public string CreateTrade(string OrderNo, string Subject, string Amount, string BuyerId, string Notify_Url, string Token)
-        {
-            IAopClient client = new DefaultAopClient("https://openapi.alipay.com/gateway.do", AppId, PrivateKey, "json", "1.0", "RSA2", AlipayPublicKey, "utf-8", false);
-            AlipayTradeCreateRequest request = new AlipayTradeCreateRequest();
-            request.SetNotifyUrl(Notify_Url);
-            request.BizContent = "{" +
-            "\"out_trade_no\":\"" + OrderNo + "\"," +
-            "\"total_amount\":" + Amount + "," +
-            "\"subject\":\"" + Subject + "\"," +
-            "\"buyer_id\":\"" + BuyerId + "\"," +
-            "\"timeout_express\":\"10m\"" +
-            "}";
-            string result = "";
-            try
-            {
-                AlipayTradeCreateResponse response = client.Execute(request, null, Token);
-                result = response.Body;
-            }
-            catch (Exception ex)
-            {
-                function.WriteLog(ex.ToString(), "支付宝统一收单交易创建异常");
-                result = "";
-            }
-            return result;
-        }
-
-        public string QueryTrade(string OrderNo, string Token)
-        {
-            IAopClient client = new DefaultAopClient("https://openapi.alipay.com/gateway.do", AppId, PrivateKey, "json", "1.0", "RSA2", AlipayPublicKey, "utf-8", false);
-            AlipayTradeQueryRequest request = new AlipayTradeQueryRequest();
-            request.BizContent = "{" +
-            "\"out_trade_no\":\"" + OrderNo + "\"" +
-            "}";
-            string result = "";
-            try
-            {
-                AlipayTradeQueryResponse response = client.Execute(request, null, Token);
-                result = response.Body;
-            }
-            catch (Exception ex)
-            {
-                function.WriteLog(ex.ToString(), "统一收单线下交易查询异常");
-                result = "";
-            }
-            return result;
-        }
-
-        #endregion
-
-        #region 退款
-
-        public string Refund(string TradeNo, string Amount, string Token)
-        {
-            IAopClient client = new DefaultAopClient("https://openapi.alipay.com/gateway.do", AppId, PrivateKey, "json", "1.0", "RSA2", AlipayPublicKey, "utf-8", false);
-            AlipayTradeRefundRequest request = new AlipayTradeRefundRequest();
-            request.BizContent = "{" +
-            "\"trade_no\":\"" + TradeNo + "\"," +
-            "\"refund_amount\":" + Amount + "" +
-            "}";
-            string result = "";
-            try
-            {
-                AlipayTradeRefundResponse response = client.Execute(request, null, Token);
-                result = response.Body;
-            }
-            catch (Exception ex)
-            {
-                function.WriteLog(ex.ToString(), "退款异常");
-                result = "";
-            }
-            return result;
-        }
-
-        #endregion
-
-        #region 分账
-        public string Settle(string OrderNo, string TradeNo, List<RoyaltyParameters> Parameters)
-        {
-            IAopClient client = new DefaultAopClient("https://openapi.alipay.com/gateway.do", AppId, PrivateKey, "json", "1.0", "RSA2", AlipayPublicKey, "utf-8", false);
-            AlipayTradeOrderSettleRequest  request= new AlipayTradeOrderSettleRequest();
-            string royalty_parameters = "";
-            foreach (RoyaltyParameters Parameter in Parameters)
-            {
-                royalty_parameters += "    {" +
-                "      \"royalty_type\":\"transfer\"," +
-                "      \"trans_in_type\":\"loginName\"," +
-                "      \"trans_in\":\"" + Parameter.Account + "\"," +
-                "      \"amount\":" + Parameter.Amount + "," +
-                "      \"trans_in_name\":\"" + Parameter.Name + "\"" +
-                "    },";
-            }
-            request.BizContent = "{" +
-            "  \"out_request_no\":\"" + OrderNo + "\"," +
-            "  \"trade_no\":\"" + TradeNo + "\"," +
-            "  \"royalty_parameters\":[" +
-            royalty_parameters.TrimEnd(',') +
-            "  ]" +
-            "}";
-            string result = "";
-            try
-            {
-                AlipayTradeOrderSettleResponse response = client.Execute(request);
-                result = response.Body;
-            }
-            catch (Exception ex)
-            {
-                function.WriteLog(ex.ToString(), "分账异常");
-                result = "";
-            }
-            return result;
-        }
-
-        #endregion
-
-
-
-
-
-
-        // 支付宝参数
-        public Models.PublicAccountSet SetData()
-        {
-            Models.PublicAccountSet set = new Models.PublicAccountSet();
-            // set.AlipayAppId = "2021003122642236";
-            // set.AlipayPrivateKey = "MIIEpAIBAAKCAQEAmfSplznW6H+wCyKh806jBxVdRabpK2P9RP4QNSGsHNIAscuH2yPbI1dNfKESC+QXAfWVRg90Vb+7yQz1I/S2vT159yY7ZH6duCopPpScfpNmICtjVukc1V5PZX+ptuDZc0YQSsRnn5WVKNO0bBR6iS3Jl9HQT949I3rHttA1+iqBn2LWyvGcUSDCOFNwstOYFM3FJTg7rQEdjmEQonEPXSbTQl1aw+fx1D+NcGx9BFSVAbE+nqfiX2co4V6yQ++N1RMlnBtbMZmTgvcoHZujqqBmjRcfRUW8I0B9aPJGNji94STBRPf0hP7yN4PHP2LixAK5gfzZ5NP2iK99sQ9tmwIDAQABAoIBAAR0N5PQcI85YnZwAg9v7vd9fr1NHuHKesFMOFvRJZGP4cVDBiMo3mYfWHaKkmMVrjS4TiFAwTTZ3yzp2w23PrIq3SRxTraRky6Iybitw/lFembj2nPhOpxRpiphjx9jUecr17zSAc10HmSX+1hFH2ZolLR3tXcaDtq/6pc3Xthl5uT0HIkisgbgxG5M8B+x26ZWnu8pbk+nT9bsAh9LrkQX+xaxTCgpmWpUTFMhG2t9pl04jT/LPOWXCmrs1BYEadqMirivcZdAXEiRbisSVrDI8cGKvPZpNZU9jfg9W5DEgfUdhnaZfRZzeAWORrBogXV1Osjlcjh2XXA3pAzCP8ECgYEA1jKv/S4RVCswh5LZTVFqVTAVyMBL/nLSu1L4mgaim19QDINxCDpN8kOfIBIBatwvkg7HzzQquotbDqj8pKgCFHTyf5gof6iFA1uGGP6AYBdL0k5tAG+uKwpo9rtRAUlOeLqwCC4rVhO1hE9tsey+t57BoAGVqi9JYIyCwEmCmo8CgYEAuABGodDT+RVbzJhUi4gHmDNDsil214uDyRYprCvD+wsJp5ma7M30hPm2NluGRWJUSdo237T0a8RkrNuXHW1ptgFKED8Qy4JV+eKemMZ21yMKyNZcjNs9X55b9BK3cGKkxXieXcxGLhz1YeLqTatS516uKfUHte62E3neZDySsjUCgYEApQGLHWi9pK9YxTfU+oD7fwB555prcGqX+AJkzJLL9REpo1omWwY/QZ/iF1yHhwB0DPoh5nbza50q2lJHvbhHUeb9YFmg6SaywPFijiKQVnXbzPjpc2qVK0brsRZ/wpPsRYjbTpHyhG7OaEyf3m7YRK+hzVcrKl0fE6dqmiKG3/UCgYEAt+2WrVRZQAjIrdir0pqUtOCxz9tA76+HebAM0g0hp8XdzcpvIj2yKmaPbQDKVHs5NGXMKozxMvSrilsrUIA5hnT9ewX/nN7ZYKPW03K4AtAFjMMy2p6hV/6tfmpjMhV5DehHrg1vLdNGuqWgfyk+AwgS4uAL6CIJoahV1S7zmO0CgYBGMNtHyIsYbnYycat2SEOQOGbLAro+jRNDPCI3FGOf1fAOpXD9JgQMD7oXSRSnZRzwvsxNQ944UXqLrHPS5yEtcmAu6BdR1QjJlpj5ClRYuQuDK7k1LR3+0eI3FySbinAMspr6UVNo0UqUkLa2k/igH2yUyThIUDOiqkfuxsu/aA==";
-            // set.AlipayPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxycehrmnTl2IaIAECP+0HWc1eWGM/T6x022K7K6fdf+xoyC97TBJaG4G3Bcon4gsJX+Sad5IA9OJIQ4eN1joM35hIlwcFZ6MmCuVXx/SMAKThIjK0jsRc6aTxVQG+GVCgS7dXMKb4Sm+vK2wEM6xtDeqcfYMB0BqGZRvxbIV59a2ooPrha4FkV6nNC9DQefzC0picHXV64oYUjMM2ed4ASTQVds7HP9BZfalz//APZcWdBV08f+xv7n79Twz/gNtVAadfuTAlcjsS6aK+G/OrZtr/diuemeRPRUKlVhcr5xOQDhqBgtdIw8M9Wp6I4ULXRlthKVBWToH9j6n9vDIiwIDAQAB";
-
-            set.AlipayAppId = "2021003126605468";
-            set.AlipayPrivateKey = "MIIEogIBAAKCAQEA1O3mknrWGkWsDiojx/hUgq5jnO/D8rjMGUpz8C7A88iJmm6ZSxssTz2+OkL75omlxRJcMZAYt+icZtLWVm6mSklCipieWZGEWiId6bsHwlEPOkwmhPw5bDBF+y6ZSkXtW+fofrmsk8/a9SZ/N3h+FJ5sqLbihn9pXNp4X1VgnZHGGNWsRTFgBdWdEWAEhDImAPNRv8IB7ZyVbbRo3aIvTCH4EDUu8Y5IMs8l5Ne0aUAkPgz81IbiSMzWqU5z9W5m1cPIOz/w5Bru/JvJliu2qkQrDlh9ccIcBIsrOddYAzxyXsxO+EqUM/m9HEtg5atvMIV9XMzgwnGpM3jVydRBywIDAQABAoIBAAdaO6b9NN1tYHaQv/GMwqZMjUYDBXohJXMOHhjCFImWeCHsBcERLCOEV0g9veMFB8NZUfOoLSJUlun6B8quQXG5O+H7SSSAoNhX6z6B5c+w6tyxencHGpiAxjnZLxPgfES7Kk0N7kagW8gxTx1EPN5LZichQYsxZRr+tD9efFqUeOnutUjECdvYNb6FsJ46tgCVRSEl7kBueR+VmFl5FXjc7B3bREGzaNylu846BK4vK6u1/IKIDczJKfZDRtwSpvMPUGwscfZAkPHOxtneKCyB1itouUyrhjaBb9AJMKIaCi7j5btazo81B3BZVK9uHV+B+gVA3d+aWwSteU9WMukCgYEA6bk0ua6285e/N6YC5KvqRTaangjtSJckx3FRVuK6799mIDyyvScz6Befi/EJ0kwF0J0HPI+GKGa7XWzk1CR4pz1Zd85uzL8TIcn9AHqjeYe62hKLSPQMlR+GTP/J604rHERlGVoo7LEHT7MrVmQhTJWmJGezldPpmwbuKoWgel8CgYEA6TlShy3qO5LYVmd360BRWrR7k6cZkkTaC/ivjLZNENLXG7nJeUKkS4LaexLu7RB2L45IWzDqhCrPqfG5P/XkxvskkzntEUmChN58xhfpS20yeTpfDhjvdbJEEYgbmkNqOD8L2Q25XRMAJ8vomzgIEIw9aDQCM3ZBK1s0zyXwyBUCgYARqthbeOOHgl8H+9qYIo6w8LG7ZH1bUWGMWfqGENmErGRx52Sze7UmxDJhR7UwWmLOJDCZ2VeQ0kMzirm5d5BPRAnxTn99pqvxj+06DgsxcpsjROeWeixBUYK7a1J+IQiNOHZT9kbFrZQZ6DdMboE94soOUnB20PAFsf5q5HL/DQKBgHXVmHTkJexjjRpavKQHoxMJDUbUrn7QerqBs3CMyvMtE7HWdIzntsrQGkMEleMA5jWw1a39UP/mAXYDw20ld6lxSlF4eua5FVC8eJ49homtaksFyvD8eEAnCW0yL4AJf6lbcUkBPh5gczuoMqX58VkrAfucC2Ck5thZBJ2EtdrhAoGAVeQbC4m789Yr+kXKPECGxI7RwIVV5xjc3TCvfE6JKztmn0IZyWT53vqvxi2LpqeAMlwc8PrCpiqd/8Tk5M/WZkzGYTj7mrp0A7BXXRWMjnbrhq3W15P1Q45aU64NofOcQvX3LdKkpEWHYXktJaSKBlZgjSQVK7ZntF6LJCiMcQ0=";
-            set.AlipayPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnw14hKejqS+si/XZpNQpFAVOVXJIThj5Qn7H14n/vsb7uRLug1+Jcve8ehTkaN3s5ibrrELCnz0dvshi3cOz9svDSbLG5OdC1biAvZzpDkvVPswOd9f9jO8Jvqk3QTXTI3MSN9gOpKomI0te3qs5kkOQx6kRozzKjU/G//o/PbJCxpBxf/QNRV3XmCwJLZMBE7ukYqi1WO9Jra8jdczFKwrd/nhiKBKdupAtVVeKlylGD2i2YLkGAH1cLsPUN9DtzrXNblGXm2HK3l9SnMDjqnakiVdEQJTNYNpEiHaOJsVmPQL38nM6miz5wNd4gTchKzXPtoZWqto+eIvYaEA/KwIDAQAB";
-            
-            return set;
-        }
-    }
-}

AppStart/Aliyun/AliyunPush.cs

@@ -14,8 +14,8 @@ namespace MySystem
 {
     public class AliyunPush
     {
-        private string AccessKeyID = "LTAI5t7ivibdYZTro4SRVZ9M";
-        private string AccessKeySecret = "nfr1bmbJbMhLuaj10iBORkuFfIAX7M";
+        private string AccessKeyID = "LTAImYRe25JQ5nr8";
+        private string AccessKeySecret = "znOWxVGLnKl8KHlPSIKruYC3C1HYIy";
 
         public void PushMessageToAndroid()
         {
@@ -154,11 +154,11 @@ namespace MySystem
             // 推送目标
             if (DeviceType == "ANDROID")
             {
-                request.AppKey = 333673923;//
+                request.AppKey = 27532904;
             }
             else if (DeviceType == "iOS")
             {
-                request.AppKey = 27724645;
+                request.AppKey = 27536906;
             }
             if (string.IsNullOrEmpty(DeviceList))
             {
@@ -202,7 +202,7 @@ namespace MySystem
             //是否允许扩展iOS通知内容
             request.IOSMutableContent = true;
             //iOS的通知是通过APNs中心来发送的，需要填写对应的环境信息。"DEV" : 表示开发环境 "PRODUCT" : 表示生产环境
-            request.IOSApnsEnv = "DEV";
+            request.IOSApnsEnv = "PRODUCT";
             //消息推送时设备不在线（既与移动推送的服务端的长连接通道不通），则这条推送会做为通知，通过苹果的APNs通道送达一次。注意：离线消息转通知仅适用于生产环境
             request.IOSRemind = true;
             //iOS消息转通知时使用的iOS通知内容，仅当iOSApnsEnv=PRODUCT && iOSRemind为true时有效
@@ -239,7 +239,7 @@ namespace MySystem
             //request.AndroidActivity = "com.alibaba.push2.demo.XiaoMiPushActivity";
 
             request.AndroidRemind = true;
-            request.AndroidPopupActivity = "com.kexiaoshuang.creator.activity.WaitActivity";
+            request.AndroidPopupActivity = "com.yunmuapp.yunmuapp.activity.WaitActivity";
             request.AndroidPopupTitle = "客小爽";
             request.AndroidPopupBody = Body;
             request.AndroidNotificationChannel = "1";
@@ -247,7 +247,7 @@ namespace MySystem
             //Android通知音乐
             request.AndroidMusic = "default";
             //设置该参数后启动小米托管弹窗功能，此处指定通知点击后跳转的Activity（托管弹窗的前提条件：1. 继承小米辅助通道；2. storeOffline设为true)
-            request.AndroidXiaoMiActivity = "com.kexiaoshuang.creator.activity.WaitActivity";
+            request.AndroidXiaoMiActivity = "com.yunmuapp.yunmuapp.activity.WaitActivity";
             //小米弹窗标题
             request.AndroidXiaoMiNotifyTitle = "客小爽";
             //小米弹窗内容

AppStart/DictionaryClass/PageUpdateInfoDictionary.cs

@@ -1,70 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using Microsoft.AspNetCore.Mvc;
-using MySystem.Models;
-
-namespace MySystem
-{
-    public class PageUpdateInfoDictionary
-    {
-        WebCMSEntities db = new WebCMSEntities();
-
-
-        #region 页面模板字典
-
-        public Dictionary<string, string> getPageUpdateInfoDic(string Kind = "default")
-        {
-            List<PageUpdateInfo> PageUpdateInfoList = db.PageUpdateInfo.Where(m => m.SeoKeyword == Kind).OrderBy(m => m.ModulePath).ToList();
-            Dictionary<string, string> PageUpdateInfoDic = new Dictionary<string, string>();
-            foreach (PageUpdateInfo subPageUpdateInfo in PageUpdateInfoList)
-            {
-                PageUpdateInfoDic.Add(subPageUpdateInfo.ModulePath.Replace(".html", ""), subPageUpdateInfo.Title+subPageUpdateInfo.ModulePath.Replace(".html", ""));
-            }
-            return PageUpdateInfoDic;
-        }
-
-        #endregion
-
-
-
-
-
-
-
-        #region 根据字典key获取字典值
-
-        public string getDictionaryNameByKey(Dictionary<string, string> data, string key)
-        {
-            if (data.ContainsKey(key))
-            {
-                return data[key];
-            }
-            return "";
-        }
-        public string getDictionaryNameById(Dictionary<int, string> data, int key)
-        {
-            if (data.ContainsKey(key))
-            {
-                return data[key];
-            }
-            return "";
-        }
-        public string getDictionaryNamesByKeys(Dictionary<string, string> data, string keys)
-        {
-            string result = "";
-            string[] keylist = keys.Split(',');
-            foreach (string subkey in keylist)
-            {
-                if (data.ContainsKey(subkey))
-                {
-                    result += data[subkey] + ",";
-                }
-            }
-            return result.TrimEnd(',');
-        }
-
-        #endregion
-    }
-}

AppStart/Helper/SycnProfitService.cs

@@ -37,7 +37,7 @@ namespace MySystem
                         int OpType = int.Parse(data[2]);
                         string SysUserName = data[3];
                         DoTradeProfit(BrandId, date, SysUserName, OpType);
-                        // DoSubsidyProfit(BrandId, date, OpType);
+                        DoSubsidyProfit(BrandId, date, OpType);
                         function.WriteLog(DateTime.Now.ToString() + "\r\n\r\n", "同步分润数据");
                     }
                     catch (Exception ex)
@@ -90,10 +90,15 @@ namespace MySystem
                         profit.ProfitAmount += ProfitMoney;
                         string IdBrand = UserId + "_" + BrandId;
                         UserMachineData MachineData = db.UserMachineData.FirstOrDefault(m => m.IdBrand == IdBrand);
-                        if (MachineData != null)
+                        if (MachineData == null)
                         {
-                            MachineData.TradeProfit += ProfitMoney;
+                            MachineData = db.UserMachineData.Add(new UserMachineData()
+                            {
+                                IdBrand = IdBrand,
+                            }).Entity;
+                            db.SaveChanges();
                         }
+                        MachineData.TradeProfit += ProfitMoney;
                         db.SaveChanges();
                     }
                     else if (OpType == 1)
@@ -170,10 +175,15 @@ namespace MySystem
                     {
                         string IdBrand = UserId + "_" + BrandId;
                         UserMachineData MachineData = db.UserMachineData.FirstOrDefault(m => m.IdBrand == IdBrand);
-                        if (MachineData != null)
+                        if (MachineData == null)
                         {
-                            MachineData.OtherProfit += ProfitMoney;
+                            MachineData = db.UserMachineData.Add(new UserMachineData()
+                            {
+                                IdBrand = IdBrand,
+                            }).Entity;
+                            db.SaveChanges();
                         }
+                        MachineData.OtherProfit += ProfitMoney;
                         db.SaveChanges();
                     }
                     else if (OpType == 1)

AppStart/Helper/SycnSpTradeService.cs

@@ -0,0 +1,154 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using MySystem.Models;
+using Library;
+using LitJson;
+
+namespace MySystem
+{
+    public class SycnSpTradeService
+    {
+        public readonly static SycnSpTradeService Instance = new SycnSpTradeService();
+        private SycnSpTradeService()
+        { }
+
+        public void Start(string PosSn, DateTime start, DateTime end)
+        {
+            SpModels.WebCMSEntities spdb = new SpModels.WebCMSEntities();
+            WebCMSEntities db = new WebCMSEntities();
+            IQueryable<SpModels.TradeRecord> trades = spdb.TradeRecord.Where(m => m.CreateDate >= start && m.CreateDate < end && m.TradeSnNo == PosSn);
+            foreach (SpModels.TradeRecord trade in trades.ToList())
+            {
+                bool op = true;
+                if (trade.SerEntryMode == "N")
+                {
+                    if (trade.TradeAmount == 9900 || trade.TradeAmount == 19900 || trade.TradeAmount == 29900)
+                    {
+                        op = false;
+                        MachineForMerNo posFor = db.MachineForMerNo.FirstOrDefault(m => m.MerNo == trade.MerNo) ?? new MachineForMerNo();
+                        PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == posFor.SnId);
+                        if (pos != null)
+                        {
+                            if (trade.SerEntryMode == "N" && trade.ProductType == "1")
+                            {
+                                pos.SeoKeyword = trade.TradeAmount.ToString("f2");
+                                db.SaveChanges();
+                            }
+                        }
+                        SpModels.TradeRecord edit = spdb.TradeRecord.FirstOrDefault(m => m.Id == trade.Id);
+                        if (edit != null)
+                        {
+                            edit.Status = 2;
+                        }
+                        spdb.SaveChanges();
+                    }
+                }
+                if (op)
+                {
+                    MachineForMerNo posFor = db.MachineForMerNo.FirstOrDefault(m => m.MerNo == trade.MerNo) ?? new MachineForMerNo();
+                    PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == posFor.SnId);
+                    if (pos != null)
+                    {
+                        if (pos.BindMerchantId > 0)
+                        {
+                            Users user = db.Users.FirstOrDefault(m => m.Id == pos.UserId) ?? new Users();
+                            int TopUserId = 0;
+                            if (!string.IsNullOrEmpty(user.ParentNav))
+                            {
+                                TopUserId = int.Parse(user.ParentNav.Trim(',').Replace(",,", ",").Split(',')[0]);
+                            }
+                            bool check = db.TradeRecord.Any(m => m.RecordNo == trade.TradeSerialNo);
+                            if (!check)
+                            {
+                                decimal TradeAmount = trade.TradeAmount;
+                                int BankCardType = -1;
+                                int QrPayFlag = 0;
+                                if (pos.BrandId == 1 || pos.BrandId == 3)
+                                {
+                                    TradeAmount = TradeAmount / 100;
+                                    BankCardType = int.Parse(trade.BankCardType);
+                                    if(trade.TradeType == "02") QrPayFlag = 1;
+                                }
+                                else if (pos.BrandId == 2)
+                                {
+                                    if (trade.TradeType == "CREDIT_BY_CARD")
+                                    {
+                                        BankCardType = 1;
+                                    }
+                                    else if (trade.TradeType == "DEBIT_BY_CARD")
+                                    {
+                                        BankCardType = 0;
+                                    }
+                                    if(trade.TradeType == "CLOUD_PAY") QrPayFlag = 1;
+                                }
+                                int BrandId = int.Parse(trade.ProductType);
+                                if (trade.MerNo.StartsWith("M900"))
+                                {
+                                    BrandId = 3;
+                                }
+                                db.TradeRecord.Add(new TradeRecord()
+                                {
+                                    CreateDate = trade.CreateDate,
+                                    UpdateDate = trade.UpdateDate,
+                                    RecordNo = trade.TradeSerialNo, //单号
+                                    UserId = pos.UserId, //创客
+                                    MerchantId = pos.BindMerchantId, //商户
+                                    MerNo = trade.MerNo, //渠道商户编号
+                                    MerHelpFlag = 0, //是否属于扶持周期内商户
+                                    HelpMonthCount = 0, //扶持第几个月
+                                    MerBuddyType = user.MerchantType, //商户创客类型
+                                    SnNo = trade.TradeSnNo, //渠道SN号
+                                    // TradeDate = DateTime.Parse(trade.TradeTime), //交易日期
+                                    TradeSerialNo = trade.ChannelSerial, //交易流水号
+                                    TradeAmount = TradeAmount, //交易金额
+                                    BankCardType = BankCardType, //银行卡类型
+                                    QrPayFlag = QrPayFlag, //云闪付标识
+                                    BrandId = BrandId, //品牌
+                                    Remark = trade.Remark, //备注
+                                    TopUserId = TopUserId, //顶级创客
+                                    MerUserId = pos.UserId, //商户直属创客
+                                });
+                                if (BankCardType == 1)
+                                {
+                                    pos.CreditTrade += TradeAmount;
+                                }
+                                else if (BankCardType == 0)
+                                {
+                                    pos.DebitCardTrade += TradeAmount;
+                                }
+                                if (pos.CreditTrade < 1000)
+                                {
+                                    pos.IsPurchase = 99;
+                                }
+                                else if (pos.CreditTrade >= 1000 && pos.ActivationState == 0 && pos.BindingTime > DateTime.Now.AddDays(-20))
+                                {
+                                    pos.IsPurchase = 0;
+                                    pos.ActivationState = 1;
+                                    pos.ActivationTime = DateTime.Now;
+                                    PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.Id == pos.BindMerchantId);
+                                    if (merchant != null)
+                                    {
+                                        merchant.ActiveStatus = 1;
+                                        merchant.MerStandardDate = DateTime.Now;
+                                        db.SaveChanges();
+                                        RedisDbconn.Instance.Set("PosMerchantInfo:" + merchant.Id, merchant);
+                                    }
+                                }
+                                db.SaveChanges();
+                            }
+                            SpModels.TradeRecord edit = spdb.TradeRecord.FirstOrDefault(m => m.Id == trade.Id);
+                            if (edit != null)
+                            {
+                                edit.Status = 2;
+                            }
+                            spdb.SaveChanges();
+                        }
+                    }
+                }
+            }
+            spdb.Dispose();
+            db.Dispose();
+        }
+    }
+}

AppStart/PublicFunction.cs

@@ -414,6 +414,31 @@ namespace MySystem
         }
         #endregion
 
+        #region 重置创客机具数量
+
+        public static void SycnMachineCount(int Id = 0, int BrandId = 0)
+        {
+            WebCMSEntities dbnew = new WebCMSEntities();
+            string IdBrand = Id + "_" + BrandId;
+            UserMachineData machineData = dbnew.UserMachineData.FirstOrDefault(m => m.IdBrand == IdBrand);
+            if (machineData == null)
+            {
+                machineData = dbnew.UserMachineData.Add(new UserMachineData()
+                {
+                    IdBrand = IdBrand
+                }).Entity;
+                dbnew.SaveChanges();
+            }
+            machineData.BindCount = dbnew.PosMachinesTwo.Count(m => m.Status > -1 && m.BuyUserId == Id && m.BrandId == BrandId && m.BindingState == 1);
+            machineData.UnBindCount = dbnew.PosMachinesTwo.Count(m => m.Status > -1 && m.BuyUserId == Id && m.BrandId == BrandId && m.BindingState == 0);
+            machineData.TotalMachineCount = machineData.BindCount + machineData.UnBindCount;
+            dbnew.SaveChanges();
+            dbnew.Dispose();
+        }
+
+        #endregion
+
+
 
         #region 测试创客Id
 

Areas/Admin/Controllers/BsServer/BaseController.cs

@@ -24,6 +24,8 @@ namespace MySystem.Areas.Admin.Controllers
         public string ApiKey = "G6H7@J8%";
         public Models.WebCMSEntities db = new Models.WebCMSEntities();
         public BsModels.WebCMSEntities bsdb = new BsModels.WebCMSEntities();
+        public SpModels.WebCMSEntities spdb = new SpModels.WebCMSEntities();
+        public CashModels.WebCMSEntities cashdb = new CashModels.WebCMSEntities();
         public string Host = Library.ConfigurationManager.AppSettings["Host"].ToString();
 
         public string ShareHost = "";

Areas/Admin/Controllers/BsServer/OperateRightListController.cs

@@ -1,311 +0,0 @@
-/*
- * 操作权限
- */
-
-using System;
-using System.Web;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using MySystem.BsModels;
-using Library;
-using LitJson;
-using MySystemLib;
-
-namespace MySystem.Areas.Admin.Controllers
-{
-    [Area("Admin")]
-    [Route("Admin/[controller]/[action]")]
-    public class OperateRightListController : BaseController
-    {
-        public OperateRightListController(IHttpContextAccessor accessor, ILogger<BaseController> logger, IOptions<Setting> setting) : base(accessor, logger, setting)
-        {
-            OtherMySqlConn.connstr = ConfigurationManager.AppSettings["BsSqlConnStr"].ToString();
-        }
-
-        #region 操作权限列表
-
-        /// <summary>
-        /// 根据条件查询操作权限列表
-        /// </summary>
-        /// <returns></returns>
-        public IActionResult Index(OperateRightList data, string right)
-        {
-            ViewBag.RightInfo = RightInfo;
-            ViewBag.right = right;
-
-            return View();
-        }
-
-        #endregion
-
-        #region 根据条件查询操作权限列表
-
-        /// <summary>
-        /// 操作权限列表
-        /// </summary>
-        /// <returns></returns>
-        public JsonResult IndexData(OperateRightList data, int page = 1, int limit = 30)
-        {
-
-            Dictionary<string, string> Fields = new Dictionary<string, string>();
-
-            Fields.Add("Name", "1"); //名称
-            Fields.Add("EnName", "1"); //英文名
-
-
-            string condition = " and Status>-1";
-
-
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.BsTables).IndexData("OperateRightList", Fields, "Id desc", "0", page, limit, condition);
-            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
-            foreach (Dictionary<string, object> dic in diclist)
-            {
-
-            }
-            return Json(obj);
-        }
-
-        #endregion
-
-        #region 增加操作权限
-
-        /// <summary>
-        /// 增加或修改操作权限信息
-        /// </summary>
-        /// <returns></returns>
-        public IActionResult Add(string right)
-        {
-            ViewBag.RightInfo = RightInfo;
-            ViewBag.right = right;
-
-
-            return View();
-        }
-
-        #endregion
-
-        #region 增加操作权限
-
-        /// <summary>
-        /// 增加或修改操作权限信息
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost]
-        public string Add(OperateRightList data)
-        {
-            Dictionary<string, object> Fields = new Dictionary<string, object>();
-
-            Fields.Add("Name", data.Name); //名称
-            Fields.Add("EnName", data.EnName); //英文名
-
-            Fields.Add("SeoTitle", data.SeoTitle);
-            Fields.Add("SeoKeyword", data.SeoKeyword);
-            Fields.Add("SeoDescription", data.SeoDescription);
-            int Id = new AdminContentOther(_accessor.HttpContext, PublicFunction.BsTables).Add("OperateRightList", Fields, 0);
-            AddSysLog(data.Id.ToString(), "OperateRightList", "add");
-            bsdb.SaveChanges();
-
-            return "success";
-        }
-
-        #endregion
-
-        #region 修改操作权限
-
-        /// <summary>
-        /// 增加或修改操作权限信息
-        /// </summary>
-        /// <returns></returns>
-        public IActionResult Edit(string right, int Id = 0)
-        {
-            ViewBag.RightInfo = RightInfo;
-            ViewBag.right = right;
-
-
-            OperateRightList editData = bsdb.OperateRightList.FirstOrDefault(m => m.Id == Id) ?? new OperateRightList();
-            ViewBag.data = editData;
-            return View();
-        }
-
-        #endregion
-
-        #region 修改操作权限
-
-        /// <summary>
-        /// 增加或修改操作权限信息
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost]
-        public string Edit(OperateRightList data)
-        {
-            Dictionary<string, object> Fields = new Dictionary<string, object>();
-
-            Fields.Add("Name", data.Name); //名称
-            Fields.Add("EnName", data.EnName); //英文名
-
-            Fields.Add("SeoTitle", data.SeoTitle);
-            Fields.Add("SeoKeyword", data.SeoKeyword);
-            Fields.Add("SeoDescription", data.SeoDescription);
-            new AdminContentOther(_accessor.HttpContext, PublicFunction.BsTables).Edit("OperateRightList", Fields, data.Id);
-            AddSysLog(data.Id.ToString(), "OperateRightList", "update");
-            bsdb.SaveChanges();
-
-            return "success";
-        }
-
-        #endregion
-
-        #region 删除操作权限信息
-
-        /// <summary>
-        /// 删除操作权限信息
-        /// </summary>
-        /// <returns></returns>
-        public string Delete(string Id)
-        {
-            string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id, "OperateRightList", "del");
-            foreach (string subid in idlist)
-            {
-                int id = int.Parse(subid);
-                Dictionary<string, object> Fields = new Dictionary<string, object>();
-                Fields.Add("Status", -1);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.BsTables).Edit("OperateRightList", Fields, id);
-            }
-            bsdb.SaveChanges();
-
-            return "success";
-        }
-
-        #endregion
-
-        #region 开启
-
-        /// <summary>
-        /// 开启
-        /// </summary>
-        /// <returns></returns>
-        public string Open(string Id)
-        {
-            string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id, "OperateRightList", "open");
-            foreach (string subid in idlist)
-            {
-                int id = int.Parse(subid);
-                Dictionary<string, object> Fields = new Dictionary<string, object>();
-                Fields.Add("Status", 1);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.BsTables).Edit("OperateRightList", Fields, id);
-            }
-            bsdb.SaveChanges();
-            return "success";
-        }
-
-        #endregion
-
-        #region 关闭
-
-        /// <summary>
-        /// 关闭
-        /// </summary>
-        /// <returns></returns>
-        public string Close(string Id)
-        {
-            string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id, "OperateRightList", "close");
-            foreach (string subid in idlist)
-            {
-                int id = int.Parse(subid);
-                Dictionary<string, object> Fields = new Dictionary<string, object>();
-                Fields.Add("Status", 0);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.BsTables).Edit("OperateRightList", Fields, id);
-            }
-            bsdb.SaveChanges();
-            return "success";
-        }
-
-        #endregion
-
-        #region 排序
-        /// <summary>
-        /// 排序
-        /// </summary>
-        /// <param name="Id"></param>
-        public string Sort(int Id, int Sort)
-        {
-            new AdminContentOther(_accessor.HttpContext, PublicFunction.BsTables).Sort("OperateRightList", Sort, Id);
-
-            AddSysLog(Id.ToString(), "OperateRightList", "sort");
-            return "success";
-        }
-        #endregion
-
-        #region 导入数据
-        /// <summary>
-        /// 导入数据
-        /// </summary>
-        /// <param name="ExcelData"></param>
-        public string Import(string ExcelData)
-        {
-            ExcelData = HttpUtility.UrlDecode(ExcelData);
-            JsonData list = JsonMapper.ToObject(ExcelData);
-            for (int i = 1; i < list.Count; i++)
-            {
-                JsonData dr = list[i];
-
-                bsdb.OperateRightList.Add(new OperateRightList()
-                {
-                    CreateDate = DateTime.Now,
-                    UpdateDate = DateTime.Now,
-
-                });
-                bsdb.SaveChanges();
-            }
-            AddSysLog("0", "OperateRightList", "Import");
-            return "success";
-        }
-        #endregion
-
-        #region 导出Excel
-
-        /// <summary>
-        /// 导出Excel
-        /// </summary>
-        /// <returns></returns>
-        public JsonResult ExportExcel(OperateRightList data)
-        {
-            Dictionary<string, string> Fields = new Dictionary<string, string>();
-            Fields.Add("Name", "1"); //名称
-            Fields.Add("EnName", "1"); //英文名
-
-
-            string condition = " and Status>-1";
-
-
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.BsTables).IndexData("OperateRightList", Fields, "Id desc", "0", 1, 20000, condition, "", false);
-            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
-            foreach (Dictionary<string, object> dic in diclist)
-            {
-
-            }
-
-            Dictionary<string, object> result = new Dictionary<string, object>();
-            result.Add("Status", "1");
-            result.Add("Info", "Excel报表-" + DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss") + ".xlsx");
-            result.Add("Obj", diclist);
-            Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
-
-            result.Add("Fields", ReturnFields);
-            AddSysLog("0", "OperateRightList", "ExportExcel");
-            return Json(result);
-        }
-
-        #endregion
-
-    }
-}

Areas/Admin/Controllers/BsServer/RightDicController.cs

@@ -1,339 +0,0 @@
-/*
- * 单页内容
- */
-
-using System;
-using System.Web;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using MySystem.BsModels;
-using Library;
-using LitJson;
-using MySystemLib;
-
-namespace MySystem.Areas.Admin.Controllers
-{
-    [Area("Admin")]
-    [Route("Admin/[controller]/[action]")]
-    public class RightDicController : BaseController
-    {
-        public RightDicController(IHttpContextAccessor accessor, ILogger<BaseController> logger, IOptions<Setting> setting) : base(accessor, logger, setting)
-        {
-            OtherMySqlConn.connstr = ConfigurationManager.AppSettings["BsSqlConnStr"].ToString();
-        }
-
-        #region 单页内容列表
-
-        /// <summary>
-        /// 根据条件查询单页内容列表
-        /// </summary>
-        /// <returns></returns>
-        public IActionResult Index(RightDic data, string right)
-        {
-            ViewBag.RightInfo = RightInfo;
-            ViewBag.right = right;
-            return View();
-        }
-
-        #endregion
-
-        #region 根据条件查询单页内容列表
-
-        /// <summary>
-        /// 单页内容列表
-        /// </summary>
-        /// <returns></returns>
-        public JsonResult IndexData(RightDic data, int page = 1, int limit = 30)
-        {
-            List<RightDic> diclist = bsdb.RightDic.OrderBy(m => m.Id).ToList();
-            foreach (RightDic dic in diclist)
-            {
-                int nameLength = dic.Id.Split('_').Length;
-                for (int i = 1; i < nameLength; i++)
-                {
-                    dic.Name = "　　" + dic.Name;
-                }
-            }
-            Dictionary<string, object> obj = new Dictionary<string, object>();
-            obj.Add("code", 0);
-            obj.Add("msg", "");
-            obj.Add("count", diclist.Count);
-            obj.Add("data", diclist);
-            return Json(obj);
-        }
-
-        #endregion
-
-        #region 修改
-
-        /// <summary>
-        /// 修改
-        /// </summary>
-        /// <returns></returns>
-        public IActionResult Edit(string right, string Id = "")
-        {
-            ViewBag.RightInfo = RightInfo;
-            ViewBag.right = right;
-
-            RightDic editData = bsdb.RightDic.FirstOrDefault(m => m.Id == Id) ?? new RightDic();
-            ViewBag.data = editData;
-
-            string PColId = "";
-            if (editData.Id.Contains("_"))
-            { 
-                PColId = editData.Id.Substring(0, editData.Id.LastIndexOf("_"));
-            }
-            else
-            {
-                PColId = editData.Id;
-            }
-            ViewBag.OldPColId = PColId;
-            ViewBag.PColId = PColId;
-            return View();
-        }
-
-        [HttpPost]
-        public string EditPost(RightDic data, string OldPColId, string PColId)
-        {
-            RightDic adddic = new RightDic();
-            bool op = false;
-            RightDic dic = bsdb.RightDic.FirstOrDefault(m => m.Id == data.Id);
-            if (dic != null)
-            {
-                if (OldPColId != PColId)
-                {
-                    string words = "123456789abcdefghijklmnopqrstuvwxyz";
-                    if (!string.IsNullOrEmpty(PColId))
-                    {
-                        int Len = PColId.Length + 2;
-                        int checkcount = bsdb.RightDic.Count(m => m.Id.StartsWith(PColId) && m.Id.Length == Len);
-                        if (checkcount > 0)
-                        {
-                            RightDic checkdic = bsdb.RightDic.Where(m => m.Id.StartsWith(PColId) && m.Id.Length == Len).OrderByDescending(m => m.Id).FirstOrDefault();
-                            string last_id = "";
-                            string[] idlist = checkdic.Id.Split('_');
-                            last_id = idlist[idlist.Length - 1];
-                            last_id = words.Substring(words.IndexOf(last_id) + 1, 1);
-                            adddic.Id = PColId + "_" + last_id;
-                        }
-                        else
-                        {
-                            adddic.Id = PColId + "_1";
-                        }
-                    }
-                    else
-                    {
-                        int checkcount = bsdb.RightDic.Count(m => m.Id.Length == 1);
-                        if (checkcount > 0)
-                        {
-                            RightDic checkdic = bsdb.RightDic.Where(m => m.Id.Length == 1).OrderByDescending(m => m.Id).FirstOrDefault();
-                            string last_id = words.Substring(words.IndexOf(checkdic.Id) + 1, 1);
-                            adddic.Id = PColId + "_" + last_id;
-                        }
-                        else
-                        {
-                            adddic.Id = "1";
-                        }
-                    }
-                    adddic.Name = data.Name;
-                    adddic.MainMenu = data.MainMenu;
-                    adddic.MainStat = data.MainStat;
-                    adddic.MainDataList = data.MainDataList;
-                    adddic.Url = dic.Url;
-                    adddic.RightLevel = dic.RightLevel;
-                    bsdb.RightDic.Remove(dic);
-                    op = true;
-                }
-                else
-                {
-                    dic.Name = data.Name;
-                    dic.MainMenu = data.MainMenu;
-                    dic.MainStat = data.MainStat;
-                    dic.MainDataList = data.MainDataList;
-                }
-            }
-            AddSysLog(data.Id.ToString(), "RightDic", "update");
-            bsdb.SaveChanges();
-            if (op)
-            {
-                bsdb.RightDic.Add(adddic);
-                bsdb.SaveChanges();
-            }
-
-            return "success";
-        }
-
-        #endregion
-
-        #region 修改
-
-        /// <summary>
-        /// 修改
-        /// </summary>
-        /// <returns></returns>
-        public IActionResult RightSet(string Id = "")
-        {
-            List<OperateRightList> rights = bsdb.OperateRightList.ToList();
-            ViewBag.rights = rights;
-            ViewBag.Id = Id;
-
-            List<string> RightList = new List<string>();
-            List<MenuRight> MenuRights = bsdb.MenuRight.Where(m => m.MenuId.StartsWith(Id)).ToList();
-            foreach (MenuRight sub in MenuRights)
-            {
-                RightList.Add(sub.MenuId.Replace(Id + "_", "") + "_" + sub.Name);
-            }
-            ViewBag.RightList = RightList;
-
-            RightDic editData = bsdb.RightDic.FirstOrDefault(m => m.Id == Id) ?? new RightDic();
-            ViewBag.OtherRight = editData.OtherRight;
-            return View();
-        }
-
-        [HttpPost]
-        public string RightSetPost(string Id, string OtherRight, string RightList)
-        {
-            IQueryable<MenuRight> MenuRights = bsdb.MenuRight.Where(m => m.MenuId.StartsWith(Id));
-            foreach (MenuRight sub in MenuRights)
-            {
-                bsdb.MenuRight.Remove(sub);
-            }
-            bsdb.SaveChanges();
-            if (!string.IsNullOrEmpty(RightList))
-            {
-                string[] Rights = RightList.TrimEnd(',').Split(',');
-                foreach (string Right in Rights)
-                {
-                    string[] list = Right.Split('_');
-                    bsdb.MenuRight.Add(new MenuRight()
-                    {
-                        MenuId = Id + "_" + list[0],
-                        Name = list[1],
-                    });
-                }
-            }
-            RightDic edit = bsdb.RightDic.FirstOrDefault(m => m.Id == Id);
-            if(edit != null)
-            {
-                edit.OtherRight = OtherRight;
-            }
-            bsdb.SaveChanges();
-            return "success";
-        }
-
-        #endregion
-
-        #region 排序
-        /// <summary>
-        /// 排序
-        /// </summary>
-        /// <param name="Id"></param>
-        public string Sort(string Id, int Sort)
-        {
-            RightDic edit = bsdb.RightDic.FirstOrDefault(m => m.Id == Id);
-            if (edit != null)
-            { 
-                edit.Sort = Sort;
-                bsdb.SaveChanges();
-            }
-            return "success";
-        }
-        #endregion
-
-        #region 设置快捷方式
-        /// <summary>
-        /// 设置快捷方式
-        /// </summary>
-        /// <param name="Id"></param>
-        public string SetMainMenu(string Id, bool value)
-        {
-            RightDic edit = bsdb.RightDic.FirstOrDefault(m => m.Id == Id);
-            if (edit != null)
-            {
-                if (value)
-                {
-                    edit.MainMenu = 1;
-                }
-                else
-                { 
-                    edit.MainMenu = 0;
-                }
-                bsdb.SaveChanges();
-            }
-            return "success";
-        }
-        #endregion
-
-        #region 统计
-        /// <summary>
-        /// 统计
-        /// </summary>
-        /// <param name="Id"></param>
-        public string SetMainStat(string Id, bool value)
-        {
-            RightDic edit = bsdb.RightDic.FirstOrDefault(m => m.Id == Id);
-            if (edit != null)
-            {
-                if (value)
-                {
-                    edit.MainStat = 1;
-                }
-                else
-                { 
-                    edit.MainStat = 0;
-                }
-                bsdb.SaveChanges();
-            }
-            return "success";
-        }
-        #endregion
-
-        #region 主界面数据列表
-        /// <summary>
-        /// 主界面数据列表
-        /// </summary>
-        /// <param name="Id"></param>
-        public string SetMainDataList(string Id, bool value)
-        {
-            RightDic edit = bsdb.RightDic.FirstOrDefault(m => m.Id == Id);
-            if (edit != null)
-            {
-                if (value)
-                {
-                    edit.MainDataList = 1;
-                }
-                else
-                { 
-                    edit.MainDataList = 0;
-                }
-                bsdb.SaveChanges();
-            }
-            return "success";
-        }
-        #endregion
-
-        #region 设置图标
-        /// <summary>
-        /// 设置图标
-        /// </summary>
-        /// <param name="Id"></param>
-        public string SetIcon(string Id, string value)
-        {
-            RightDic edit = bsdb.RightDic.FirstOrDefault(m => m.Id == Id);
-            if (edit != null)
-            {
-                edit.Icon = value;
-                bsdb.SaveChanges();
-            }
-            return "success";
-        }
-        #endregion
-
-    }
-}

Areas/Admin/Controllers/BsServer/UploadParamsController.cs

@@ -1,339 +0,0 @@
-/*
- * 上传配置项
- */
-
-using System;
-using System.Web;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using MySystem.BsModels;
-using Library;
-using LitJson;
-using MySystemLib;
-
-namespace MySystem.Areas.Admin.Controllers
-{
-    [Area("Admin")]
-    [Route("Admin/[controller]/[action]")]
-    public class UploadParamsController : BaseController
-    {
-        public UploadParamsController(IHttpContextAccessor accessor, ILogger<BaseController> logger, IOptions<Setting> setting) : base(accessor, logger, setting)
-        {
-            OtherMySqlConn.connstr = ConfigurationManager.AppSettings["BsSqlConnStr"].ToString();
-        }
-
-        #region 上传配置项列表
-
-        /// <summary>
-        /// 根据条件查询上传配置项列表
-        /// </summary>
-        /// <returns></returns>
-        public IActionResult Index(UploadParams data, string right)
-        {
-            ViewBag.RightInfo = RightInfo;
-            ViewBag.right = right;
-
-
-            string Condition = "";
-            Condition += "TableName:\"" + data.TableName + "\",";
-            Condition += "ColumnName:\"" + data.ColumnName + "\",";
-            Condition += "ColumnEnName:\"" + data.ColumnEnName + "\",";
-
-            if (!string.IsNullOrEmpty(Condition))
-            {
-                Condition = Condition.TrimEnd(',');
-                Condition = ", where: {" + Condition + "}";
-            }
-            ViewBag.Condition = Condition;
-            return View();
-        }
-
-        #endregion
-
-        #region 根据条件查询上传配置项列表
-
-        /// <summary>
-        /// 上传配置项列表
-        /// </summary>
-        /// <returns></returns>
-        public JsonResult IndexData(UploadParams data, int page = 1, int limit = 30)
-        {
-
-            Dictionary<string, string> Fields = new Dictionary<string, string>();
-
-            Fields.Add("TableName", "2"); //表名
-            Fields.Add("ColumnName", "2"); //字段名
-            Fields.Add("ColumnEnName", "2"); //字段英文明
-
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.BsTables).IndexData("UploadParams", Fields, "Id desc", "0", page, limit);
-            //List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
-            //foreach (Dictionary<string, object> dic in diclist)
-            //{
-
-            //}
-            return Json(obj);
-        }
-
-        #endregion
-
-        #region 增加上传配置项
-
-        /// <summary>
-        /// 增加或修改上传配置项信息
-        /// </summary>
-        /// <returns></returns>
-        public IActionResult Add(string right)
-        {
-            ViewBag.RightInfo = RightInfo;
-            ViewBag.right = right;
-
-
-            return View();
-        }
-
-        #endregion
-
-        #region 增加上传配置项
-
-        /// <summary>
-        /// 增加或修改上传配置项信息
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost]
-        public string Add(UploadParams data)
-        {
-            Dictionary<string, object> Fields = new Dictionary<string, object>();
-
-            Fields.Add("TableName", data.TableName); //表名
-            Fields.Add("TableEnName", data.TableEnName);
-            Fields.Add("ColumnName", data.ColumnName); //字段名
-            Fields.Add("ColumnEnName", data.ColumnEnName); //字段英文明
-            Fields.Add("ParamString", data.ParamString); //参数
-
-            Fields.Add("SeoTitle", data.SeoTitle);
-            Fields.Add("SeoKeyword", data.SeoKeyword);
-            Fields.Add("SeoDescription", data.SeoDescription);
-            int Id = new AdminContentOther(_accessor.HttpContext, PublicFunction.BsTables).Add("UploadParams", Fields, 0);
-            AddSysLog(data.Id.ToString(), "UploadParams", "add");
-            bsdb.SaveChanges();
-
-            RedisDbconn.Instance.Set("btn:" + function.MD5_16(data.TableEnName + data.ColumnEnName), data.ParamString);
-
-            return "success";
-        }
-
-        #endregion
-
-        #region 修改上传配置项
-
-        /// <summary>
-        /// 增加或修改上传配置项信息
-        /// </summary>
-        /// <returns></returns>
-        public IActionResult Edit(string right, int Id = 0)
-        {
-            ViewBag.RightInfo = RightInfo;
-            ViewBag.right = right;
-
-
-            UploadParams editData = bsdb.UploadParams.FirstOrDefault(m => m.Id == Id) ?? new UploadParams();
-            ViewBag.data = editData;
-            return View();
-        }
-
-        #endregion
-
-        #region 修改上传配置项
-
-        /// <summary>
-        /// 增加或修改上传配置项信息
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost]
-        public string Edit(UploadParams data)
-        {
-            Dictionary<string, object> Fields = new Dictionary<string, object>();
-
-            Fields.Add("TableName", data.TableName); //表名
-            Fields.Add("TableEnName", data.TableEnName);
-            Fields.Add("ColumnName", data.ColumnName); //字段名
-            Fields.Add("ColumnEnName", data.ColumnEnName); //字段英文明
-            Fields.Add("ParamString", data.ParamString); //参数
-
-            Fields.Add("SeoTitle", data.SeoTitle);
-            Fields.Add("SeoKeyword", data.SeoKeyword);
-            Fields.Add("SeoDescription", data.SeoDescription);
-            new AdminContentOther(_accessor.HttpContext, PublicFunction.BsTables).Edit("UploadParams", Fields, data.Id);
-            AddSysLog(data.Id.ToString(), "UploadParams", "update");
-            bsdb.SaveChanges();
-            
-            RedisDbconn.Instance.Set("btn:" + function.MD5_16(data.TableEnName + data.ColumnEnName), data.ParamString);
-
-            return "success";
-        }
-
-        #endregion
-
-        #region 删除上传配置项信息
-
-        /// <summary>
-        /// 删除上传配置项信息
-        /// </summary>
-        /// <returns></returns>
-        public string Delete(string Id)
-        {
-            string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id, "UploadParams", "del");
-            foreach (string subid in idlist)
-            {
-                int id = int.Parse(subid);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.BsTables).Delete("UploadParams", id);
-            }
-            bsdb.SaveChanges();
-
-            return "success";
-        }
-
-        #endregion
-
-        #region 开启
-
-        /// <summary>
-        /// 开启
-        /// </summary>
-        /// <returns></returns>
-        public string Open(string Id)
-        {
-            string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id, "UploadParams", "open");
-            foreach (string subid in idlist)
-            {
-                int id = int.Parse(subid);
-                Dictionary<string, object> Fields = new Dictionary<string, object>();
-                Fields.Add("Status", 1);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.BsTables).Edit("UploadParams", Fields, id);
-            }
-            bsdb.SaveChanges();
-            return "success";
-        }
-
-        #endregion
-
-        #region 关闭
-
-        /// <summary>
-        /// 关闭
-        /// </summary>
-        /// <returns></returns>
-        public string Close(string Id)
-        {
-            string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id, "UploadParams", "close");
-            foreach (string subid in idlist)
-            {
-                int id = int.Parse(subid);
-                Dictionary<string, object> Fields = new Dictionary<string, object>();
-                Fields.Add("Status", 0);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.BsTables).Edit("UploadParams", Fields, id);
-            }
-            bsdb.SaveChanges();
-            return "success";
-        }
-
-        #endregion
-
-        #region 排序
-        /// <summary>
-        /// 排序
-        /// </summary>
-        /// <param name="Id"></param>
-        public string Sort(int Id, int Sort)
-        {
-            new AdminContentOther(_accessor.HttpContext, PublicFunction.BsTables).Sort("UploadParams", Sort, Id);
-
-            AddSysLog(Id.ToString(), "UploadParams", "sort");
-            return "success";
-        }
-        #endregion
-
-        #region 导入数据
-        /// <summary>
-        /// 导入数据
-        /// </summary>
-        /// <param name="ExcelData"></param>
-        public string Import(string ExcelData)
-        {
-            ExcelData = HttpUtility.UrlDecode(ExcelData);
-            JsonData list = JsonMapper.ToObject(ExcelData);
-            for (int i = 1; i < list.Count; i++)
-            {
-                JsonData dr = list[i];
-
-                bsdb.UploadParams.Add(new UploadParams()
-                {
-                    CreateDate = DateTime.Now,
-                    UpdateDate = DateTime.Now,
-
-                });
-                bsdb.SaveChanges();
-            }
-            AddSysLog("0", "UploadParams", "Import");
-            return "success";
-        }
-        #endregion
-
-        #region 导出Excel
-
-        /// <summary>
-        /// 导出Excel
-        /// </summary>
-        /// <returns></returns>
-        public JsonResult ExportExcel(UploadParams data)
-        {
-            Dictionary<string, string> Fields = new Dictionary<string, string>();
-            Fields.Add("TableName", "2"); //表名
-            Fields.Add("ColumnName", "2"); //字段名
-            Fields.Add("ColumnEnName", "2"); //字段英文明
-
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.BsTables).IndexData("UploadParams", Fields, "Id desc", "0", 1, 20000, "", "", false);
-            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
-
-            Dictionary<string, object> result = new Dictionary<string, object>();
-            result.Add("Status", "1");
-            result.Add("Info", "Excel报表-" + DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss") + ".xlsx");
-            result.Add("Obj", diclist);
-            Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
-
-            result.Add("Fields", ReturnFields);
-            AddSysLog("0", "UploadParams", "ExportExcel");
-            return Json(result);
-        }
-
-        #endregion
-
-        #region 生成配置
-
-        /// <summary>
-        /// 生成配置
-        /// </summary>
-        /// <returns></returns>
-        public string MakeParams()
-        {
-            AddSysLog(0, "UploadParams", "MakeParam");
-            List<UploadParams> paramlist = bsdb.UploadParams.ToList();
-            foreach (UploadParams param in paramlist)
-            {
-                RedisDbconn.Instance.Set("btn:" + function.MD5_16(param.TableEnName + param.ColumnEnName), param.ParamString);
-            }
-            return "success";
-        }
-
-        #endregion
-    }
-}

Areas/Admin/Controllers/CashServer/UserIdentityController.cs

@@ -0,0 +1,363 @@
+/*
+ * 创客信息
+ */
+
+using System;
+using System.Web;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using MySystem.CashModels;
+using Library;
+using LitJson;
+using MySystemLib;
+
+namespace MySystem.Areas.Admin.Controllers
+{
+    [Area("Admin")]
+    [Route("Admin/[controller]/[action]")]
+    public class UserIdentityController : BaseController
+    {
+        public UserIdentityController(IHttpContextAccessor accessor, ILogger<BaseController> logger, IOptions<Setting> setting) : base(accessor, logger, setting)
+        {
+            OtherMySqlConn.connstr = ConfigurationManager.AppSettings["CashSqlConnStr"].ToString();
+        }
+
+        #region 创客信息列表
+
+        /// <summary>
+        /// 根据条件查询创客信息列表
+        /// </summary>
+        /// <returns></returns>
+        public IActionResult Index(UserIdentity data, string right)
+        {
+            ViewBag.RightInfo = RightInfo;
+            ViewBag.right = right;
+
+
+            return View();
+        }
+
+        #endregion
+
+        #region 根据条件查询创客信息列表
+
+        /// <summary>
+        /// 创客信息列表
+        /// </summary>
+        /// <returns></returns>
+        public JsonResult IndexData(UserIdentity data, string CheckStatusSelect, int page = 1, int limit = 30)
+        {
+
+            Dictionary<string, string> Fields = new Dictionary<string, string>();
+
+            Fields.Add("BuddyNo", "1"); //创客编号
+            Fields.Add("CreateDate", "3"); //时间
+            Fields.Add("BuddyName", "1"); //创客名称
+            Fields.Add("IdCardNo", "1"); //身份证号
+            Fields.Add("UserMobile", "1"); //手机号
+            Fields.Add("BankCardNo", "1"); //银行卡号
+
+
+            string condition = " and Status>-1";
+            //验证和同步账户
+            if (!string.IsNullOrEmpty(CheckStatusSelect))
+            {
+                condition += " and CheckStatus=" + CheckStatusSelect;
+            }
+
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.CashTables).IndexData("UserIdentity", Fields, "Id desc", "0", page, limit, condition);
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
+            foreach (Dictionary<string, object> dic in diclist)
+            {
+                //验证和同步账户
+                int CheckStatus = int.Parse(dic["CheckStatus"].ToString());
+                if (CheckStatus == 0) dic["CheckStatus"] = "初始";
+                if (CheckStatus == 1) dic["CheckStatus"] = "进件成功";
+                if (CheckStatus == 2) dic["CheckStatus"] = "签约成功";
+                if (CheckStatus == 3) dic["CheckStatus"] = "进件失败";
+
+            }
+            return Json(obj);
+        }
+
+        #endregion
+
+        #region 增加创客信息
+
+        /// <summary>
+        /// 增加或修改创客信息信息
+        /// </summary>
+        /// <returns></returns>
+        public IActionResult Add(string right)
+        {
+            ViewBag.RightInfo = RightInfo;
+            ViewBag.right = right;
+
+
+            return View();
+        }
+
+        #endregion
+
+        #region 增加创客信息
+
+        /// <summary>
+        /// 增加或修改创客信息信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public string Add(UserIdentity data)
+        {
+            Dictionary<string, object> Fields = new Dictionary<string, object>();
+
+            Fields.Add("BuddyNo", data.BuddyNo); //创客编号
+            Fields.Add("BuddyName", data.BuddyName); //创客名称
+            Fields.Add("IdCardNo", data.IdCardNo); //身份证号
+            Fields.Add("UserMobile", data.UserMobile); //手机号
+            Fields.Add("BankCardNo", data.BankCardNo); //银行卡号
+            Fields.Add("CertFrontImage", data.CertFrontImage); //身份证正面照
+            Fields.Add("CertReverseImage", data.CertReverseImage); //身份证反面照
+            Fields.Add("LivingScore", data.LivingScore); //活体得分
+            Fields.Add("FaceVideo", data.FaceVideo); //活体视频
+            Fields.Add("LivingImage", data.LivingImage); //活体照
+            Fields.Add("SignImageUrl", data.SignImageUrl); //签名照片地址
+            Fields.Add("CheckStatus", data.CheckStatus); //验证和同步账户
+
+            Fields.Add("SeoTitle", data.SeoTitle);
+            Fields.Add("SeoKeyword", data.SeoKeyword);
+            Fields.Add("SeoDescription", data.SeoDescription);
+            int Id = new AdminContentOther(_accessor.HttpContext, PublicFunction.CashTables).Add("UserIdentity", Fields, 0);
+            AddSysLog(data.Id.ToString(), "UserIdentity", "add");
+            cashdb.SaveChanges();
+
+            return "success";
+        }
+
+        #endregion
+
+        #region 修改创客信息
+
+        /// <summary>
+        /// 增加或修改创客信息信息
+        /// </summary>
+        /// <returns></returns>
+        public IActionResult Edit(string right, int Id = 0)
+        {
+            ViewBag.RightInfo = RightInfo;
+            ViewBag.right = right;
+
+
+            UserIdentity editData = cashdb.UserIdentity.FirstOrDefault(m => m.Id == Id) ?? new UserIdentity();
+            ViewBag.data = editData;
+            return View();
+        }
+
+        #endregion
+
+        #region 修改创客信息
+
+        /// <summary>
+        /// 增加或修改创客信息信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public string Edit(UserIdentity data)
+        {
+            Dictionary<string, object> Fields = new Dictionary<string, object>();
+
+            Fields.Add("BuddyNo", data.BuddyNo); //创客编号
+            Fields.Add("BuddyName", data.BuddyName); //创客名称
+            Fields.Add("IdCardNo", data.IdCardNo); //身份证号
+            Fields.Add("UserMobile", data.UserMobile); //手机号
+            Fields.Add("BankCardNo", data.BankCardNo); //银行卡号
+            Fields.Add("CertFrontImage", data.CertFrontImage); //身份证正面照
+            Fields.Add("CertReverseImage", data.CertReverseImage); //身份证反面照
+            Fields.Add("LivingScore", data.LivingScore); //活体得分
+            Fields.Add("FaceVideo", data.FaceVideo); //活体视频
+            Fields.Add("LivingImage", data.LivingImage); //活体照
+            Fields.Add("SignImageUrl", data.SignImageUrl); //签名照片地址
+            Fields.Add("CheckStatus", data.CheckStatus); //验证和同步账户
+
+            Fields.Add("SeoTitle", data.SeoTitle);
+            Fields.Add("SeoKeyword", data.SeoKeyword);
+            Fields.Add("SeoDescription", data.SeoDescription);
+            new AdminContentOther(_accessor.HttpContext, PublicFunction.CashTables).Edit("UserIdentity", Fields, data.Id);
+            AddSysLog(data.Id.ToString(), "UserIdentity", "update");
+            cashdb.SaveChanges();
+            RedisDbconn.Instance.AddList("CashPersonalCreateQueue", data.Id);
+
+            return "success";
+        }
+
+        #endregion
+
+        #region 删除创客信息信息
+
+        /// <summary>
+        /// 删除创客信息信息
+        /// </summary>
+        /// <returns></returns>
+        public string Delete(string Id)
+        {
+            string[] idlist = Id.Split(new char[] { ',' });
+            AddSysLog(Id, "UserIdentity", "del");
+            foreach (string subid in idlist)
+            {
+                int id = int.Parse(subid);
+                Dictionary<string, object> Fields = new Dictionary<string, object>();
+                Fields.Add("Status", -1);
+                new AdminContentOther(_accessor.HttpContext, PublicFunction.CashTables).Edit("UserIdentity", Fields, id);
+            }
+            cashdb.SaveChanges();
+
+            return "success";
+        }
+
+        #endregion
+
+        #region 开启
+
+        /// <summary>
+        /// 开启
+        /// </summary>
+        /// <returns></returns>
+        public string Open(string Id)
+        {
+            string[] idlist = Id.Split(new char[] { ',' });
+            AddSysLog(Id, "UserIdentity", "open");
+            foreach (string subid in idlist)
+            {
+                int id = int.Parse(subid);
+                Dictionary<string, object> Fields = new Dictionary<string, object>();
+                Fields.Add("Status", 1);
+                new AdminContentOther(_accessor.HttpContext, PublicFunction.CashTables).Edit("UserIdentity", Fields, id);
+            }
+            cashdb.SaveChanges();
+            return "success";
+        }
+
+        #endregion
+
+        #region 关闭
+
+        /// <summary>
+        /// 关闭
+        /// </summary>
+        /// <returns></returns>
+        public string Close(string Id)
+        {
+            string[] idlist = Id.Split(new char[] { ',' });
+            AddSysLog(Id, "UserIdentity", "close");
+            foreach (string subid in idlist)
+            {
+                int id = int.Parse(subid);
+                Dictionary<string, object> Fields = new Dictionary<string, object>();
+                Fields.Add("Status", 0);
+                new AdminContentOther(_accessor.HttpContext, PublicFunction.CashTables).Edit("UserIdentity", Fields, id);
+            }
+            cashdb.SaveChanges();
+            return "success";
+        }
+
+        #endregion
+
+        #region 排序
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="Id"></param>
+        public string Sort(int Id, int Sort)
+        {
+            new AdminContentOther(_accessor.HttpContext, PublicFunction.CashTables).Sort("UserIdentity", Sort, Id);
+
+            AddSysLog(Id.ToString(), "UserIdentity", "sort");
+            return "success";
+        }
+        #endregion
+
+        #region 导入数据
+        /// <summary>
+        /// 导入数据
+        /// </summary>
+        /// <param name="ExcelData"></param>
+        public string Import(string ExcelData)
+        {
+            ExcelData = HttpUtility.UrlDecode(ExcelData);
+            JsonData list = JsonMapper.ToObject(ExcelData);
+            for (int i = 1; i < list.Count; i++)
+            {
+                JsonData dr = list[i];
+
+                cashdb.UserIdentity.Add(new UserIdentity()
+                {
+                    CreateDate = DateTime.Now,
+                    UpdateDate = DateTime.Now,
+
+                });
+                cashdb.SaveChanges();
+            }
+            AddSysLog("0", "UserIdentity", "Import");
+            return "success";
+        }
+        #endregion
+
+        #region 导出Excel
+
+        /// <summary>
+        /// 导出Excel
+        /// </summary>
+        /// <returns></returns>
+        public JsonResult ExportExcel(UserIdentity data, string CheckStatusSelect)
+        {
+            Dictionary<string, string> Fields = new Dictionary<string, string>();
+            Fields.Add("BuddyNo", "1"); //创客编号
+            Fields.Add("CreateDate", "3"); //时间
+            Fields.Add("BuddyName", "1"); //创客名称
+            Fields.Add("IdCardNo", "1"); //身份证号
+            Fields.Add("UserMobile", "1"); //手机号
+            Fields.Add("BankCardNo", "1"); //银行卡号
+
+
+            string condition = " and Status>-1";
+            //验证和同步账户
+            if (!string.IsNullOrEmpty(CheckStatusSelect))
+            {
+                condition += " and CheckStatus=" + CheckStatusSelect;
+            }
+
+
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.CashTables).IndexData("UserIdentity", Fields, "Id desc", "0", 1, 20000, condition, "Remark", false);
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
+            foreach (Dictionary<string, object> dic in diclist)
+            {
+                //验证和同步账户
+                int CheckStatus = int.Parse(dic["CheckStatus"].ToString());
+                if (CheckStatus == 0) dic["CheckStatus"] = "初始";
+                if (CheckStatus == 1) dic["CheckStatus"] = "进件成功";
+                if (CheckStatus == 2) dic["CheckStatus"] = "签约成功";
+                if (CheckStatus == 3) dic["CheckStatus"] = "进件失败";
+
+            }
+
+            Dictionary<string, object> result = new Dictionary<string, object>();
+            result.Add("Status", "1");
+            result.Add("Info", "Excel报表-" + DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss") + ".xlsx");
+            result.Add("Obj", diclist);
+            Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
+            ReturnFields.Add("Remark", "注释");
+
+            result.Add("Fields", ReturnFields);
+            AddSysLog("0", "UserIdentity", "ExportExcel");
+            return Json(result);
+        }
+
+        #endregion
+
+    }
+}

Areas/Admin/Controllers/CashServer/WithdrawRecordController.cs

@@ -0,0 +1,394 @@
+/*
+ * 提现记录
+ */
+
+using System;
+using System.Web;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using MySystem.CashModels;
+using Library;
+using LitJson;
+using MySystemLib;
+
+namespace MySystem.Areas.Admin.Controllers
+{
+    [Area("Admin")]
+    [Route("Admin/[controller]/[action]")]
+    public class WithdrawRecordController : BaseController
+    {
+        public WithdrawRecordController(IHttpContextAccessor accessor, ILogger<BaseController> logger, IOptions<Setting> setting) : base(accessor, logger, setting)
+        {
+            OtherMySqlConn.connstr = ConfigurationManager.AppSettings["CashSqlConnStr"].ToString();
+        }
+
+        #region 提现记录列表
+
+        /// <summary>
+        /// 根据条件查询提现记录列表
+        /// </summary>
+        /// <returns></returns>
+        public IActionResult Index(WithdrawRecord data, string right)
+        {
+            ViewBag.RightInfo = RightInfo;
+            ViewBag.right = right;
+
+
+            return View();
+        }
+
+        #endregion
+
+        #region 根据条件查询提现记录列表
+
+        /// <summary>
+        /// 提现记录列表
+        /// </summary>
+        /// <returns></returns>
+        public JsonResult IndexData(WithdrawRecord data, string TradeStatusSelect, string CashChannelSelect, int page = 1, int limit = 30)
+        {
+
+            Dictionary<string, string> Fields = new Dictionary<string, string>();
+
+            Fields.Add("CashRecNo", "1"); //提现单号
+            Fields.Add("PartnerTradeNo", "1"); //业务单号
+            Fields.Add("UserMobile", "1"); //用户手机号
+            Fields.Add("BizTime", "3"); //业务时间
+            Fields.Add("ChannelCode", "1"); //渠道编号
+            Fields.Add("TransCompleteTime", "3"); //交易完成时间
+
+
+            string condition = " and Status>-1";
+            //订单状态
+            if (!string.IsNullOrEmpty(TradeStatusSelect))
+            {
+                condition += " and TradeStatus=" + TradeStatusSelect;
+            }
+            //代付渠道
+            if (!string.IsNullOrEmpty(CashChannelSelect))
+            {
+                condition += " and CashChannel=" + CashChannelSelect;
+            }
+
+
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.CashTables).IndexData("WithdrawRecord", Fields, "Id desc", "0", page, limit, condition);
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
+            foreach (Dictionary<string, object> dic in diclist)
+            {
+                //订单状态
+                int TradeStatus = int.Parse(dic["TradeStatus"].ToString());
+                if (TradeStatus == 0) dic["TradeStatusName"] = "初始化";
+                if (TradeStatus == 1) dic["TradeStatusName"] = "未审核,待打款";
+                if (TradeStatus == 2) dic["TradeStatusName"] = "审核通过,待打款";
+                if (TradeStatus == 3) dic["TradeStatusName"] = "审核不通过,已解冻";
+                if (TradeStatus == 4) dic["TradeStatusName"] = "冻结失败(预留)";
+                if (TradeStatus == 5) dic["TradeStatusName"] = "代付成功";
+                if (TradeStatus == 6) dic["TradeStatusName"] = "代付失败,待核实";
+                if (TradeStatus == 7) dic["TradeStatusName"] = "代付失败,已解冻";
+                if (TradeStatus == 8) dic["TradeStatusName"] = "代付处理中";
+                //代付渠道
+                dic["CashChannel"] = "云汇算";
+                // string CashChannel = dic["CashChannel"].ToString();
+                // if (CashChannel == "CloudAcc") dic["CashChannel"] = "云账户";
+                // if (CashChannel == "KuaiQian") dic["CashChannel"] = "快钱";
+                // if (CashChannel == "CloudPay") dic["CashChannel"] = "云银付";
+                // if (CashChannel == "CloudPayAF") dic["CashChannel"] = "安福灵新";
+                // if (CashChannel == "JuHeBa") dic["CashChannel"] = "聚合吧云慧算";
+                // if (CashChannel == "") dic["CashChannel"] = "";
+
+            }
+            return Json(obj);
+        }
+
+        #endregion
+
+        #region 增加提现记录
+
+        /// <summary>
+        /// 增加或修改提现记录信息
+        /// </summary>
+        /// <returns></returns>
+        public IActionResult Add(string right)
+        {
+            ViewBag.RightInfo = RightInfo;
+            ViewBag.right = right;
+
+
+            return View();
+        }
+
+        #endregion
+
+        #region 增加提现记录
+
+        /// <summary>
+        /// 增加或修改提现记录信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public string Add(WithdrawRecord data)
+        {
+            Dictionary<string, object> Fields = new Dictionary<string, object>();
+
+            Fields.Add("AuditResult", data.AuditResult); //审核结果
+            Fields.Add("AuditRemark", data.AuditRemark); //审核备注
+
+            Fields.Add("SeoTitle", data.SeoTitle);
+            Fields.Add("SeoKeyword", data.SeoKeyword);
+            Fields.Add("SeoDescription", data.SeoDescription);
+            int Id = new AdminContentOther(_accessor.HttpContext, PublicFunction.CashTables).Add("WithdrawRecord", Fields, 0);
+            AddSysLog(data.Id.ToString(), "WithdrawRecord", "add");
+            cashdb.SaveChanges();
+
+            return "success";
+        }
+
+        #endregion
+
+        #region 修改提现记录
+
+        /// <summary>
+        /// 增加或修改提现记录信息
+        /// </summary>
+        /// <returns></returns>
+        public IActionResult Edit(string right, int Id = 0)
+        {
+            ViewBag.RightInfo = RightInfo;
+            ViewBag.right = right;
+
+
+            WithdrawRecord editData = cashdb.WithdrawRecord.FirstOrDefault(m => m.Id == Id) ?? new WithdrawRecord();
+            ViewBag.data = editData;
+            return View();
+        }
+
+        #endregion
+
+        #region 修改提现记录
+
+        /// <summary>
+        /// 增加或修改提现记录信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public string Edit(WithdrawRecord data)
+        {
+            Dictionary<string, object> Fields = new Dictionary<string, object>();
+
+            Fields.Add("AuditResult", data.AuditResult); //审核结果
+            Fields.Add("AuditRemark", data.AuditRemark); //审核备注
+
+            Fields.Add("SeoTitle", data.SeoTitle);
+            Fields.Add("SeoKeyword", data.SeoKeyword);
+            Fields.Add("SeoDescription", data.SeoDescription);
+            new AdminContentOther(_accessor.HttpContext, PublicFunction.CashTables).Edit("WithdrawRecord", Fields, data.Id);
+            AddSysLog(data.Id.ToString(), "WithdrawRecord", "update");
+            cashdb.SaveChanges();
+
+            return "success";
+        }
+
+        #endregion
+
+        #region 删除提现记录信息
+
+        /// <summary>
+        /// 删除提现记录信息
+        /// </summary>
+        /// <returns></returns>
+        public string Delete(string Id)
+        {
+            string[] idlist = Id.Split(new char[] { ',' });
+            AddSysLog(Id, "WithdrawRecord", "del");
+            foreach (string subid in idlist)
+            {
+                int id = int.Parse(subid);
+                Dictionary<string, object> Fields = new Dictionary<string, object>();
+                Fields.Add("Status", -1);
+                new AdminContentOther(_accessor.HttpContext, PublicFunction.CashTables).Edit("WithdrawRecord", Fields, id);
+            }
+            cashdb.SaveChanges();
+
+            return "success";
+        }
+
+        #endregion
+
+        #region 开启
+
+        /// <summary>
+        /// 开启
+        /// </summary>
+        /// <returns></returns>
+        public string Open(string Id)
+        {
+            string[] idlist = Id.Split(new char[] { ',' });
+            AddSysLog(Id, "WithdrawRecord", "open");
+            foreach (string subid in idlist)
+            {
+                int id = int.Parse(subid);
+                Dictionary<string, object> Fields = new Dictionary<string, object>();
+                Fields.Add("Status", 1);
+                new AdminContentOther(_accessor.HttpContext, PublicFunction.CashTables).Edit("WithdrawRecord", Fields, id);
+            }
+            cashdb.SaveChanges();
+            return "success";
+        }
+
+        #endregion
+
+        #region 关闭
+
+        /// <summary>
+        /// 关闭
+        /// </summary>
+        /// <returns></returns>
+        public string Close(string Id)
+        {
+            string[] idlist = Id.Split(new char[] { ',' });
+            AddSysLog(Id, "WithdrawRecord", "close");
+            foreach (string subid in idlist)
+            {
+                int id = int.Parse(subid);
+                Dictionary<string, object> Fields = new Dictionary<string, object>();
+                Fields.Add("Status", 0);
+                new AdminContentOther(_accessor.HttpContext, PublicFunction.CashTables).Edit("WithdrawRecord", Fields, id);
+            }
+            cashdb.SaveChanges();
+            return "success";
+        }
+
+        #endregion
+
+        #region 排序
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="Id"></param>
+        public string Sort(int Id, int Sort)
+        {
+            new AdminContentOther(_accessor.HttpContext, PublicFunction.CashTables).Sort("WithdrawRecord", Sort, Id);
+
+            AddSysLog(Id.ToString(), "WithdrawRecord", "sort");
+            return "success";
+        }
+        #endregion
+
+        #region 导入数据
+        /// <summary>
+        /// 导入数据
+        /// </summary>
+        /// <param name="ExcelData"></param>
+        public string Import(string ExcelData)
+        {
+            ExcelData = HttpUtility.UrlDecode(ExcelData);
+            JsonData list = JsonMapper.ToObject(ExcelData);
+            for (int i = 1; i < list.Count; i++)
+            {
+                JsonData dr = list[i];
+
+                cashdb.WithdrawRecord.Add(new WithdrawRecord()
+                {
+                    CreateDate = DateTime.Now,
+                    UpdateDate = DateTime.Now,
+
+                });
+                cashdb.SaveChanges();
+            }
+            AddSysLog("0", "WithdrawRecord", "Import");
+            return "success";
+        }
+        #endregion
+
+        #region 导出Excel
+
+        /// <summary>
+        /// 导出Excel
+        /// </summary>
+        /// <returns></returns>
+        public JsonResult ExportExcel(WithdrawRecord data, string TradeStatusSelect, string CashChannelSelect)
+        {
+            Dictionary<string, string> Fields = new Dictionary<string, string>();
+            Fields.Add("CashRecNo", "1"); //提现单号
+            Fields.Add("PartnerTradeNo", "1"); //业务单号
+            Fields.Add("UserMobile", "1"); //用户手机号
+            Fields.Add("BizTime", "3"); //业务时间
+            Fields.Add("ChannelCode", "1"); //渠道编号
+            Fields.Add("TransCompleteTime", "3"); //交易完成时间
+
+
+            string condition = " and Status>-1";
+            //订单状态
+            if (!string.IsNullOrEmpty(TradeStatusSelect))
+            {
+                condition += " and TradeStatus=" + TradeStatusSelect;
+            }
+            //代付渠道
+            if (!string.IsNullOrEmpty(CashChannelSelect))
+            {
+                condition += " and CashChannel=" + CashChannelSelect;
+            }
+
+
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.CashTables).IndexData("WithdrawRecord", Fields, "Id desc", "0", 1, 20000, condition, "CashRecNo,UserId,UserMobile,UserName,IdcardNo,BankCardNo,ChannelCode,ChannelName,TradeAmount,TradeFee,ManageFee,TradeStatus,TransCompleteTime,CashChannel", false);
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
+            foreach (Dictionary<string, object> dic in diclist)
+            {
+                //订单状态
+                int TradeStatus = int.Parse(dic["TradeStatus"].ToString());
+                if (TradeStatus == 0) dic["TradeStatus"] = "初始化";
+                if (TradeStatus == 1) dic["TradeStatus"] = "未审核,待打款";
+                if (TradeStatus == 2) dic["TradeStatus"] = "审核通过,待打款";
+                if (TradeStatus == 3) dic["TradeStatus"] = "审核不通过,已解冻";
+                if (TradeStatus == 4) dic["TradeStatus"] = "冻结失败(预留)";
+                if (TradeStatus == 5) dic["TradeStatus"] = "代付成功";
+                if (TradeStatus == 6) dic["TradeStatus"] = "代付失败,待核实";
+                if (TradeStatus == 7) dic["TradeStatus"] = "代付失败,已解冻";
+                if (TradeStatus == 8) dic["TradeStatus"] = "代付处理中";
+                //代付渠道
+                string CashChannel = dic["CashChannel"].ToString();
+                if (CashChannel == "CloudAcc") dic["CashChannel"] = "云账户";
+                if (CashChannel == "KuaiQian") dic["CashChannel"] = "快钱";
+                if (CashChannel == "CloudPay") dic["CashChannel"] = "云银付";
+                if (CashChannel == "CloudPayAF") dic["CashChannel"] = "安福灵新";
+                if (CashChannel == "JuHeBa") dic["CashChannel"] = "聚合吧云慧算";
+                if (CashChannel == "") dic["CashChannel"] = "";
+
+            }
+
+            Dictionary<string, object> result = new Dictionary<string, object>();
+            result.Add("Status", "1");
+            result.Add("Info", "Excel报表-" + DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss") + ".xlsx");
+            result.Add("Obj", diclist);
+            Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
+            ReturnFields.Add("CashRecNo", "提现单号");
+            ReturnFields.Add("UserId", "创客");
+            ReturnFields.Add("UserMobile", "用户手机号");
+            ReturnFields.Add("UserName", "用户姓名");
+            ReturnFields.Add("IdcardNo", "身份证号");
+            ReturnFields.Add("BankCardNo", "提现卡号");
+            ReturnFields.Add("ChannelCode", "渠道编号");
+            ReturnFields.Add("ChannelName", "渠道名称");
+            ReturnFields.Add("TradeAmount", "交易金额");
+            ReturnFields.Add("TradeFee", "交易渠道手续费");
+            ReturnFields.Add("ManageFee", "交易平台管理");
+            ReturnFields.Add("TradeStatus", "订单状态");
+            ReturnFields.Add("TransCompleteTime", "交易完成时间");
+            ReturnFields.Add("CashChannel", "代付渠道");
+
+            result.Add("Fields", ReturnFields);
+            AddSysLog("0", "WithdrawRecord", "ExportExcel");
+            return Json(result);
+        }
+
+        #endregion
+
+
+    }
+}

Areas/Admin/Controllers/HomeController.cs

@@ -75,7 +75,7 @@ namespace MySystem.Areas.Admin.Controllers
                     int count = 0;
                     DataTable dt = dbconn.dtable("select count(Id) from " + table);
                     if (dt.Rows.Count > 0)
-                    {
+                    { 
                         count = int.Parse(dt.Rows[0][0].ToString());
                     }
                     item.Add("Count", count);

Areas/Admin/Controllers/MainServer/ActiveRewardController.cs

@@ -7,7 +7,6 @@ using System.Web;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Data;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Http;
@@ -51,7 +50,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 激活奖励记录列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(ActiveReward data, string right, string BrandId, string MerchantNo, string MerchantName, string MakerCode, string RealName, string MerMakerCode, string MerRealName, string ParentMakerCode, string ParentRealName, string ParentParentMakerCode, string ParentParentRealName, string StoreNo, string StoreName, string SnTypeSelect, string ActTypeSelect, string ActDateData, int page = 1, int limit = 30)
+        public JsonResult IndexData(ActiveReward data, string MerchantNo, string MerchantName, string MakerCode, string RealName, string MerMakerCode, string MerRealName, string ParentMakerCode, string ParentRealName, string ParentParentMakerCode, string ParentParentRealName, string StoreNo, string StoreName, string SnTypeSelect, string ActTypeSelect, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -62,10 +61,6 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("ActDate", "3"); //激活时间
             Fields.Add("TopUserId", "0"); //顶级创客
 
-            ViewBag.RightInfo = RightInfo;
-            ViewBag.right = right;
-            ViewBag.BrandId = BrandId;
-
             string condition = " and Status>-1";
             //商户编号
             if (!string.IsNullOrEmpty(MerchantNo))
@@ -138,14 +133,6 @@ namespace MySystem.Areas.Admin.Controllers
                 condition += " and ActType=" + ActTypeSelect;
             }
 
-            if(!string.IsNullOrEmpty(ActDateData))
-            {
-                string[] datelist = ActDateData.Split(new string[] { " - " }, StringSplitOptions.None);
-                string start = datelist[0];
-                string end = datelist[1];
-                condition += " and ActDate>='" + start + " 00:00:00' and ActDate<='" + end + " 23:59:59'";
-            }
-
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("ActiveReward", Fields, "Id desc", "0", page, limit, condition);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
@@ -202,13 +189,7 @@ namespace MySystem.Areas.Admin.Controllers
                 if(ActType == 3) dic["ActType"] = "循环机划拨激活";
             }            
             Dictionary<string, object> other = new Dictionary<string, object>();
-            string RewardAmount = "0.00";//奖励金额
-            DataTable dt = OtherMySqlConn.dtable("select sum(RewardAmount) from ActiveReward where BrandId='" + ViewBag.BrandId + "'" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                RewardAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            }
-            other.Add("RewardAmount", RewardAmount);
+            other.Add("RewardAmount", 0);
             obj.Add("other", other);
             return Json(obj);
         }

Areas/Admin/Controllers/MainServer/FileUpdateInfoController.cs

@@ -1,397 +0,0 @@
-/*
- * 资源文件更新信息
- */
-
-using System;
-using System.Web;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.RegularExpressions;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using MySystem.Models;
-using Library;
-using LitJson;
-using MySystemLib;
-
-namespace MySystem.Areas.Admin.Controllers
-{
-    [Area("Admin")]
-    [Route("Admin/[controller]/[action]")]
-    public class FileUpdateInfoController : BaseController
-    {
-        public FileUpdateInfoController(IHttpContextAccessor accessor, ILogger<BaseController> logger, IOptions<Setting> setting) : base(accessor, logger, setting)
-        {
-            OtherMySqlConn.connstr = ConfigurationManager.AppSettings["SqlConnStr"].ToString();
-        }
-
-        #region 资源文件更新信息列表
-
-        /// <summary>
-        /// 根据条件查询资源文件更新信息列表
-        /// </summary>
-        /// <returns></returns>
-        public IActionResult Index(FileUpdateInfo data, string right)
-        {
-            ViewBag.RightInfo = RightInfo;
-            ViewBag.right = right;
-
-            string Condition = "";
-
-            if (!string.IsNullOrEmpty(Condition))
-            {
-                Condition = Condition.TrimEnd(',');
-                Condition = ", where: {" + Condition + "}";
-            }
-            ViewBag.Condition = Condition;
-            return View();
-        }
-
-        #endregion
-
-        #region 根据条件查询资源文件更新信息列表
-
-        /// <summary>
-        /// 资源文件更新信息列表
-        /// </summary>
-        /// <returns></returns>
-        public JsonResult IndexData(FileUpdateInfo data, string Kind = "default", int page = 1, int limit = 30)
-        {
-
-            Dictionary<string, string> Fields = new Dictionary<string, string>();
-
-            string condition = " and SeoKeyword='" + Kind + "'";
-
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("FileUpdateInfo", Fields, "Path asc,FileName asc", "False", page, limit, condition);
-            //List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
-            //foreach (Dictionary<string, object> dic in diclist)
-            //{
-
-            //}
-            return Json(obj);
-        }
-
-        #endregion
-
-        #region 增加资源文件更新信息
-
-        /// <summary>
-        /// 增加或修改资源文件更新信息信息
-        /// </summary>
-        /// <returns></returns>
-        public IActionResult Add(string right)
-        {
-            ViewBag.RightInfo = RightInfo;
-            ViewBag.right = right;
-
-            return View();
-        }
-
-        #endregion
-
-        #region 增加资源文件更新信息
-
-        /// <summary>
-        /// 增加或修改资源文件更新信息信息
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost]
-        public string Add(FileUpdateInfo data)
-        {
-            Dictionary<string, object> Fields = new Dictionary<string, object>();
-            Fields.Add("Version", data.VersionNum); //更新版本
-            Fields.Add("Path", data.Path); //路径
-            Fields.Add("FileName", data.FileName); //文件名
-
-            Fields.Add("SeoTitle", data.SeoTitle);
-            // Fields.Add("SeoKeyword", data.SeoKeyword);
-            Fields.Add("SeoDescription", data.SeoDescription);
-            int Id = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Add("FileUpdateInfo", Fields, 0);
-            AddSysLog(data.Id.ToString(), "FileUpdateInfo", "add");
-            db.SaveChanges();
-
-            return "success";
-        }
-
-        #endregion
-
-        #region 修改资源文件更新信息
-
-        /// <summary>
-        /// 增加或修改资源文件更新信息信息
-        /// </summary>
-        /// <returns></returns>
-        public IActionResult Edit(string right, int Id = 0)
-        {
-            ViewBag.RightInfo = RightInfo;
-            ViewBag.right = right;
-
-            FileUpdateInfo editData = db.FileUpdateInfo.FirstOrDefault(m => m.Id == Id) ?? new FileUpdateInfo();
-            ViewBag.data = editData;
-            return View();
-        }
-
-        #endregion
-
-        #region 修改资源文件更新信息
-
-        /// <summary>
-        /// 增加或修改资源文件更新信息信息
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost]
-        public string Edit(FileUpdateInfo data)
-        {
-            Dictionary<string, object> Fields = new Dictionary<string, object>();
-            Fields.Add("Version", data.VersionNum); //更新版本
-            Fields.Add("Path", data.Path); //路径
-            Fields.Add("FileName", data.FileName); //文件名
-
-            Fields.Add("SeoTitle", data.SeoTitle);
-            // Fields.Add("SeoKeyword", data.SeoKeyword);
-            Fields.Add("SeoDescription", data.SeoDescription);
-            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("FileUpdateInfo", Fields, data.Id);
-            AddSysLog(data.Id.ToString(), "FileUpdateInfo", "update");
-            db.SaveChanges();
-
-            return "success";
-        }
-
-        #endregion
-
-        #region 删除资源文件更新信息信息
-
-        /// <summary>
-        /// 删除资源文件更新信息信息
-        /// </summary>
-        /// <returns></returns>
-        public string Delete(string Id)
-        {
-            string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id, "FileUpdateInfo", "del");
-            foreach (string subid in idlist)
-            {
-                int id = int.Parse(subid);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Delete("FileUpdateInfo", id);
-            }
-            db.SaveChanges();
-
-            return "success";
-        }
-
-        #endregion
-
-        #region 开启
-
-        /// <summary>
-        /// 开启
-        /// </summary>
-        /// <returns></returns>
-        public string Open(string Id)
-        {
-            string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id, "FileUpdateInfo", "open");
-            foreach (string subid in idlist)
-            {
-                int id = int.Parse(subid);
-                Dictionary<string, object> Fields = new Dictionary<string, object>();
-                Fields.Add("Status", 1);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("FileUpdateInfo", Fields, id);
-            }
-            db.SaveChanges();
-            return "success";
-        }
-
-        #endregion
-
-        #region 关闭
-
-        /// <summary>
-        /// 关闭
-        /// </summary>
-        /// <returns></returns>
-        public string Close(string Id)
-        {
-            string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id, "FileUpdateInfo", "close");
-            foreach (string subid in idlist)
-            {
-                int id = int.Parse(subid);
-                Dictionary<string, object> Fields = new Dictionary<string, object>();
-                Fields.Add("Status", 0);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("FileUpdateInfo", Fields, id);
-            }
-            db.SaveChanges();
-            return "success";
-        }
-
-        #endregion
-
-        #region 排序
-        /// <summary>
-        /// 排序
-        /// </summary>
-        /// <param name="Id"></param>
-        public string Sort(int Id, int Sort)
-        {
-            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Sort("FileUpdateInfo", Sort, Id);
-
-            AddSysLog(Id.ToString(), "FileUpdateInfo", "sort");
-            return "success";
-        }
-        #endregion
-
-        #region 导入数据
-        /// <summary>
-        /// 导入数据
-        /// </summary>
-        /// <param name="ExcelData"></param>
-        public string Import(string ExcelData)
-        {
-            ExcelData = HttpUtility.UrlDecode(ExcelData);
-            JsonData list = JsonMapper.ToObject(ExcelData);
-            for (int i = 1; i < list.Count; i++)
-            {
-                JsonData dr = list[i];
-
-                db.FileUpdateInfo.Add(new FileUpdateInfo()
-                {
-                    CreateDate = DateTime.Now,
-                    UpdateDate = DateTime.Now,
-
-                });
-                db.SaveChanges();
-            }
-            AddSysLog("0", "FileUpdateInfo", "Import");
-            return "success";
-        }
-        #endregion
-
-        #region 导出Excel
-
-        /// <summary>
-        /// 导出Excel
-        /// </summary>
-        /// <returns></returns>
-        public JsonResult ExportExcel(FileUpdateInfo data)
-        {
-            Dictionary<string, string> Fields = new Dictionary<string, string>();
-
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("FileUpdateInfo", Fields, "Id desc", "False", 1, 20000, "", "", false);
-            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
-
-            Dictionary<string, object> result = new Dictionary<string, object>();
-            result.Add("Status", "1");
-            result.Add("Info", "Excel报表-" + DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss") + ".xlsx");
-            result.Add("Obj", diclist);
-            Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
-
-            result.Add("Fields", ReturnFields);
-            AddSysLog("0", "FileUpdateInfo", "ExportExcel");
-            return Json(result);
-        }
-
-        #endregion
-
-        #region 更新版本
-
-        /// <summary>
-        /// 更新版本
-        /// </summary>
-        /// <returns></returns>
-        public string UpdateVersion(int Id)
-        {
-            FileUpdateInfo info = db.FileUpdateInfo.FirstOrDefault(m => m.Id == Id);
-            if (info != null)
-            {
-                info.VersionNum += 1;
-                db.SaveChanges();
-            }
-            return "success";
-        }
-
-        #endregion
-
-        #region 更新文件
-
-        /// <summary>
-        /// 更新文件
-        /// </summary>
-        /// <returns></returns>
-        public string UpdateFile(string Kind = "default")
-        {
-            SystemSet set = db.SystemSet.FirstOrDefault() ?? new SystemSet();
-            GetSystemFiles(set, Kind);
-            foreach (string filename in SystemFiles)
-            {
-                string Path = filename.Substring(0, filename.LastIndexOf("/") + 1);
-                string template = filename.Substring(filename.LastIndexOf("/") + 1);
-                if (!template.EndsWith(".html") && !template.EndsWith(".DS_Store") && !template.EndsWith("LICENSE") && !template.EndsWith("Thumbs.db"))
-                {
-                    FileUpdateInfo check = db.FileUpdateInfo.FirstOrDefault(m => m.Path == Path && m.FileName == template && m.SeoKeyword == Kind);
-                    if (check == null)
-                    {
-                        check = db.FileUpdateInfo.Add(new FileUpdateInfo()
-                        {
-                            CreateDate = DateTime.Now,
-                            UpdateDate = DateTime.Now,
-                            FileName = template,
-                            Path = Path,
-                            VersionNum = 0,
-                            SeoKeyword = Kind,
-                        }).Entity;
-                        db.SaveChanges();
-                    }
-                }
-            }
-            List<FileUpdateInfo> list = db.FileUpdateInfo.OrderBy(m => m.Path).OrderBy(m => m.FileName).ToList();
-            RedisDbconn.Instance.AddList("FileUpdateInfo", list.ToArray());
-            return "success";
-        }
-        List<string> SystemFiles;
-        private void GetSystemFiles(SystemSet set, string Kind = "default")
-        {
-            SystemFiles = new List<string>();
-            string dataFilePath = function.ReadInstance("/WebRootPath.txt") + "/skin/app/" + Kind + "/";
-            System.IO.FileSystemInfo info = new System.IO.DirectoryInfo(dataFilePath);
-            scan(info, set, Kind);
-        }
-        private void scan(System.IO.FileSystemInfo info, SystemSet set, string Kind = "default")
-        {
-            if (!info.Exists) return;
-            string sPath = "/skin/app/" + Kind + "/";
-            System.IO.DirectoryInfo dir = info as System.IO.DirectoryInfo;
-            //不是目录
-            if (dir == null) return;
-            System.IO.FileSystemInfo[] files = dir.GetFileSystemInfos();
-            for (int i = 0; i < files.Length; i++)
-            {
-                System.IO.FileInfo file = files[i] as System.IO.FileInfo;
-                //是文件
-                if (file != null)
-                {
-                    SystemFiles.Add(file.FullName.Substring(file.FullName.IndexOf(sPath) + sPath.Length).Replace("\\", "/"));
-                }
-                else scan(files[i], set, Kind);
-            }
-        }
-
-        #endregion
-    
-        #region 同步数据到redis
-
-        public string SyncAll(string Kind = "default")
-        {
-            List<FileUpdateInfo> files = db.FileUpdateInfo.Where(m => m.SeoKeyword == Kind).ToList();
-            RedisDbconn.Instance.Clear("FileUpdateInfo:" + Kind + "");
-            // RedisDbconn.Instance.AddList("FileUpdateInfo:" + Kind + "", files.ToArray());
-            return "success";
-        }
-
-        #endregion
-    
-    
-    }
-}

Areas/Admin/Controllers/MainServer/FluxProfitDetailController.cs

@@ -7,7 +7,6 @@ using System.Web;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Data;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Http;
@@ -51,7 +50,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 流量分佣明细列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(FluxProfitDetail data, string MakerCode, string RealName, string TopMakerCode, string TopRealName, string CreateDateData, string MerUserTypeSelect, string ProfitTypeSelect, int page = 1, int limit = 30)
+        public JsonResult IndexData(FluxProfitDetail data, string MakerCode, string RealName, string TopMakerCode, string TopRealName, string MerUserTypeSelect, string ProfitTypeSelect, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -93,14 +92,6 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and ProfitType=" + ProfitTypeSelect;
             }
-            //交易时间
-            if(!string.IsNullOrEmpty(CreateDateData))
-            {
-                string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
-                string start = datelist[0];
-                string end = datelist[1];
-                condition += " and TradeDate>='" + start + " 00:00:00' and TradeDate>='" + end + " 23:59:59'";
-            }
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("FluxProfitDetail", Fields, "Id desc", "0", page, limit, condition);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
@@ -131,13 +122,7 @@ namespace MySystem.Areas.Admin.Controllers
 
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
-            string ProfitAmt = "0.00";//分佣总金额
-            DataTable dt = OtherMySqlConn.dtable("select sum(FluxProfitAmt) from FluxProfitDetail where 1=1" + condition);
-            if(dt.Rows.Count > 0)
-            {
-                ProfitAmt = dt.Rows[0][0].ToString();
-            }
-            other.Add("ProfitAmt", ProfitAmt);
+            other.Add("ProfitAmt", 0);
             obj.Add("other", other);
             return Json(obj);
         }

Areas/Admin/Controllers/MainServer/FluxProfitSummaryController.cs

@@ -7,7 +7,6 @@ using System.Web;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Data;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Http;
@@ -111,20 +110,8 @@ namespace MySystem.Areas.Admin.Controllers
                 if (CheckStatus == 1) dic["CheckStatus"] = "已验证和同步";
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
-            string TradeCount = "0.00";//流量费交易笔数
-            string FluxProfit = "0.00";//分佣总金额
-            DataTable dt = OtherMySqlConn.dtable("select count(0) from FluxProfitSummary where BrandId=3 or BrandId=5" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                TradeCount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            }
-            dt = OtherMySqlConn.dtable("select sum(FluxProfitAmt) from FluxProfitSummary where BrandId=3 or BrandId=5" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                FluxProfit = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            }
-            other.Add("TradeCount", TradeCount);
-            other.Add("FluxProfit", FluxProfit);
+            other.Add("TradeCount", 0);
+            other.Add("FluxProfit", 0);
             obj.Add("other", other);
             return Json(obj);
         }

Areas/Admin/Controllers/MainServer/MachineApplyController.cs

@@ -7,7 +7,6 @@ using System.Web;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Data;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Http;
@@ -166,20 +165,8 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["ExpressInfo"] = dic["ExpressName"].ToString() + "<br />" + dic["ExpressNo"].ToString();
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
-            string ApplyCount = "0.00";//申请机具数
-            string SendCount = "0.00";//发货机具数
-            DataTable dt = OtherMySqlConn.dtable("select sum(ApplyDeviceNum) from MachineApply where SendStatus=0" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                ApplyCount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            }
-            dt = OtherMySqlConn.dtable("select sum(ApplyDeviceNum) from MachineApply where SendStatus=1" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                SendCount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            }
-            other.Add("ApplyCount", ApplyCount);
-            other.Add("SendCount", SendCount);
+            other.Add("ApplyCount", 0);
+            other.Add("SendCount", 0);
             obj.Add("other", other);
             return Json(obj);
         }

Areas/Admin/Controllers/MainServer/MerchantAddInfoController.cs

@@ -331,7 +331,7 @@ namespace MySystem.Areas.Admin.Controllers
 
             MerchantInfo merchant = db.MerchantInfo.FirstOrDefault(m => m.Id == Id) ?? new MerchantInfo();
             MerchantAddInfo merchantadd = db.MerchantAddInfo.FirstOrDefault(m => m.Id == Id) ?? new MerchantAddInfo();
-            string result = new WeChatFunction(_accessor.HttpContext).MerchantCreate(merchantadd, merchant);
+            string result = ""; //new WeChatFunction(_accessor.HttpContext).MerchantCreate(merchantadd, merchant);
             if (result.Contains("\"applyment_id\":"))
             {
                 JsonData jsonObj = JsonMapper.ToObject(result);

Areas/Admin/Controllers/MainServer/MerchantRebateDetailController.cs

@@ -7,7 +7,6 @@ using System.Web;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Data;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Http;
@@ -99,19 +98,10 @@ namespace MySystem.Areas.Admin.Controllers
                 // if (SyncStatus == 1) dic["SyncStatus"] = "已验证和同步";
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
-            string CreditTradeAmt = "0.00", DebitTradeAmt = "0.00", CreditPrizeAmt = "0.00", DebitPrizeAmt = "0.00";
-            DataTable dt = OtherMySqlConn.dtable("select sum(CreditTradeAmt),sum(DebitTradeAmt),sum(CreditPrizeAmt),sum(DebitPrizeAmt) from MerchantRebateDetail where 1=1" + condition);
-            if(dt.Rows.Count > 0)
-            {
-                CreditTradeAmt = dt.Rows[0][0].ToString();
-                DebitTradeAmt = dt.Rows[0][1].ToString();
-                CreditPrizeAmt = dt.Rows[0][2].ToString();
-                DebitPrizeAmt = dt.Rows[0][3].ToString();
-            }
-            other.Add("CreditTradeAmt", CreditTradeAmt);
-            other.Add("DebitTradeAmt", DebitTradeAmt);
-            other.Add("CreditPrizeAmt", CreditPrizeAmt);
-            other.Add("DebitPrizeAmt", DebitPrizeAmt);
+            other.Add("CreditTradeAmt", 0);
+            other.Add("DebitTradeAmt", 0);
+            other.Add("CreditPrizeAmt", 0);
+            other.Add("DebitPrizeAmt", 0);
             obj.Add("other", other);
             return Json(obj);
         }

Areas/Admin/Controllers/MainServer/OpenRewardDetailController.cs

@@ -7,7 +7,6 @@ using System.Web;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Data;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Http;
@@ -51,7 +50,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 开机奖励明细列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(OpenRewardDetail data, string MakerCode, string RealName, string MerchantNo, string MerchantName, string TradeDateData, int page = 1, int limit = 30)
+        public JsonResult IndexData(OpenRewardDetail data, string MakerCode, string RealName, string MerchantNo, string MerchantName, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -83,14 +82,6 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and MerchantId in (select MerchantId from MerchantForName where Name='" + MerchantName + "')";
             }
-            // 交易时间
-            if(!string.IsNullOrEmpty(TradeDateData))
-            {
-                string[] datelist = TradeDateData.Split(new string[] { " - " }, StringSplitOptions.None);
-                string start = datelist[0];
-                string end = datelist[1];
-                condition += " and TradeDate>='" + start + " 00:00:00' and TradeDate>='" + end + " 23:59:59'";
-            }
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("OpenRewardDetail", Fields, "Id desc", "0", page, limit, condition);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
@@ -147,20 +138,10 @@ namespace MySystem.Areas.Admin.Controllers
                 
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
-            string CreditTradeAmt = "0.00", DebitTradeAmt = "0.00", CreditRewardAmount = "0.00", DebitRewardAmount = "0.00";//贷记卡交易总额 借记卡交易总额 贷记卡交易奖励金额 借记记卡交易奖励金额
-            DataTable dt = OtherMySqlConn.dtable("select sum(CreditTradeAmt),sum(DebitTradeAmt),sum(CreditRewardAmount),sum(DebitRewardAmount) from OpenRewardDetail where 1=1" + condition);
-            if(dt.Rows.Count > 0)
-            {
-                CreditTradeAmt = dt.Rows[0][0].ToString();
-                DebitTradeAmt = dt.Rows[0][1].ToString();
-                CreditRewardAmount = dt.Rows[0][2].ToString();
-                DebitRewardAmount = dt.Rows[0][3].ToString();
-
-            }
-            other.Add("CreditTradeAmt", CreditTradeAmt);
-            other.Add("DebitTradeAmt", DebitTradeAmt);
-            other.Add("CreditRewardAmount", CreditRewardAmount);
-            other.Add("DebitRewardAmount", DebitRewardAmount);
+            other.Add("CreditTradeAmt", 0);
+            other.Add("DebitTradeAmt", 0);
+            other.Add("CreditPrizeAmt", 0);
+            other.Add("DebitPrizeAmt", 0);
             obj.Add("other", other);
             return Json(obj);
         }

Areas/Admin/Controllers/MainServer/OpenSnSnapshotController.cs

@@ -7,7 +7,6 @@ using System.Web;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Data;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Http;
@@ -122,14 +121,6 @@ namespace MySystem.Areas.Admin.Controllers
                 if (Status == 1) dic["Status"] = "成功";
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
-            string PrizeAmt = "0.00", BuyPosCount = "0.00", StadardBuyPosCount = "0.00";//奖励金额 购买机数量 标准购买机数量
-            DataTable dt = OtherMySqlConn.dtable("select sum(PrizeAmt),sum(BuyPosCount),sum(StadardBuyPosCount) from OpenSnSnapshot where 1=1" + condition);
-            if(dt.Rows.Count > 0)
-            {
-                PrizeAmt = dt.Rows[0][0].ToString();
-                BuyPosCount = dt.Rows[0][1].ToString();
-                StadardBuyPosCount = dt.Rows[0][2].ToString();
-            }
             other.Add("PrizeAmt", 0);
             other.Add("BuyPosCount", 0);
             other.Add("StadardBuyPosCount", 0);

Areas/Admin/Controllers/MainServer/OrdersController.cs

@@ -7,7 +7,6 @@ using System.Web;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Data;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Http;
@@ -116,7 +115,7 @@ namespace MySystem.Areas.Admin.Controllers
             //商品名称
             if (!string.IsNullOrEmpty(ProductIdSelect))
             {
-                condition += " and Id in (select OrderId from OrderProduct where ProductId="+ProductIdSelect+")";//表数据量过大时不适用
+                condition += " and ProductId=" + ProductIdSelect;
             }
             //仓库类型
             if (!string.IsNullOrEmpty(StoreTypeSelect))
@@ -195,12 +194,6 @@ namespace MySystem.Areas.Admin.Controllers
                 }
                 //商品名称
                 dic["ProductId"] = RelationClass.GetProductsInfo(int.Parse(dic["ProductId"].ToString()));
-
-                //商品名称
-                int Id = int.Parse(function.CheckInt(dic["Id"].ToString()));
-                OrderProduct orderProducts = db.OrderProduct.FirstOrDefault(m => m.OrderId == Id) ?? new OrderProduct();
-                dic["ProductName"] = orderProducts.ProductName;
-
                 //仓库归属创客
                 int StoreUserId = int.Parse(function.CheckInt(dic["StoreUserId"].ToString()));
                 Users storeuserid_Users = db.Users.FirstOrDefault(m => m.Id == StoreUserId) ?? new Users();
@@ -221,99 +214,12 @@ namespace MySystem.Areas.Admin.Controllers
 
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
-            string SuccessAmount = "0.00";//支付成功总金额
-            string FailAmount = "0.00";//支付失败总金额
-            DataTable dt = OtherMySqlConn.dtable("select sum(TotalPrice) from Orders where PayStatus=0" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                SuccessAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            }
-            dt = OtherMySqlConn.dtable("select sum(TotalPrice) from Orders where PayStatus=1" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                FailAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            }
-            other.Add("SuccessAmount", SuccessAmount);
-            other.Add("FailAmount", FailAmount);
+            other.Add("SuccessAmount", 0);
+            other.Add("FailAmount", 0);
             obj.Add("other", other);
             return Json(obj);
         }
 
-
-        public JsonResult IndexDatas(string UserIdMakerCode, string UserIdRealName, string PayModeSelect, string StoreIdStoreNo, string StoreIdStoreName, string RefundStatusSelect, string DeliveryTypeSelect, string SendStatusSelect, string ProductIdSelect, string StoreTypeSelect, string StoreUserIdMakerCode, string StoreUserIdRealName, string PayStatusSelect, int page = 1, int limit = 30)
-        {
-            string condition = " and Status>-1";
-            //创客创客编号
-            if (!string.IsNullOrEmpty(UserIdMakerCode))
-            {
-                condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
-            }
-            //创客真实姓名
-            if (!string.IsNullOrEmpty(UserIdRealName))
-            {
-                condition += " and UserId in (select UserId from UserForRealName where RealName='" + UserIdRealName + "')";
-            }
-            //支付方式
-            if (!string.IsNullOrEmpty(PayModeSelect))
-            {
-                condition += " and PayMode=" + PayModeSelect;
-            }
-            //仓库仓库编号
-            if (!string.IsNullOrEmpty(StoreIdStoreNo))
-            {
-                condition += " and StoreId in (select StoreId from StoreForCode where Code='" + StoreIdStoreNo + "')";
-            }
-            //仓库仓库名称
-            if (!string.IsNullOrEmpty(StoreIdStoreName))
-            {
-                condition += " and StoreId in (select StoreId from StoreForName where Name='" + StoreIdStoreName + "')";
-            }
-            //退款状态
-            if (!string.IsNullOrEmpty(RefundStatusSelect))
-            {
-                condition += " and RefundStatus=" + RefundStatusSelect;
-            }
-            //提货类型
-            if (!string.IsNullOrEmpty(DeliveryTypeSelect))
-            {
-                condition += " and DeliveryType=" + DeliveryTypeSelect;
-            }
-            //发货状态
-            if (!string.IsNullOrEmpty(SendStatusSelect))
-            {
-                condition += " and SendStatus=" + SendStatusSelect;
-            }
-            //商品名称
-            if (!string.IsNullOrEmpty(ProductIdSelect))
-            {
-                condition += " and ProductId=" + ProductIdSelect;
-            }
-            //仓库类型
-            if (!string.IsNullOrEmpty(StoreTypeSelect))
-            {
-                condition += " and StoreType=" + StoreTypeSelect;
-            }
-            //仓库归属创客创客编号
-            if (!string.IsNullOrEmpty(StoreUserIdMakerCode))
-            {
-                condition += " and StoreUserId in (select StoreUserId from UserForMakerCode where MakerCode='" + StoreUserIdMakerCode + "')";
-            }
-            //仓库归属创客真实姓名
-            if (!string.IsNullOrEmpty(StoreUserIdRealName))
-            {
-                condition += " and StoreUserId in (select StoreUserId from UserForRealName where RealName='" + StoreUserIdRealName + "')";
-            }
-            //支付状态
-            if (!string.IsNullOrEmpty(PayStatusSelect))
-            {
-                condition += " and PayStatus=" + PayStatusSelect;
-            }
-            List<Dictionary<string, object>> other = new List<Dictionary<string, object>>();
-            Dictionary<string, object> obj = new Dictionary<string, object>();
-            DataTable dt = OtherMySqlConn.dtable("select sum(TotalPrice) from Orders where PayStatus=0" + condition);
-            return null;
-        }
-
         #endregion
 
         #region 增加创客订单

Areas/Admin/Controllers/MainServer/PageUpdateInfoController.cs

@@ -1,456 +0,0 @@
-/*
- * 页面模板更新信息
- */
-
-using System;
-using System.Web;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.RegularExpressions;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using MySystem.Models;
-using Library;
-using LitJson;
-using MySystemLib;
-
-namespace MySystem.Areas.Admin.Controllers
-{
-    [Area("Admin")]
-    [Route("Admin/[controller]/[action]")]
-    public class PageUpdateInfoController : BaseController
-    {
-        public PageUpdateInfoController(IHttpContextAccessor accessor, ILogger<BaseController> logger, IOptions<Setting> setting) : base(accessor, logger, setting)
-        {
-            OtherMySqlConn.connstr = ConfigurationManager.AppSettings["SqlConnStr"].ToString();
-        }
-
-        #region 页面模板更新信息列表
-
-        /// <summary>
-        /// 根据条件查询页面模板更新信息列表
-        /// </summary>
-        /// <returns></returns>
-        public IActionResult Index(PageUpdateInfo data, string right)
-        {
-            ViewBag.RightInfo = RightInfo;
-            ViewBag.right = right;
-
-            string Condition = "";
-
-            if (!string.IsNullOrEmpty(Condition))
-            {
-                Condition = Condition.TrimEnd(',');
-                Condition = ", where: {" + Condition + "}";
-            }
-            ViewBag.Condition = Condition;
-            return View();
-        }
-
-        #endregion
-
-        #region 根据条件查询页面模板更新信息列表
-
-        /// <summary>
-        /// 页面模板更新信息列表
-        /// </summary>
-        /// <returns></returns>
-        public JsonResult IndexData(PageUpdateInfo data, string Kind = "default", int page = 1, int limit = 30)
-        {
-
-            Dictionary<string, string> Fields = new Dictionary<string, string>();
-
-            string condition = " and SeoKeyword='" + Kind + "'";
-
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("PageUpdateInfo", Fields, "ModulePath asc, Id desc", "False", page, limit, condition);
-            //List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
-            //foreach (Dictionary<string, object> dic in diclist)
-            //{
-
-            //}
-            return Json(obj);
-        }
-
-        #endregion
-
-        #region 增加页面模板更新信息
-
-        /// <summary>
-        /// 增加或修改页面模板更新信息信息
-        /// </summary>
-        /// <returns></returns>
-        public IActionResult Add()
-        {
-            ViewBag.right = _accessor.HttpContext.Request.Query["right"];
-
-            return View();
-        }
-
-        #endregion
-
-        #region 增加页面模板更新信息
-
-        /// <summary>
-        /// 增加或修改页面模板更新信息信息
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost]
-        public string Add(PageUpdateInfo data)
-        {
-            Dictionary<string, object> Fields = new Dictionary<string, object>();
-            Fields.Add("ModuleVersion", data.ModuleVersion); //模板更新版本
-            Fields.Add("ModulePath", data.ModulePath); //模板路径
-            Fields.Add("BgColor", data.BgColor); //背景色
-            Fields.Add("TextColor", data.TextColor); //前景色
-            Fields.Add("StatusBarStyle", data.StatusBarStyle); //苹果状态栏
-            Fields.Add("ShowTitle", data.ShowTitle); //是否显示头部
-            Fields.Add("Title", data.Title); //顶部标题
-            Fields.Add("IsScrollBar", data.IsScrollBar); //是否显示滚动条
-            Fields.Add("IsSkid", data.IsSkid); //是否侧滑返回
-            Fields.Add("LeftBtn1", data.LeftBtn1); //左侧按钮1
-            Fields.Add("LeftBtn2", data.LeftBtn2); //左侧按钮2
-            Fields.Add("RightBtn1", data.RightBtn1); //右侧按钮1
-            Fields.Add("RightBtn2", data.RightBtn2); //右侧按钮2
-            Fields.Add("LeftAction1", data.LeftAction1); //左侧按钮1点击事件
-            Fields.Add("LeftAction2", data.LeftAction2); //左侧按钮2点击事件
-            Fields.Add("RightAction1", data.RightAction1); //右侧按钮1点击事件
-            Fields.Add("RightAction2", data.RightAction2); //右侧按钮2点击事件
-            Fields.Add("GotoPages", data.GotoPages); //下级页面
-            Fields.Add("MustUpdate", data.MustUpdate); //是否强制更新
-            Fields.Add("SeoTitle", data.SeoTitle);
-            // Fields.Add("SeoKeyword", data.SeoKeyword);
-            Fields.Add("SeoDescription", data.SeoDescription);
-
-            int Id = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Add("PageUpdateInfo", Fields, 0);
-            AddSysLog(data.Id.ToString(), "PageUpdateInfo", "add");
-            db.SaveChanges();
-
-            return "success";
-        }
-
-        #endregion
-
-        #region 修改页面模板更新信息
-
-        /// <summary>
-        /// 增加或修改页面模板更新信息信息
-        /// </summary>
-        /// <returns></returns>
-        public IActionResult Edit(int Id = 0)
-        {
-            ViewBag.right = _accessor.HttpContext.Request.Query["right"];
-
-            PageUpdateInfo editData = db.PageUpdateInfo.FirstOrDefault(m => m.Id == Id) ?? new PageUpdateInfo();
-            ViewBag.data = editData;
-            return View();
-        }
-
-        #endregion
-
-        #region 修改页面模板更新信息
-
-        /// <summary>
-        /// 增加或修改页面模板更新信息信息
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost]
-        public string Edit(PageUpdateInfo data)
-        {
-            Dictionary<string, object> Fields = new Dictionary<string, object>();
-            Fields.Add("ModuleVersion", data.ModuleVersion); //模板更新版本
-            Fields.Add("ModulePath", data.ModulePath); //模板路径
-            Fields.Add("BgColor", data.BgColor); //背景色
-            Fields.Add("TextColor", data.TextColor); //前景色
-            Fields.Add("StatusBarStyle", data.StatusBarStyle); //苹果状态栏
-            Fields.Add("ShowTitle", data.ShowTitle); //是否显示头部
-            Fields.Add("Title", data.Title); //顶部标题
-            Fields.Add("IsScrollBar", data.IsScrollBar); //是否显示滚动条
-            Fields.Add("IsSkid", data.IsSkid); //是否侧滑返回
-            Fields.Add("LeftBtn1", data.LeftBtn1); //左侧按钮1
-            Fields.Add("LeftBtn2", data.LeftBtn2); //左侧按钮2
-            Fields.Add("RightBtn1", data.RightBtn1); //右侧按钮1
-            Fields.Add("RightBtn2", data.RightBtn2); //右侧按钮2
-            Fields.Add("LeftAction1", data.LeftAction1); //左侧按钮1点击事件
-            Fields.Add("LeftAction2", data.LeftAction2); //左侧按钮2点击事件
-            Fields.Add("RightAction1", data.RightAction1); //右侧按钮1点击事件
-            Fields.Add("RightAction2", data.RightAction2); //右侧按钮2点击事件
-            Fields.Add("GotoPages", data.GotoPages); //下级页面
-            Fields.Add("MustUpdate", data.MustUpdate); //是否强制更新
-            Fields.Add("SeoTitle", data.SeoTitle);
-            // Fields.Add("SeoKeyword", data.SeoKeyword);
-            Fields.Add("SeoDescription", data.SeoDescription);
-
-            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("PageUpdateInfo", Fields, data.Id);
-            AddSysLog(data.Id.ToString(), "PageUpdateInfo", "update");
-            db.SaveChanges();
-
-            return "success";
-        }
-
-        #endregion
-
-        #region 删除页面模板更新信息信息
-
-        /// <summary>
-        /// 删除页面模板更新信息信息
-        /// </summary>
-        /// <returns></returns>
-        public string Delete(string Id)
-        {
-            string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id, "PageUpdateInfo", "del");
-            foreach (string subid in idlist)
-            {
-                int id = int.Parse(subid);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Delete("PageUpdateInfo", id);
-            }
-            db.SaveChanges();
-
-            return "success";
-        }
-
-        #endregion
-
-        #region 开启
-
-        /// <summary>
-        /// 开启
-        /// </summary>
-        /// <returns></returns>
-        public string Open(string Id)
-        {
-            string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id, "PageUpdateInfo", "open");
-            foreach (string subid in idlist)
-            {
-                int id = int.Parse(subid);
-                Dictionary<string, object> Fields = new Dictionary<string, object>();
-                Fields.Add("Status", 1);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("PageUpdateInfo", Fields, id);
-            }
-            db.SaveChanges();
-            return "success";
-        }
-
-        #endregion
-
-        #region 关闭
-
-        /// <summary>
-        /// 关闭
-        /// </summary>
-        /// <returns></returns>
-        public string Close(string Id)
-        {
-            string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id, "PageUpdateInfo", "close");
-            foreach (string subid in idlist)
-            {
-                int id = int.Parse(subid);
-                Dictionary<string, object> Fields = new Dictionary<string, object>();
-                Fields.Add("Status", 0);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("PageUpdateInfo", Fields, id);
-            }
-            db.SaveChanges();
-            return "success";
-        }
-
-        #endregion
-
-        #region 排序
-        /// <summary>
-        /// 排序
-        /// </summary>
-        /// <param name="Id"></param>
-        public string Sort(int Id, int Sort)
-        {
-            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Sort("PageUpdateInfo", Sort, Id);
-
-            AddSysLog(Id.ToString(), "PageUpdateInfo", "sort");
-            return "success";
-        }
-        #endregion
-
-        #region 导入数据
-        /// <summary>
-        /// 导入数据
-        /// </summary>
-        /// <param name="ExcelData"></param>
-        public string Import(string ExcelData)
-        {
-            ExcelData = HttpUtility.UrlDecode(ExcelData);
-            JsonData list = JsonMapper.ToObject(ExcelData);
-            for (int i = 1; i < list.Count; i++)
-            {
-                JsonData dr = list[i];
-
-                db.PageUpdateInfo.Add(new PageUpdateInfo()
-                {
-                    CreateDate = DateTime.Now,
-                    UpdateDate = DateTime.Now,
-                });
-                db.SaveChanges();
-            }
-            AddSysLog("0", "PageUpdateInfo", "Import");
-            return "success";
-        }
-        #endregion
-
-        #region 导出Excel
-
-        /// <summary>
-        /// 导出Excel
-        /// </summary>
-        /// <returns></returns>
-        public JsonResult ExportExcel(PageUpdateInfo data)
-        {
-            Dictionary<string, string> Fields = new Dictionary<string, string>();
-
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("PageUpdateInfo", Fields, "Id desc", "False", 1, 20000, "", "", false);
-            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
-
-            Dictionary<string, object> result = new Dictionary<string, object>();
-            result.Add("Status", "1");
-            result.Add("Info", "Excel报表-" + DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss") + ".xlsx");
-            result.Add("Obj", diclist);
-            Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
-
-            result.Add("Fields", ReturnFields);
-            AddSysLog("0", "PageUpdateInfo", "ExportExcel");
-            return Json(result);
-        }
-
-        #endregion
-
-        #region 更新版本
-        /// <summary>
-        /// 更新版本
-        /// </summary>
-        /// <returns></returns>
-        public string UpdateVersion(int Id)
-        {
-            PageUpdateInfo info = db.PageUpdateInfo.FirstOrDefault(m => m.Id == Id);
-            if (info != null)
-            {
-                info.ModuleVersion += 1;
-                db.SaveChanges();
-            }
-            return "success";
-        }
-
-        #endregion
-
-        #region 刷新文件
-
-        /// <summary>
-        /// 刷新文件
-        /// </summary>
-        /// <returns></returns>
-        public string UpdateTemplate(string Kind = "default")
-        {
-            SystemSet set = db.SystemSet.FirstOrDefault() ?? new SystemSet();
-            GetSystemFiles(set, Kind);
-            foreach (string filename in SystemFiles)
-            {
-                string template = filename.Substring(filename.LastIndexOf("/") + 1);
-                if (template.EndsWith(".html"))
-                {
-                    PageUpdateInfo check = db.PageUpdateInfo.FirstOrDefault(m => m.ModulePath == template && m.SeoKeyword == Kind);
-                    if (check == null)
-                    {
-                        string ModuleContent = function.ReadInstanceByFull(function.ReadInstance("/WebRootPath.txt") + "/template/app/" + Kind + "/" + template);
-                        if (!string.IsNullOrEmpty(ModuleContent))
-                        {
-                            string admintitle = "";
-                            string title = "";
-                            Match match = Regex.Match(ModuleContent, "<title>.*?</title>", RegexOptions.IgnoreCase);
-                            if (match.Success)
-                            {
-                                admintitle = match.Value.Replace("<title>", "").Replace("</title>", "");
-                                if (admintitle.Contains("-"))
-                                {
-                                    title = admintitle.Substring(admintitle.LastIndexOf("-") + 1);
-                                }
-                                else
-                                {
-                                    title = admintitle;
-                                }
-                            }
-                            check = db.PageUpdateInfo.Add(new PageUpdateInfo()
-                            {
-                                CreateDate = DateTime.Now,
-                                UpdateDate = DateTime.Now,
-                                SeoTitle = admintitle,
-                                SeoKeyword = Kind,
-                                LeftAction1 = "{\"Url\":\"GoBack#{\\\"Level\\\":\\\"1\\\"}\",\"Jump\":\"1\",\"Kind\":\"2\"}",
-                                LeftBtn1 = "static/images/left.png",
-                                IsSkid = 1,
-                                IsScrollBar = 0,
-                                Title = title,
-                                ShowTitle = 1,
-                                StatusBarStyle = "default",
-                                TextColor = "FFFFFF",
-                                BgColor = "FD7538",
-                                ModulePath = template,
-                                ModuleVersion = 1,
-                            }).Entity;
-                            db.SaveChanges();
-                        }
-                    }
-                }
-            }
-            return "success";
-        }
-        List<string> SystemFiles;
-        private void GetSystemFiles(SystemSet set, string Kind = "default")
-        {
-            SystemFiles = new List<string>();
-            string dataFilePath = function.ReadInstance("/WebRootPath.txt") + "/template/app/" + Kind + "/";
-            System.IO.FileSystemInfo info = new System.IO.DirectoryInfo(dataFilePath);
-            scan(info);
-        }
-        private void scan(System.IO.FileSystemInfo info)
-        {
-            if (!info.Exists) return;
-            System.IO.DirectoryInfo dir = info as System.IO.DirectoryInfo;
-            //不是目录
-            if (dir == null) return;
-            System.IO.FileSystemInfo[] files = dir.GetFileSystemInfos();
-            for (int i = 0; i < files.Length; i++)
-            {
-                System.IO.FileInfo file = files[i] as System.IO.FileInfo;
-                //是文件
-                if (file != null)
-                {
-                    SystemFiles.Add(file.FullName.Substring(file.FullName.IndexOf("template")).Replace("\\", "/"));
-                }
-                else scan(files[i]);
-            }
-        }
-
-        #endregion
-
-        #region 同步数据到redis
-
-        public string SyncAll(string Kind = "default")
-        {
-
-            SystemSet set = db.SystemSet.FirstOrDefault() ?? new SystemSet();
-            RedisDbconn.Instance.Set("SystemSet", set);
-            List<PageUpdateInfo> pages = db.PageUpdateInfo.Where(m => m.SeoKeyword == Kind).ToList();
-            RedisDbconn.Instance.Clear("PageUpdateInfo:" + Kind + "*");
-            // RedisDbconn.Instance.AddList("PageUpdateInfo:" + Kind + "", pages.ToArray());
-            // foreach (PageUpdateInfo page in pages)
-            // {
-            //     RedisDbconn.Instance.Set("PageUpdateInfo:" + Kind + ":" + page.ModulePath.Split('.')[0], page);
-            // }
-            return "success";
-        }
-
-        #endregion
-
-
-    }
-}

Areas/Admin/Controllers/MainServer/PosMachinesTwoController.cs

@@ -7,7 +7,6 @@ using System.Web;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Data;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Http;
@@ -139,21 +138,6 @@ namespace MySystem.Areas.Admin.Controllers
 
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
-            string TotalCount = "0.00";//总机具数
-            string KysCount99 = "0.00";
-            string KssCount99 = "0.00";
-            string KssCoun198 = "0.00";
-            string KssCount298 = "0.00";
-            DataTable dt = OtherMySqlConn.dtable("select count(0) from PosMachinesTwo" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                TotalCount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            }
-            // dt = OtherMySqlConn.dtable("select sum(TotalPrice) from Orders where PayStatus=1" + condition);
-            // if (dt.Rows.Count > 0)
-            // {
-            //     FailAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            // }
             other.Add("TotalCount", 0);
             other.Add("KysCount99", 0);
             other.Add("KssCount99", 0);

Areas/Admin/Controllers/MainServer/ProfitObjectActivationsController.cs

@@ -1,326 +0,0 @@
-/*
- * 激活奖励设置
- */
-
-using System;
-using System.Web;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using MySystem.Models;
-using Library;
-using LitJson;
-using MySystemLib;
-
-namespace MySystem.Areas.Admin.Controllers
-{
-    [Area("Admin")]
-    [Route("Admin/[controller]/[action]")]
-    public class ProfitObjectActivationsController : BaseController
-    {
-        public ProfitObjectActivationsController(IHttpContextAccessor accessor, ILogger<BaseController> logger, IOptions<Setting> setting) : base(accessor, logger, setting)
-        {
-            OtherMySqlConn.connstr = ConfigurationManager.AppSettings["SqlConnStr"].ToString();
-        }
-
-        #region 激活奖励设置列表
-
-        /// <summary>
-        /// 根据条件查询激活奖励设置列表
-        /// </summary>
-        /// <returns></returns>
-        public IActionResult Index(ProfitObjectActivations data, string right, string ObjectId)
-        {
-            ViewBag.RightInfo = RightInfo;
-            ViewBag.right = right;
-            ViewBag.ObjectId = ObjectId;
-
-
-            string Condition = "";
-
-            if (!string.IsNullOrEmpty(Condition))
-            {
-                Condition = Condition.TrimEnd(',');
-                Condition = ", where: {" + Condition + "}";
-            }
-            ViewBag.Condition = Condition;
-            return View();
-        }
-
-        #endregion
-
-        #region 根据条件查询激活奖励设置列表
-
-        /// <summary>
-        /// 激活奖励设置列表
-        /// </summary>
-        /// <returns></returns>
-        public JsonResult IndexData(ProfitObjectActivations data, int page = 1, int limit = 30)
-        {
-
-            Dictionary<string, string> Fields = new Dictionary<string, string>();
-            Fields.Add("ObjectId", "1");
-
-
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("ProfitObjectActivations", Fields, "Id desc", "0", page, limit);
-            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
-            foreach (Dictionary<string, object> dic in diclist)
-            {
-                int LimitDateKind = int.Parse(dic["LimitDateKind"].ToString());
-                if (LimitDateKind == 1) dic["LimitDateKind"] = "天";
-                if (LimitDateKind == 2) dic["LimitDateKind"] = "月";
-                if (LimitDateKind == 3) dic["LimitDateKind"] = "年";
-                if (LimitDateKind == 4) dic["LimitDateKind"] = "自定义";
-            }
-            return Json(obj);
-        }
-
-        #endregion
-
-        #region 增加激活奖励设置
-
-        /// <summary>
-        /// 增加或修改激活奖励设置信息
-        /// </summary>
-        /// <returns></returns>
-        public IActionResult Add(string right, string ObjectId)
-        {
-            ViewBag.RightInfo = RightInfo;
-            ViewBag.right = right;
-            ViewBag.ObjectId = ObjectId;
-
-
-            return View();
-        }
-
-        #endregion
-
-        #region 增加激活奖励设置
-
-        /// <summary>
-        /// 增加或修改激活奖励设置信息
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost]
-        public string Add(ProfitObjectActivations data)
-        {
-            Dictionary<string, object> Fields = new Dictionary<string, object>();
-            Fields.Add("ObjectId", data.ObjectId);
-
-            Fields.Add("LimitDateKind", data.LimitDateKind); //限制时间类型
-            Fields.Add("LimitDateVal", data.LimitDateVal); //限制时间值
-            Fields.Add("LimitCustomerDate", data.LimitCustomerDate); //自定时间限制
-            Fields.Add("ExpiredNumber", data.ExpiredNumber); //过期收益值
-            Fields.Add("ProfitNumber", data.ProfitNumber); //获得收益值
-            Fields.Add("MachineCount", data.MachineCount); //赠机台数
-            Fields.Add("StartDate", data.StartDate); //开始时间
-            Fields.Add("EndDate", data.EndDate); //结束时间
-            Fields.Add("Code", data.Code); //编号
-
-            Fields.Add("SeoTitle", data.SeoTitle);
-            Fields.Add("SeoKeyword", data.SeoKeyword);
-            Fields.Add("SeoDescription", data.SeoDescription);
-            int Id = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Add("ProfitObjectActivations", Fields, 0);
-            AddSysLog(data.Id.ToString(), "ProfitObjectActivations", "add");
-            db.SaveChanges();
-
-            return "success";
-        }
-
-        #endregion
-
-        #region 修改激活奖励设置
-
-        /// <summary>
-        /// 增加或修改激活奖励设置信息
-        /// </summary>
-        /// <returns></returns>
-        public IActionResult Edit(string right, string ObjectId, int Id = 0)
-        {
-            ViewBag.RightInfo = RightInfo;
-            ViewBag.right = right;
-            ViewBag.ObjectId = ObjectId;
-
-
-            ProfitObjectActivations editData = db.ProfitObjectActivations.FirstOrDefault(m => m.Id == Id) ?? new ProfitObjectActivations();
-            ViewBag.data = editData;
-            return View();
-        }
-
-        #endregion
-
-        #region 修改激活奖励设置
-
-        /// <summary>
-        /// 增加或修改激活奖励设置信息
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost]
-        public string Edit(ProfitObjectActivations data)
-        {
-            Dictionary<string, object> Fields = new Dictionary<string, object>();
-            Fields.Add("ObjectId", data.ObjectId);
-
-            Fields.Add("LimitDateKind", data.LimitDateKind); //限制时间类型
-            Fields.Add("LimitDateVal", data.LimitDateVal); //限制时间值
-            Fields.Add("LimitCustomerDate", data.LimitCustomerDate); //自定时间限制
-            Fields.Add("ExpiredNumber", data.ExpiredNumber); //过期收益值
-            Fields.Add("ProfitNumber", data.ProfitNumber); //获得收益值
-            Fields.Add("MachineCount", data.MachineCount); //赠机台数
-            Fields.Add("StartDate", data.StartDate); //开始时间
-            Fields.Add("EndDate", data.EndDate); //结束时间
-            Fields.Add("Code", data.Code); //编号
-
-            Fields.Add("SeoTitle", data.SeoTitle);
-            Fields.Add("SeoKeyword", data.SeoKeyword);
-            Fields.Add("SeoDescription", data.SeoDescription);
-            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("ProfitObjectActivations", Fields, data.Id);
-            AddSysLog(data.Id.ToString(), "ProfitObjectActivations", "update");
-            db.SaveChanges();
-
-            return "success";
-        }
-
-        #endregion
-
-        #region 删除激活奖励设置信息
-
-        /// <summary>
-        /// 删除激活奖励设置信息
-        /// </summary>
-        /// <returns></returns>
-        public string Delete(string Id)
-        {
-            string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id, "ProfitObjectActivations", "del");
-            foreach (string subid in idlist)
-            {
-                int id = int.Parse(subid);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Delete("ProfitObjectActivations", id);
-            }
-            db.SaveChanges();
-
-            return "success";
-        }
-
-        #endregion
-
-        #region 开启
-
-        /// <summary>
-        /// 开启
-        /// </summary>
-        /// <returns></returns>
-        public string Open(string Id)
-        {
-            string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id, "ProfitObjectActivations", "open");
-            foreach (string subid in idlist)
-            {
-                int id = int.Parse(subid);
-                Dictionary<string, object> Fields = new Dictionary<string, object>();
-                Fields.Add("Status", 1);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("ProfitObjectActivations", Fields, id);
-            }
-            db.SaveChanges();
-            return "success";
-        }
-
-        #endregion
-
-        #region 关闭
-
-        /// <summary>
-        /// 关闭
-        /// </summary>
-        /// <returns></returns>
-        public string Close(string Id)
-        {
-            string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id, "ProfitObjectActivations", "close");
-            foreach (string subid in idlist)
-            {
-                int id = int.Parse(subid);
-                Dictionary<string, object> Fields = new Dictionary<string, object>();
-                Fields.Add("Status", 0);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("ProfitObjectActivations", Fields, id);
-            }
-            db.SaveChanges();
-            return "success";
-        }
-
-        #endregion
-
-        #region 排序
-        /// <summary>
-        /// 排序
-        /// </summary>
-        /// <param name="Id"></param>
-        public string Sort(int Id, int Sort)
-        {
-            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Sort("ProfitObjectActivations", Sort, Id);
-
-            AddSysLog(Id.ToString(), "ProfitObjectActivations", "sort");
-            return "success";
-        }
-        #endregion
-
-        #region 导入数据
-        /// <summary>
-        /// 导入数据
-        /// </summary>
-        /// <param name="ExcelData"></param>
-        public string Import(string ExcelData)
-        {
-            ExcelData = HttpUtility.UrlDecode(ExcelData);
-            JsonData list = JsonMapper.ToObject(ExcelData);
-            for (int i = 1; i < list.Count; i++)
-            {
-                JsonData dr = list[i];
-
-                db.ProfitObjectActivations.Add(new ProfitObjectActivations()
-                {
-                    CreateDate = DateTime.Now,
-                    UpdateDate = DateTime.Now,
-
-                });
-                db.SaveChanges();
-            }
-            AddSysLog("0", "ProfitObjectActivations", "Import");
-            return "success";
-        }
-        #endregion
-
-        #region 导出Excel
-
-        /// <summary>
-        /// 导出Excel
-        /// </summary>
-        /// <returns></returns>
-        public JsonResult ExportExcel(ProfitObjectActivations data)
-        {
-            Dictionary<string, string> Fields = new Dictionary<string, string>();
-
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("ProfitObjectActivations", Fields, "Id desc", "0", 1, 20000, "", "", false);
-            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
-
-            Dictionary<string, object> result = new Dictionary<string, object>();
-            result.Add("Status", "1");
-            result.Add("Info", "Excel报表-" + DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss") + ".xlsx");
-            result.Add("Obj", diclist);
-            Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
-
-            result.Add("Fields", ReturnFields);
-            AddSysLog("0", "ProfitObjectActivations", "ExportExcel");
-            return Json(result);
-        }
-
-        #endregion
-
-    }
-}

Areas/Admin/Controllers/MainServer/ProfitObjectContinueFloorsController.cs

@@ -1,310 +0,0 @@
-/*
- * 继续分润层级
- */
-
-using System;
-using System.Web;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using MySystem.Models;
-using Library;
-using LitJson;
-using MySystemLib;
-
-namespace MySystem.Areas.Admin.Controllers
-{
-    [Area("Admin")]
-    [Route("Admin/[controller]/[action]")]
-    public class ProfitObjectContinueFloorsController : BaseController
-    {
-        public ProfitObjectContinueFloorsController(IHttpContextAccessor accessor, ILogger<BaseController> logger, IOptions<Setting> setting) : base(accessor, logger, setting)
-        {
-            OtherMySqlConn.connstr = ConfigurationManager.AppSettings["SqlConnStr"].ToString();
-        }
-
-        #region 继续分润层级列表
-
-        /// <summary>
-        /// 根据条件查询继续分润层级列表
-        /// </summary>
-        /// <returns></returns>
-        public IActionResult Index(ProfitObjectContinueFloors data, string right, string ObjectId)
-        {
-            ViewBag.RightInfo = RightInfo;
-            ViewBag.right = right;
-            ViewBag.ObjectId = ObjectId;
-
-
-            string Condition = "";
-            
-            if (!string.IsNullOrEmpty(Condition))
-            { 
-                Condition = Condition.TrimEnd(',');
-                Condition = ", where: {" + Condition + "}";
-            }
-            ViewBag.Condition = Condition;
-            return View();
-        }
-
-        #endregion
-
-        #region 根据条件查询继续分润层级列表
-
-        /// <summary>
-        /// 继续分润层级列表
-        /// </summary>
-        /// <returns></returns>
-        public JsonResult IndexData(ProfitObjectContinueFloors data, int page = 1, int limit = 30)
-        {
-            
-            Dictionary<string, string> Fields = new Dictionary<string, string>();
-            Fields.Add("ObjectId", "1");
-
-            
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("ProfitObjectContinueFloors", Fields, "Id desc", "0", page, limit);
-            //List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
-            //foreach (Dictionary<string, object> dic in diclist)
-            //{
-                
-            //}
-            return Json(obj);
-        }
-
-        #endregion
-
-        #region 增加继续分润层级
-
-        /// <summary>
-        /// 增加或修改继续分润层级信息
-        /// </summary>
-        /// <returns></returns>
-        public IActionResult Add(string right, string ObjectId)
-        {
-            ViewBag.RightInfo = RightInfo;
-            ViewBag.right = right;
-            ViewBag.ObjectId = ObjectId;
-
-
-            return View();
-        }
-
-        #endregion
-
-        #region 增加继续分润层级
-
-        /// <summary>
-        /// 增加或修改继续分润层级信息
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost]
-        public string Add(ProfitObjectContinueFloors data)
-        {
-            Dictionary<string, object> Fields = new Dictionary<string, object>();
-            Fields.Add("ObjectId", data.ObjectId);
-
-            Fields.Add("FloorNumber", data.FloorNumber); //层级
-Fields.Add("Percents", data.Percents); //分润比例
-Fields.Add("AddProfitVal", data.AddProfitVal); //附加分润值
-
-            Fields.Add("SeoTitle", data.SeoTitle);
-            Fields.Add("SeoKeyword", data.SeoKeyword);
-            Fields.Add("SeoDescription", data.SeoDescription);
-            int Id = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Add("ProfitObjectContinueFloors", Fields, 0);
-            AddSysLog(data.Id.ToString(), "ProfitObjectContinueFloors", "add");
-            db.SaveChanges();
-            
-            return "success";
-        }
-
-        #endregion
-
-        #region 修改继续分润层级
-
-        /// <summary>
-        /// 增加或修改继续分润层级信息
-        /// </summary>
-        /// <returns></returns>
-        public IActionResult Edit(string right, string ObjectId, int Id = 0)
-        {
-            ViewBag.RightInfo = RightInfo;
-            ViewBag.right = right;
-            ViewBag.ObjectId = ObjectId;
-
-
-            ProfitObjectContinueFloors editData = db.ProfitObjectContinueFloors.FirstOrDefault(m => m.Id == Id) ?? new ProfitObjectContinueFloors();
-            ViewBag.data = editData;
-            return View();
-        }
-
-        #endregion
-
-        #region 修改继续分润层级
-
-        /// <summary>
-        /// 增加或修改继续分润层级信息
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost]
-        public string Edit(ProfitObjectContinueFloors data)
-        {
-            Dictionary<string, object> Fields = new Dictionary<string, object>();
-            Fields.Add("ObjectId", data.ObjectId);
-
-            Fields.Add("FloorNumber", data.FloorNumber); //层级
-Fields.Add("Percents", data.Percents); //分润比例
-Fields.Add("AddProfitVal", data.AddProfitVal); //附加分润值
-
-            Fields.Add("SeoTitle", data.SeoTitle);
-            Fields.Add("SeoKeyword", data.SeoKeyword);
-            Fields.Add("SeoDescription", data.SeoDescription);
-            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("ProfitObjectContinueFloors", Fields, data.Id);
-            AddSysLog(data.Id.ToString(),"ProfitObjectContinueFloors","update");
-            db.SaveChanges();
-            
-            return "success";
-        }
-
-        #endregion
-
-        #region 删除继续分润层级信息
-
-        /// <summary>
-        /// 删除继续分润层级信息
-        /// </summary>
-        /// <returns></returns>
-        public string Delete(string Id)
-        {
-            string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id,"ProfitObjectContinueFloors","del");
-            foreach (string subid in idlist)
-            {
-                int id = int.Parse(subid);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Delete("ProfitObjectContinueFloors", id);
-            }
-            db.SaveChanges();
-            
-            return "success";
-        }
-
-        #endregion
-
-        #region 开启
-
-        /// <summary>
-        /// 开启
-        /// </summary>
-        /// <returns></returns>
-        public string Open(string Id)
-        {
-            string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id,"ProfitObjectContinueFloors","open");
-            foreach (string subid in idlist)
-            {
-                int id = int.Parse(subid);
-                Dictionary<string, object> Fields = new Dictionary<string, object>();
-                Fields.Add("Status", 1);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("ProfitObjectContinueFloors", Fields, id);
-            }
-            db.SaveChanges();
-            return "success";
-        }
-
-        #endregion
-
-        #region 关闭
-
-        /// <summary>
-        /// 关闭
-        /// </summary>
-        /// <returns></returns>
-        public string Close(string Id)
-        {
-            string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id,"ProfitObjectContinueFloors","close");
-            foreach (string subid in idlist)
-            {
-                int id = int.Parse(subid);
-                Dictionary<string, object> Fields = new Dictionary<string, object>();
-                Fields.Add("Status", 0);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("ProfitObjectContinueFloors", Fields, id);
-            }
-            db.SaveChanges();
-            return "success";
-        }
-
-        #endregion
-
-        #region 排序
-        /// <summary>
-        /// 排序
-        /// </summary>
-        /// <param name="Id"></param>
-        public string Sort(int Id, int Sort)
-        {
-            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Sort("ProfitObjectContinueFloors", Sort, Id);
-            
-            AddSysLog(Id.ToString(), "ProfitObjectContinueFloors", "sort");
-            return "success";
-        }
-        #endregion
-
-        #region 导入数据
-        /// <summary>
-        /// 导入数据
-        /// </summary>
-        /// <param name="ExcelData"></param>
-        public string Import(string ExcelData)
-        {
-            ExcelData = HttpUtility.UrlDecode(ExcelData);
-            JsonData list = JsonMapper.ToObject(ExcelData);
-            for (int i = 1; i < list.Count;i++ )
-            {
-                JsonData dr = list[i];
-                
-                db.ProfitObjectContinueFloors.Add(new ProfitObjectContinueFloors()
-                {
-                    CreateDate = DateTime.Now,
-                    UpdateDate = DateTime.Now,
-                    
-                });
-                db.SaveChanges();
-            }
-            AddSysLog("0", "ProfitObjectContinueFloors", "Import");
-            return "success";
-        }
-        #endregion
-
-        #region 导出Excel
-
-        /// <summary>
-        /// 导出Excel
-        /// </summary>
-        /// <returns></returns>
-        public JsonResult ExportExcel(ProfitObjectContinueFloors data)
-        {
-            Dictionary<string, string> Fields = new Dictionary<string, string>();
-            
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("ProfitObjectContinueFloors", Fields, "Id desc", "0", 1, 20000, "", "", false);
-            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
-
-            Dictionary<string, object> result = new Dictionary<string, object>();
-            result.Add("Status", "1");
-            result.Add("Info", "Excel报表-" + DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss") + ".xlsx");
-            result.Add("Obj", diclist);
-            Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
-            
-            result.Add("Fields", ReturnFields);
-            AddSysLog("0", "ProfitObjectContinueFloors", "ExportExcel");
-            return Json(result);
-        }
-
-        #endregion
-
-    }
-}

Areas/Admin/Controllers/MainServer/ProfitObjectFloorsController.cs

@@ -1,312 +0,0 @@
-/*
- * 分润对象层级
- */
-
-using System;
-using System.Web;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using MySystem.Models;
-using Library;
-using LitJson;
-using MySystemLib;
-
-namespace MySystem.Areas.Admin.Controllers
-{
-    [Area("Admin")]
-    [Route("Admin/[controller]/[action]")]
-    public class ProfitObjectFloorsController : BaseController
-    {
-        public ProfitObjectFloorsController(IHttpContextAccessor accessor, ILogger<BaseController> logger, IOptions<Setting> setting) : base(accessor, logger, setting)
-        {
-            OtherMySqlConn.connstr = ConfigurationManager.AppSettings["SqlConnStr"].ToString();
-        }
-
-        #region 分润对象层级列表
-
-        /// <summary>
-        /// 根据条件查询分润对象层级列表
-        /// </summary>
-        /// <returns></returns>
-        public IActionResult Index(ProfitObjectFloors data, string right, string ObjectId)
-        {
-            ViewBag.RightInfo = RightInfo;
-            ViewBag.right = right;
-            ViewBag.ObjectId = ObjectId;
-
-
-            string Condition = "";
-            
-            if (!string.IsNullOrEmpty(Condition))
-            { 
-                Condition = Condition.TrimEnd(',');
-                Condition = ", where: {" + Condition + "}";
-            }
-            ViewBag.Condition = Condition;
-            return View();
-        }
-
-        #endregion
-
-        #region 根据条件查询分润对象层级列表
-
-        /// <summary>
-        /// 分润对象层级列表
-        /// </summary>
-        /// <returns></returns>
-        public JsonResult IndexData(ProfitObjectFloors data, int page = 1, int limit = 30)
-        {
-            
-            Dictionary<string, string> Fields = new Dictionary<string, string>();
-            Fields.Add("ObjectId", "1");
-
-            
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("ProfitObjectFloors", Fields, "Id desc", "0", page, limit);
-            //List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
-            //foreach (Dictionary<string, object> dic in diclist)
-            //{
-                
-            //}
-            return Json(obj);
-        }
-
-        #endregion
-
-        #region 增加分润对象层级
-
-        /// <summary>
-        /// 增加或修改分润对象层级信息
-        /// </summary>
-        /// <returns></returns>
-        public IActionResult Add(string right, string ObjectId)
-        {
-            ViewBag.RightInfo = RightInfo;
-            ViewBag.right = right;
-            ViewBag.ObjectId = ObjectId;
-
-
-            return View();
-        }
-
-        #endregion
-
-        #region 增加分润对象层级
-
-        /// <summary>
-        /// 增加或修改分润对象层级信息
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost]
-        public string Add(ProfitObjectFloors data)
-        {
-            Dictionary<string, object> Fields = new Dictionary<string, object>();
-            Fields.Add("ObjectId", data.ObjectId);
-
-            Fields.Add("FloorNumber", data.FloorNumber); //层级
-Fields.Add("Percents", data.Percents); //分润比例
-Fields.Add("AddProfitVal", data.AddProfitVal); //附加分润值
-Fields.Add("FloorDiff", data.FloorDiff); //级差
-
-            Fields.Add("SeoTitle", data.SeoTitle);
-            Fields.Add("SeoKeyword", data.SeoKeyword);
-            Fields.Add("SeoDescription", data.SeoDescription);
-            int Id = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Add("ProfitObjectFloors", Fields, 0);
-            AddSysLog(data.Id.ToString(), "ProfitObjectFloors", "add");
-            db.SaveChanges();
-            
-            return "success";
-        }
-
-        #endregion
-
-        #region 修改分润对象层级
-
-        /// <summary>
-        /// 增加或修改分润对象层级信息
-        /// </summary>
-        /// <returns></returns>
-        public IActionResult Edit(string right, string ObjectId, int Id = 0)
-        {
-            ViewBag.RightInfo = RightInfo;
-            ViewBag.right = right;
-            ViewBag.ObjectId = ObjectId;
-
-
-            ProfitObjectFloors editData = db.ProfitObjectFloors.FirstOrDefault(m => m.Id == Id) ?? new ProfitObjectFloors();
-            ViewBag.data = editData;
-            return View();
-        }
-
-        #endregion
-
-        #region 修改分润对象层级
-
-        /// <summary>
-        /// 增加或修改分润对象层级信息
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost]
-        public string Edit(ProfitObjectFloors data)
-        {
-            Dictionary<string, object> Fields = new Dictionary<string, object>();
-            Fields.Add("ObjectId", data.ObjectId);
-
-            Fields.Add("FloorNumber", data.FloorNumber); //层级
-Fields.Add("Percents", data.Percents); //分润比例
-Fields.Add("AddProfitVal", data.AddProfitVal); //附加分润值
-Fields.Add("FloorDiff", data.FloorDiff); //级差
-
-            Fields.Add("SeoTitle", data.SeoTitle);
-            Fields.Add("SeoKeyword", data.SeoKeyword);
-            Fields.Add("SeoDescription", data.SeoDescription);
-            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("ProfitObjectFloors", Fields, data.Id);
-            AddSysLog(data.Id.ToString(),"ProfitObjectFloors","update");
-            db.SaveChanges();
-            
-            return "success";
-        }
-
-        #endregion
-
-        #region 删除分润对象层级信息
-
-        /// <summary>
-        /// 删除分润对象层级信息
-        /// </summary>
-        /// <returns></returns>
-        public string Delete(string Id)
-        {
-            string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id,"ProfitObjectFloors","del");
-            foreach (string subid in idlist)
-            {
-                int id = int.Parse(subid);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Delete("ProfitObjectFloors", id);
-            }
-            db.SaveChanges();
-            
-            return "success";
-        }
-
-        #endregion
-
-        #region 开启
-
-        /// <summary>
-        /// 开启
-        /// </summary>
-        /// <returns></returns>
-        public string Open(string Id)
-        {
-            string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id,"ProfitObjectFloors","open");
-            foreach (string subid in idlist)
-            {
-                int id = int.Parse(subid);
-                Dictionary<string, object> Fields = new Dictionary<string, object>();
-                Fields.Add("Status", 1);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("ProfitObjectFloors", Fields, id);
-            }
-            db.SaveChanges();
-            return "success";
-        }
-
-        #endregion
-
-        #region 关闭
-
-        /// <summary>
-        /// 关闭
-        /// </summary>
-        /// <returns></returns>
-        public string Close(string Id)
-        {
-            string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id,"ProfitObjectFloors","close");
-            foreach (string subid in idlist)
-            {
-                int id = int.Parse(subid);
-                Dictionary<string, object> Fields = new Dictionary<string, object>();
-                Fields.Add("Status", 0);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("ProfitObjectFloors", Fields, id);
-            }
-            db.SaveChanges();
-            return "success";
-        }
-
-        #endregion
-
-        #region 排序
-        /// <summary>
-        /// 排序
-        /// </summary>
-        /// <param name="Id"></param>
-        public string Sort(int Id, int Sort)
-        {
-            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Sort("ProfitObjectFloors", Sort, Id);
-            
-            AddSysLog(Id.ToString(), "ProfitObjectFloors", "sort");
-            return "success";
-        }
-        #endregion
-
-        #region 导入数据
-        /// <summary>
-        /// 导入数据
-        /// </summary>
-        /// <param name="ExcelData"></param>
-        public string Import(string ExcelData)
-        {
-            ExcelData = HttpUtility.UrlDecode(ExcelData);
-            JsonData list = JsonMapper.ToObject(ExcelData);
-            for (int i = 1; i < list.Count;i++ )
-            {
-                JsonData dr = list[i];
-                
-                db.ProfitObjectFloors.Add(new ProfitObjectFloors()
-                {
-                    CreateDate = DateTime.Now,
-                    UpdateDate = DateTime.Now,
-                    
-                });
-                db.SaveChanges();
-            }
-            AddSysLog("0", "ProfitObjectFloors", "Import");
-            return "success";
-        }
-        #endregion
-
-        #region 导出Excel
-
-        /// <summary>
-        /// 导出Excel
-        /// </summary>
-        /// <returns></returns>
-        public JsonResult ExportExcel(ProfitObjectFloors data)
-        {
-            Dictionary<string, string> Fields = new Dictionary<string, string>();
-            
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("ProfitObjectFloors", Fields, "Id desc", "0", 1, 20000, "", "", false);
-            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
-
-            Dictionary<string, object> result = new Dictionary<string, object>();
-            result.Add("Status", "1");
-            result.Add("Info", "Excel报表-" + DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss") + ".xlsx");
-            result.Add("Obj", diclist);
-            Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
-            
-            result.Add("Fields", ReturnFields);
-            AddSysLog("0", "ProfitObjectFloors", "ExportExcel");
-            return Json(result);
-        }
-
-        #endregion
-
-    }
-}

Areas/Admin/Controllers/MainServer/ProfitObjectLevelKindsController.cs

@@ -1,318 +0,0 @@
-/*
- * 分润对象等级分类
- */
-
-using System;
-using System.Web;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using MySystem.Models;
-using Library;
-using LitJson;
-using MySystemLib;
-
-namespace MySystem.Areas.Admin.Controllers
-{
-    [Area("Admin")]
-    [Route("Admin/[controller]/[action]")]
-    public class ProfitObjectLevelKindsController : BaseController
-    {
-        public ProfitObjectLevelKindsController(IHttpContextAccessor accessor, ILogger<BaseController> logger, IOptions<Setting> setting) : base(accessor, logger, setting)
-        {
-            OtherMySqlConn.connstr = ConfigurationManager.AppSettings["SqlConnStr"].ToString();
-        }
-
-        #region 分润对象等级分类列表
-
-        /// <summary>
-        /// 根据条件查询分润对象等级分类列表
-        /// </summary>
-        /// <returns></returns>
-        public IActionResult Index(ProfitObjectLevelKinds data, string right, string ObjectId)
-        {
-            ViewBag.RightInfo = RightInfo;
-            ViewBag.right = right;
-            ViewBag.ObjectId = ObjectId;
-
-
-            string Condition = "";
-            Condition += "Name:\"" + data.Name + "\",";
-
-            if (!string.IsNullOrEmpty(Condition))
-            { 
-                Condition = Condition.TrimEnd(',');
-                Condition = ", where: {" + Condition + "}";
-            }
-            ViewBag.Condition = Condition;
-            return View();
-        }
-
-        #endregion
-
-        #region 根据条件查询分润对象等级分类列表
-
-        /// <summary>
-        /// 分润对象等级分类列表
-        /// </summary>
-        /// <returns></returns>
-        public JsonResult IndexData(ProfitObjectLevelKinds data, int page = 1, int limit = 30)
-        {
-            
-            Dictionary<string, string> Fields = new Dictionary<string, string>();
-            Fields.Add("ObjectId", "1");
-
-            Fields.Add("Name", "2"); //名称
-
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("ProfitObjectLevelKinds", Fields, "Id desc", "0", page, limit);
-            //List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
-            //foreach (Dictionary<string, object> dic in diclist)
-            //{
-                
-            //}
-            return Json(obj);
-        }
-
-        #endregion
-
-        #region 增加分润对象等级分类
-
-        /// <summary>
-        /// 增加或修改分润对象等级分类信息
-        /// </summary>
-        /// <returns></returns>
-        public IActionResult Add(string right, string ObjectId)
-        {
-            ViewBag.RightInfo = RightInfo;
-            ViewBag.right = right;
-            ViewBag.ObjectId = ObjectId;
-
-
-            return View();
-        }
-
-        #endregion
-
-        #region 增加分润对象等级分类
-
-        /// <summary>
-        /// 增加或修改分润对象等级分类信息
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost]
-        public string Add(ProfitObjectLevelKinds data)
-        {
-            Dictionary<string, object> Fields = new Dictionary<string, object>();
-            Fields.Add("ObjectId", data.ObjectId);
-
-            Fields.Add("Name", data.Name); //名称
-            Fields.Add("IsHelp", data.IsHelp); //是否扶持期
-            Fields.Add("BankCardType", data.BankCardType); //卡类型
-
-            Fields.Add("SeoTitle", data.SeoTitle);
-            Fields.Add("SeoKeyword", data.SeoKeyword);
-            Fields.Add("SeoDescription", data.SeoDescription);
-            int Id = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Add("ProfitObjectLevelKinds", Fields, 0);
-            AddSysLog(data.Id.ToString(), "ProfitObjectLevelKinds", "add");
-            db.SaveChanges();
-            
-            return "success";
-        }
-
-        #endregion
-
-        #region 修改分润对象等级分类
-
-        /// <summary>
-        /// 增加或修改分润对象等级分类信息
-        /// </summary>
-        /// <returns></returns>
-        public IActionResult Edit(string right, string ObjectId, int Id = 0)
-        {
-            ViewBag.RightInfo = RightInfo;
-            ViewBag.right = right;
-            ViewBag.ObjectId = ObjectId;
-
-
-            ProfitObjectLevelKinds editData = db.ProfitObjectLevelKinds.FirstOrDefault(m => m.Id == Id) ?? new ProfitObjectLevelKinds();
-            ViewBag.data = editData;
-            return View();
-        }
-
-        #endregion
-
-        #region 修改分润对象等级分类
-
-        /// <summary>
-        /// 增加或修改分润对象等级分类信息
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost]
-        public string Edit(ProfitObjectLevelKinds data)
-        {
-            Dictionary<string, object> Fields = new Dictionary<string, object>();
-            Fields.Add("ObjectId", data.ObjectId);
-
-            Fields.Add("Name", data.Name); //名称
-            Fields.Add("IsHelp", data.IsHelp); //是否扶持期
-            Fields.Add("BankCardType", data.BankCardType); //卡类型
-
-            Fields.Add("SeoTitle", data.SeoTitle);
-            Fields.Add("SeoKeyword", data.SeoKeyword);
-            Fields.Add("SeoDescription", data.SeoDescription);
-            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("ProfitObjectLevelKinds", Fields, data.Id);
-            AddSysLog(data.Id.ToString(),"ProfitObjectLevelKinds","update");
-            db.SaveChanges();
-            
-            return "success";
-        }
-
-        #endregion
-
-        #region 删除分润对象等级分类信息
-
-        /// <summary>
-        /// 删除分润对象等级分类信息
-        /// </summary>
-        /// <returns></returns>
-        public string Delete(string Id)
-        {
-            string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id,"ProfitObjectLevelKinds","del");
-            foreach (string subid in idlist)
-            {
-                int id = int.Parse(subid);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Delete("ProfitObjectLevelKinds", id);
-                ProfitObjectLevels edit = db.ProfitObjectLevels.FirstOrDefault(m => m.KindId == id);
-                if (edit != null)
-                {
-                    db.ProfitObjectLevels.Remove(edit);
-                }
-            }
-            db.SaveChanges();
-            
-            return "success";
-        }
-
-        #endregion
-
-        #region 开启
-
-        /// <summary>
-        /// 开启
-        /// </summary>
-        /// <returns></returns>
-        public string Open(string Id)
-        {
-            string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id,"ProfitObjectLevelKinds","open");
-            foreach (string subid in idlist)
-            {
-                int id = int.Parse(subid);
-                Dictionary<string, object> Fields = new Dictionary<string, object>();
-                Fields.Add("Status", 1);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("ProfitObjectLevelKinds", Fields, id);
-            }
-            db.SaveChanges();
-            return "success";
-        }
-
-        #endregion
-
-        #region 关闭
-
-        /// <summary>
-        /// 关闭
-        /// </summary>
-        /// <returns></returns>
-        public string Close(string Id)
-        {
-            string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id,"ProfitObjectLevelKinds","close");
-            foreach (string subid in idlist)
-            {
-                int id = int.Parse(subid);
-                Dictionary<string, object> Fields = new Dictionary<string, object>();
-                Fields.Add("Status", 0);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("ProfitObjectLevelKinds", Fields, id);
-            }
-            db.SaveChanges();
-            return "success";
-        }
-
-        #endregion
-
-        #region 排序
-        /// <summary>
-        /// 排序
-        /// </summary>
-        /// <param name="Id"></param>
-        public string Sort(int Id, int Sort)
-        {
-            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Sort("ProfitObjectLevelKinds", Sort, Id);
-            
-            AddSysLog(Id.ToString(), "ProfitObjectLevelKinds", "sort");
-            return "success";
-        }
-        #endregion
-
-        #region 导入数据
-        /// <summary>
-        /// 导入数据
-        /// </summary>
-        /// <param name="ExcelData"></param>
-        public string Import(string ExcelData)
-        {
-            ExcelData = HttpUtility.UrlDecode(ExcelData);
-            JsonData list = JsonMapper.ToObject(ExcelData);
-            for (int i = 1; i < list.Count;i++ )
-            {
-                JsonData dr = list[i];
-                
-                db.ProfitObjectLevelKinds.Add(new ProfitObjectLevelKinds()
-                {
-                    CreateDate = DateTime.Now,
-                    UpdateDate = DateTime.Now,
-                    
-                });
-                db.SaveChanges();
-            }
-            AddSysLog("0", "ProfitObjectLevelKinds", "Import");
-            return "success";
-        }
-        #endregion
-
-        #region 导出Excel
-
-        /// <summary>
-        /// 导出Excel
-        /// </summary>
-        /// <returns></returns>
-        public JsonResult ExportExcel(ProfitObjectLevelKinds data)
-        {
-            Dictionary<string, string> Fields = new Dictionary<string, string>();
-            Fields.Add("Name", "2"); //名称
-
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("ProfitObjectLevelKinds", Fields, "Id desc", "0", 1, 20000, "", "", false);
-            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
-
-            Dictionary<string, object> result = new Dictionary<string, object>();
-            result.Add("Status", "1");
-            result.Add("Info", "Excel报表-" + DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss") + ".xlsx");
-            result.Add("Obj", diclist);
-            Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
-            
-            result.Add("Fields", ReturnFields);
-            AddSysLog("0", "ProfitObjectLevelKinds", "ExportExcel");
-            return Json(result);
-        }
-
-        #endregion
-
-    }
-}

Areas/Admin/Controllers/MainServer/ProfitObjectLevelsController.cs

@@ -1,353 +0,0 @@
-/*
- * 分润对象等级
- */
-
-using System;
-using System.Web;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using MySystem.Models;
-using Library;
-using LitJson;
-using MySystemLib;
-
-namespace MySystem.Areas.Admin.Controllers
-{
-    [Area("Admin")]
-    [Route("Admin/[controller]/[action]")]
-    public class ProfitObjectLevelsController : BaseController
-    {
-        public ProfitObjectLevelsController(IHttpContextAccessor accessor, ILogger<BaseController> logger, IOptions<Setting> setting) : base(accessor, logger, setting)
-        {
-            OtherMySqlConn.connstr = ConfigurationManager.AppSettings["SqlConnStr"].ToString();
-        }
-
-        #region 分润对象等级列表
-
-        /// <summary>
-        /// 根据条件查询分润对象等级列表
-        /// </summary>
-        /// <returns></returns>
-        public IActionResult Index(ProfitObjectLevels data, string right, string KindId)
-        {
-            ViewBag.RightInfo = RightInfo;
-            ViewBag.right = right;
-            ViewBag.KindId = KindId;
-
-
-            string Condition = "";
-            Condition += "Name:\"" + data.Name + "\",";
-
-            if (!string.IsNullOrEmpty(Condition))
-            {
-                Condition = Condition.TrimEnd(',');
-                Condition = ", where: {" + Condition + "}";
-            }
-            ViewBag.Condition = Condition;
-            return View();
-        }
-
-        #endregion
-
-        #region 根据条件查询分润对象等级列表
-
-        /// <summary>
-        /// 分润对象等级列表
-        /// </summary>
-        /// <returns></returns>
-        public JsonResult IndexData(ProfitObjectLevels data, int page = 1, int limit = 30)
-        {
-
-            Dictionary<string, string> Fields = new Dictionary<string, string>();
-            Fields.Add("KindId", "1");
-
-            Fields.Add("Name", "2"); //名称
-
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("ProfitObjectLevels", Fields, "Id desc", "0", page, limit);
-            //List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
-            //foreach (Dictionary<string, object> dic in diclist)
-            //{
-
-            //}
-            return Json(obj);
-        }
-
-        #endregion
-
-        #region 增加分润对象等级
-
-        /// <summary>
-        /// 增加或修改分润对象等级信息
-        /// </summary>
-        /// <returns></returns>
-        public IActionResult Add(string right, string KindId)
-        {
-            ViewBag.RightInfo = RightInfo;
-            ViewBag.right = right;
-            ViewBag.KindId = KindId;
-
-
-            return View();
-        }
-
-        #endregion
-
-        #region 增加分润对象等级
-
-        /// <summary>
-        /// 增加或修改分润对象等级信息
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost]
-        public string Add(ProfitObjectLevels data)
-        {
-            Dictionary<string, object> Fields = new Dictionary<string, object>();
-            Fields.Add("KindId", data.KindId);
-
-            Fields.Add("LevelNumber", data.LevelNumber); //级别
-            Fields.Add("Name", data.Name); //名称
-            Fields.Add("Percents", data.Percents); //分润比例
-            Fields.Add("AddProfitVal", data.AddProfitVal); //附加分润值
-            Fields.Add("LevelDiff", data.LevelDiff); //级差
-
-            Fields.Add("SeoTitle", data.SeoTitle);
-            Fields.Add("SeoKeyword", data.SeoKeyword);
-            Fields.Add("SeoDescription", data.SeoDescription);
-            int Id = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Add("ProfitObjectLevels", Fields, 0);
-            AddSysLog(data.Id.ToString(), "ProfitObjectLevels", "add");
-            db.SaveChanges();
-
-            return "success";
-        }
-
-        #endregion
-
-        #region 修改分润对象等级
-
-        /// <summary>
-        /// 增加或修改分润对象等级信息
-        /// </summary>
-        /// <returns></returns>
-        public IActionResult Edit(string right, string KindId, int Id = 0)
-        {
-            ViewBag.RightInfo = RightInfo;
-            ViewBag.right = right;
-            ViewBag.KindId = KindId;
-
-
-            ProfitObjectLevels editData = db.ProfitObjectLevels.FirstOrDefault(m => m.Id == Id) ?? new ProfitObjectLevels();
-            ViewBag.data = editData;
-            return View();
-        }
-
-        #endregion
-
-        #region 修改分润对象等级
-
-        /// <summary>
-        /// 增加或修改分润对象等级信息
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost]
-        public string Edit(ProfitObjectLevels data)
-        {
-            Dictionary<string, object> Fields = new Dictionary<string, object>();
-            Fields.Add("KindId", data.KindId);
-
-            Fields.Add("LevelNumber", data.LevelNumber); //级别
-            Fields.Add("Name", data.Name); //名称
-            Fields.Add("Percents", data.Percents); //分润比例
-            Fields.Add("AddProfitVal", data.AddProfitVal); //附加分润值
-            Fields.Add("LevelDiff", data.LevelDiff); //级差
-
-            Fields.Add("SeoTitle", data.SeoTitle);
-            Fields.Add("SeoKeyword", data.SeoKeyword);
-            Fields.Add("SeoDescription", data.SeoDescription);
-            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("ProfitObjectLevels", Fields, data.Id);
-            AddSysLog(data.Id.ToString(), "ProfitObjectLevels", "update");
-            db.SaveChanges();
-
-            return "success";
-        }
-
-        #endregion
-
-        #region 删除分润对象等级信息
-
-        /// <summary>
-        /// 删除分润对象等级信息
-        /// </summary>
-        /// <returns></returns>
-        public string Delete(string Id)
-        {
-            string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id, "ProfitObjectLevels", "del");
-            foreach (string subid in idlist)
-            {
-                int id = int.Parse(subid);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Delete("ProfitObjectLevels", id);
-            }
-            db.SaveChanges();
-
-            return "success";
-        }
-
-        #endregion
-
-        #region 开启
-
-        /// <summary>
-        /// 开启
-        /// </summary>
-        /// <returns></returns>
-        public string Open(string Id)
-        {
-            string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id, "ProfitObjectLevels", "open");
-            foreach (string subid in idlist)
-            {
-                int id = int.Parse(subid);
-                Dictionary<string, object> Fields = new Dictionary<string, object>();
-                Fields.Add("Status", 1);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("ProfitObjectLevels", Fields, id);
-            }
-            db.SaveChanges();
-            return "success";
-        }
-
-        #endregion
-
-        #region 关闭
-
-        /// <summary>
-        /// 关闭
-        /// </summary>
-        /// <returns></returns>
-        public string Close(string Id)
-        {
-            string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id, "ProfitObjectLevels", "close");
-            foreach (string subid in idlist)
-            {
-                int id = int.Parse(subid);
-                Dictionary<string, object> Fields = new Dictionary<string, object>();
-                Fields.Add("Status", 0);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("ProfitObjectLevels", Fields, id);
-            }
-            db.SaveChanges();
-            return "success";
-        }
-
-        #endregion
-
-        #region 排序
-        /// <summary>
-        /// 排序
-        /// </summary>
-        /// <param name="Id"></param>
-        public string Sort(int Id, int Sort)
-        {
-            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Sort("ProfitObjectLevels", Sort, Id);
-
-            AddSysLog(Id.ToString(), "ProfitObjectLevels", "sort");
-            return "success";
-        }
-        #endregion
-
-        #region 导入数据
-        /// <summary>
-        /// 导入数据
-        /// </summary>
-        /// <param name="ExcelData"></param>
-        public string Import(string ExcelData)
-        {
-            ExcelData = HttpUtility.UrlDecode(ExcelData);
-            JsonData list = JsonMapper.ToObject(ExcelData);
-            for (int i = 1; i < list.Count; i++)
-            {
-                JsonData dr = list[i];
-
-                db.ProfitObjectLevels.Add(new ProfitObjectLevels()
-                {
-                    CreateDate = DateTime.Now,
-                    UpdateDate = DateTime.Now,
-
-                });
-                db.SaveChanges();
-            }
-            AddSysLog("0", "ProfitObjectLevels", "Import");
-            return "success";
-        }
-        #endregion
-
-        #region 导出Excel
-
-        /// <summary>
-        /// 导出Excel
-        /// </summary>
-        /// <returns></returns>
-        public JsonResult ExportExcel(ProfitObjectLevels data)
-        {
-            Dictionary<string, string> Fields = new Dictionary<string, string>();
-            Fields.Add("Name", "2"); //名称
-
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("ProfitObjectLevels", Fields, "Id desc", "0", 1, 20000, "", "", false);
-            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
-
-            Dictionary<string, object> result = new Dictionary<string, object>();
-            result.Add("Status", "1");
-            result.Add("Info", "Excel报表-" + DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss") + ".xlsx");
-            result.Add("Obj", diclist);
-            Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
-
-            result.Add("Fields", ReturnFields);
-            AddSysLog("0", "ProfitObjectLevels", "ExportExcel");
-            return Json(result);
-        }
-
-        #endregion
-
-        #region 编辑字段
-
-        public string Percents(int Id, decimal Percents)
-        {
-            ProfitObjectLevels edit = db.ProfitObjectLevels.FirstOrDefault(m => m.Id == Id);
-            if (edit != null)
-            {
-                edit.Percents = Percents;
-                db.SaveChanges();
-            }
-            AddSysLog(Id.ToString(), "ProfitObjectLevels", "Percents");
-            return "success";
-        }
-        public string AddProfitVal(int Id, decimal AddProfitVal)
-        {
-            ProfitObjectLevels edit = db.ProfitObjectLevels.FirstOrDefault(m => m.Id == Id);
-            if (edit != null)
-            {
-                edit.AddProfitVal = AddProfitVal;
-                db.SaveChanges();
-            }
-            AddSysLog(Id.ToString(), "ProfitObjectLevels", "AddProfitVal");
-            return "success";
-        }
-        public string LevelDiff(int Id, ulong LevelDiff)
-        {
-            ProfitObjectLevels edit = db.ProfitObjectLevels.FirstOrDefault(m => m.Id == Id);
-            if (edit != null)
-            {
-                edit.LevelDiff = LevelDiff;
-                db.SaveChanges();
-            }
-            AddSysLog(Id.ToString(), "ProfitObjectLevels", "LevelDiff");
-            return "success";
-        }
-        #endregion
-    }
-}

Areas/Admin/Controllers/MainServer/ProfitObjectsActiveParamsController.cs

@@ -1,319 +0,0 @@
-/*
- * 分润对象活动参数
- */
-
-using System;
-using System.Web;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using MySystem.Models;
-using Library;
-using LitJson;
-using MySystemLib;
-
-namespace MySystem.Areas.Admin.Controllers
-{
-    [Area("Admin")]
-    [Route("Admin/[controller]/[action]")]
-    public class ProfitObjectsActiveParamsController : BaseController
-    {
-        public ProfitObjectsActiveParamsController(IHttpContextAccessor accessor, ILogger<BaseController> logger, IOptions<Setting> setting) : base(accessor, logger, setting)
-        {
-            OtherMySqlConn.connstr = ConfigurationManager.AppSettings["SqlConnStr"].ToString();
-        }
-
-        #region 分润对象活动参数列表
-
-        /// <summary>
-        /// 根据条件查询分润对象活动参数列表
-        /// </summary>
-        /// <returns></returns>
-        public IActionResult Index(ProfitObjectsActiveParams data, string right, string ProfitObjectsActiveId)
-        {
-            ViewBag.RightInfo = RightInfo;
-            ViewBag.right = right;
-            ViewBag.ProfitObjectsActiveId = ProfitObjectsActiveId;
-
-
-            string Condition = "";
-            Condition += "Name:\"" + data.Name + "\",";
-
-            if (!string.IsNullOrEmpty(Condition))
-            { 
-                Condition = Condition.TrimEnd(',');
-                Condition = ", where: {" + Condition + "}";
-            }
-            ViewBag.Condition = Condition;
-            return View();
-        }
-
-        #endregion
-
-        #region 根据条件查询分润对象活动参数列表
-
-        /// <summary>
-        /// 分润对象活动参数列表
-        /// </summary>
-        /// <returns></returns>
-        public JsonResult IndexData(ProfitObjectsActiveParams data, int page = 1, int limit = 30)
-        {
-            
-            Dictionary<string, string> Fields = new Dictionary<string, string>();
-            Fields.Add("ProfitObjectsActiveId", "1");
-
-            Fields.Add("Name", "2"); //参数名称
-
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("ProfitObjectsActiveParams", Fields, "Id desc", "0", page, limit, " and Status>-1");
-            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
-            foreach (Dictionary<string, object> dic in diclist)
-            {
-                
-            }
-            return Json(obj);
-        }
-
-        #endregion
-
-        #region 增加分润对象活动参数
-
-        /// <summary>
-        /// 增加或修改分润对象活动参数信息
-        /// </summary>
-        /// <returns></returns>
-        public IActionResult Add(string right, string ProfitObjectsActiveId)
-        {
-            ViewBag.RightInfo = RightInfo;
-            ViewBag.right = right;
-            ViewBag.ProfitObjectsActiveId = ProfitObjectsActiveId;
-
-
-            return View();
-        }
-
-        #endregion
-
-        #region 增加分润对象活动参数
-
-        /// <summary>
-        /// 增加或修改分润对象活动参数信息
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost]
-        public string Add(ProfitObjectsActiveParams data)
-        {
-            Dictionary<string, object> Fields = new Dictionary<string, object>();
-            Fields.Add("ProfitObjectsActiveId", data.ProfitObjectsActiveId);
-
-            Fields.Add("Name", data.Name); //参数名称
-Fields.Add("TextValue", data.TextValue); //参数值
-Fields.Add("Remark", data.Remark); //参数说明
-
-            Fields.Add("SeoTitle", data.SeoTitle);
-            Fields.Add("SeoKeyword", data.SeoKeyword);
-            Fields.Add("SeoDescription", data.SeoDescription);
-            int Id = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Add("ProfitObjectsActiveParams", Fields, 0);
-            AddSysLog(data.Id.ToString(), "ProfitObjectsActiveParams", "add");
-            db.SaveChanges();
-            
-            return "success";
-        }
-
-        #endregion
-
-        #region 修改分润对象活动参数
-
-        /// <summary>
-        /// 增加或修改分润对象活动参数信息
-        /// </summary>
-        /// <returns></returns>
-        public IActionResult Edit(string right, string ProfitObjectsActiveId, int Id = 0)
-        {
-            ViewBag.RightInfo = RightInfo;
-            ViewBag.right = right;
-            ViewBag.ProfitObjectsActiveId = ProfitObjectsActiveId;
-
-
-            ProfitObjectsActiveParams editData = db.ProfitObjectsActiveParams.FirstOrDefault(m => m.Id == Id) ?? new ProfitObjectsActiveParams();
-            ViewBag.data = editData;
-            return View();
-        }
-
-        #endregion
-
-        #region 修改分润对象活动参数
-
-        /// <summary>
-        /// 增加或修改分润对象活动参数信息
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost]
-        public string Edit(ProfitObjectsActiveParams data)
-        {
-            Dictionary<string, object> Fields = new Dictionary<string, object>();
-            Fields.Add("ProfitObjectsActiveId", data.ProfitObjectsActiveId);
-
-            Fields.Add("Name", data.Name); //参数名称
-Fields.Add("TextValue", data.TextValue); //参数值
-Fields.Add("Remark", data.Remark); //参数说明
-
-            Fields.Add("SeoTitle", data.SeoTitle);
-            Fields.Add("SeoKeyword", data.SeoKeyword);
-            Fields.Add("SeoDescription", data.SeoDescription);
-            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("ProfitObjectsActiveParams", Fields, data.Id);
-            AddSysLog(data.Id.ToString(),"ProfitObjectsActiveParams","update");
-            db.SaveChanges();
-            
-            return "success";
-        }
-
-        #endregion
-
-        #region 删除分润对象活动参数信息
-
-        /// <summary>
-        /// 删除分润对象活动参数信息
-        /// </summary>
-        /// <returns></returns>
-        public string Delete(string Id)
-        {
-            string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id,"ProfitObjectsActiveParams","del");
-            foreach (string subid in idlist)
-            {
-                int id = int.Parse(subid);
-                Dictionary<string, object> Fields = new Dictionary<string, object>();
-                Fields.Add("Status", -1);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("ProfitObjectsActiveParams", Fields, id);
-            }
-            db.SaveChanges();
-            
-            return "success";
-        }
-
-        #endregion
-
-        #region 开启
-
-        /// <summary>
-        /// 开启
-        /// </summary>
-        /// <returns></returns>
-        public string Open(string Id)
-        {
-            string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id,"ProfitObjectsActiveParams","open");
-            foreach (string subid in idlist)
-            {
-                int id = int.Parse(subid);
-                Dictionary<string, object> Fields = new Dictionary<string, object>();
-                Fields.Add("Status", 1);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("ProfitObjectsActiveParams", Fields, id);
-            }
-            db.SaveChanges();
-            return "success";
-        }
-
-        #endregion
-
-        #region 关闭
-
-        /// <summary>
-        /// 关闭
-        /// </summary>
-        /// <returns></returns>
-        public string Close(string Id)
-        {
-            string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id,"ProfitObjectsActiveParams","close");
-            foreach (string subid in idlist)
-            {
-                int id = int.Parse(subid);
-                Dictionary<string, object> Fields = new Dictionary<string, object>();
-                Fields.Add("Status", 0);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("ProfitObjectsActiveParams", Fields, id);
-            }
-            db.SaveChanges();
-            return "success";
-        }
-
-        #endregion
-
-        #region 排序
-        /// <summary>
-        /// 排序
-        /// </summary>
-        /// <param name="Id"></param>
-        public string Sort(int Id, int Sort)
-        {
-            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Sort("ProfitObjectsActiveParams", Sort, Id);
-            
-            AddSysLog(Id.ToString(), "ProfitObjectsActiveParams", "sort");
-            return "success";
-        }
-        #endregion
-
-        #region 导入数据
-        /// <summary>
-        /// 导入数据
-        /// </summary>
-        /// <param name="ExcelData"></param>
-        public string Import(string ExcelData)
-        {
-            ExcelData = HttpUtility.UrlDecode(ExcelData);
-            JsonData list = JsonMapper.ToObject(ExcelData);
-            for (int i = 1; i < list.Count;i++ )
-            {
-                JsonData dr = list[i];
-                
-                db.ProfitObjectsActiveParams.Add(new ProfitObjectsActiveParams()
-                {
-                    CreateDate = DateTime.Now,
-                    UpdateDate = DateTime.Now,
-                    
-                });
-                db.SaveChanges();
-            }
-            AddSysLog("0", "ProfitObjectsActiveParams", "Import");
-            return "success";
-        }
-        #endregion
-
-        #region 导出Excel
-
-        /// <summary>
-        /// 导出Excel
-        /// </summary>
-        /// <returns></returns>
-        public JsonResult ExportExcel(ProfitObjectsActiveParams data)
-        {
-            Dictionary<string, string> Fields = new Dictionary<string, string>();
-            Fields.Add("Name", "2"); //参数名称
-
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("ProfitObjectsActiveParams", Fields, "Id desc", "0", 1, 20000, "", "", false);
-            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
-            foreach (Dictionary<string, object> dic in diclist)
-            {
-                
-            }
-
-            Dictionary<string, object> result = new Dictionary<string, object>();
-            result.Add("Status", "1");
-            result.Add("Info", "Excel报表-" + DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss") + ".xlsx");
-            result.Add("Obj", diclist);
-            Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
-            
-            result.Add("Fields", ReturnFields);
-            AddSysLog("0", "ProfitObjectsActiveParams", "ExportExcel");
-            return Json(result);
-        }
-
-        #endregion
-
-    }
-}

Areas/Admin/Controllers/MainServer/ProfitObjectsActivesController.cs

@@ -1,329 +0,0 @@
-/*
- * 分润对象活动奖
- */
-
-using System;
-using System.Web;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using MySystem.Models;
-using Library;
-using LitJson;
-using MySystemLib;
-
-namespace MySystem.Areas.Admin.Controllers
-{
-    [Area("Admin")]
-    [Route("Admin/[controller]/[action]")]
-    public class ProfitObjectsActivesController : BaseController
-    {
-        public ProfitObjectsActivesController(IHttpContextAccessor accessor, ILogger<BaseController> logger, IOptions<Setting> setting) : base(accessor, logger, setting)
-        {
-            OtherMySqlConn.connstr = ConfigurationManager.AppSettings["SqlConnStr"].ToString();
-        }
-
-        #region 分润对象活动奖列表
-
-        /// <summary>
-        /// 根据条件查询分润对象活动奖列表
-        /// </summary>
-        /// <returns></returns>
-        public IActionResult Index(ProfitObjectsActives data, string right, string ObjectId)
-        {
-            ViewBag.RightInfo = RightInfo;
-            ViewBag.right = right;
-            ViewBag.ObjectId = ObjectId;
-
-
-            string Condition = "";
-            Condition += "Name:\"" + data.Name + "\",";
-
-            if (!string.IsNullOrEmpty(Condition))
-            {
-                Condition = Condition.TrimEnd(',');
-                Condition = ", where: {" + Condition + "}";
-            }
-            ViewBag.Condition = Condition;
-            return View();
-        }
-
-        #endregion
-
-        #region 根据条件查询分润对象活动奖列表
-
-        /// <summary>
-        /// 分润对象活动奖列表
-        /// </summary>
-        /// <returns></returns>
-        public JsonResult IndexData(ProfitObjectsActives data, int page = 1, int limit = 30)
-        {
-
-            Dictionary<string, string> Fields = new Dictionary<string, string>();
-            Fields.Add("ObjectId", "1");
-
-            Fields.Add("Name", "2"); //名称
-
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("ProfitObjectsActives", Fields, "Id desc", "0", page, limit);
-            //List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
-            //foreach (Dictionary<string, object> dic in diclist)
-            //{
-
-            //}
-            return Json(obj);
-        }
-
-        #endregion
-
-        #region 增加分润对象活动奖
-
-        /// <summary>
-        /// 增加或修改分润对象活动奖信息
-        /// </summary>
-        /// <returns></returns>
-        public IActionResult Add(string right, string ObjectId)
-        {
-            ViewBag.RightInfo = RightInfo;
-            ViewBag.right = right;
-            ViewBag.ObjectId = ObjectId;
-
-
-            return View();
-        }
-
-        #endregion
-
-        #region 增加分润对象活动奖
-
-        /// <summary>
-        /// 增加或修改分润对象活动奖信息
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost]
-        public string Add(ProfitObjectsActives data)
-        {
-            Dictionary<string, object> Fields = new Dictionary<string, object>();
-            Fields.Add("ObjectId", data.ObjectId);
-
-            Fields.Add("Name", data.Name); //名称
-            Fields.Add("LimitDateKind", data.LimitDateKind); //限制时间类型
-            Fields.Add("LimitDateVal", data.LimitDateVal); //限制时间值
-            Fields.Add("LimitCustomerDate", data.LimitCustomerDate); //自定时间限制
-            Fields.Add("FinishNumber", data.FinishNumber); //满足条件的数值
-            Fields.Add("ProfitNumber", data.ProfitNumber); //获得收益值
-            Fields.Add("StartDate", data.StartDate); //活动开始时间
-            Fields.Add("EndDate", data.EndDate); //活动结束时间
-            Fields.Add("MachineCount", data.MachineCount); //赠机台数
-            Fields.Add("CardType", data.CardType); //卡类型
-            Fields.Add("ProfitNumber2", data.ProfitNumber2); //获得收益值2
-
-            Fields.Add("SeoTitle", data.SeoTitle);
-            Fields.Add("SeoKeyword", data.SeoKeyword);
-            Fields.Add("SeoDescription", data.SeoDescription);
-            int Id = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Add("ProfitObjectsActives", Fields, 0);
-            AddSysLog(data.Id.ToString(), "ProfitObjectsActives", "add");
-            db.SaveChanges();
-
-            return "success";
-        }
-
-        #endregion
-
-        #region 修改分润对象活动奖
-
-        /// <summary>
-        /// 增加或修改分润对象活动奖信息
-        /// </summary>
-        /// <returns></returns>
-        public IActionResult Edit(string right, string ObjectId, int Id = 0)
-        {
-            ViewBag.RightInfo = RightInfo;
-            ViewBag.right = right;
-            ViewBag.ObjectId = ObjectId;
-
-
-            ProfitObjectsActives editData = db.ProfitObjectsActives.FirstOrDefault(m => m.Id == Id) ?? new ProfitObjectsActives();
-            ViewBag.data = editData;
-            return View();
-        }
-
-        #endregion
-
-        #region 修改分润对象活动奖
-
-        /// <summary>
-        /// 增加或修改分润对象活动奖信息
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost]
-        public string Edit(ProfitObjectsActives data)
-        {
-            Dictionary<string, object> Fields = new Dictionary<string, object>();
-            Fields.Add("ObjectId", data.ObjectId);
-
-            Fields.Add("Name", data.Name); //名称
-            Fields.Add("LimitDateKind", data.LimitDateKind); //限制时间类型
-            Fields.Add("LimitDateVal", data.LimitDateVal); //限制时间值
-            Fields.Add("LimitCustomerDate", data.LimitCustomerDate); //自定时间限制
-            Fields.Add("FinishNumber", data.FinishNumber); //满足条件的数值
-            Fields.Add("ProfitNumber", data.ProfitNumber); //获得收益值
-            Fields.Add("StartDate", data.StartDate); //活动开始时间
-            Fields.Add("EndDate", data.EndDate); //活动结束时间
-            Fields.Add("MachineCount", data.MachineCount); //赠机台数
-            Fields.Add("CardType", data.CardType); //卡类型
-            Fields.Add("ProfitNumber2", data.ProfitNumber2); //获得收益值2
-
-            Fields.Add("SeoTitle", data.SeoTitle);
-            Fields.Add("SeoKeyword", data.SeoKeyword);
-            Fields.Add("SeoDescription", data.SeoDescription);
-            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("ProfitObjectsActives", Fields, data.Id);
-            AddSysLog(data.Id.ToString(), "ProfitObjectsActives", "update");
-            db.SaveChanges();
-
-            return "success";
-        }
-
-        #endregion
-
-        #region 删除分润对象活动奖信息
-
-        /// <summary>
-        /// 删除分润对象活动奖信息
-        /// </summary>
-        /// <returns></returns>
-        public string Delete(string Id)
-        {
-            string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id, "ProfitObjectsActives", "del");
-            foreach (string subid in idlist)
-            {
-                int id = int.Parse(subid);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Delete("ProfitObjectsActives", id);
-            }
-            db.SaveChanges();
-
-            return "success";
-        }
-
-        #endregion
-
-        #region 开启
-
-        /// <summary>
-        /// 开启
-        /// </summary>
-        /// <returns></returns>
-        public string Open(string Id)
-        {
-            string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id, "ProfitObjectsActives", "open");
-            foreach (string subid in idlist)
-            {
-                int id = int.Parse(subid);
-                Dictionary<string, object> Fields = new Dictionary<string, object>();
-                Fields.Add("Status", 1);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("ProfitObjectsActives", Fields, id);
-            }
-            db.SaveChanges();
-            return "success";
-        }
-
-        #endregion
-
-        #region 关闭
-
-        /// <summary>
-        /// 关闭
-        /// </summary>
-        /// <returns></returns>
-        public string Close(string Id)
-        {
-            string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id, "ProfitObjectsActives", "close");
-            foreach (string subid in idlist)
-            {
-                int id = int.Parse(subid);
-                Dictionary<string, object> Fields = new Dictionary<string, object>();
-                Fields.Add("Status", 0);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("ProfitObjectsActives", Fields, id);
-            }
-            db.SaveChanges();
-            return "success";
-        }
-
-        #endregion
-
-        #region 排序
-        /// <summary>
-        /// 排序
-        /// </summary>
-        /// <param name="Id"></param>
-        public string Sort(int Id, int Sort)
-        {
-            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Sort("ProfitObjectsActives", Sort, Id);
-
-            AddSysLog(Id.ToString(), "ProfitObjectsActives", "sort");
-            return "success";
-        }
-        #endregion
-
-        #region 导入数据
-        /// <summary>
-        /// 导入数据
-        /// </summary>
-        /// <param name="ExcelData"></param>
-        public string Import(string ExcelData)
-        {
-            ExcelData = HttpUtility.UrlDecode(ExcelData);
-            JsonData list = JsonMapper.ToObject(ExcelData);
-            for (int i = 1; i < list.Count; i++)
-            {
-                JsonData dr = list[i];
-
-                db.ProfitObjectsActives.Add(new ProfitObjectsActives()
-                {
-                    CreateDate = DateTime.Now,
-                    UpdateDate = DateTime.Now,
-
-                });
-                db.SaveChanges();
-            }
-            AddSysLog("0", "ProfitObjectsActives", "Import");
-            return "success";
-        }
-        #endregion
-
-        #region 导出Excel
-
-        /// <summary>
-        /// 导出Excel
-        /// </summary>
-        /// <returns></returns>
-        public JsonResult ExportExcel(ProfitObjectsActives data)
-        {
-            Dictionary<string, string> Fields = new Dictionary<string, string>();
-            Fields.Add("Name", "2"); //名称
-
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("ProfitObjectsActives", Fields, "Id desc", "0", 1, 20000, "", "", false);
-            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
-
-            Dictionary<string, object> result = new Dictionary<string, object>();
-            result.Add("Status", "1");
-            result.Add("Info", "Excel报表-" + DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss") + ".xlsx");
-            result.Add("Obj", diclist);
-            Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
-
-            result.Add("Fields", ReturnFields);
-            AddSysLog("0", "ProfitObjectsActives", "ExportExcel");
-            return Json(result);
-        }
-
-        #endregion
-
-    }
-}

Areas/Admin/Controllers/MainServer/ProfitObjectsController.cs

@@ -1,427 +0,0 @@
-/*
- * 分润对象
- */
-
-using System;
-using System.Web;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using MySystem.Models;
-using Library;
-using LitJson;
-using MySystemLib;
-
-namespace MySystem.Areas.Admin.Controllers
-{
-    [Area("Admin")]
-    [Route("Admin/[controller]/[action]")]
-    public class ProfitObjectsController : BaseController
-    {
-        public ProfitObjectsController(IHttpContextAccessor accessor, ILogger<BaseController> logger, IOptions<Setting> setting) : base(accessor, logger, setting)
-        {
-            OtherMySqlConn.connstr = ConfigurationManager.AppSettings["SqlConnStr"].ToString();
-        }
-
-        #region 分润对象列表
-
-        /// <summary>
-        /// 根据条件查询分润对象列表
-        /// </summary>
-        /// <returns></returns>
-        public IActionResult Index(ProfitObjects data, string right)
-        {
-            ViewBag.RightInfo = RightInfo;
-            ViewBag.right = right;
-
-
-            string Condition = "";
-            Condition += "Name:\"" + data.Name + "\",";
-
-            if (!string.IsNullOrEmpty(Condition))
-            {
-                Condition = Condition.TrimEnd(',');
-                Condition = ", where: {" + Condition + "}";
-            }
-            ViewBag.Condition = Condition;
-            return View();
-        }
-
-        #endregion
-
-        #region 根据条件查询分润对象列表
-
-        /// <summary>
-        /// 分润对象列表
-        /// </summary>
-        /// <returns></returns>
-        public JsonResult IndexData(ProfitObjects data, int page = 1, int limit = 30)
-        {
-
-            Dictionary<string, string> Fields = new Dictionary<string, string>();
-
-            Fields.Add("Name", "2"); //名称
-
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("ProfitObjects", Fields, "Id desc", "0", page, limit);
-            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
-            foreach (Dictionary<string, object> dic in diclist)
-            {
-                dic["Status"] = dic["Status"].ToString() == "1" ? "开启" : "关闭";
-            }
-            return Json(obj);
-        }
-
-        #endregion
-
-        #region 增加分润对象
-
-        /// <summary>
-        /// 增加或修改分润对象信息
-        /// </summary>
-        /// <returns></returns>
-        public IActionResult Add(string right)
-        {
-            ViewBag.RightInfo = RightInfo;
-            ViewBag.right = right;
-
-            List<ProfitObjects> objs = db.ProfitObjects.OrderBy(m => m.Id).ToList();
-            ViewBag.objs = objs;
-
-            return View();
-        }
-
-        #endregion
-
-        #region 增加分润对象
-
-        /// <summary>
-        /// 增加或修改分润对象信息
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost]
-        public string Add(ProfitObjects data, int CopyId)
-        {
-            Dictionary<string, object> Fields = new Dictionary<string, object>();
-
-            Fields.Add("Name", data.Name); //名称
-            Fields.Add("MaxFloor", data.MaxFloor); //最大层级
-            Fields.Add("MaxLevel", data.MaxLevel); //最大等级
-            Fields.Add("MaxLevelContinue", data.MaxLevelContinue); //到顶级是否继续
-            Fields.Add("MinProfitVal", data.MinProfitVal); //最小分润值
-
-            Fields.Add("SeoTitle", data.SeoTitle);
-            Fields.Add("SeoKeyword", data.SeoKeyword);
-            Fields.Add("SeoDescription", data.SeoDescription);
-            int Id = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Add("ProfitObjects", Fields, 0);
-            AddSysLog(data.Id.ToString(), "ProfitObjects", "add");
-            db.SaveChanges();
-
-            if (CopyId > 0)
-            {
-                List<ProfitObjectLevelKinds> objlevelkinds = db.ProfitObjectLevelKinds.Where(m => m.ObjectId == CopyId).ToList();
-                foreach (ProfitObjectLevelKinds objlevelkind in objlevelkinds)
-                {
-                    List<ProfitObjectLevels> objlevels = db.ProfitObjectLevels.Where(m => m.KindId == objlevelkind.Id).ToList();
-                    objlevelkind.Id = 0;
-                    objlevelkind.CreateDate = DateTime.Now;
-                    objlevelkind.ObjectId = Id;
-                    ProfitObjectLevelKinds add = db.ProfitObjectLevelKinds.Add(objlevelkind).Entity;
-                    db.SaveChanges();
-                    foreach (ProfitObjectLevels objlevel in objlevels)
-                    {
-                        objlevel.Id = 0;
-                        objlevel.CreateDate = DateTime.Now;                    
-                        objlevel.KindId = add.Id;
-                        db.ProfitObjectLevels.Add(objlevel);
-                        db.SaveChanges();
-                    }
-                }
-                List<ProfitObjectFloors> objfloors = db.ProfitObjectFloors.Where(m => m.ObjectId == CopyId).ToList();
-                foreach (ProfitObjectFloors objfloor in objfloors)
-                {
-                    objfloor.Id = 0;
-                    objfloor.CreateDate = DateTime.Now;
-                    objfloor.ObjectId = Id;
-                    db.ProfitObjectFloors.Add(objfloor);
-                    db.SaveChanges();
-                }
-                List<ProfitObjectContinueFloors> objcontinuefloors = db.ProfitObjectContinueFloors.Where(m => m.ObjectId == CopyId).ToList();
-                foreach (ProfitObjectContinueFloors objcontinuefloor in objcontinuefloors)
-                {
-                    objcontinuefloor.Id = 0;
-                    objcontinuefloor.CreateDate = DateTime.Now;                    
-                    objcontinuefloor.ObjectId = Id;
-                    db.ProfitObjectContinueFloors.Add(objcontinuefloor);
-                    db.SaveChanges();
-                }
-                List<ProfitObjectsActives> objactives = db.ProfitObjectsActives.Where(m => m.ObjectId == CopyId).ToList();                
-                foreach (ProfitObjectsActives objactive in objactives)
-                {
-                    objactive.Id = 0;
-                    objactive.CreateDate = DateTime.Now;                    
-                    objactive.ObjectId = Id;
-                    db.ProfitObjectsActives.Add(objactive);
-                    db.SaveChanges();
-                }
-                List<ProfitObjectActivations> objactivations = db.ProfitObjectActivations.Where(m => m.ObjectId == CopyId).ToList();
-                foreach (ProfitObjectActivations objactivation in objactivations)
-                {
-                    objactivation.Id = 0;
-                    objactivation.CreateDate = DateTime.Now;                    
-                    objactivation.ObjectId = Id;
-                    db.ProfitObjectActivations.Add(objactivation);
-                    db.SaveChanges();
-                }
-            }
-
-            return "success";
-        }
-
-        #endregion
-
-        #region 修改分润对象
-
-        /// <summary>
-        /// 增加或修改分润对象信息
-        /// </summary>
-        /// <returns></returns>
-        public IActionResult Edit(string right, int Id = 0)
-        {
-            ViewBag.RightInfo = RightInfo;
-            ViewBag.right = right;
-
-
-            ProfitObjects editData = db.ProfitObjects.FirstOrDefault(m => m.Id == Id) ?? new ProfitObjects();
-            ViewBag.data = editData;
-            return View();
-        }
-
-        #endregion
-
-        #region 修改分润对象
-
-        /// <summary>
-        /// 增加或修改分润对象信息
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost]
-        public string Edit(ProfitObjects data)
-        {
-            Dictionary<string, object> Fields = new Dictionary<string, object>();
-
-            Fields.Add("Name", data.Name); //名称
-            Fields.Add("MaxFloor", data.MaxFloor); //最大层级
-            Fields.Add("MaxLevel", data.MaxLevel); //最大等级
-            Fields.Add("MaxLevelContinue", data.MaxLevelContinue); //到顶级是否继续
-            Fields.Add("MinProfitVal", data.MinProfitVal); //最小分润值
-
-            Fields.Add("SeoTitle", data.SeoTitle);
-            Fields.Add("SeoKeyword", data.SeoKeyword);
-            Fields.Add("SeoDescription", data.SeoDescription);
-            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("ProfitObjects", Fields, data.Id);
-            AddSysLog(data.Id.ToString(), "ProfitObjects", "update");
-            db.SaveChanges();
-
-            return "success";
-        }
-
-        #endregion
-
-        #region 删除分润对象信息
-
-        /// <summary>
-        /// 删除分润对象信息
-        /// </summary>
-        /// <returns></returns>
-        public string Delete(string Id)
-        {
-            string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id, "ProfitObjects", "del");
-            foreach (string subid in idlist)
-            {
-                int id = int.Parse(subid);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Delete("ProfitObjects", id);
-            }
-            db.SaveChanges();
-
-            return "success";
-        }
-
-        #endregion
-
-        #region 开启
-
-        /// <summary>
-        /// 开启
-        /// </summary>
-        /// <returns></returns>
-        public string Open(string Id)
-        {
-            string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id, "ProfitObjects", "open");
-            foreach (string subid in idlist)
-            {
-                int id = int.Parse(subid);
-                Dictionary<string, object> Fields = new Dictionary<string, object>();
-                Fields.Add("Status", 1);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("ProfitObjects", Fields, id);
-            }
-            db.SaveChanges();
-            return "success";
-        }
-
-        #endregion
-
-        #region 关闭
-
-        /// <summary>
-        /// 关闭
-        /// </summary>
-        /// <returns></returns>
-        public string Close(string Id)
-        {
-            string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id, "ProfitObjects", "close");
-            foreach (string subid in idlist)
-            {
-                int id = int.Parse(subid);
-                Dictionary<string, object> Fields = new Dictionary<string, object>();
-                Fields.Add("Status", 0);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("ProfitObjects", Fields, id);
-            }
-            db.SaveChanges();
-            return "success";
-        }
-
-        #endregion
-
-        #region 排序
-        /// <summary>
-        /// 排序
-        /// </summary>
-        /// <param name="Id"></param>
-        public string Sort(int Id, int Sort)
-        {
-            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Sort("ProfitObjects", Sort, Id);
-
-            AddSysLog(Id.ToString(), "ProfitObjects", "sort");
-            return "success";
-        }
-        #endregion
-
-        #region 导入数据
-        /// <summary>
-        /// 导入数据
-        /// </summary>
-        /// <param name="ExcelData"></param>
-        public string Import(string ExcelData)
-        {
-            ExcelData = HttpUtility.UrlDecode(ExcelData);
-            JsonData list = JsonMapper.ToObject(ExcelData);
-            for (int i = 1; i < list.Count; i++)
-            {
-                JsonData dr = list[i];
-
-                db.ProfitObjects.Add(new ProfitObjects()
-                {
-                    CreateDate = DateTime.Now,
-                    UpdateDate = DateTime.Now,
-
-                });
-                db.SaveChanges();
-            }
-            AddSysLog("0", "ProfitObjects", "Import");
-            return "success";
-        }
-        #endregion
-
-        #region 导出Excel
-
-        /// <summary>
-        /// 导出Excel
-        /// </summary>
-        /// <returns></returns>
-        public JsonResult ExportExcel(ProfitObjects data)
-        {
-            Dictionary<string, string> Fields = new Dictionary<string, string>();
-            Fields.Add("Name", "2"); //名称
-
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("ProfitObjects", Fields, "Id desc", "0", 1, 20000, "", "", false);
-            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
-
-            Dictionary<string, object> result = new Dictionary<string, object>();
-            result.Add("Status", "1");
-            result.Add("Info", "Excel报表-" + DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss") + ".xlsx");
-            result.Add("Obj", diclist);
-            Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
-
-            result.Add("Fields", ReturnFields);
-            AddSysLog("0", "ProfitObjects", "ExportExcel");
-            return Json(result);
-        }
-
-        #endregion
-
-        #region 同步redis
-
-        public string SyncRedis()
-        {
-            List<ProfitObjects> objs = db.ProfitObjects.ToList();
-            foreach (ProfitObjects obj in objs)
-            {
-                RedisDbconn.Instance.Set("pobj" + obj.Id, obj);
-                RedisDbconn.Instance.Set("pobjconc" + obj.Id, db.ProfitObjectContinueFloors.Count(m => m.ObjectId == obj.Id));
-                List<ProfitObjectsRule> rules = db.ProfitObjectsRule.Where(m => m.ObjectId == obj.Id).ToList();
-                foreach (ProfitObjectsRule rule in rules)
-                {
-                    RedisDbconn.Instance.Set("pobjrule:" + obj.Id + ":" + rule.Code, rule);
-                    List<ProfitObjectsRuleDetails> details = db.ProfitObjectsRuleDetails.Where(m => m.RuleId == rule.Id).ToList();
-                    foreach (ProfitObjectsRuleDetails detail in details)
-                    {
-                        RedisDbconn.Instance.Set("pobjrule:" + obj.Id + ":" + rule.Code + ":" + detail.Code, detail.DataValue);
-                    }
-                }
-            }
-            List<ProfitObjectLevels> objlevels = db.ProfitObjectLevels.ToList();
-            foreach (ProfitObjectLevels objlevel in objlevels)
-            {
-                RedisDbconn.Instance.Set("pobjlv" + objlevel.KindId + ":" + objlevel.LevelNumber, objlevel);
-            }
-            List<ProfitObjectLevelKinds> objlevelkinds = db.ProfitObjectLevelKinds.ToList();
-            foreach (ProfitObjectLevelKinds objlevelkind in objlevelkinds)
-            {
-                RedisDbconn.Instance.Set("pobjlv:kid:" + objlevelkind.ObjectId + ":" + objlevelkind.IsHelp + ":" + objlevelkind.BankCardType, objlevelkind.Id);
-            }
-            List<ProfitObjectFloors> objfloors = db.ProfitObjectFloors.ToList();
-            foreach (ProfitObjectFloors objfloor in objfloors)
-            {
-                RedisDbconn.Instance.Set("pobjfl" + objfloor.ObjectId + ":" + objfloor.FloorNumber, objfloor);
-            }
-            List<ProfitObjectContinueFloors> objcontinuefloors = db.ProfitObjectContinueFloors.ToList();
-            foreach (ProfitObjectContinueFloors objcontinuefloor in objcontinuefloors)
-            {
-                RedisDbconn.Instance.Set("pobjcon" + objcontinuefloor.ObjectId + ":" + objcontinuefloor.FloorNumber, objcontinuefloor);
-            }
-            List<ProfitObjectsActives> objactives = db.ProfitObjectsActives.ToList();
-            RedisDbconn.Instance.Clear("pobjact*");
-            foreach (ProfitObjectsActives objactive in objactives)
-            {
-                RedisDbconn.Instance.AddList("pobjact" + objactive.ObjectId, objactive);
-            }
-            List<ProfitObjectActivations> objactivations = db.ProfitObjectActivations.ToList();
-            foreach (ProfitObjectActivations objactivation in objactivations)
-            {
-                RedisDbconn.Instance.Set("pobjacti" + objactivation.ObjectId, objactivation);
-            }
-            return "success";
-        }
-
-        #endregion
-
-    }
-}

Areas/Admin/Controllers/MainServer/ProfitObjectsRuleController.cs

@@ -1,320 +0,0 @@
-/*
- * 分润对象规则
- */
-
-using System;
-using System.Web;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using MySystem.Models;
-using Library;
-using LitJson;
-using MySystemLib;
-
-namespace MySystem.Areas.Admin.Controllers
-{
-    [Area("Admin")]
-    [Route("Admin/[controller]/[action]")]
-    public class ProfitObjectsRuleController : BaseController
-    {
-        public ProfitObjectsRuleController(IHttpContextAccessor accessor, ILogger<BaseController> logger, IOptions<Setting> setting) : base(accessor, logger, setting)
-        {
-            OtherMySqlConn.connstr = ConfigurationManager.AppSettings["SqlConnStr"].ToString();
-        }
-
-        #region 分润对象规则列表
-
-        /// <summary>
-        /// 根据条件查询分润对象规则列表
-        /// </summary>
-        /// <returns></returns>
-        public IActionResult Index(ProfitObjectsRule data, string right, string ObjectId)
-        {
-            ViewBag.RightInfo = RightInfo;
-            ViewBag.right = right;
-            
-            return View();
-        }
-
-        #endregion
-
-        #region 根据条件查询分润对象规则列表
-
-        /// <summary>
-        /// 分润对象规则列表
-        /// </summary>
-        /// <returns></returns>
-        public JsonResult IndexData(ProfitObjectsRule data, int page = 1, int limit = 30)
-        {
-            
-            Dictionary<string, string> Fields = new Dictionary<string, string>();
-            Fields.Add("ObjectId", "1");
-
-            Fields.Add("Name", "1"); //名称
-Fields.Add("Code", "1"); //编号
-
-
-            string condition = " and Status>-1";
-            
-
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("ProfitObjectsRule", Fields, "Id desc", "0", page, limit, condition);
-            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
-            foreach (Dictionary<string, object> dic in diclist)
-            {
-                
-            }
-            return Json(obj);
-        }
-
-        #endregion
-
-        #region 增加分润对象规则
-
-        /// <summary>
-        /// 增加或修改分润对象规则信息
-        /// </summary>
-        /// <returns></returns>
-        public IActionResult Add(string right, string ObjectId)
-        {
-            ViewBag.RightInfo = RightInfo;
-            ViewBag.right = right;
-            ViewBag.ObjectId = ObjectId;
-
-
-            return View();
-        }
-
-        #endregion
-
-        #region 增加分润对象规则
-
-        /// <summary>
-        /// 增加或修改分润对象规则信息
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost]
-        public string Add(ProfitObjectsRule data)
-        {
-            Dictionary<string, object> Fields = new Dictionary<string, object>();
-            Fields.Add("ObjectId", data.ObjectId);
-
-            Fields.Add("Name", data.Name); //名称
-Fields.Add("StartDate", data.StartDate); //活动开始时间
-Fields.Add("EndDate", data.EndDate); //活动结束时间
-Fields.Add("Code", data.Code); //编号
-
-            Fields.Add("SeoTitle", data.SeoTitle);
-            Fields.Add("SeoKeyword", data.SeoKeyword);
-            Fields.Add("SeoDescription", data.SeoDescription);
-            int Id = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Add("ProfitObjectsRule", Fields, 0);
-            AddSysLog(data.Id.ToString(), "ProfitObjectsRule", "add");
-            db.SaveChanges();
-            
-            return "success";
-        }
-
-        #endregion
-
-        #region 修改分润对象规则
-
-        /// <summary>
-        /// 增加或修改分润对象规则信息
-        /// </summary>
-        /// <returns></returns>
-        public IActionResult Edit(string right, string ObjectId, int Id = 0)
-        {
-            ViewBag.RightInfo = RightInfo;
-            ViewBag.right = right;
-            ViewBag.ObjectId = ObjectId;
-
-
-            ProfitObjectsRule editData = db.ProfitObjectsRule.FirstOrDefault(m => m.Id == Id) ?? new ProfitObjectsRule();
-            ViewBag.data = editData;
-            return View();
-        }
-
-        #endregion
-
-        #region 修改分润对象规则
-
-        /// <summary>
-        /// 增加或修改分润对象规则信息
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost]
-        public string Edit(ProfitObjectsRule data)
-        {
-            Dictionary<string, object> Fields = new Dictionary<string, object>();
-            Fields.Add("ObjectId", data.ObjectId);
-
-            Fields.Add("Name", data.Name); //名称
-Fields.Add("StartDate", data.StartDate); //活动开始时间
-Fields.Add("EndDate", data.EndDate); //活动结束时间
-Fields.Add("Code", data.Code); //编号
-
-            Fields.Add("SeoTitle", data.SeoTitle);
-            Fields.Add("SeoKeyword", data.SeoKeyword);
-            Fields.Add("SeoDescription", data.SeoDescription);
-            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("ProfitObjectsRule", Fields, data.Id);
-            AddSysLog(data.Id.ToString(),"ProfitObjectsRule","update");
-            db.SaveChanges();
-            
-            return "success";
-        }
-
-        #endregion
-
-        #region 删除分润对象规则信息
-
-        /// <summary>
-        /// 删除分润对象规则信息
-        /// </summary>
-        /// <returns></returns>
-        public string Delete(string Id)
-        {
-            string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id,"ProfitObjectsRule","del");
-            foreach (string subid in idlist)
-            {
-                int id = int.Parse(subid);
-                Dictionary<string, object> Fields = new Dictionary<string, object>();
-                Fields.Add("Status", -1);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("ProfitObjectsRule", Fields, id);
-            }
-            db.SaveChanges();
-            
-            return "success";
-        }
-
-        #endregion
-
-        #region 开启
-
-        /// <summary>
-        /// 开启
-        /// </summary>
-        /// <returns></returns>
-        public string Open(string Id)
-        {
-            string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id,"ProfitObjectsRule","open");
-            foreach (string subid in idlist)
-            {
-                int id = int.Parse(subid);
-                Dictionary<string, object> Fields = new Dictionary<string, object>();
-                Fields.Add("Status", 1);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("ProfitObjectsRule", Fields, id);
-            }
-            db.SaveChanges();
-            return "success";
-        }
-
-        #endregion
-
-        #region 关闭
-
-        /// <summary>
-        /// 关闭
-        /// </summary>
-        /// <returns></returns>
-        public string Close(string Id)
-        {
-            string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id,"ProfitObjectsRule","close");
-            foreach (string subid in idlist)
-            {
-                int id = int.Parse(subid);
-                Dictionary<string, object> Fields = new Dictionary<string, object>();
-                Fields.Add("Status", 0);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("ProfitObjectsRule", Fields, id);
-            }
-            db.SaveChanges();
-            return "success";
-        }
-
-        #endregion
-
-        #region 排序
-        /// <summary>
-        /// 排序
-        /// </summary>
-        /// <param name="Id"></param>
-        public string Sort(int Id, int Sort)
-        {
-            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Sort("ProfitObjectsRule", Sort, Id);
-            
-            AddSysLog(Id.ToString(), "ProfitObjectsRule", "sort");
-            return "success";
-        }
-        #endregion
-
-        #region 导入数据
-        /// <summary>
-        /// 导入数据
-        /// </summary>
-        /// <param name="ExcelData"></param>
-        public string Import(string ExcelData)
-        {
-            ExcelData = HttpUtility.UrlDecode(ExcelData);
-            JsonData list = JsonMapper.ToObject(ExcelData);
-            for (int i = 1; i < list.Count;i++ )
-            {
-                JsonData dr = list[i];
-                
-                db.ProfitObjectsRule.Add(new ProfitObjectsRule()
-                {
-                    CreateDate = DateTime.Now,
-                    UpdateDate = DateTime.Now,
-                    
-                });
-                db.SaveChanges();
-            }
-            AddSysLog("0", "ProfitObjectsRule", "Import");
-            return "success";
-        }
-        #endregion
-
-        #region 导出Excel
-
-        /// <summary>
-        /// 导出Excel
-        /// </summary>
-        /// <returns></returns>
-        public JsonResult ExportExcel(ProfitObjectsRule data)
-        {
-            Dictionary<string, string> Fields = new Dictionary<string, string>();
-            Fields.Add("Name", "1"); //名称
-Fields.Add("Code", "1"); //编号
-
-
-            string condition = " and Status>-1";
-            
-
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("ProfitObjectsRule", Fields, "Id desc", "0", 1, 20000, condition, "", false);
-            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
-            foreach (Dictionary<string, object> dic in diclist)
-            {
-                
-            }
-
-            Dictionary<string, object> result = new Dictionary<string, object>();
-            result.Add("Status", "1");
-            result.Add("Info", "Excel报表-" + DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss") + ".xlsx");
-            result.Add("Obj", diclist);
-            Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
-            
-            result.Add("Fields", ReturnFields);
-            AddSysLog("0", "ProfitObjectsRule", "ExportExcel");
-            return Json(result);
-        }
-
-        #endregion
-
-    }
-}

Areas/Admin/Controllers/MainServer/ProfitObjectsRuleDetailsController.cs

@@ -1,319 +0,0 @@
-/*
- * 分润对象规则
- */
-
-using System;
-using System.Web;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using MySystem.Models;
-using Library;
-using LitJson;
-using MySystemLib;
-
-namespace MySystem.Areas.Admin.Controllers
-{
-    [Area("Admin")]
-    [Route("Admin/[controller]/[action]")]
-    public class ProfitObjectsRuleDetailsController : BaseController
-    {
-        public ProfitObjectsRuleDetailsController(IHttpContextAccessor accessor, ILogger<BaseController> logger, IOptions<Setting> setting) : base(accessor, logger, setting)
-        {
-            OtherMySqlConn.connstr = ConfigurationManager.AppSettings["SqlConnStr"].ToString();
-        }
-
-        #region 分润对象规则列表
-
-        /// <summary>
-        /// 根据条件查询分润对象规则列表
-        /// </summary>
-        /// <returns></returns>
-        public IActionResult Index(ProfitObjectsRuleDetails data, string right, string RuleId)
-        {
-            ViewBag.RightInfo = RightInfo;
-            ViewBag.right = right;
-            ViewBag.RuleId = RuleId;
-
-            return View();
-        }
-
-        #endregion
-
-        #region 根据条件查询分润对象规则列表
-
-        /// <summary>
-        /// 分润对象规则列表
-        /// </summary>
-        /// <returns></returns>
-        public JsonResult IndexData(ProfitObjectsRuleDetails data, int page = 1, int limit = 30)
-        {
-
-            Dictionary<string, string> Fields = new Dictionary<string, string>();
-            Fields.Add("RuleId", "1");
-
-            Fields.Add("Name", "1"); //名称
-            Fields.Add("Code", "1"); //编号
-
-
-            string condition = " and Status>-1";
-
-
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("ProfitObjectsRuleDetails", Fields, "Id desc", "0", page, limit, condition);
-            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
-            foreach (Dictionary<string, object> dic in diclist)
-            {
-
-            }
-            return Json(obj);
-        }
-
-        #endregion
-
-        #region 增加分润对象规则
-
-        /// <summary>
-        /// 增加或修改分润对象规则信息
-        /// </summary>
-        /// <returns></returns>
-        public IActionResult Add(string right, string RuleId)
-        {
-            ViewBag.RightInfo = RightInfo;
-            ViewBag.right = right;
-            ViewBag.RuleId = RuleId;
-
-
-            return View();
-        }
-
-        #endregion
-
-        #region 增加分润对象规则
-
-        /// <summary>
-        /// 增加或修改分润对象规则信息
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost]
-        public string Add(ProfitObjectsRuleDetails data)
-        {
-            Dictionary<string, object> Fields = new Dictionary<string, object>();
-            Fields.Add("RuleId", data.RuleId);
-
-            Fields.Add("Name", data.Name); //名称
-            Fields.Add("Code", data.Code); //编号
-            Fields.Add("DataValue", data.DataValue); //设置值
-
-            Fields.Add("SeoTitle", data.SeoTitle);
-            Fields.Add("SeoKeyword", data.SeoKeyword);
-            Fields.Add("SeoDescription", data.SeoDescription);
-            int Id = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Add("ProfitObjectsRuleDetails", Fields, 0);
-            AddSysLog(data.Id.ToString(), "ProfitObjectsRuleDetails", "add");
-            db.SaveChanges();
-
-            return "success";
-        }
-
-        #endregion
-
-        #region 修改分润对象规则
-
-        /// <summary>
-        /// 增加或修改分润对象规则信息
-        /// </summary>
-        /// <returns></returns>
-        public IActionResult Edit(string right, string RuleId, int Id = 0)
-        {
-            ViewBag.RightInfo = RightInfo;
-            ViewBag.right = right;
-            ViewBag.RuleId = RuleId;
-
-
-            ProfitObjectsRuleDetails editData = db.ProfitObjectsRuleDetails.FirstOrDefault(m => m.Id == Id) ?? new ProfitObjectsRuleDetails();
-            ViewBag.data = editData;
-            return View();
-        }
-
-        #endregion
-
-        #region 修改分润对象规则
-
-        /// <summary>
-        /// 增加或修改分润对象规则信息
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost]
-        public string Edit(ProfitObjectsRuleDetails data)
-        {
-            Dictionary<string, object> Fields = new Dictionary<string, object>();
-            Fields.Add("RuleId", data.RuleId);
-
-            Fields.Add("Name", data.Name); //名称
-            Fields.Add("Code", data.Code); //编号
-            Fields.Add("DataValue", data.DataValue); //设置值
-
-            Fields.Add("SeoTitle", data.SeoTitle);
-            Fields.Add("SeoKeyword", data.SeoKeyword);
-            Fields.Add("SeoDescription", data.SeoDescription);
-            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("ProfitObjectsRuleDetails", Fields, data.Id);
-            AddSysLog(data.Id.ToString(), "ProfitObjectsRuleDetails", "update");
-            db.SaveChanges();
-
-            return "success";
-        }
-
-        #endregion
-
-        #region 删除分润对象规则信息
-
-        /// <summary>
-        /// 删除分润对象规则信息
-        /// </summary>
-        /// <returns></returns>
-        public string Delete(string Id)
-        {
-            string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id, "ProfitObjectsRuleDetails", "del");
-            foreach (string subid in idlist)
-            {
-                int id = int.Parse(subid);
-                Dictionary<string, object> Fields = new Dictionary<string, object>();
-                Fields.Add("Status", -1);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("ProfitObjectsRuleDetails", Fields, id);
-            }
-            db.SaveChanges();
-
-            return "success";
-        }
-
-        #endregion
-
-        #region 开启
-
-        /// <summary>
-        /// 开启
-        /// </summary>
-        /// <returns></returns>
-        public string Open(string Id)
-        {
-            string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id, "ProfitObjectsRuleDetails", "open");
-            foreach (string subid in idlist)
-            {
-                int id = int.Parse(subid);
-                Dictionary<string, object> Fields = new Dictionary<string, object>();
-                Fields.Add("Status", 1);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("ProfitObjectsRuleDetails", Fields, id);
-            }
-            db.SaveChanges();
-            return "success";
-        }
-
-        #endregion
-
-        #region 关闭
-
-        /// <summary>
-        /// 关闭
-        /// </summary>
-        /// <returns></returns>
-        public string Close(string Id)
-        {
-            string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id, "ProfitObjectsRuleDetails", "close");
-            foreach (string subid in idlist)
-            {
-                int id = int.Parse(subid);
-                Dictionary<string, object> Fields = new Dictionary<string, object>();
-                Fields.Add("Status", 0);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("ProfitObjectsRuleDetails", Fields, id);
-            }
-            db.SaveChanges();
-            return "success";
-        }
-
-        #endregion
-
-        #region 排序
-        /// <summary>
-        /// 排序
-        /// </summary>
-        /// <param name="Id"></param>
-        public string Sort(int Id, int Sort)
-        {
-            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Sort("ProfitObjectsRuleDetails", Sort, Id);
-
-            AddSysLog(Id.ToString(), "ProfitObjectsRuleDetails", "sort");
-            return "success";
-        }
-        #endregion
-
-        #region 导入数据
-        /// <summary>
-        /// 导入数据
-        /// </summary>
-        /// <param name="ExcelData"></param>
-        public string Import(string ExcelData)
-        {
-            ExcelData = HttpUtility.UrlDecode(ExcelData);
-            JsonData list = JsonMapper.ToObject(ExcelData);
-            for (int i = 1; i < list.Count; i++)
-            {
-                JsonData dr = list[i];
-
-                db.ProfitObjectsRuleDetails.Add(new ProfitObjectsRuleDetails()
-                {
-                    CreateDate = DateTime.Now,
-                    UpdateDate = DateTime.Now,
-
-                });
-                db.SaveChanges();
-            }
-            AddSysLog("0", "ProfitObjectsRuleDetails", "Import");
-            return "success";
-        }
-        #endregion
-
-        #region 导出Excel
-
-        /// <summary>
-        /// 导出Excel
-        /// </summary>
-        /// <returns></returns>
-        public JsonResult ExportExcel(ProfitObjectsRuleDetails data)
-        {
-            Dictionary<string, string> Fields = new Dictionary<string, string>();
-            Fields.Add("Name", "1"); //名称
-            Fields.Add("Code", "1"); //编号
-
-
-            string condition = " and Status>-1";
-
-
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("ProfitObjectsRuleDetails", Fields, "Id desc", "0", 1, 20000, condition, "", false);
-            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
-            foreach (Dictionary<string, object> dic in diclist)
-            {
-
-            }
-
-            Dictionary<string, object> result = new Dictionary<string, object>();
-            result.Add("Status", "1");
-            result.Add("Info", "Excel报表-" + DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss") + ".xlsx");
-            result.Add("Obj", diclist);
-            Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
-
-            result.Add("Fields", ReturnFields);
-            AddSysLog("0", "ProfitObjectsRuleDetails", "ExportExcel");
-            return Json(result);
-        }
-
-        #endregion
-
-    }
-}

Areas/Admin/Controllers/MainServer/ProfitRewardRecordController.cs

@@ -64,7 +64,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 分润奖励记录列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(ProfitRewardRecord data, string right, string BrandId, string MakerCode, string RealName, string ProfitTypeSelect, string CheckStatusSelect, int page = 1, int limit = 30)
+        public JsonResult IndexData(ProfitRewardRecord data, string MakerCode, string RealName, string ProfitTypeSelect, string CheckStatusSelect, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -72,9 +72,6 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("BrandId", "1");
             Fields.Add("CreateDate", "3"); //交易时间
             Fields.Add("TopUserId", "0"); //顶级创客
-            ViewBag.RightInfo = RightInfo;
-            ViewBag.right = right;
-            ViewBag.BrandId = BrandId;
 
             string condition = " and Status>-1";
             //创客编号
@@ -165,34 +162,10 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["DebitProfitAmt"] = DebitProfitAmt;
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
-            string MerchantTradeAmount = "0.00";//商户交易总额
-            string CreditTradeAmount = "0.00";//贷记卡交易总金额
-            string MerchantProfitAmount = "0.00";//商户交易分润总金额
-            string CreditProfitAmount = "0.00";//贷记卡分润总金额
-            DataTable dt = OtherMySqlConn.dtable("select sum(TradeAmt) from ProfitRewardRecord where BrandId='" + ViewBag.BrandId + "'" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                MerchantTradeAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString();
-            }
-            dt = OtherMySqlConn.dtable("select sum(CreditTradeAmt) from ProfitRewardRecord where BrandId='" + ViewBag.BrandId + "'" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                CreditTradeAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString();
-            }
-            dt = OtherMySqlConn.dtable("select sum(TradeProfit) from ProfitRewardRecord where BrandId='" + ViewBag.BrandId + "'" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                MerchantProfitAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString();
-            }
-            dt = OtherMySqlConn.dtable("select sum(CreditTradeProfit) from ProfitRewardRecord where BrandId='" + ViewBag.BrandId + "'" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                CreditProfitAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString();
-            }
-            other.Add("MerchantTradeAmount", MerchantTradeAmount);
-            other.Add("CreditTradeAmount", CreditTradeAmount);
-            other.Add("MerchantProfitAmount", MerchantProfitAmount);
-            other.Add("CreditProfitAmount", CreditProfitAmount);
+            other.Add("MerchantTradeAmount", 0);
+            other.Add("CreditTradeAmount", 0);
+            other.Add("MerchantProfitAmount", 0);
+            other.Add("CreditProfitAmount", 0);
             obj.Add("other", other);
             return Json(obj);
         }
@@ -507,10 +480,15 @@ namespace MySystem.Areas.Admin.Controllers
         public string SycnData(int BrandId, int OpType = 0)
         {
             string date = DateTime.Now.AddMonths(-1).ToString("yyyyMM");
-            string check = function.ReadInstance("/Balance/" + BrandId + "/" + date + ".txt");
+            string filename = date + ".txt";
+            if(OpType == 1)
+            {
+                filename = date + "do.txt";
+            }
+            string check = function.ReadInstance("/Balance/" + BrandId + "/" + filename);
             if (string.IsNullOrEmpty(check))
             {
-                function.WritePage("/Balance/" + BrandId + "/", date + ".txt", DateTime.Now.ToString());
+                function.WritePage("/Balance/" + BrandId + "/", filename, DateTime.Now.ToString());
                 // DoTradeProfit(BrandId, date, OpType);
                 // DoSubsidyProfit(BrandId, date, OpType);
                 RedisDbconn.Instance.AddList("SycnProfitQueue", BrandId + "#cut#" + date + "#cut#" + OpType + "#cut#" + SysUserName);
@@ -522,10 +500,15 @@ namespace MySystem.Areas.Admin.Controllers
         public string SycnDataByCondi(int BrandId, string MakerCode, int OpType = 0)
         {
             string date = DateTime.Now.AddMonths(-1).ToString("yyyyMM");
-            string check = function.ReadInstance("/Balance/" + BrandId + "/" + MakerCode + "/" + date + ".txt");
+            string filename = date + ".txt";
+            if(OpType == 1)
+            {
+                filename = date + "do.txt";
+            }
+            string check = function.ReadInstance("/Balance/" + BrandId + "/" + MakerCode + "/" + filename);
             if (string.IsNullOrEmpty(check))
             {
-                function.WritePage("/Balance/" + BrandId + "/" + MakerCode + "/", date + ".txt", DateTime.Now.ToString());
+                function.WritePage("/Balance/" + BrandId + "/" + MakerCode + "/", filename, DateTime.Now.ToString());
                 UserForMakerCode forMakerCode = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == MakerCode) ?? new UserForMakerCode();
                 DoTradeProfitByCondi(forMakerCode.UserId, BrandId, date, OpType);
                 DoSubsidyProfitByCondi(forMakerCode.UserId, BrandId, date, OpType);

Areas/Admin/Controllers/MainServer/ProfitSubsidyDetailController.cs

@@ -7,7 +7,6 @@ using System.Web;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Data;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Http;
@@ -113,13 +112,7 @@ namespace MySystem.Areas.Admin.Controllers
                 if (SubsidyType == 1) dic["SubsidyType"] = "下级商户交易分润补贴";
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
-            string SubsidyProfit = "0.00";//分润补贴金额
-            DataTable dt = OtherMySqlConn.dtable("select sum(SubsidyProfit) from ProfitSubsidyDetail where 1=1" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                SubsidyProfit = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            }
-            other.Add("SubsidyProfit", SubsidyProfit);
+            other.Add("SubsidyProfit", 0);
             obj.Add("other", other);
             return Json(obj);
         }

Areas/Admin/Controllers/MainServer/StoreBalanceController.cs

@@ -7,7 +7,6 @@ using System.Web;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Data;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Http;
@@ -108,34 +107,10 @@ namespace MySystem.Areas.Admin.Controllers
 
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
-            string InCount = "0.00";//入库
-            string MoveInCount = "0.00";//调拨入库
-            string MoveOutCount = "0.00";//调拨出库
-            string OutCount = "0.00";//出库
-            DataTable dt = OtherMySqlConn.dtable("select sum(OpStoreNum) from StoreBalance where TransType=0" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                InCount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            }
-            dt = OtherMySqlConn.dtable("select sum(OpStoreNum) from StoreBalance where TransType=1 and OpSymbol='+'" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                MoveInCount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            }
-            dt = OtherMySqlConn.dtable("select sum(OpStoreNum) from StoreBalance where TransType=1 and OpSymbol='-'" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                MoveInCount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            }
-            dt = OtherMySqlConn.dtable("select sum(OpStoreNum) from StoreBalance where TransType=2" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                MoveInCount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            }
-            other.Add("InCount", InCount);
-            other.Add("MoveInCount", MoveInCount);
-            other.Add("MoveOutCount", MoveOutCount);
-            other.Add("OutCount", OutCount);
+            other.Add("InCount", 0);
+            other.Add("MoveInCount", 0);
+            other.Add("MoveOutCount", 0);
+            other.Add("OutCount", 0);
             obj.Add("other", other);
             return Json(obj);
         }

Areas/Admin/Controllers/MainServer/StoreHouseController.cs

@@ -313,6 +313,20 @@ namespace MySystem.Areas.Admin.Controllers
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", -1);
+                StoreHouse edit = db.StoreHouse.FirstOrDefault(m => m.Id == id);
+                if (edit != null)
+                {
+                    StoreForCode code = db.StoreForCode.FirstOrDefault(m => m.Code == edit.StoreNo);
+                    if (code != null)
+                    {
+                        db.StoreForCode.Remove(code);
+                    }
+                    StoreForName name = db.StoreForName.FirstOrDefault(m => m.Name == edit.StoreName);
+                    if (name != null)
+                    {
+                        db.StoreForName.Remove(name);
+                    }
+                }
                 new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("StoreHouse", Fields, id);
             }
             db.SaveChanges();
@@ -556,7 +570,7 @@ namespace MySystem.Areas.Admin.Controllers
                 }
             }
             else
-            { 
+            {
                 DataTable dt = OtherMySqlConn.dtable("select s.Id,LaveNum,count(p.Id) as CurLaveNum from StoreHouse s left join PosMachinesTwo p on s.Id=p.StoreId and s.BrandId=p.BrandId and p.UserId=0 group by s.Id HAVING LaveNum!=count(p.Id)");
                 foreach (DataRow dr in dt.Rows)
                 {
@@ -586,7 +600,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 RedisDbconn.Instance.Clear("StoreHouseList:" + UserId);
                 List<StoreHouse> stores = db.StoreHouse.Where(m => m.Status > -1 && m.UserId == UserId).OrderByDescending(m => m.Sort).ThenByDescending(m => m.Id).ToList();
-                
+
                 RedisDbconn.Instance.Clear("StoreHouse");
                 stores = db.StoreHouse.Where(m => m.Status > -1).OrderByDescending(m => m.Sort).ThenByDescending(m => m.Id).ToList();
             }

Areas/Admin/Controllers/MainServer/StoreMachineApplyController.cs

@@ -1,820 +0,0 @@
-using System;
-using System.Web;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using MySystem.Models;
-using Library;
-using LitJson;
-using MySystemLib;
-
-/// <summary>
-/// 机具申请记录
-/// </summary>
-namespace MySystem.Areas.Admin.Controllers
-{
-    [Area("Admin")]
-    [Route("Admin/[controller]/[action]")]
-    public class StoreMachineApplyController : BaseController
-    {
-        public StoreMachineApplyController(IHttpContextAccessor accessor, ILogger<BaseController> logger, IOptions<Setting> setting) : base(accessor, logger, setting)
-        {
-            OtherMySqlConn.connstr = ConfigurationManager.AppSettings["SqlConnStr"].ToString();
-        }
-
-        #region 机具申请记录列表
-
-        /// <summary>
-        /// 机具申请记录列表
-        /// </summary>
-        /// <returns></returns>
-        public IActionResult Index(StoreMachineApply data, string right)
-        {
-            ViewBag.RightInfo = RightInfo;
-            ViewBag.right = right;
-
-            return View();
-        }
-
-        #endregion
-
-        #region 根据条件查询机具申请记录列表
-
-        /// <summary>
-        /// 机具申请记录列表
-        /// </summary>
-        /// <returns></returns>
-        public JsonResult IndexData(StoreMachineApply data, string MakerCode, string RealName, string StoreNo, string StoreName, string StoreMakerCode, string StatusSelect, string SendStatusSelect, string StoreTypeSelect, int page = 1, int limit = 30)
-        {
-
-            Dictionary<string, string> Fields = new Dictionary<string, string>();
-
-            Fields.Add("ApplyNo", "1"); //申请单号
-            Fields.Add("BrandId", "1"); //品牌
-            Fields.Add("ApplyTime", "3"); //申请时间
-            Fields.Add("ExpressNo", "1"); //快递单号
-
-            string condition = " and Status>-1";
-            //创客编号
-            if (!string.IsNullOrEmpty(MakerCode))
-            {
-                condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + MakerCode + "')";
-            }
-            //创客名称
-            if (!string.IsNullOrEmpty(RealName))
-            {
-                condition += " and UserId in (select UserId from UserForRealName where RealName='" + RealName + "')";
-            }
-            //仓库编号
-            if (!string.IsNullOrEmpty(StoreNo))
-            {
-                condition += " and StoreId in (select StoreId from StoreForCode where Code='" + StoreNo + "')";
-            }
-            //仓库名称
-            if (!string.IsNullOrEmpty(StoreName))
-            {
-                condition += " and StoreId in (select StoreId from StoreForName where Name='" + StoreName + "')";
-            }
-            //仓库归属创客编号
-            if (!string.IsNullOrEmpty(StoreMakerCode))
-            {
-                condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + StoreMakerCode + "')";
-            }
-            //订单状态
-            if (!string.IsNullOrEmpty(StatusSelect))
-            {
-                condition += " and Status=" + StatusSelect;
-            }
-            //发货状态
-            if (!string.IsNullOrEmpty(SendStatusSelect))
-            {
-                condition += " and SendStatus=" + SendStatusSelect;
-            }
-            //仓库类型
-            if (!string.IsNullOrEmpty(StoreTypeSelect))
-            {
-                condition += " and StoreType=" + StoreTypeSelect;
-            }
-
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("StoreMachineApply", Fields, "Id desc", "0", page, limit, condition);
-            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
-            foreach (Dictionary<string, object> dic in diclist)
-            {
-                dic["BrandId"] = RelationClass.GetKqProductBrandInfo(int.Parse(dic["BrandId"].ToString()));
-
-                //申请仓库信息
-                int StoreId = int.Parse(dic["StoreId"].ToString());
-                StoreHouse store = db.StoreHouse.FirstOrDefault(m => m.Id == StoreId) ?? new StoreHouse();
-                dic["StoreInfo"] = store.StoreNo + "<br />" + store.StoreName;
-
-                //仓库收货地址
-                dic["StoreAddressInfo"] = store.Areas + "<br />" + store.Address;
-
-                //仓库联系人信息
-                //dic["StoreContact"] = dic["StoreManagerMobile"].ToString() + "<br />" + dic["StoreManager"].ToString();
-
-                //仓库归属信息
-                // int StoreUserId = int.Parse(dic["StoreUserId"].ToString());
-                // Users storeUser = db.Users.FirstOrDefault(m => m.Id == StoreUserId) ?? new Users();
-                // int StoreType = int.Parse(dic["StoreType"].ToString());
-                // string StoreTypeName = "";
-                // if(StoreType == 0) StoreTypeName = "总仓";
-                // if(StoreType == 1) StoreTypeName = "分仓";
-                // dic["StoreUser"] = storeUser.MakerCode + "<br />" + StoreTypeName;
-
-                //创客信息
-                int UserId = int.Parse(dic["UserId"].ToString());
-                Users puser = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
-                dic["UserInfo"] = puser.MakerCode + "<br />" + puser.RealName;
-
-                //顶级创客
-                // int TopUserId = int.Parse(dic["TopUserId"].ToString());
-                // Users tuser = db.Users.FirstOrDefault(m => m.Id == TopUserId) ?? new Users();
-                // dic["TopUserInfo"] = tuser.MakerCode + "<br />" + tuser.RealName;
-
-                //申请状态
-                int Status = int.Parse(dic["Status"].ToString());
-                if (Status == 0) dic["Status"] = "待审核";
-                if (Status == 1) dic["Status"] = "申请成功";
-                if (Status == 2) dic["Status"] = "申请失败";
-            }
-            Dictionary<string, object> other = new Dictionary<string, object>();
-            other.Add("ApplyNum", 0);
-            other.Add("SendNum", 0);
-            obj.Add("other", other);
-            return Json(obj);
-        }
-
-        #endregion
-
-        #region 增加机具申请记录
-
-        /// <summary>
-        /// 增加或修改机具申请记录信息
-        /// </summary>
-        /// <returns></returns>
-        public IActionResult Add(string right)
-        {
-            ViewBag.RightInfo = RightInfo;
-            ViewBag.right = right;
-
-
-            return View();
-        }
-
-        #endregion
-
-        #region 增加机具申请记录
-
-        /// <summary>
-        /// 增加或修改机具申请记录信息
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost]
-        public string Add(StoreMachineApply data)
-        {
-            Dictionary<string, object> Fields = new Dictionary<string, object>();
-
-
-            Fields.Add("SeoTitle", data.SeoTitle);
-            Fields.Add("SeoKeyword", data.SeoKeyword);
-            Fields.Add("SeoDescription", data.SeoDescription);
-            int Id = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Add("StoreMachineApply", Fields, 0);
-            AddSysLog(data.Id.ToString(), "StoreMachineApply", "add");
-            db.SaveChanges();
-
-            return "success";
-        }
-
-        #endregion
-
-        #region 修改机具申请记录信息
-
-        /// <summary>
-        /// 增加或修改机具申请记录信息
-        /// </summary>
-        /// <returns></returns>
-        public IActionResult Edit(string right, int Id = 0)
-        {
-            ViewBag.RightInfo = RightInfo;
-            ViewBag.right = right;
-
-            StoreMachineApply editData = db.StoreMachineApply.FirstOrDefault(m => m.Id == Id) ?? new StoreMachineApply();
-            ViewBag.data = editData;
-
-            KqProducts kqProducts = db.KqProducts.FirstOrDefault(m => m.Id == editData.BrandId);
-            ViewBag.BrandName = kqProducts.Name;
-
-            Users user = db.Users.FirstOrDefault(m => m.Id == editData.UserId) ?? new Users();
-            ViewBag.MakerCode = user.MakerCode;
-            ViewBag.RealName = user.RealName;
-
-            int Status = editData.Status;
-            if (Status == 0) ViewBag.Status = "待审核";
-            if (Status == 1) ViewBag.Status = "申请成功";
-            if (Status == 2) ViewBag.Status = "申请失败";
-            return View();
-        }
-
-        #endregion
-
-        #region 修改机具申请记录
-
-        /// <summary>
-        /// 增加或修改机具申请记录信息
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost]
-        public string Edit(StoreMachineApply data)
-        {
-            Dictionary<string, object> Fields = new Dictionary<string, object>();
-
-            Fields.Add("ApplyNo", data.ApplyNo); //申请单号
-            // Fields.Add("BrandId", data.BrandId); //产品Id
-            Fields.Add("ApplyNum", data.ApplyNum); //申请箱数
-            Fields.Add("SendNum", data.SendNum); //发货箱数
-            // Fields.Add("UserId", data.UserId); //创客ID
-            Fields.Add("Status", data.Status); //申请状态
-            Fields.Add("SwapSnExpand", data.SwapSnExpand);//已发货机具SN
-            Fields.Add("SeoDescription", data.SeoDescription); //申请描述
-
-            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("StoreMachineApply", Fields, data.Id);
-            AddSysLog(data.Id.ToString(), "StoreMachineApply", "update");
-            db.SaveChanges();
-
-            return "success";
-        }
-
-        #endregion
-
-        #region 删除机具申请记录信息
-
-        /// <summary>
-        /// 删除机具申请记录信息
-        /// </summary>
-        /// <returns></returns>
-        public string Delete(string Id)
-        {
-            string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id, "StoreMachineApply", "del");
-            foreach (string subid in idlist)
-            {
-                int id = int.Parse(subid);
-                Dictionary<string, object> Fields = new Dictionary<string, object>();
-                Fields.Add("Status", -1);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("StoreMachineApply", Fields, id);
-            }
-            db.SaveChanges();
-
-            return "success";
-        }
-
-        #endregion
-
-        #region 取消机具申请记录信息
-
-        /// <summary>
-        /// 取消机具申请记录信息
-        /// </summary>
-        /// <returns></returns>
-        public string Cancel(int Id)
-        {
-            AddSysLog(Id, "StoreMachineApply", "cancel");
-            AddSysLog(Id, "Orders", "cancel");
-            StoreMachineApply storeMachineApply = db.StoreMachineApply.FirstOrDefault(m => m.Id == Id);
-            Orders order = db.Orders.FirstOrDefault(m => m.Id == storeMachineApply.OrderId);
-            if (storeMachineApply != null && order != null)
-            {
-                function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(storeMachineApply) + "#cut#" + Newtonsoft.Json.JsonConvert.SerializeObject(order) + "#cut#" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), "机具申请订单取消日志");
-                db.StoreMachineApply.Remove(storeMachineApply);
-                db.Orders.Remove(order);
-                db.SaveChanges();
-            }
-            return "success";
-            // if (storeMachineApply != null)
-            // {
-            //     Orders order = db.Orders.FirstOrDefault(m => m.Id == storeMachineApply.OrderId);
-            //     if (order != null)
-            //     {
-            //         string SwapSnExpand = storeMachineApply.SwapSnExpand;
-            //         if (!string.IsNullOrEmpty(SwapSnExpand))
-            //         {
-            //             string[] list = SwapSnExpand.TrimEnd('\n').Split('\n');
-            //             if (storeMachineApply.Sort > 0)
-            //             {
-            //                 int Kind = storeMachineApply.Sort - 1;
-            //                 string ChangeRecordNo = "SC" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8);
-            //                 int CouponCount = 0;
-            //                 foreach (string sub in list)
-            //                 {
-            //                     PosCoupons coupon = db.PosCoupons.FirstOrDefault(m => m.ExchangeCode == sub && m.UserId == order.UserId && m.IsUse == 1);
-            //                     if (coupon != null)
-            //                     {
-            //                         coupon.IsUse = 0;
-            //                         coupon.IsLock = 0;
-            //                         coupon.UseDate = DateTime.Parse("1900-01-01");
-            //                         PosCouponRecord query = db.PosCouponRecord.Add(new PosCouponRecord()
-            //                         {
-            //                             QueryCount = Kind,
-            //                             CreateDate = DateTime.Now,
-            //                             ChangeKind = 1,
-            //                             OrderNo = ChangeRecordNo,
-            //                             ToUserId = order.UserId,
-            //                             FromUserId = order.UserId,
-            //                             PosCouponId = coupon.Id,
-            //                         }).Entity;
-            //                         CouponCount += 1;
-            //                     }
-            //                 }
-            //                 if (CouponCount > 0)
-            //                 {
-            //                     PosCouponForUser forUser = db.PosCouponForUser.FirstOrDefault(m => m.Id == order.UserId);
-            //                     if (forUser == null)
-            //                     {
-            //                         forUser = db.PosCouponForUser.Add(new PosCouponForUser()
-            //                         {
-            //                             Id = order.UserId,
-            //                         }).Entity;
-            //                         db.SaveChanges();
-            //                     }
-            //                     int BeforeOut = forUser.OutNum;
-            //                     int BeforeTotal = forUser.TotalNum;
-            //                     int BeforeStock = forUser.StockNum;
-            //                     forUser.StockNum += CouponCount;
-            //                     int AfterOut = forUser.OutNum;
-            //                     int AfterTotal = forUser.TotalNum;
-            //                     int AfterStock = forUser.StockNum;
-            //                     PosCouponOrders stat = db.PosCouponOrders.Add(new PosCouponOrders()
-            //                     {
-            //                         QueryCount = Kind,
-            //                         CreateDate = DateTime.Now,
-            //                         ChangeKind = 1,
-            //                         ChangeCount = CouponCount,
-            //                         AfterOut = AfterOut,
-            //                         AfterTotal = AfterTotal,
-            //                         AfterStock = AfterStock,
-            //                         BeforeOut = BeforeOut,
-            //                         BeforeTotal = BeforeTotal,
-            //                         BeforeStock = BeforeStock,
-            //                         OrderNo = ChangeRecordNo,
-            //                         ToUserId = order.UserId,
-            //                         FromUserId = order.UserId,
-            //                     }).Entity;
-            //                 }
-            //                 function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(storeMachineApply) + "#cut#" + Newtonsoft.Json.JsonConvert.SerializeObject(order) + "#cut#" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), "机具申请订单取消日志");
-            //                 db.StoreMachineApply.Remove(storeMachineApply);
-            //                 db.Orders.Remove(order);
-            //                 db.SaveChanges();
-            //             }
-            //             else
-            //             {
-            //                 foreach (string sub in list)
-            //                 {
-            //                     string SourcePosSn = sub.Split(':')[0];
-            //                     MachineForSnNo forSnNo = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == SourcePosSn) ?? new MachineForSnNo();
-            //                     PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == forSnNo.SnId);
-            //                     if (pos != null)
-            //                     {
-            //                         function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(storeMachineApply) + "#cut#" + Newtonsoft.Json.JsonConvert.SerializeObject(order) + "#cut#" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), "机具申请订单取消日志");
-            //                         pos.IsPurchase = 0;
-            //                         RedisDbconn.Instance.Clear("PosMachinesTwo:" + pos.Id);
-            //                     }
-            //                 }
-            //                 db.StoreMachineApply.Remove(storeMachineApply);
-            //                 db.Orders.Remove(order);
-            //                 db.SaveChanges();
-            //             }
-            //         }
-            //     }
-            // }
-            // return "success";
-        }
-
-        #endregion
-
-        #region 开启
-
-        /// <summary>
-        /// 开启
-        /// </summary>
-        /// <returns></returns>
-        public string Open(string Id)
-        {
-            string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id, "StoreMachineApply", "open");
-            foreach (string subid in idlist)
-            {
-                int id = int.Parse(subid);
-                Dictionary<string, object> Fields = new Dictionary<string, object>();
-                Fields.Add("Status", 1);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("StoreMachineApply", Fields, id);
-            }
-            db.SaveChanges();
-            return "success";
-        }
-
-        #endregion
-
-        #region 关闭
-
-        /// <summary>
-        /// 关闭
-        /// </summary>
-        /// <returns></returns>
-        public string Close(string Id)
-        {
-            string[] idlist = Id.Split(new char[] { ',' });
-            AddSysLog(Id, "StoreMachineApply", "close");
-            foreach (string subid in idlist)
-            {
-                int id = int.Parse(subid);
-                Dictionary<string, object> Fields = new Dictionary<string, object>();
-                Fields.Add("Status", 0);
-                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("StoreMachineApply", Fields, id);
-            }
-            db.SaveChanges();
-            return "success";
-        }
-
-        #endregion
-
-        #region 排序
-        /// <summary>
-        /// 排序
-        /// </summary>
-        /// <param name="Id"></param>
-        public string Sort(int Id, int Sort)
-        {
-            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Sort("StoreMachineApply", Sort, Id);
-
-            AddSysLog(Id.ToString(), "StoreMachineApply", "sort");
-            return "success";
-        }
-        #endregion
-
-         #region 导入数据
-
-        public IActionResult Import(string right, string ExcelKind)
-        {
-            ViewBag.RightInfo = RightInfo;
-            ViewBag.right = right;
-            ViewBag.ExcelKind = ExcelKind;
-            return View();
-        }
-        /// <summary>
-        /// 导入数据
-        /// </summary>
-        /// <param name="ExcelData"></param>
-        [HttpPost]
-        public string ImportPost(string ExcelPath, int Kind = 0)
-        {
-            // RedisDbconn.Instance.AddList("ExcelImport", ExcelPath + "#cut#" + Kind);
-            string key = function.MD5_16(Guid.NewGuid().ToString());
-            RedisDbconn.Instance.AddList("ExcelImportV2", ExcelPath + "#cut#" + Kind + "#cut#" + key);
-            return "success|" + key;
-        }
-        #endregion
-
-        #region 导出Excel
-
-        /// <summary>
-        /// 导出Excel
-        /// </summary>
-        /// <returns></returns>
-        public JsonResult ExportExcel(StoreMachineApply data, string MakerCode, string RealName, string StoreNo, string StoreName, string StoreMakerCode, string StatusSelect, string SendStatusSelect, string StoreTypeSelect)
-        {
-            Dictionary<string, string> Fields = new Dictionary<string, string>();
-
-            Fields.Add("ApplyNo", "1"); //申请单号
-            Fields.Add("BrandId", "1"); //品牌
-            Fields.Add("ApplyTime", "3"); //申请时间
-            Fields.Add("ExpressNo", "1"); //快递单号
-
-            string condition = " and Status>-1";
-            //创客编号
-            if (!string.IsNullOrEmpty(MakerCode))
-            {
-                condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + MakerCode + "')";
-            }
-            //创客名称
-            if (!string.IsNullOrEmpty(RealName))
-            {
-                condition += " and UserId in (select UserId from UserForRealName where RealName='" + RealName + "')";
-            }
-            //仓库编号
-            if (!string.IsNullOrEmpty(StoreNo))
-            {
-                condition += " and StoreId in (select StoreId from StoreForCode where Code='" + StoreNo + "')";
-            }
-            //仓库名称
-            if (!string.IsNullOrEmpty(RealName))
-            {
-                condition += " and StoreId in (select StoreId from StoreForName where Name='" + RealName + "')";
-            }
-            //仓库归属创客编号
-            if (!string.IsNullOrEmpty(StoreMakerCode))
-            {
-                condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + StoreMakerCode + "')";
-            }
-            //订单状态
-            if (!string.IsNullOrEmpty(StatusSelect))
-            {
-                condition += " and Status=" + StatusSelect;
-            }
-            //发货状态
-            if (!string.IsNullOrEmpty(SendStatusSelect))
-            {
-                condition += " and SendStatus=" + SendStatusSelect;
-            }
-            //仓库类型
-            if (!string.IsNullOrEmpty(StoreTypeSelect))
-            {
-                condition += " and StoreType=" + StoreTypeSelect;
-            }
-
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("MachineApply", Fields, "Id desc", "0", 1, 20000, condition, "ApplyNo,UserId,TopUserId,BrandId,Areas,Address,RealName,Mobile,ApplyDeviceName,ApplyDeviceNum,ApplyTime,SendStatus,ExpressNo,ExpressName,DeliveryType,StoreId,StoreName,StoreManager,StoreManagerMobile,Remark,StoreUserId,SendDate,StoreType,Status", false);
-            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
-            foreach (Dictionary<string, object> dic in diclist)
-            {
-                dic["BrandId"] = RelationClass.GetKqProductBrandInfo(int.Parse(dic["BrandId"].ToString()));
-
-                //申请仓库信息
-                int StoreId = int.Parse(dic["StoreId"].ToString());
-                StoreHouse store = db.StoreHouse.FirstOrDefault(m => m.Id == StoreId) ?? new StoreHouse();
-                dic["StoreInfo"] = store.StoreNo + "<br />" + store.StoreName;
-
-                //仓库联系人信息
-                //dic["StoreContact"] = dic["StoreManagerMobile"].ToString() + "<br />" + dic["StoreManager"].ToString();
-
-                //仓库归属信息
-                // int StoreUserId = int.Parse(dic["StoreUserId"].ToString());
-                // Users storeUser = db.Users.FirstOrDefault(m => m.Id == StoreUserId) ?? new Users();
-                // int StoreType = int.Parse(dic["StoreType"].ToString());
-                // string StoreTypeName = "";
-                // if(StoreType == 0) StoreTypeName = "总仓";
-                // if(StoreType == 1) StoreTypeName = "分仓";
-                // dic["StoreUser"] = storeUser.MakerCode + "<br />" + StoreTypeName;
-
-                //创客信息
-                int UserId = int.Parse(dic["UserId"].ToString());
-                Users puser = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
-                dic["UserInfo"] = puser.MakerCode + "<br />" + puser.RealName;
-
-                //顶级创客
-                // int TopUserId = int.Parse(dic["TopUserId"].ToString());
-                // Users tuser = db.Users.FirstOrDefault(m => m.Id == TopUserId) ?? new Users();
-                // dic["TopUserInfo"] = tuser.MakerCode + "<br />" + tuser.RealName;
-
-                //申请状态
-                int Status = int.Parse(dic["Status"].ToString());
-                if (Status == 0) dic["Status"] = "待审核";
-                if (Status == 1) dic["Status"] = "申请成功";
-                if (Status == 2) dic["Status"] = "申请失败";
-
-                dic.Remove("BrandId");
-                dic.Remove("StoreInfo");
-                dic.Remove("UserInfo");
-                dic.Remove("Status");
-            }
-
-            Dictionary<string, object> result = new Dictionary<string, object>();
-            result.Add("Status", "1");
-            result.Add("Info", "Excel报表-" + DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss") + ".xlsx");
-            result.Add("Obj", diclist);
-            Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
-            ReturnFields.Add("ApplyNo", "申请单号");
-            ReturnFields.Add("BrandId", "产品类型");
-            ReturnFields.Add("StoreId", "申请仓库");
-            ReturnFields.Add("StoreMakerCode", "仓库归属创客编号");
-            ReturnFields.Add("StoreRealName", "仓库归属创客名称");
-            ReturnFields.Add("MakerCode", "创客编号");
-            ReturnFields.Add("MakerName", "创客名称");
-            ReturnFields.Add("Status", "申请状态");
-            ReturnFields.Add("ApplyTime", "申请时间");
-            ReturnFields.Add("ApplyNum", "申请箱数");
-            ReturnFields.Add("SendNum", "发货箱数");
-            ReturnFields.Add("SwapSnExpand", "已发货SN号");
-            ReturnFields.Add("SeoDescription", "申请描述");
-
-            result.Add("Fields", ReturnFields);
-            AddSysLog("0", "StoreMachineApply", "ExportExcel");
-            return Json(result);
-        }
-
-        #endregion
-
-
-
-
-
-        #region 审核发货
-
-        public IActionResult AuditSend(string right, int Id = 0)
-        {
-            ViewBag.RightInfo = RightInfo;
-            ViewBag.right = right;
-
-
-            StoreMachineApply editData = db.StoreMachineApply.FirstOrDefault(m => m.Id == Id) ?? new StoreMachineApply();
-            ViewBag.data = editData;
-
-            Users users = db.Users.FirstOrDefault(m => m.Id == editData.UserId) ?? new Users();
-            StoreHouse storeHouse = db.StoreHouse.FirstOrDefault(m => m.Id == editData.StoreId) ?? new StoreHouse();
-            ViewBag.MakerCode=users.MakerCode;
-            ViewBag.RealName=users.RealName;
-
-            return View();
-        }
-
-        #endregion
-
-        #region 审核发货
-
-        [HttpPost]
-        public string AuditSend(StoreMachineApply data, string ExcelData)
-        {
-            Dictionary<string, object> Fields = new Dictionary<string, object>();
-            Fields.Add("ApplyNum", data.ApplyNum); //申请箱数
-            Fields.Add("SendNum", data.SendNum); //发货箱数
-            Fields.Add("SeoDescription", data.SeoDescription); //申请描述
-            Fields.Add("Status", data.Status);
-            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("StoreMachineApply", Fields, data.Id);
-            AddSysLog(data.Id.ToString(), "StoreMachineApply", "AuditSend");
-            StoreMachineApply apply = db.StoreMachineApply.FirstOrDefault(m=>m.Id == data.Id) ?? new StoreMachineApply();
-            StoreHouse tostore = db.StoreHouse.FirstOrDefault(m=>m.Id == apply.StoreId) ?? new StoreHouse();
-            int BrandId = apply.BrandId.Value;
-            ExcelData = HttpUtility.UrlDecode(ExcelData);
-            JsonData list = JsonMapper.ToObject(ExcelData);            
-            Dictionary<string, int> storeData = new Dictionary<string, int>();
-            Dictionary<string, int> toStoreData = new Dictionary<string, int>();
-            for (int i = 1; i < list.Count; i++)
-            {
-                JsonData dr = list[i];
-                string itemJson = dr.ToJson();
-                string SnNo = itemJson.Contains("\"A\"") ? dr["A"].ToString() : "";
-                string BatchNo = itemJson.Contains("\"B\"") ? dr["B"].ToString() : "";
-                string OutNote = itemJson.Contains("\"C\"") ? dr["B"].ToString() : "";
-                MachineForSnNo machinefor = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == SnNo) ?? new MachineForSnNo();
-                PosMachinesTwo machine = db.PosMachinesTwo.FirstOrDefault(m => m.Id == machinefor.SnId && m.StoreId != apply.StoreId && m.BuyUserId == 0 && m.UserId == 0) ?? new PosMachinesTwo();
-                if (machine.Id > 0)
-                {
-                    StoreStockChange stockchange = db.StoreStockChange.Add(new StoreStockChange()
-                    {
-                        CreateDate = DateTime.Now,
-                        StoreId = 7, //出货仓库
-                        BrandId = BrandId, //产品类型
-                        ProductName = RelationClass.GetKqProductBrandInfo(BrandId), //产品名称
-                        BizBatchNo = BatchNo, //业务批次号
-                        TransType = 1, //交易类型
-                        SnNo = SnNo, //SN编号
-                        StockOpDirect = 1, //库存操作方向
-                        SnStatus = 1, //SN状态
-                        DeviceVendor = machine.DeviceName, //设备厂商
-                        DeviceModel = machine.DeviceKind, //设备型号
-                        DeviceType = machine.DeviceType, //设备类型
-                        FromUserId = tostore.UserId, //出货人
-                        FromDate = DateTime.Now, //出库时间
-                        FromRemark = OutNote, //出库备注
-                        ToUserId = tostore.UserId, //收货人
-                        ToStoreId = tostore.Id, //退货收货仓库                        
-                        SourceStoreId = machine.SourceStoreId, //源仓库编号
-                        BrandType = machine.DeviceType, //品牌类型
-                    }).Entity;
-                    db.SaveChanges();
-                    string ChangeNo = "SC";
-                    int StoreStockChangeId = stockchange.Id;
-                    string StoreStockChangeIdString = StoreStockChangeId.ToString();
-                    for (int j = 0; j < 18 - StoreStockChangeId.ToString().Length; j++)
-                    {
-                        StoreStockChangeIdString = "0" + StoreStockChangeIdString;
-                    }
-                    ChangeNo += StoreStockChangeIdString;
-                    stockchange.ChangeNo = ChangeNo; //交易流水编号
-                    machine.StoreId = tostore.Id;
-
-                    db.StoreChangeHistory.Add(new StoreChangeHistory()
-                    {
-                        CreateDate = DateTime.Now,
-                        UserId = tostore.UserId, //创客
-                        BrandId = BrandId, //产品类型
-                        ChangeRecordNo = ChangeNo, //变更记录单号
-                        BizBatchNo = BatchNo, //业务批次号
-                        TransType = 1, //交易类型
-                        SnNo = SnNo, //SN编号
-                        SnType = machine.PosSnType, //SN机具类型
-                        StockOpDirect = 1, //库存操作方向
-                        DeviceVendor = machine.DeviceName, //设备厂商
-                        DeviceModel = machine.DeviceKind, //设备型号
-                        DeviceType = machine.DeviceType, //设备类型
-                        FromUserId = tostore.UserId, //出货创客
-                        FromDate = DateTime.Now, //出库时间
-                        FromRemark = OutNote, //出库备注
-                        SourceStoreId = machine.SourceStoreId, //源仓库
-                        StoreId = tostore.Id, //仓库
-                    });
-
-                    db.StoreChangeHistory.Add(new StoreChangeHistory()
-                    {
-                        CreateDate = DateTime.Now,
-                        UserId = tostore.UserId, //创客
-                        BrandId = BrandId, //产品类型
-                        ChangeRecordNo = ChangeNo, //变更记录单号
-                        BizBatchNo = BatchNo, //业务批次号
-                        TransType = 1, //交易类型
-                        SnNo = SnNo, //SN编号
-                        SnType = machine.PosSnType, //SN机具类型
-                        StockOpDirect = 0, //库存操作方向
-                        DeviceVendor = machine.DeviceName, //设备厂商
-                        DeviceModel = machine.DeviceKind, //设备型号
-                        DeviceType = machine.DeviceType, //设备类型
-                        ToUserId = tostore.UserId, //收货创客
-                        ToStoreId = tostore.Id, //创客退货收货仓库
-                        ToDate = DateTime.Now, //入库时间
-                        ToRemark = OutNote, //入库备注
-                        SourceStoreId = machine.SourceStoreId, //源仓库
-                        StoreId = tostore.Id, //仓库
-                    });
-                    db.SaveChanges();
-                }
-            }
-            int StoreId = 7;
-            int OpStoreNum = list.Count - 1;
-            StoreHouse store = db.StoreHouse.FirstOrDefault(m => m.Id == StoreId) ?? new StoreHouse();
-            StoreBalance balance = db.StoreBalance.Add(new StoreBalance()
-            {
-                CreateDate = DateTime.Now,
-                StoreId = StoreId, //仓库
-                TransType = 1, //交易类型
-                BrandId = BrandId, //产品类型
-                OpStoreNum = OpStoreNum, //操作库存数
-                OpSymbol = "-", //操作符
-                BeforeTotalNum = store.TotalNum, //操作前总库存数
-                AfterTotalNum = store.TotalNum, //操作后总库存数
-                BeforeLaveNum = store.LaveNum, //操作前剩余库存数
-                AfterLaveNum = store.LaveNum - OpStoreNum, //操作后剩余库存数
-                BeforeOutNum = store.OutNum, //操作前出库数
-                AfterOutNum = store.OutNum + OpStoreNum, //操作后出库数
-            }).Entity;
-            db.SaveChanges();
-            string ChangeNo1 = "SC";
-            int StoreStockChangeId1 = balance.Id;
-            string StoreStockChangeId1String = StoreStockChangeId1.ToString();
-            for (int i = 0; i < 18 - StoreStockChangeId1.ToString().Length; i++)
-            {
-                StoreStockChangeId1String = "0" + StoreStockChangeId1String;
-            }
-            ChangeNo1 += StoreStockChangeId1String;
-            balance.TransRecordNo = ChangeNo1; //交易流水编号
-            store.LaveNum -= OpStoreNum;
-            store.OutNum += OpStoreNum;
-            db.SaveChanges();
-            
-            StoreId = tostore.Id;
-            balance = db.StoreBalance.Add(new StoreBalance()
-            {
-                CreateDate = DateTime.Now,
-                StoreId = StoreId, //仓库
-                TransType = 0, //交易类型
-                BrandId = BrandId, //产品类型
-                OpStoreNum = OpStoreNum, //操作库存数
-                OpSymbol = "+", //操作符
-                BeforeTotalNum = store.TotalNum, //操作前总库存数
-                AfterTotalNum = store.TotalNum + OpStoreNum, //操作后总库存数
-                BeforeLaveNum = store.LaveNum, //操作前剩余库存数
-                AfterLaveNum = store.LaveNum + OpStoreNum, //操作后剩余库存数
-                BeforeOutNum = store.OutNum, //操作前出库数
-                AfterOutNum = store.OutNum, //操作后出库数
-            }).Entity;
-            db.SaveChanges();
-            string ChangeNo2 = "SC";
-            int StoreStockChangeId2 = balance.Id;
-            string StoreStockChangeId2String = StoreStockChangeId2.ToString();
-            for (int i = 0; i < 18 - StoreStockChangeId2.ToString().Length; i++)
-            {
-                StoreStockChangeId2String = "0" + StoreStockChangeId2String;
-            }
-            ChangeNo2 += StoreStockChangeId2String;
-            balance.TransRecordNo = ChangeNo2; //交易流水编号
-            store.TotalNum += OpStoreNum;
-            store.LaveNum += OpStoreNum;
-            db.SaveChanges();
-            if (data.Status == 1)
-            {
-                return "success";
-            }
-            else
-            {
-                return "false";
-            }
-
-        }
-
-        #endregion
-
-    }
-}

Areas/Admin/Controllers/MainServer/StoreMallOrderSummaryController.cs

@@ -7,7 +7,6 @@ using System.Web;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Data;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Http;
@@ -113,19 +112,10 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["CreateDate"] = string.IsNullOrEmpty(dic["CreateDate"].ToString()) ? "" : DateTime.Parse(dic["CreateDate"].ToString()).ToString("yyyy-MM-dd");
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
-            string OrderCount = "0.00", OrderAmt = "0.00", ReturnOrderCount = "0.00", ReturnAmt = "0.00";
-            DataTable dt = OtherMySqlConn.dtable("select sum(OrderNum),sum(OrderAmt),sum(RefundOrderNum),sum(RefundAmt) from StoreMallOrderSummary where 1=1" + condition);
-            if(dt.Rows.Count > 0)
-            {
-                OrderCount = dt.Rows[0][0].ToString();
-                OrderAmt = dt.Rows[0][1].ToString();
-                ReturnOrderCount = dt.Rows[0][2].ToString();
-                ReturnAmt = dt.Rows[0][3].ToString();
-            }
-            other.Add("OrderCount", OrderCount);
-            other.Add("OrderAmt", OrderAmt);
-            other.Add("ReturnOrderCount", ReturnOrderCount);
-            other.Add("ReturnAmt", ReturnAmt);
+            other.Add("OrderCount", 0);
+            other.Add("OrderAmt", 0);
+            other.Add("ReturnOrderCount", 0);
+            other.Add("ReturnAmt", 0);
             obj.Add("other", other);
             return Json(obj);
         }

Areas/Admin/Controllers/MainServer/StoreSnActivateSummaryController.cs

@@ -7,7 +7,6 @@ using System.Web;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Data;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Http;
@@ -108,41 +107,11 @@ namespace MySystem.Areas.Admin.Controllers
 
             }            
             Dictionary<string, object> other = new Dictionary<string, object>();
-            string ActCount = "0.00";//激活数量
-            string RejectActCount = "0.00";//划拨激活数量
-            string PutActCount = "0.00";//互斥激活数量
-            string EffectActCount = "0.00";//有效激活数量
-            string ApplyCount = "0.00";//创客申请数量
-            DataTable dt = OtherMySqlConn.dtable("select sum(ActivateNum) from StoreSnActivateSummary" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                ActCount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            }
-            dt = OtherMySqlConn.dtable("select sum(RejectActNum) from StoreSnActivateSummary" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                RejectActCount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            }
-            dt = OtherMySqlConn.dtable("select sum(TransferActNum) from StoreSnActivateSummary" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                PutActCount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            }
-            dt = OtherMySqlConn.dtable("select sum(EffectActNum) from StoreSnActivateSummary" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                EffectActCount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            }
-            dt = OtherMySqlConn.dtable("select sum(UserApplyNum) from StoreSnActivateSummary" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                ApplyCount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            }
-            other.Add("ActCount", ActCount);
-            other.Add("RejectActCount", RejectActCount);
-            other.Add("PutActCount", PutActCount);
-            other.Add("EffectActCount", EffectActCount);
-            other.Add("ApplyCount", ApplyCount);
+            other.Add("ActCount", 0);
+            other.Add("RejectActCount", 0);
+            other.Add("PutActCount", 0);
+            other.Add("EffectActCount", 0);
+            other.Add("ApplyCount", 0);
             obj.Add("other", other);
             return Json(obj);
         }

Areas/Admin/Controllers/MainServer/TradeDaySummaryController.cs

@@ -7,7 +7,6 @@ using System.Web;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Data;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Http;
@@ -94,34 +93,10 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["TopRealName"] = tuser.RealName;
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
-            string HelpDirectTradeAmt = "0.00";//扶持期直营商户交易总额
-            string HelpNonDirectTradeAmt = "0.00";//扶持期非直营商户交易总额
-            string NotHelpDirectTradeAmt = "0.00";//非扶持期直营商户交易总额
-            string NotHelpNonDirectTradeAmt = "0.00";//非扶持期非直营商户交易总额
-            DataTable dt = OtherMySqlConn.dtable("select sum(HelpDirectTradeAmt) from TradeDaySummary" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                HelpDirectTradeAmt = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            }
-            dt = OtherMySqlConn.dtable("select sum(HelpNonDirectTradeAmt) from TradeDaySummary" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                HelpNonDirectTradeAmt = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            }
-            dt = OtherMySqlConn.dtable("select sum(NotHelpDirectTradeAmt) from TradeDaySummary" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                NotHelpDirectTradeAmt = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            }
-            dt = OtherMySqlConn.dtable("select sum(NotHelpNonDirectTradeAmt) from TradeDaySummary" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                NotHelpNonDirectTradeAmt = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            }
-            other.Add("HelpDirectTradeAmt", HelpDirectTradeAmt);
-            other.Add("HelpNonDirectTradeAmt", HelpNonDirectTradeAmt);
-            other.Add("NotHelpDirectTradeAmt", NotHelpDirectTradeAmt);
-            other.Add("NotHelpNonDirectTradeAmt", NotHelpNonDirectTradeAmt);
+            other.Add("HelpDirectTradeAmt", 0);
+            other.Add("HelpNonDirectTradeAmt", 0);
+            other.Add("NotHelpDirectTradeAmt", 0);
+            other.Add("NotHelpNonDirectTradeAmt", 0);
             obj.Add("other", other);
             return Json(obj);
         }

Areas/Admin/Controllers/MainServer/TradeRecordController.cs

@@ -7,7 +7,6 @@ using System.Web;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Data;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Http;
@@ -52,13 +51,10 @@ namespace MySystem.Areas.Admin.Controllers
         /// 交易记录列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(TradeRecord data, string right, string BrandId, string MerchantNo, string MerchantName, string MakerCode, string RealName, string MerMakerCode, string MerRealName, string MerNo, string SnNo, string BankCardTypeSelect, string MerBuddyTypeSelect, string CreateDateData, int page = 1, int limit = 30)
+        public JsonResult IndexData(TradeRecord data, string MerchantNo, string MerchantName, string MakerCode, string RealName, string MerMakerCode, string MerRealName, string BankCardTypeSelect, string MerBuddyTypeSelect, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
-            ViewBag.RightInfo = RightInfo;
-            ViewBag.right = right;
-            ViewBag.BrandId = BrandId;
 
             Fields.Add("BrandId", "1");
             Fields.Add("MerNo", "2"); //快钱商户编号
@@ -67,11 +63,6 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("TopUserId", "0"); //顶级创客
 
             string condition = " and Status>-1";
-
-            if(!string.IsNullOrEmpty(ViewBag.BrandId))
-            {
-                condition += " and BrandId=" + ViewBag.BrandId;
-            }
             //商户编号
             if (!string.IsNullOrEmpty(MerchantNo))
             {
@@ -102,16 +93,6 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and MerUserId in (select UserId from UserForRealName where RealName='" + MerRealName + "')";
             }
-            //快钱商户编号
-            if (!string.IsNullOrEmpty(MerNo))
-            {
-                condition += " and MerNo='" + MerNo + "'";
-            }
-            //块钱SN号
-            if (!string.IsNullOrEmpty(SnNo))
-            {
-                condition += " and SnNo='" + SnNo + "'";
-            }
             //银行卡类型
             if(!string.IsNullOrEmpty(BankCardTypeSelect))
             {
@@ -122,13 +103,6 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and MerBuddyType=" + MerBuddyTypeSelect;
             }
-            if(!string.IsNullOrEmpty(CreateDateData))
-            {
-                string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
-                string start = datelist[0];
-                string end = datelist[1];
-                condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
-            }
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("TradeRecord", Fields, "Id desc", "0", page, limit, condition);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
@@ -164,26 +138,12 @@ namespace MySystem.Areas.Admin.Controllers
                 if(MerBuddyType == 1) dic["MerBuddyType"] = "商户型创客";
                 //银行卡类型
                 int BankCardType = int.Parse(dic["BankCardType"].ToString());
-                if(BankCardType == 0) dic["BankCardType"] = "借记卡";
-                if(BankCardType == 1) dic["BankCardType"] = "贷记卡";
-                if(BankCardType == 2) dic["BankCardType"] = "准贷记卡";
+                if(BankCardType == 0) dic["BankCardType"] = "贷记卡";
+                if(BankCardType == 1) dic["BankCardType"] = "借记卡";
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
-            
-            string TotalTrade0 = "0.00";//贷记卡交易总额
-            string TotalTrade1 = "0.00";//借记卡交易总额
-            DataTable dt = OtherMySqlConn.dtable("select sum(TradeAmount) from TradeRecord where BankCardType=1" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                TotalTrade0 = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            }
-            dt = OtherMySqlConn.dtable("select sum(TradeAmount) from TradeRecord where BankCardType=0" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                TotalTrade1 = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            }
-            other.Add("TotalTrade0", TotalTrade0);
-            other.Add("TotalTrade1", TotalTrade1);
+            other.Add("TotalTrade0", 0);
+            other.Add("TotalTrade1", 0);
             obj.Add("other", other);
             return Json(obj);
         }

Areas/Admin/Controllers/MainServer/UserAccountController.cs

@@ -112,7 +112,7 @@ namespace MySystem.Areas.Admin.Controllers
                 string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
                 string start = datelist[0];
                 string end = datelist[1];
-                condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
+                condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate>='" + end + " 23:59:59'";
             }
             if(sTotalAmount != null)
             {

Areas/Admin/Controllers/MainServer/UserAccountRecordController.cs

@@ -86,25 +86,6 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and UserId=" + UserId;
             }
-            if(!string.IsNullOrEmpty(CreateDateData))
-            {
-                string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
-                string start = datelist[0];
-                string end = datelist[1];
-                condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
-            }
-            if (data.ChangeType > 0)
-            { 
-                condition += " and ChangeType=" + data.ChangeType;
-            }
-            if (data.ProductType > 0)
-            { 
-                condition += " and ProductType=" + data.ProductType;
-            }
-            if (!string.IsNullOrEmpty(data.TransRecordNo))
-            { 
-                condition += " and TransRecordNo='" + data.TransRecordNo + "'";
-            }
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("UserAccountRecord", Fields, "Id desc", "0", page, limit, condition);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
@@ -127,7 +108,25 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["ChangeTypeName"] = RelationClassForConst.GetChangeTypeInfo(ChangeType);
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
-            
+            if(!string.IsNullOrEmpty(CreateDateData))
+            {
+                string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0];
+                string end = datelist[1];
+                condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate>='" + end + " 23:59:59'";
+            }
+            if (data.ChangeType > 0)
+            { 
+                condition += " and ChangeType=" + data.ChangeType;
+            }
+            if (data.ProductType > 0)
+            { 
+                condition += " and ProductType=" + data.ProductType;
+            }
+            if (!string.IsNullOrEmpty(data.TransRecordNo))
+            { 
+                condition += " and TransRecordNo='" + data.TransRecordNo + "'";
+            }
             string ChangeTypeAmount0 = "0.00", ChangeTypeAmount1 = "0.00", ChangeTypeAmount2 = "0.00", ChangeTypeAmount6 = "0.00", ChangeTypeAmount61 = "0.00", ChangeTypeAmount62 = "0.00", ChangeTypeAmount63 = "0.00", ChangeTypeAmount64 = "0.00", ChangeTypeAmount50 = "0.00", ChangeTypeAmount111 = "0.00", ChangeTypeAmount112 = "0.00";
             DataTable dt = OtherMySqlConn.dtable("select sum(if(ChangeType=0, ChangeAmount, 0)),sum(if(ChangeType=1, ChangeAmount, 0)),sum(if(ChangeType=2, ChangeAmount, 0)),sum(if(ChangeType=6, ChangeAmount, 0)),sum(if(ChangeType=61, ChangeAmount, 0)),sum(if(ChangeType=62, ChangeAmount, 0)),sum(if(ChangeType=63, ChangeAmount, 0)),sum(if(ChangeType=64, ChangeAmount, 0)),sum(if(ChangeType=50, ChangeAmount, 0)),sum(if(ChangeType=111, ChangeAmount, 0)),sum(if(ChangeType=112, ChangeAmount, 0)) from UserAccountRecord where 1=1" + condition);
             if(dt.Rows.Count > 0)

Areas/Admin/Controllers/MainServer/UserCardForWeChatController.cs

@@ -222,7 +222,7 @@ namespace MySystem.Areas.Admin.Controllers
             db.SaveChanges();
 
             UserCardForWeChat edit = db.UserCardForWeChat.FirstOrDefault(m => m.Id == data.Id) ?? new UserCardForWeChat();
-            new WeChatFunction(_accessor.HttpContext).CardCreate(edit);
+            // new WeChatFunction(_accessor.HttpContext).CardCreate(edit);
         
             return "success";
         }

Areas/Admin/Controllers/MainServer/UserCashRecordController.cs

@@ -82,25 +82,18 @@ namespace MySystem.Areas.Admin.Controllers
                 condition += " and UserId in (select UserId from UserForRealName where RealName='" + RealName + "')";
             }
             //提现状态
-            if(!string.IsNullOrEmpty(StatusSelect))
+            if (!string.IsNullOrEmpty(StatusSelect))
             {
                 condition += " and Status=" + StatusSelect;
             }
-
-            if(!string.IsNullOrEmpty(data.CashOrderNo))
+            if (data.QueryCount > 0)
             {
-                condition += " and CashOrderNo='" + data.CashOrderNo + "'";
-            }
-            if (data.TradeType > 0)
-            { 
-                condition += " and TradeType=" + data.TradeType;
-            }
-            if(!string.IsNullOrEmpty(CreateDateData))
-            {
-                string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
-                string start = datelist[0];
-                string end = datelist[1];
-                condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
+                int QueryCount = data.QueryCount;
+                if (QueryCount == 2)
+                {
+                    QueryCount = 0;
+                }
+                condition += " and QueryCount=" + QueryCount;
             }
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("UserCashRecord", Fields, "Id desc", "0", page, limit, condition);
@@ -113,25 +106,34 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["RealName"] = user.RealName;
                 dic["TradeType"] = RelationClassForConst.GetTradeTypeInfo(int.Parse(dic["TradeType"].ToString()));
                 int Status = int.Parse(dic["Status"].ToString());
-                if(Status == 0) dic["StatusName"] = "处理中";
-                if(Status == 1) dic["StatusName"] = "成功";
-                if(Status == 2) dic["StatusName"] = "失败";
+                if (Status == 0) dic["StatusName"] = "处理中";
+                if (Status == 1) dic["StatusName"] = "成功";
+                if (Status == 2) dic["StatusName"] = "失败";
 
                 int QueryCount = int.Parse(dic["QueryCount"].ToString());
-                if(QueryCount == 0) dic["LockName"] = "待提交";
-                if(QueryCount == 1) dic["LockName"] = "已提交";
+                if (QueryCount == 0) dic["LockName"] = "待提交";
+                if (QueryCount == 1) dic["LockName"] = "已提交";
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
-            
-            string WaitAmount = "0.00";//待处理总金额
-            string SuccessAmount = "0.00";//提现成功总金额
-            string FailAmount = "0.00";//提现失败总金额
-            DataTable dt = OtherMySqlConn.dtable("select sum(TradeAmount) from UserCashRecord where Status=0" + condition);
-            if (dt.Rows.Count > 0)
+            if (!string.IsNullOrEmpty(data.CashOrderNo))
             {
-                WaitAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+                condition += " and CashOrderNo='" + data.CashOrderNo + "'";
+            }
+            if (data.TradeType > 0)
+            {
+                condition += " and TradeType=" + data.TradeType;
+            }
+            if (!string.IsNullOrEmpty(CreateDateData))
+            {
+                string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0];
+                string end = datelist[1];
+                condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate>='" + end + " 23:59:59'";
             }
-            dt = OtherMySqlConn.dtable("select sum(TradeAmount) from UserCashRecord where Status=1" + condition);
+            string SuccessAmount = "0.00";
+            string FailAmount = "0.00";
+            string WaitAmount = "0.00";
+            DataTable dt = OtherMySqlConn.dtable("select sum(TradeAmount) from UserCashRecord where Status=1" + condition);
             if (dt.Rows.Count > 0)
             {
                 SuccessAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
@@ -141,9 +143,14 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 FailAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
             }
-            other.Add("WaitAmount", WaitAmount);
+            dt = OtherMySqlConn.dtable("select sum(TradeAmount) from UserCashRecord where Status=0" + condition);
+            if (dt.Rows.Count > 0)
+            {
+                WaitAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
+            }
             other.Add("SuccessAmount", SuccessAmount);
             other.Add("FailAmount", FailAmount);
+            other.Add("WaitAmount", WaitAmount);
             obj.Add("other", other);
             return Json(obj);
         }
@@ -380,12 +387,12 @@ namespace MySystem.Areas.Admin.Controllers
                 condition += " and UserId in (select UserId from UserForRealName where RealName='" + RealName + "')";
             }
             //提现状态
-            if(!string.IsNullOrEmpty(StatusSelect))
+            if (!string.IsNullOrEmpty(StatusSelect))
             {
                 condition += " and Status=" + StatusSelect;
             }
 
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("UserCashRecord", Fields, "Id desc", "0", 1, 20000, condition, "CashOrderNo,UserId,IdCardNo,ActualTradeAmount,Remark", false);
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("UserCashRecord", Fields, "Id desc", "0", 1, 20000, condition, "CashOrderNo,UserId,IdCardNo,ActualTradeAmount,Remark,Status,QueryCount", false);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {
@@ -396,12 +403,18 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["Mobile"] = user.Mobile;
                 dic["SettleBankName"] = user.SettleBankName;
                 dic["SettleBankCardNo"] = user.SettleBankCardNo;
-                // dic["TradeType"] = RelationClassForConst.GetTradeTypeInfo(int.Parse(dic["TradeType"].ToString()));
-                // int Status = int.Parse(dic["Status"].ToString());
-                // if(Status == 0) dic["Status"] = "处理中";
-                // if(Status == 1) dic["Status"] = "成功";
-                // if(Status == 2) dic["Status"] = "失败";
                 dic.Remove("UserId");
+                // dic["TradeType"] = RelationClassForConst.GetTradeTypeInfo(int.Parse(dic["TradeType"].ToString()));
+                int Status = int.Parse(dic["Status"].ToString());
+                if (Status == 0) dic["StatusName"] = "处理中";
+                if (Status == 1) dic["StatusName"] = "成功";
+                if (Status == 2) dic["StatusName"] = "失败";
+                dic.Remove("Status");
+
+                int QueryCount = int.Parse(dic["QueryCount"].ToString());
+                if (QueryCount == 0) dic["LockName"] = "待提交";
+                if (QueryCount == 1) dic["LockName"] = "已提交";
+                dic.Remove("QueryCount");
             }
 
             Dictionary<string, object> result = new Dictionary<string, object>();
@@ -417,6 +430,8 @@ namespace MySystem.Areas.Admin.Controllers
             ReturnFields.Add("SettleBankName", "开户行名称");
             ReturnFields.Add("SettleBankCardNo", "开户行卡号");
             ReturnFields.Add("ActualTradeAmount", "发佣金额(单位：元）");
+            ReturnFields.Add("LockName", "代付标记");
+            ReturnFields.Add("StatusName", "状态");
             ReturnFields.Add("Remark", "备注");
 
             // ReturnFields.Add("CashOrderNo", "提现单号");
@@ -442,7 +457,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
 
-        
+
         #region 提交代付平台
 
         /// <summary>
@@ -470,5 +485,99 @@ namespace MySystem.Areas.Admin.Controllers
 
         #endregion
 
+        #region 拒绝
+
+        /// <summary>
+        /// 拒绝
+        /// </summary>
+        /// <returns></returns>
+        public IActionResult Reduce(string right)
+        {
+            ViewBag.RightInfo = RightInfo;
+            ViewBag.right = right;
+
+            return View();
+        }
+
+        #endregion
+
+        #region 拒绝
+
+        /// <summary>
+        /// 拒绝
+        /// </summary>
+        /// <returns></returns>
+        public string ReduceDo(int Id, string Remark)
+        {
+            AddSysLog(Id, "UserCashRecord", "Reduce");
+            UserCashRecord edit = db.UserCashRecord.FirstOrDefault(m => m.Id == Id);
+            if (edit != null)
+            {
+                edit.Status = 2;
+                edit.Remark = Remark;
+                edit.UpdateMan = SysUserName;
+                UserAccount account = db.UserAccount.FirstOrDefault(m => m.Id == edit.UserId);
+                if (account != null)
+                {
+                    decimal TradeAmount = edit.TradeAmount;
+                    decimal BeforeTotalAmount = account.TotalAmount; //变更前总金额
+                    decimal BeforeFreezeAmount = account.FreezeAmount; //变更前冻结金额
+                    decimal BeforeBalanceAmount = account.BalanceAmount; //变更前余额
+                    account.BalanceAmount += TradeAmount;
+                    account.FreezeAmount -= TradeAmount;
+                    decimal AfterTotalAmount = account.TotalAmount; //变更后总金额
+                    decimal AfterFreezeAmount = account.FreezeAmount; //变更后冻结金额
+                    decimal AfterBalanceAmount = account.BalanceAmount; //变更后余额
+                    db.UserAccountRecord.Add(new UserAccountRecord()
+                    {
+                        CreateDate = DateTime.Now,
+                        UpdateDate = DateTime.Now,
+                        UserId = edit.UserId, //创客
+                        ChangeType = 6, //变动类型
+                        ProductType = 99, //产品类型
+                        ChangeAmount = TradeAmount, //变更金额
+                        BeforeTotalAmount = BeforeTotalAmount, //变更前总金额
+                        AfterTotalAmount = AfterTotalAmount, //变更后总金额
+                        BeforeFreezeAmount = BeforeFreezeAmount, //变更前冻结金额
+                        AfterFreezeAmount = AfterFreezeAmount, //变更后冻结金额
+                        BeforeBalanceAmount = BeforeBalanceAmount, //变更前余额
+                        AfterBalanceAmount = AfterBalanceAmount, //变更后余额
+                    });
+                    db.SaveChanges();
+                    RedisDbconn.Instance.Set("UserAccount:" + edit.UserId, account);
+                }
+                db.SaveChanges();
+            }
+            return "success";
+        }
+
+        #endregion
+
+        #region 解除
+
+        /// <summary>
+        /// 解除
+        /// </summary>
+        /// <returns></returns>
+        public string Cancel(string Id)
+        {
+            string[] idlist = Id.Split(new char[] { ',' });
+            AddSysLog(Id, "WithdrawRecord", "Cancel");
+            foreach (string subid in idlist)
+            {
+                int id = int.Parse(subid);
+                UserCashRecord edit = db.UserCashRecord.FirstOrDefault(m => m.Id == id);
+                if (edit != null)
+                {
+                    edit.QueryCount = 0;
+                    db.SaveChanges();
+                }
+            }
+
+            return "success";
+        }
+
+        #endregion
+
     }
-}
+}

Areas/Admin/Controllers/MainServer/UserProfitSubsidySummaryController.cs

@@ -7,7 +7,6 @@ using System.Web;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Data;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Http;
@@ -93,13 +92,7 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["CheckStatus"] = dic["CheckStatus"].ToString() == "1" ? "已验证和同步" : "初始";
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
-            string SubsidyTotalProfit = "0.00";//分润补贴总金额
-            DataTable dt = OtherMySqlConn.dtable("select sum(SubsidyDirectProfit+SubsidyJuniorProfit+SubsidyTotalProfit) from ProfitSubsidyDetail where 1=1" + condition);
-            if (dt.Rows.Count > 0)
-            {
-                SubsidyTotalProfit = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            }
-            other.Add("SubsidyTotalProfit", SubsidyTotalProfit);
+            other.Add("SubsidyTotalProfit", 0);
             obj.Add("other", other);
             return Json(obj);
         }

Areas/Admin/Controllers/MainServer/UserStoreChangeController.cs

@@ -7,7 +7,6 @@ using System.Web;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Data;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Http;
@@ -195,121 +194,25 @@ namespace MySystem.Areas.Admin.Controllers
 
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
-            string NotPutNotBindCount = "0.00";//支付成功总金额
-            string NotPutBindCount = "0.00";//支付失败总金额
-            string PutNotBindCount = "0.00";//支付成功总金额
-            string PutBindCount = "0.00";//支付失败总金额
-            string NotPutNotBindCount2 = "0.00";//支付成功总金额
-            string NotPutBindCount2 = "0.00";//支付失败总金额
-            string PutNotBindCount2 = "0.00";//支付成功总金额
-            string PutBindCount2 = "0.00";//支付失败总金额
-            string NotPutNotBindCount3 = "0.00";//支付成功总金额
-            string NotPutBindCount3 = "0.00";//支付失败总金额
-            string PutNotBindCount3 = "0.00";//支付成功总金额
-            string PutBindCount3 = "0.00";//支付失败总金额
-            string NotPutNotBindCount4 = "0.00";//支付成功总金额
-            string NotPutBindCount4 = "0.00";//支付失败总金额
-            string PutNotBindCount4 = "0.00";//支付成功总金额
-            string PutBindCount4 = "0.00";//支付失败总金额
-            // DataTable dt = OtherMySqlConn.dtable("select sum(TotalPrice) from Orders where PayStatus=0" + condition);
-            // if (dt.Rows.Count > 0)
-            // {
-            //     NotPutNotBindCount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            // }
-            // dt = OtherMySqlConn.dtable("select sum(TotalPrice) from Orders where PayStatus=1" + condition);
-            // if (dt.Rows.Count > 0)
-            // {
-            //     NotPutBindCount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            // }
-            // dt = OtherMySqlConn.dtable("select sum(TotalPrice) from Orders where PayStatus=1" + condition);
-            // if (dt.Rows.Count > 0)
-            // {
-            //     PutNotBindCount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            // }
-            // dt = OtherMySqlConn.dtable("select sum(TotalPrice) from Orders where PayStatus=1" + condition);
-            // if (dt.Rows.Count > 0)
-            // {
-            //     PutBindCount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            // }
-            // dt = OtherMySqlConn.dtable("select sum(TotalPrice) from Orders where PayStatus=1" + condition);
-            // if (dt.Rows.Count > 0)
-            // {
-            //     NotPutNotBindCount2 = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            // }
-            // dt = OtherMySqlConn.dtable("select sum(TotalPrice) from Orders where PayStatus=1" + condition);
-            // if (dt.Rows.Count > 0)
-            // {
-            //     NotPutBindCount2 = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            // }
-            // dt = OtherMySqlConn.dtable("select sum(TotalPrice) from Orders where PayStatus=1" + condition);
-            // if (dt.Rows.Count > 0)
-            // {
-            //     PutNotBindCount2 = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            // }
-            // dt = OtherMySqlConn.dtable("select sum(TotalPrice) from Orders where PayStatus=1" + condition);
-            // if (dt.Rows.Count > 0)
-            // {
-            //     PutBindCount2 = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            // }
-            // dt = OtherMySqlConn.dtable("select sum(TotalPrice) from Orders where PayStatus=1" + condition);
-            // if (dt.Rows.Count > 0)
-            // {
-            //     NotPutNotBindCount3 = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            // }
-            // dt = OtherMySqlConn.dtable("select sum(TotalPrice) from Orders where PayStatus=1" + condition);
-            // if (dt.Rows.Count > 0)
-            // {
-            //     NotPutBindCount3 = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            // }
-            // dt = OtherMySqlConn.dtable("select sum(TotalPrice) from Orders where PayStatus=1" + condition);
-            // if (dt.Rows.Count > 0)
-            // {
-            //     PutNotBindCount3 = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            // }
-            // dt = OtherMySqlConn.dtable("select sum(TotalPrice) from Orders where PayStatus=1" + condition);
-            // if (dt.Rows.Count > 0)
-            // {
-            //     PutBindCount3 = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            // }
-            // dt = OtherMySqlConn.dtable("select sum(TotalPrice) from Orders where PayStatus=1" + condition);
-            // if (dt.Rows.Count > 0)
-            // {
-            //     NotPutNotBindCount4 = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            // }
-            // dt = OtherMySqlConn.dtable("select sum(TotalPrice) from Orders where PayStatus=1" + condition);
-            // if (dt.Rows.Count > 0)
-            // {
-            //     NotPutBindCount4 = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            // }
-            // dt = OtherMySqlConn.dtable("select sum(TotalPrice) from Orders where PayStatus=1" + condition);
-            // if (dt.Rows.Count > 0)
-            // {
-            //     PutNotBindCount4 = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            // }
-            // dt = OtherMySqlConn.dtable("select sum(TotalPrice) from Orders where PayStatus=1" + condition);
-            // if (dt.Rows.Count > 0)
-            // {
-            //     PutBindCount4 = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
-            // }
-            other.Add("NotPutNotBindCount", NotPutNotBindCount);
-            other.Add("NotPutBindCount", NotPutBindCount);
-            other.Add("PutNotBindCount", PutNotBindCount);
-            other.Add("PutBindCount",PutBindCount);
+            other.Add("NotPutNotBindCount", 0);
+            other.Add("NotPutBindCount", 0);
+            other.Add("PutNotBindCount", 0);
+            other.Add("PutBindCount", 0);
             
-            other.Add("NotPutNotBindCount2", NotPutNotBindCount2);
-            other.Add("NotPutBindCount2", NotPutBindCount2);
-            other.Add("PutNotBindCount2", PutNotBindCount2);
-            other.Add("PutBindCount2", PutBindCount2);
+            other.Add("NotPutNotBindCount2", 0);
+            other.Add("NotPutBindCount2", 0);
+            other.Add("PutNotBindCount2", 0);
+            other.Add("PutBindCount2", 0);
             
-            other.Add("NotPutNotBindCount3", NotPutNotBindCount3);
-            other.Add("NotPutBindCount3", NotPutBindCount3);
-            other.Add("PutNotBindCount3", PutNotBindCount3);
-            other.Add("PutBindCount3", PutBindCount3);
+            other.Add("NotPutNotBindCount3", 0);
+            other.Add("NotPutBindCount3", 0);
+            other.Add("PutNotBindCount3", 0);
+            other.Add("PutBindCount3", 0);
             
-            other.Add("NotPutNotBindCount4", NotPutNotBindCount4);
-            other.Add("NotPutBindCount4", NotPutBindCount4);
-            other.Add("PutNotBindCount4", PutNotBindCount4);
-            other.Add("PutBindCount4", PutBindCount4);
+            other.Add("NotPutNotBindCount4", 0);
+            other.Add("NotPutBindCount4", 0);
+            other.Add("PutNotBindCount4", 0);
+            other.Add("PutBindCount4", 0);
             obj.Add("other", other);
             return Json(obj);
         }

Areas/Admin/Controllers/MainServer/UserTradeDaySummaryController.cs

@@ -7,7 +7,6 @@ using System.Web;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Data;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Http;
@@ -52,7 +51,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 创客交易日汇总列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(UserTradeDaySummary data, string MakerCode, string RealName, string TradeMonthSelect, string TradeDateSelect, int page = 1, int limit = 30)
+        public JsonResult IndexData(UserTradeDaySummary data, string MakerCode, string RealName, string TradeMonthSelect, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -72,15 +71,10 @@ namespace MySystem.Areas.Admin.Controllers
                 condition += " and UserId in (select UserId from UserForRealName where RealName='" + RealName + "')";
             }
             //交易月份
-            if (!string.IsNullOrEmpty(TradeMonthSelect))
+            if(!string.IsNullOrEmpty(TradeMonthSelect))
             {
                 condition += " and TradeMonth=" + TradeMonthSelect.Replace("-", "");
             }
-            //交易日期
-            if (!string.IsNullOrEmpty(TradeDateSelect))
-            {
-                condition += " and TradeDate=" + TradeDateSelect.Replace("-", "-");
-            }
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("UserTradeDaySummary", Fields, "Id desc", "0", page, limit, condition);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
@@ -93,17 +87,9 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["BrandId"] = RelationClass.GetKqProductBrandInfo(int.Parse(dic["BrandId"].ToString()));
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
-            string DirectTradeAmt = "0.00", DirectDebitTradeAmt = "0.00", DirectDebitCapNum = "0.00";//直营商户交易总额 直营商户借记卡交易总额 直营激活商户数
-            DataTable dt = OtherMySqlConn.dtable("select sum(DirectTradeAmt),sum(DirectDebitTradeAmt),sum(DirectDebitCapNum) from UserTradeDaySummary where 1=1" + condition);
-            if(dt.Rows.Count > 0)
-            {
-                DirectTradeAmt = dt.Rows[0][0].ToString();
-                DirectDebitTradeAmt = dt.Rows[0][1].ToString();
-                DirectDebitCapNum = dt.Rows[0][2].ToString();
-            }
-            other.Add("DirectTradeAmt", DirectTradeAmt);
-            other.Add("DirectDebitTradeAmt", DirectDebitTradeAmt);
-            other.Add("DirectDebitCapNum", DirectDebitCapNum);
+            other.Add("DirectTradeAmt", 0);
+            other.Add("DirectDebitTradeAmt", 0);
+            other.Add("DirectDebitCapNum", 0);
             obj.Add("other", other);
             return Json(obj);
         }
@@ -329,7 +315,7 @@ namespace MySystem.Areas.Admin.Controllers
                 condition += " and UserId in (select UserId from UserForRealName where RealName='" + RealName + "')";
             }
             //交易月份
-            if (!string.IsNullOrEmpty(TradeMonthSelect))
+            if(!string.IsNullOrEmpty(TradeMonthSelect))
             {
                 condition += " and TradeMonth=" + TradeMonthSelect.Replace("-", "");
             }

Areas/Admin/Controllers/MainServer/UsersController.cs

@@ -827,20 +827,7 @@ namespace MySystem.Areas.Admin.Controllers
             var Brands = db.KqProducts.Where(m => m.Status == 1).ToList();
             foreach (var Brand in Brands)
             {
-                string IdBrand = Id + "_" + Brand.Id;
-                UserMachineData machineData = db.UserMachineData.FirstOrDefault(m => m.IdBrand == IdBrand);
-                if (machineData == null)
-                {
-                    machineData = db.UserMachineData.Add(new UserMachineData()
-                    {
-                        IdBrand = IdBrand
-                    }).Entity;
-                    db.SaveChanges();
-                }
-                machineData.BindCount = db.PosMachinesTwo.Count(m => m.BuyUserId == Id && m.BrandId == Brand.Id && m.BindingState == 1);
-                machineData.UnBindCount = db.PosMachinesTwo.Count(m => m.BuyUserId == Id && m.BrandId == Brand.Id && m.BindingState == 0);
-                machineData.TotalMachineCount = machineData.BindCount + machineData.UnBindCount;
-                db.SaveChanges();
+                PublicFunction.SycnMachineCount(Id, Brand.Id);
                 // RedisDbconn.Instance.Set("UserMachineData:" + IdBrand, machineData);
                 // RedisDbconn.Instance.SetExpire("UserMachineData:" + IdBrand, function.get_Random(1800, 5400));
             }

Areas/Admin/Views/BsServer/OperateRightList/Index.cshtml

@@ -1,85 +0,0 @@
-@{
-    string RightInfo = ViewBag.RightInfo as string;
-    string right = ViewBag.right as string;
-    
-}
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <title>操作权限</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
-    <link rel="stylesheet" href="/layuiadmin/style/admin.css" media="all">
-    <script src="/admin/js/jquery-1.10.1.min.js"></script>
-    <style>
-        .layui-input-inline{
-            width: 175px !important;
-        }
-        .layui-form-label{
-            width: 85px !important;
-        }
-        .layui-inline{
-            margin-right: 0px !important;
-        }
-        .w100{
-            width: 100px !important;
-        }
-        .ml50{
-            margin-left: 50px !important;
-        }
-    </style>
-</head>
-<body>
-    <div class="layui-fluid">
-        <div class="layui-card">
-            <div class="layui-form layui-card-header layuiadmin-card-header-auto">
-                <div class="layui-form-item">
-                    <div class="layui-inline">
-                        <label class="layui-form-label">名称</label>
-                        <div class="layui-input-inline">
-                            <input class="layui-input" type="text" name="Name" placeholder="" autocomplete="off">
-                        </div>
-                    </div>
-                    <div class="layui-inline">
-                        <label class="layui-form-label">英文名</label>
-                        <div class="layui-input-inline">
-                            <input class="layui-input" type="text" name="EnName" placeholder="" autocomplete="off">
-                        </div>
-                    </div>
-
-                    <div class="layui-inline ml50">
-                        <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">
-                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>查询
-                        </button>
-                        <button class="layui-btn" lay-submit lay-filter="LAY-list-front-searchall">
-                            <i class="layui-icon layui-icon-list layuiadmin-button-btn"></i>全部
-                        </button>
-                    </div>
-                </div>
-            </div>
-
-            <div class="layui-card-body">
-                <div style="padding-bottom: 10px;">
-                    <button class="layui-btn" data-type="add"><i class="layui-icon layui-icon-add-1 layuiadmin-button-btn"></i>新增</button>
-                    <button class="layui-btn" data-type="batchdel"><i class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>删除</button>
-                </div>
-                
-                <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
-                <script type="text/html" id="table-list-tools">
-                    <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>编辑</a>
-                    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon layui-icon-delete"></i>删除</a>
-                </script>
-            </div>
-        </div>
-    </div>
-
-    <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/layuiadmin/modules/OperateRightList_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
-    <script>
-        
-    </script>
-</body>
-</html>

Areas/Admin/Views/BsServer/RightDic/Edit.cshtml

@@ -1,267 +0,0 @@
-@using MySystem.BsModels;
-@{RightDic editData = ViewBag.data as RightDic;}
-@{
-string RightInfo = ViewBag.RightInfo as string;
-string right = ViewBag.right as string;
-string PColId = ViewBag.PColId as string;
-
-}
-<!DOCTYPE html>
-<html>
-
-<head>
-    <meta charset="utf-8">
-    <title>导航菜单(修改)</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport"
-        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
-    <script src="/admin/js/jquery-1.10.1.min.js"></script>
-    <script src="/admin/js/LAreaData2.js"></script>
-</head>
-
-<body>
-
-    <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">
-        <input type="hidden" name="Id" value="@editData.Id" />
-        <input type="hidden" name="OldPColId" value="@ViewBag.OldPColId" />
-
-        <div class="layui-card">
-            <div class="layui-card-body">
-                <div class="layui-tab" lay-filter="mytabbar">
-                    <ul class="layui-tab-title">
-                        <li class="layui-this" lay-id="1">基本信息</li>
-                        <li lay-id="2">后台主界面</li>
-                    </ul>
-                    <div class="layui-tab-content mt20">
-                        <div class="layui-tab-item layui-show">
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">上级栏目</label>
-                                <div class="layui-input-inline">
-                                    <select id="PColId" name="PColId" lay-search="">
-                                        <option value="">作为顶级导航</option>
-                                        @{List<MySystem.Models.RightDic> ColIds = new MySystem.Models.WebCMSEntities().RightDic.OrderBy(m => m.Id).ToList();}
-                                        @foreach (MySystem.Models.RightDic subColId in ColIds)
-                                        {
-                                            string checkCol = subColId.Id.Replace("_", "");
-                                            string kg = "";
-                                            for (int i = 1; i < checkCol.Length; i++)
-                                            {
-                                                kg += "　　";
-                                            }
-                                            <option value="@subColId.Id" @(subColId.Id == PColId ? "selected=selected" : "")>@(kg+subColId.Name)</option>
-                                        }
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">标题</label>
-                                <div class="layui-input-block">
-                                    <input class="layui-input" type="text" id="Name" name="Name" value="@editData.Name"
-                                        maxlength="50" lay-verify="" autocomplete="off" placeholder="请输入标题">
-                                </div>
-                            </div>
-                        </div>
-                        <div class="layui-tab-item">
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">快捷方式</label>
-                                <div class="layui-input-block">
-                                    <input type="checkbox" id="MainMenu" name="MainMenu" value="1" @(editData.MainMenu == 1 ? "checked=checked" : "") lay-skin="switch" lay-filter="switchTest" title="开关">
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">统计</label>
-                                <div class="layui-input-block">
-                                    <input type="checkbox" id="MainStat" name="MainStat" value="1" @(editData.MainStat == 1 ? "checked=checked" : "") lay-skin="switch" lay-filter="switchTest" title="开关">
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">主界面数据列表</label>
-                                <div class="layui-input-block">
-                                    <input type="checkbox" id="MainDataList" name="MainDataList" value="1" @(editData.MainDataList == 1 ? "checked=checked" : "") lay-skin="switch" lay-filter="switchTest" title="开关">
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="layui-form-item layui-hide">
-                    <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit"
-                        value="确认">
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js"></script>
-    <script src="/other/mybjq/kindeditor-min.js"></script>
-    <script src="/other/mybjq/lang/zh_CN.js"></script>
-    <script>
-        //编辑器
-        KindEditor.ready(function (K) {
-
-        });
-
-        var ids = "";
-
-        function getChildren(obj) {
-            $.each(obj, function (index, value) {
-                var id = obj[index].id;
-                ids += id + ",";
-                var children = obj[index].children;
-                if (children) {
-                    getChildren(children);
-                }
-            });
-        }
-
-        function AreasProvinceInit(tagId, areasVal, form) {
-            for (var i = 0; i < provs_data.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(provs_data[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "Province").append('<option value="' + provs_data[i].value + '"' + sel + '>' +
-                    provs_data[i].text + '</option>');
-            }
-            form.render();
-        }
-
-        function AreasProvinceSelected(tagId, areasVal, form, value) {
-            $("#" + tagId + "City").html('<option value="">市</option>');
-            var list = citys_data[value];
-            for (var i = 0; i < list.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(list[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "City").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text +
-                    '</option>');
-            }
-            $("#" + tagId + "Area").html('<option value="">县/区</option>');
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId +
-                "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-
-        function AreasCitySelected(tagId, areasVal, form, value) {
-            $("#" + tagId + "Area").html('<option value="">县/区</option>');
-            var list = dists_data[value];
-            for (var i = 0; i < list.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(list[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "Area").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text +
-                    '</option>');
-            }
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId +
-                "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-
-        function AreasAreaSelected(tagId, form) {
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId +
-                "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-
-        function movePrev(obj, tagId) {
-            $(obj).parent().prev().insertAfter($(obj).parent());
-            checkPics(tagId);
-        }
-
-        function moveNext(obj, tagId) {
-            $(obj).parent().next().insertBefore($(obj).parent());
-            checkPics(tagId);
-        }
-
-        function deletePic(obj, tagId) {
-            $(obj).parent().remove();
-            checkPics(tagId);
-        }
-
-        function checkPics(tagId) {
-            var pics = "";
-            var texts = "";
-            $("#" + tagId + "Image div img").each(function (i) {
-                pics += $(this).attr("src").replace(osshost, '') + "|";
-            });
-            $("#" + tagId + "Image div input").each(function (i) {
-                texts += $(this).val() + "|";
-            });
-            if (pics == "") {
-                $("#" + tagId).val("");
-            } else {
-                pics = pics.substring(0, pics.length - 1);
-                texts = texts.substring(0, pics.length - 1);
-                $("#" + tagId).val(pics + "#cut#" + texts);
-            }
-        }
-
-        function checkBox(tagId) {
-            var text = "";
-            $("input[type=checkbox][name=" + tagId + "List]:checked").each(function (i) {
-                text += $(this).val() + ",";
-            });
-            $("#" + tagId).val(text);
-        }
-
-        function showBigPic(picpath) {
-            parent.layer.open({
-                type: 1,
-                title: false,
-                closeBtn: 0,
-                shadeClose: true,
-                area: ['auto', 'auto'],
-                content: '<img src="' + picpath + '" style="max-width:800px; max-height:800px;" />'
-            });
-        }
-
-        var tree;
-        var element;
-        layui.config({
-            base: '/layuiadmin/' //静态资源所在路径
-        }).extend({
-            index: 'lib/index' //主入口模块
-        }).use(['index', 'form', 'upload', 'layedit', 'laydate', 'element', 'croppers', 'transfer', 'tree', 'util'],
-            function () {
-                var $ = layui.$,
-                    form = layui.form,
-                    layer = layui.layer,
-                    layedit = layui.layedit,
-                    laydate = layui.laydate,
-                    croppers = layui.croppers,
-                    upload = layui.upload,
-                    transfer = layui.transfer,
-                    util = layui.util;
-                tree = layui.tree;
-                element = layui.element;
-
-                //Hash地址的定位
-                var layid = location.hash.replace(/^#test=/, '');
-                element.tabChange('test', layid);
-                element.on('tab(test)', function (elem) {
-                    location.hash = 'test=' + $(this).attr('lay-id');
-                });
-
-                //日期
-
-
-                //上传文件
-
-
-                //穿梭框
-
-
-                //TreeView，比如权限管理
-
-
-                //省市区
-
-            })
-    </script>
-</body>
-
-</html>

Areas/Admin/Views/BsServer/RightDic/Index.cshtml

@@ -1,44 +0,0 @@
-@{
-    string RightInfo = ViewBag.RightInfo as string;
-    string right = ViewBag.right as string;
-}
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <title>菜单管理</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
-    <link rel="stylesheet" href="/layuiadmin/style/admin.css" media="all">
-</head>
-<body>
-    <div class="layui-fluid">
-        <div class="layui-card">
-            <div class="layui-card-body">
-                <script type="text/html" id="switchMainMenu">
-                    <input type="checkbox" name="MainMenu" value="{{d.id}}" lay-skin="switch" lay-text="开|关" lay-filter="MainMenu" @Html.Raw("{{ d.mainMenu == 1 ? 'checked' : '' }}")>
-                </script>
-                <script type="text/html" id="switchMainStat">
-                    <input type="checkbox" name="MainStat" value="{{d.id}}" lay-skin="switch" lay-text="开|关" lay-filter="MainStat" @Html.Raw("{{ d.mainStat == 1 ? 'checked' : '' }}")>
-                </script>
-                <script type="text/html" id="switchMainDataList">
-                    <input type="checkbox" name="MainDataList" value="{{d.id}}" lay-skin="switch" lay-text="开|关" lay-filter="MainDataList" @Html.Raw("{{ d.mainDataList == 1 ? 'checked' : '' }}")>
-                </script>
-                <script type="text/html" id="iconShow">
-                    <i class="layui-icon {{d.icon}}"></i>
-                </script>
-                <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
-                <script type="text/html" id="table-list-tools">
-                    <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>编辑</a>
-                    <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="right"><i class="layui-icon layui-icon-edit"></i>权限</a>
-                </script>
-            </div>
-        </div>
-    </div>
-    
-    <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/layuiadmin/modules/RightDic_Admin.js?r=@(DateTime.Now.ToString("yyyyMMddHHmmss"))"></script>
-</body>
-</html>

Areas/Admin/Views/BsServer/RightDic/RightSet.cshtml

@@ -1,125 +0,0 @@
-@using MySystem.BsModels;
-@{
-List<OperateRightList> rights = ViewBag.rights as List<OperateRightList>;
-List<string> RightList = ViewBag.RightList as List<string>;
-}
-<!DOCTYPE html>
-<html>
-
-<head>
-    <meta charset="utf-8">
-    <title>权限设置</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport"
-        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
-    <script src="/admin/js/jquery-1.10.1.min.js"></script>
-</head>
-
-<body>
-
-    <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">
-        <input type="hidden" name="Id" value="@ViewBag.Id" />
-
-        <div class="layui-card">
-            <div class="layui-card-body">
-                <div class="layui-tab" lay-filter="mytabbar">
-                    <div class="layui-tab-content mt20">
-                        <div class="layui-tab-item layui-show">
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">权限</label>
-                                <div class="layui-input-block">
-                                    @foreach(OperateRightList sub in rights)
-                                    {
-                                    <input type="checkbox" name="RightString" title="@sub.Name" value="@(sub.EnName)_@(sub.Name)" @(RightList.Contains(sub.EnName + "_" + sub.Name) ? "checked=checked" : "")>
-                                    }
-                                </div>
-                            </div>
-                        </div>
-                        <div class="layui-form-item layui-form-text">
-                            <label class="layui-form-label">自定义权限</label>
-                            <div class="layui-input-block">
-                            <textarea class="layui-textarea" id="OtherRight" name="OtherRight" placeholder="请输入内容" style="width:100%;height:500px;">@(ViewBag.OtherRight)</textarea>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="layui-form-item layui-hide">
-                    <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit"
-                        value="确认">
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js"></script>
-    <script src="/other/mybjq/kindeditor-min.js"></script>
-    <script src="/other/mybjq/lang/zh_CN.js"></script>
-    <script>
-        //编辑器
-        KindEditor.ready(function (K) {
-
-        });
-
-        var ids = "";
-
-        function getChildren(obj) {
-            $.each(obj, function (index, value) {
-                var id = obj[index].id;
-                ids += id + ",";
-                var children = obj[index].children;
-                if (children) {
-                    getChildren(children);
-                }
-            });
-        }
-
-
-        var tree;
-        var element;
-        layui.config({
-            base: '/layuiadmin/' //静态资源所在路径
-        }).extend({
-            index: 'lib/index' //主入口模块
-        }).use(['index', 'form', 'upload', 'layedit', 'laydate', 'element', 'croppers', 'transfer', 'tree', 'util'],
-            function () {
-                var $ = layui.$,
-                    form = layui.form,
-                    layer = layui.layer,
-                    layedit = layui.layedit,
-                    laydate = layui.laydate,
-                    croppers = layui.croppers,
-                    upload = layui.upload,
-                    transfer = layui.transfer,
-                    util = layui.util;
-                tree = layui.tree;
-                element = layui.element;
-
-                //Hash地址的定位
-                var layid = location.hash.replace(/^#test=/, '');
-                element.tabChange('test', layid);
-                element.on('tab(test)', function (elem) {
-                    location.hash = 'test=' + $(this).attr('lay-id');
-                });
-
-                //日期
-
-
-                //上传文件
-
-
-                //穿梭框
-
-
-                //TreeView，比如权限管理
-
-
-                //省市区
-
-            })
-    </script>
-</body>
-
-</html>

Areas/Admin/Views/BsServer/UploadParams/Add.cshtml

@@ -1,253 +0,0 @@
-@{
-string RightInfo = ViewBag.RightInfo as string;
-string right = ViewBag.right as string;
-
-}
-<!DOCTYPE html>
-<html>
-
-<head>
-    <meta charset="utf-8">
-    <title>上传配置项(增加)</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport"
-        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
-    <script src="/admin/js/jquery-1.10.1.min.js"></script>
-    <script src="/admin/js/LAreaData2.js"></script>
-</head>
-
-<body>
-
-    <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">
-
-        <div class="layui-card">
-            <div class="layui-card-body">
-                <div class="layui-tab" lay-filter="mytabbar">
-                    <ul class="layui-tab-title">
-                        <li class="layui-this" lay-id="1">基本资料</li>
-                    </ul>
-                    <div class="layui-tab-content mt20">
-                        <div class="layui-tab-item layui-show">
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">表名</label>
-                                <div class="layui-input-block">
-                                    <input class="layui-input" type="text" id="TableName" name="TableName"
-                                        maxlength="50" lay-verify="" autocomplete="off" placeholder="请输入表名">
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">表英文名</label>
-                                <div class="layui-input-block">
-                                    <input class="layui-input" type="text" id="TableEnName" name="TableEnName"
-                                        maxlength="50" lay-verify="" autocomplete="off" placeholder="请输入表英文名">
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">字段名</label>
-                                <div class="layui-input-block">
-                                    <input class="layui-input" type="text" id="ColumnName" name="ColumnName"
-                                        maxlength="50" lay-verify="" autocomplete="off" placeholder="请输入字段名">
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">字段英文名</label>
-                                <div class="layui-input-block">
-                                    <input class="layui-input" type="text" id="ColumnEnName" name="ColumnEnName"
-                                        maxlength="50" lay-verify="" autocomplete="off" placeholder="请输入字段英文明">
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">参数</label>
-                                <div class="layui-input-block">
-                                    <input class="layui-input" type="text" id="ParamString" name="ParamString"
-                                        maxlength="200" lay-verify="" autocomplete="off" placeholder="请输入参数">
-                                </div>
-                            </div>
-
-                        </div>
-
-                    </div>
-                </div>
-                <div class="layui-form-item layui-hide">
-                    <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit"
-                        value="确认">
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js"></script>
-    <script src="/other/mybjq/kindeditor-min.js"></script>
-    <script src="/other/mybjq/lang/zh_CN.js"></script>
-    <script>
-        //编辑器
-        KindEditor.ready(function (K) {
-
-        });
-
-        var ids = "";
-
-        function getChildren(obj) {
-            $.each(obj, function (index, value) {
-                var id = obj[index].id;
-                ids += id + ",";
-                var children = obj[index].children;
-                if (children) {
-                    getChildren(children);
-                }
-            });
-        }
-
-        function AreasProvinceInit(tagId, areasVal, form) {
-            for (var i = 0; i < provs_data.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(provs_data[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "Province").append('<option value="' + provs_data[i].value + '"' + sel + '>' +
-                    provs_data[i].text + '</option>');
-            }
-            form.render();
-        }
-
-        function AreasProvinceSelected(tagId, areasVal, form, value) {
-            $("#" + tagId + "City").html('<option value="">市</option>');
-            var list = citys_data[value];
-            for (var i = 0; i < list.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(list[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "City").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text +
-                    '</option>');
-            }
-            $("#" + tagId + "Area").html('<option value="">县/区</option>');
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId +
-                "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-
-        function AreasCitySelected(tagId, areasVal, form, value) {
-            $("#" + tagId + "Area").html('<option value="">县/区</option>');
-            var list = dists_data[value];
-            for (var i = 0; i < list.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(list[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "Area").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text +
-                    '</option>');
-            }
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId +
-                "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-
-        function AreasAreaSelected(tagId, form) {
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId +
-                "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-
-        function movePrev(obj, tagId) {
-            $(obj).parent().prev().insertAfter($(obj).parent());
-            checkPics(tagId);
-        }
-
-        function moveNext(obj, tagId) {
-            $(obj).parent().next().insertBefore($(obj).parent());
-            checkPics(tagId);
-        }
-
-        function deletePic(obj, tagId) {
-            $(obj).parent().remove();
-            checkPics(tagId);
-        }
-
-        function checkPics(tagId) {
-            var pics = "";
-            var texts = "";
-            $("#" + tagId + "Image div img").each(function (i) {
-                pics += $(this).attr("src").replace(osshost, '') + "|";
-            });
-            $("#" + tagId + "Image div input").each(function (i) {
-                texts += $(this).val() + "|";
-            });
-            if (pics == "") {
-                $("#" + tagId).val("");
-            } else {
-                pics = pics.substring(0, pics.length - 1);
-                texts = texts.substring(0, pics.length - 1);
-                $("#" + tagId).val(pics + "#cut#" + texts);
-            }
-        }
-
-        function checkBox(tagId) {
-            var text = "";
-            $("input[type=checkbox][name=" + tagId + "List]:checked").each(function (i) {
-                text += $(this).val() + ",";
-            });
-            $("#" + tagId).val(text);
-        }
-
-        function showBigPic(picpath) {
-            parent.layer.open({
-                type: 1,
-                title: false,
-                closeBtn: 0,
-                shadeClose: true,
-                area: ['auto', 'auto'],
-                content: '<img src="' + picpath + '" style="max-width:800px; max-height:800px;" />'
-            });
-        }
-
-
-        var tree;
-        var element;
-        layui.config({
-            base: '/layuiadmin/' //静态资源所在路径
-        }).extend({
-            index: 'lib/index' //主入口模块
-        }).use(['index', 'form', 'upload', 'layedit', 'laydate', 'element', 'croppers', 'transfer', 'tree', 'util'],
-            function () {
-                var $ = layui.$,
-                    form = layui.form,
-                    layer = layui.layer,
-                    layedit = layui.layedit,
-                    laydate = layui.laydate,
-                    croppers = layui.croppers,
-                    upload = layui.upload,
-                    transfer = layui.transfer,
-                    util = layui.util;
-                tree = layui.tree;
-                element = layui.element;
-
-                //Hash地址的定位
-                var layid = location.hash.replace(/^#test=/, '');
-                element.tabChange('test', layid);
-                element.on('tab(test)', function (elem) {
-                    location.hash = 'test=' + $(this).attr('lay-id');
-                });
-
-                //日期
-
-
-                //上传文件
-
-
-                //穿梭框
-
-
-                //TreeView，比如权限管理
-
-
-                //省市区
-
-            })
-    </script>
-</body>
-
-</html>

Areas/Admin/Views/BsServer/UploadParams/Edit.cshtml

@@ -1,259 +0,0 @@
-@using MySystem.BsModels;
-@{UploadParams editData = ViewBag.data as UploadParams;}
-@{
-string RightInfo = ViewBag.RightInfo as string;
-string right = ViewBag.right as string;
-
-}
-<!DOCTYPE html>
-<html>
-
-<head>
-    <meta charset="utf-8">
-    <title>上传配置项(修改)</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport"
-        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
-    <script src="/admin/js/jquery-1.10.1.min.js"></script>
-    <script src="/admin/js/LAreaData2.js"></script>
-</head>
-
-<body>
-
-    <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">
-        <input type="hidden" name="Id" value="@editData.Id" />
-
-        <div class="layui-card">
-            <div class="layui-card-body">
-                <div class="layui-tab" lay-filter="mytabbar">
-                    <ul class="layui-tab-title">
-                        <li class="layui-this" lay-id="1">基本资料</li>
-                    </ul>
-                    <div class="layui-tab-content mt20">
-                        <div class="layui-tab-item layui-show">
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">表名</label>
-                                <div class="layui-input-block">
-                                    <input class="layui-input" type="text" id="TableName" name="TableName"
-                                        value="@editData.TableName" maxlength="50" lay-verify="" autocomplete="off"
-                                        placeholder="请输入表名">
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">表英文名</label>
-                                <div class="layui-input-block">
-                                    <input class="layui-input" type="text" id="TableEnName" name="TableEnName" value="@editData.TableEnName"
-                                        maxlength="50" lay-verify="" autocomplete="off" placeholder="请输入表英文名">
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">字段名</label>
-                                <div class="layui-input-block">
-                                    <input class="layui-input" type="text" id="ColumnName" name="ColumnName"
-                                        value="@editData.ColumnName" maxlength="50" lay-verify="" autocomplete="off"
-                                        placeholder="请输入字段名">
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">字段英文明</label>
-                                <div class="layui-input-block">
-                                    <input class="layui-input" type="text" id="ColumnEnName" name="ColumnEnName"
-                                        value="@editData.ColumnEnName" maxlength="50" lay-verify="" autocomplete="off"
-                                        placeholder="请输入字段英文明">
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">参数</label>
-                                <div class="layui-input-block">
-                                    <input class="layui-input" type="text" id="ParamString" name="ParamString"
-                                        value="@editData.ParamString" maxlength="200" lay-verify="" autocomplete="off"
-                                        placeholder="请输入参数">
-                                </div>
-                            </div>
-
-                        </div>
-
-                    </div>
-                </div>
-                <div class="layui-form-item layui-hide">
-                    <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit"
-                        value="确认">
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js"></script>
-    <script src="/other/mybjq/kindeditor-min.js"></script>
-    <script src="/other/mybjq/lang/zh_CN.js"></script>
-    <script>
-        //编辑器
-        KindEditor.ready(function (K) {
-
-        });
-
-        var ids = "";
-
-        function getChildren(obj) {
-            $.each(obj, function (index, value) {
-                var id = obj[index].id;
-                ids += id + ",";
-                var children = obj[index].children;
-                if (children) {
-                    getChildren(children);
-                }
-            });
-        }
-
-        function AreasProvinceInit(tagId, areasVal, form) {
-            for (var i = 0; i < provs_data.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(provs_data[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "Province").append('<option value="' + provs_data[i].value + '"' + sel + '>' +
-                    provs_data[i].text + '</option>');
-            }
-            form.render();
-        }
-
-        function AreasProvinceSelected(tagId, areasVal, form, value) {
-            $("#" + tagId + "City").html('<option value="">市</option>');
-            var list = citys_data[value];
-            for (var i = 0; i < list.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(list[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "City").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text +
-                    '</option>');
-            }
-            $("#" + tagId + "Area").html('<option value="">县/区</option>');
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId +
-                "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-
-        function AreasCitySelected(tagId, areasVal, form, value) {
-            $("#" + tagId + "Area").html('<option value="">县/区</option>');
-            var list = dists_data[value];
-            for (var i = 0; i < list.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(list[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "Area").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text +
-                    '</option>');
-            }
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId +
-                "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-
-        function AreasAreaSelected(tagId, form) {
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId +
-                "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-
-        function movePrev(obj, tagId) {
-            $(obj).parent().prev().insertAfter($(obj).parent());
-            checkPics(tagId);
-        }
-
-        function moveNext(obj, tagId) {
-            $(obj).parent().next().insertBefore($(obj).parent());
-            checkPics(tagId);
-        }
-
-        function deletePic(obj, tagId) {
-            $(obj).parent().remove();
-            checkPics(tagId);
-        }
-
-        function checkPics(tagId) {
-            var pics = "";
-            var texts = "";
-            $("#" + tagId + "Image div img").each(function (i) {
-                pics += $(this).attr("src").replace(osshost, '') + "|";
-            });
-            $("#" + tagId + "Image div input").each(function (i) {
-                texts += $(this).val() + "|";
-            });
-            if (pics == "") {
-                $("#" + tagId).val("");
-            } else {
-                pics = pics.substring(0, pics.length - 1);
-                texts = texts.substring(0, pics.length - 1);
-                $("#" + tagId).val(pics + "#cut#" + texts);
-            }
-        }
-
-        function checkBox(tagId) {
-            var text = "";
-            $("input[type=checkbox][name=" + tagId + "List]:checked").each(function (i) {
-                text += $(this).val() + ",";
-            });
-            $("#" + tagId).val(text);
-        }
-
-        function showBigPic(picpath) {
-            parent.layer.open({
-                type: 1,
-                title: false,
-                closeBtn: 0,
-                shadeClose: true,
-                area: ['auto', 'auto'],
-                content: '<img src="' + picpath + '" style="max-width:800px; max-height:800px;" />'
-            });
-        }
-
-        var tree;
-        var element;
-        layui.config({
-            base: '/layuiadmin/' //静态资源所在路径
-        }).extend({
-            index: 'lib/index' //主入口模块
-        }).use(['index', 'form', 'upload', 'layedit', 'laydate', 'element', 'croppers', 'transfer', 'tree', 'util'],
-            function () {
-                var $ = layui.$,
-                    form = layui.form,
-                    layer = layui.layer,
-                    layedit = layui.layedit,
-                    laydate = layui.laydate,
-                    croppers = layui.croppers,
-                    upload = layui.upload,
-                    transfer = layui.transfer,
-                    util = layui.util;
-                tree = layui.tree;
-                element = layui.element;
-
-                //Hash地址的定位
-                var layid = location.hash.replace(/^#test=/, '');
-                element.tabChange('test', layid);
-                element.on('tab(test)', function (elem) {
-                    location.hash = 'test=' + $(this).attr('lay-id');
-                });
-
-                //日期
-
-
-                //上传文件
-
-
-                //穿梭框
-
-
-                //TreeView，比如权限管理
-
-
-                //省市区
-
-            })
-    </script>
-</body>
-
-</html>

Areas/Admin/Views/BsServer/UploadParams/Index.cshtml

@@ -1,101 +0,0 @@
-@{
-string RightInfo = ViewBag.RightInfo as string;
-string right = ViewBag.right as string;
-
-}
-<!DOCTYPE html>
-<html>
-
-<head>
-    <meta charset="utf-8">
-    <title>上传配置项</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport"
-        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
-    <link rel="stylesheet" href="/layuiadmin/style/admin.css" media="all">
-    <script src="/admin/js/jquery-1.10.1.min.js"></script>
-</head>
-
-<body>
-    <div class="layui-fluid">
-        <div class="layui-card">
-            <div class="layui-form layui-card-header layuiadmin-card-header-auto">
-                <div class="layui-form-item">
-                    <div class="layui-inline">
-                        <div class="layui-input-inline">
-                            <input class="layui-input" type="text" name="TableName" placeholder="表名" autocomplete="off">
-                        </div>
-                    </div>
-                    <div class="layui-inline">
-                        <div class="layui-input-inline">
-                            <input class="layui-input" type="text" name="ColumnName" placeholder="字段名"
-                                autocomplete="off">
-                        </div>
-                    </div>
-                    <div class="layui-inline">
-                        <div class="layui-input-inline">
-                            <input class="layui-input" type="text" name="ColumnEnName" placeholder="字段英文明"
-                                autocomplete="off">
-                        </div>
-                    </div>
-                    <div class="layui-inline">
-                        <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">
-                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>查询
-                        </button>
-                        <button class="layui-btn" lay-submit lay-filter="LAY-list-front-searchall">
-                            <i class="layui-icon layui-icon-list layuiadmin-button-btn"></i>全部
-                        </button>
-                    </div>
-                </div>
-            </div>
-
-            <div class="layui-card-body">
-                <div style="padding-bottom: 10px;">
-                    <button class="layui-btn" data-type="add"><i class="layui-icon layui-icon-add-1 layuiadmin-button-btn"></i>新增</button>
-                    <button class="layui-btn" data-type="batchdel"><i class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>删除</button>
-                    <button class="layui-btn" data-type="makeparams">生成配置</button>
-                </div>
-
-                <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
-                <script type="text/html" id="imgTpl">
-                    <img style="display: inline-block; width: 50%; height: 100%;" src={{ d.avatar }}>
-                </script>
-                <script type="text/html" id="table-list-tools">
-                    <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit"><i
-                            class="layui-icon layui-icon-edit"></i>编辑</a>
-                    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i
-                            class="layui-icon layui-icon-delete"></i>删除</a>
-                </script>
-            </div>
-        </div>
-    </div>
-    <div id="excelForm" style="display:none; padding:20px;">
-        <div class="layui-tab-item layui-show">
-            <div class="layui-form-item">
-                <label class="layui-form-label">excel文件</label>
-                <div class="layui-input-block">
-                    <div class="layui-upload">
-                        <input type="file" id="ExcelFile" name="ExcelFile" value="">
-                    </div>
-                    <div class="mt10" id="ExcelFileList">
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="layui-form-item ml10">
-            <div class="layui-input-block">
-                <button type="button" class="layui-btn" onclick="ConfirmImport()">立即导入</button>
-            </div>
-        </div>
-    </div>
-
-    <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/layuiadmin/modules/UploadParams_Admin.js"></script>
-    <script>
-
-    </script>
-</body>
-
-</html>

Areas/Admin/Views/MainServer/ProfitObjectsRule/Add.cshtml → Areas/Admin/Views/CashServer/UserIdentity/Add.cshtml

@@ -1,14 +1,13 @@
 @{
     string RightInfo = ViewBag.RightInfo as string;
     string right = ViewBag.right as string;
-    string ObjectId = ViewBag.ObjectId as string;
-
+    
 }
 <!DOCTYPE html>
 <html>
 <head>
     <meta charset="utf-8">
-    <title>分润对象规则(增加)</title>
+    <title>创客信息(增加)</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
@@ -19,8 +18,7 @@
 <body>
 
     <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">
-        <input type="hidden" name="ObjectId" value="@ObjectId" />
-
+        
         <div class="layui-card">
           <div class="layui-card-body">
             <div class="layui-tab" lay-filter="mytabbar">
@@ -30,27 +28,115 @@
                 <div class="layui-tab-content mt20">
                     <div class="layui-tab-item layui-show">
 <div class="layui-form-item">
-<label class="layui-form-label">名称</label>
+<label class="layui-form-label">创客编号</label>
+<div class="layui-input-inline">
+<input class="layui-input" type="text" id="BuddyNo" name="BuddyNo" maxlength="16" lay-verify="" autocomplete="off" placeholder="请输入创客编号">
+</div>
+</div>
+<div class="layui-form-item">
+<label class="layui-form-label">创客名称</label>
+<div class="layui-input-inline">
+<input class="layui-input" type="text" id="BuddyName" name="BuddyName" maxlength="16" lay-verify="" autocomplete="off" placeholder="请输入创客名称">
+</div>
+</div>
+<div class="layui-form-item">
+<label class="layui-form-label">身份证号</label>
+<div class="layui-input-inline">
+<input class="layui-input" type="text" id="IdCardNo" name="IdCardNo" maxlength="18" lay-verify="" autocomplete="off" placeholder="请输入身份证号">
+</div>
+</div>
+<div class="layui-form-item">
+<label class="layui-form-label">手机号</label>
 <div class="layui-input-inline">
-<input class="layui-input" type="text" id="Name" name="Name" maxlength="50" lay-verify="required|" autocomplete="off" placeholder="请输入名称">
+<input class="layui-input" type="text" id="UserMobile" name="UserMobile" maxlength="11" lay-verify="" autocomplete="off" placeholder="请输入手机号">
 </div>
 </div>
 <div class="layui-form-item">
-<label class="layui-form-label">活动开始时间</label>
+<label class="layui-form-label">银行卡号</label>
 <div class="layui-input-inline">
-<input class="layui-input" type="text" id="StartDate" name="StartDate" lay-verify="required|" autocomplete="off" placeholder="请输入活动开始时间">
+<input class="layui-input" type="text" id="BankCardNo" name="BankCardNo" maxlength="32" lay-verify="" autocomplete="off" placeholder="请输入银行卡号">
+</div>
+</div>
+<div class="layui-form-item">
+<label class="layui-form-label">身份证正面照</label>
+<div class="layui-input-block">
+<div class="layui-upload">
+<input type="hidden" id="CertFrontImage" name="CertFrontImage" value="">
+<button class="layui-btn" type="button" id="CertFrontImageBtn">选择图片</button>
+<div class="layui-inline layui-word-aux">@(new MySystem.PublicFunction().GetUploadHint("UserIdentityCertFrontImage"))</div>
+</div>
+<div style="margin-top:10px;" id="CertFrontImageImage">
+</div>
+</div>
+</div>
+<div class="layui-form-item">
+<label class="layui-form-label">身份证反面照</label>
+<div class="layui-input-block">
+<div class="layui-upload">
+<input type="hidden" id="CertReverseImage" name="CertReverseImage" value="">
+<button class="layui-btn" type="button" id="CertReverseImageBtn">选择图片</button>
+<div class="layui-inline layui-word-aux">@(new MySystem.PublicFunction().GetUploadHint("UserIdentityCertReverseImage"))</div>
+</div>
+<div style="margin-top:10px;" id="CertReverseImageImage">
+</div>
 </div>
 </div>
 <div class="layui-form-item">
-<label class="layui-form-label">活动结束时间</label>
+<label class="layui-form-label">活体得分</label>
 <div class="layui-input-inline">
-<input class="layui-input" type="text" id="EndDate" name="EndDate" lay-verify="required|" autocomplete="off" placeholder="请输入活动结束时间">
+<input class="layui-input" type="text" id="LivingScore" name="LivingScore" maxlength="20" lay-verify="" autocomplete="off" placeholder="请输入活体得分">
 </div>
 </div>
 <div class="layui-form-item">
-<label class="layui-form-label">编号</label>
+<label class="layui-form-label">活体视频</label>
+<div class="layui-input-block">
+<div class="layui-upload">
+<input type="hidden" id="FaceVideo" name="FaceVideo" value="">
+<button class="layui-btn" type="button" id="FaceVideoBtn">选择文件</button>
+<div class="layui-inline layui-word-aux">@(new MySystem.PublicFunction().GetUploadHint("UserIdentityFaceVideo"))</div>
+</div>
+<div style="margin-top:10px;" id="FaceVideoFile">
+</div>
+<div style="width: 50%; margin-top:20px; display:none;" id="FaceVideoProgressBar">
+<div class="layui-progress" lay-showpercent="true" lay-filter="FaceVideoProgress">
+<div class="layui-progress-bar" lay-percent="0%"></div>
+</div>
+</div>
+</div>
+</div>
+<div class="layui-form-item">
+<label class="layui-form-label">活体照</label>
+<div class="layui-input-block">
+<div class="layui-upload">
+<input type="hidden" id="LivingImage" name="LivingImage" value="">
+<button class="layui-btn" type="button" id="LivingImageBtn">选择图片</button>
+<div class="layui-inline layui-word-aux">@(new MySystem.PublicFunction().GetUploadHint("UserIdentityLivingImage"))</div>
+</div>
+<div style="margin-top:10px;" id="LivingImageImage">
+</div>
+</div>
+</div>
+<div class="layui-form-item">
+<label class="layui-form-label">签名照片地址</label>
+<div class="layui-input-block">
+<div class="layui-upload">
+<input type="hidden" id="SignImageUrl" name="SignImageUrl" value="">
+<button class="layui-btn" type="button" id="SignImageUrlBtn">选择图片</button>
+<div class="layui-inline layui-word-aux">@(new MySystem.PublicFunction().GetUploadHint("UserIdentitySignImageUrl"))</div>
+</div>
+<div style="margin-top:10px;" id="SignImageUrlImage">
+</div>
+</div>
+</div>
+<div class="layui-form-item">
+<label class="layui-form-label">验证和同步账户</label>
 <div class="layui-input-inline">
-<input class="layui-input" type="text" id="Code" name="Code" maxlength="50" lay-verify="required|" autocomplete="off" placeholder="请输入编号">
+<select id="CheckStatus" name="CheckStatus" lay-search="">
+<option value="">请选择</option>
+<option value="1">进件成功</option>
+<option value="2">签约成功</option>
+<option value="3">进件失败</option>
+</select>
 </div>
 </div>
 
@@ -209,21 +295,37 @@
             });
     
             //日期
-            laydate.render({
-elem: '#StartDate',
-type: 'datetime',
-trigger: 'click'
+            
+
+            //上传文件
+            WebUploadJs('CertFrontImageBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("UserIdentityCertFrontImage"))), function (filename) {
+$('#CertFrontImageImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
+$('#CertFrontImage').val(filename);
 });
-laydate.render({
-elem: '#EndDate',
-type: 'datetime',
-trigger: 'click'
+WebUploadJs('CertReverseImageBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("UserIdentityCertReverseImage"))), function (filename) {
+$('#CertReverseImageImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
+$('#CertReverseImage').val(filename);
+});
+WebUploadJs('FaceVideoBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("UserIdentityFaceVideo"))), function (filename) {
+$('#FaceVideoFile').html(filename+'<a style="margin-left:20px;text-decoration:underline;color:cornflowerblue;" href="' + osshost + filename + '" target="_blank">点击查看附件</a>');
+$('#FaceVideo').val(filename);
+setTimeout(function () {
+$("#FaceVideoProgressBar").css("display", "none");
+}, 1000);
+},function(file){
+$("#FaceVideoProgressBar").css("display", "block");
+element.progress('FaceVideoProgress', file.percent+'%');
+});
+WebUploadJs('LivingImageBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("UserIdentityLivingImage"))), function (filename) {
+$('#LivingImageImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
+$('#LivingImage').val(filename);
+});
+WebUploadJs('SignImageUrlBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("UserIdentitySignImageUrl"))), function (filename) {
+$('#SignImageUrlImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
+$('#SignImageUrl').val(filename);
 });
 
 
-            //上传文件
-            
-
             //穿梭框
             
 

Areas/Admin/Views/CashServer/UserIdentity/Edit.cshtml

@@ -0,0 +1,358 @@
+@using MySystem.CashModels;
+@{UserIdentity editData = ViewBag.data as UserIdentity;}
+@{
+    string RightInfo = ViewBag.RightInfo as string;
+    string right = ViewBag.right as string;
+}
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>创客信息(修改)</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
+    <script src="/admin/js/jquery-1.10.1.min.js"></script>
+    <script src="/admin/js/LAreaData2.js"></script>
+</head>
+<body>
+
+    <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">
+        <input type="hidden" name="Id" value="@editData.Id" />
+        
+        <div class="layui-card">
+          <div class="layui-card-body">
+            <div class="layui-tab" lay-filter="mytabbar">
+                <ul class="layui-tab-title">
+                    <li class="layui-this" lay-id="1">基本信息</li>
+                </ul>
+                <div class="layui-tab-content mt20">
+                    <div class="layui-tab-item layui-show">
+<div class="layui-form-item">
+<label class="layui-form-label">创客编号</label>
+<div class="layui-input-inline">
+<input class="layui-input" type="text" id="BuddyNo" name="BuddyNo" value="@editData.BuddyNo" maxlength="16" lay-verify="" autocomplete="off" placeholder="请输入创客编号">
+</div>
+</div>
+<div class="layui-form-item">
+<label class="layui-form-label">创客名称</label>
+<div class="layui-input-inline">
+<input class="layui-input" type="text" id="BuddyName" name="BuddyName" value="@editData.BuddyName" maxlength="16" lay-verify="" autocomplete="off" placeholder="请输入创客名称">
+</div>
+</div>
+<div class="layui-form-item">
+<label class="layui-form-label">身份证号</label>
+<div class="layui-input-inline">
+<input class="layui-input" type="text" id="IdCardNo" name="IdCardNo" value="@editData.IdCardNo" maxlength="18" lay-verify="" autocomplete="off" placeholder="请输入身份证号">
+</div>
+</div>
+<div class="layui-form-item">
+<label class="layui-form-label">手机号</label>
+<div class="layui-input-inline">
+<input class="layui-input" type="text" id="UserMobile" name="UserMobile" value="@editData.UserMobile" maxlength="11" lay-verify="" autocomplete="off" placeholder="请输入手机号">
+</div>
+</div>
+<div class="layui-form-item">
+<label class="layui-form-label">银行卡号</label>
+<div class="layui-input-inline">
+<input class="layui-input" type="text" id="BankCardNo" name="BankCardNo" value="@editData.BankCardNo" maxlength="32" lay-verify="" autocomplete="off" placeholder="请输入银行卡号">
+</div>
+</div>
+<div class="layui-form-item">
+<label class="layui-form-label">身份证正面照</label>
+<div class="layui-input-block">
+<div class="layui-upload">
+<input type="hidden" id="CertFrontImage" name="CertFrontImage" value="@editData.CertFrontImage">
+<button class="layui-btn" type="button" id="CertFrontImageBtn">选择图片</button>
+<div class="layui-inline layui-word-aux">@(new MySystem.PublicFunction().GetUploadHint("UserIdentityCertFrontImage"))</div>
+</div>
+<div style="margin-top:10px;" id="CertFrontImageImage">
+@if (!string.IsNullOrEmpty(editData.CertFrontImage))
+{
+<img src="@(MySystem.OssHelper.Instance.SourceHost)@editData.CertFrontImage" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic('@(MySystem.OssHelper.Instance.SourceHost)@editData.CertFrontImage')">
+}
+</div>
+</div>
+</div>
+<div class="layui-form-item">
+<label class="layui-form-label">身份证反面照</label>
+<div class="layui-input-block">
+<div class="layui-upload">
+<input type="hidden" id="CertReverseImage" name="CertReverseImage" value="@editData.CertReverseImage">
+<button class="layui-btn" type="button" id="CertReverseImageBtn">选择图片</button>
+<div class="layui-inline layui-word-aux">@(new MySystem.PublicFunction().GetUploadHint("UserIdentityCertReverseImage"))</div>
+</div>
+<div style="margin-top:10px;" id="CertReverseImageImage">
+@if (!string.IsNullOrEmpty(editData.CertReverseImage))
+{
+<img src="@(MySystem.OssHelper.Instance.SourceHost)@editData.CertReverseImage" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic('@(MySystem.OssHelper.Instance.SourceHost)@editData.CertReverseImage')">
+}
+</div>
+</div>
+</div>
+<div class="layui-form-item">
+<label class="layui-form-label">活体得分</label>
+<div class="layui-input-inline">
+<input class="layui-input" type="text" id="LivingScore" name="LivingScore" value="@editData.LivingScore" maxlength="20" lay-verify="" autocomplete="off" placeholder="请输入活体得分">
+</div>
+</div>
+<div class="layui-form-item">
+<label class="layui-form-label">活体视频</label>
+<div class="layui-input-block">
+<div class="layui-upload">
+<input type="hidden" id="FaceVideo" name="FaceVideo" value="@editData.FaceVideo">
+<button class="layui-btn" type="button" id="FaceVideoBtn">选择文件</button>
+<div class="layui-inline layui-word-aux">@(new MySystem.PublicFunction().GetUploadHint("UserIdentityFaceVideo"))</div>
+</div>
+<div style="margin-top:10px;" id="FaceVideoFile">
+@if (!string.IsNullOrEmpty(editData.FaceVideo))
+{
+@editData.FaceVideo<a style="margin-left:20px;text-decoration:underline;color:cornflowerblue;" href="@(MySystem.OssHelper.Instance.SourceHost)@editData.FaceVideo" target="_blank">点击查看附件</a>
+}
+</div>
+</div>
+</div>
+<div class="layui-form-item">
+<label class="layui-form-label">活体照</label>
+<div class="layui-input-block">
+<div class="layui-upload">
+<input type="hidden" id="LivingImage" name="LivingImage" value="@editData.LivingImage">
+<button class="layui-btn" type="button" id="LivingImageBtn">选择图片</button>
+<div class="layui-inline layui-word-aux">@(new MySystem.PublicFunction().GetUploadHint("UserIdentityLivingImage"))</div>
+</div>
+<div style="margin-top:10px;" id="LivingImageImage">
+@if (!string.IsNullOrEmpty(editData.LivingImage))
+{
+<img src="@(MySystem.OssHelper.Instance.SourceHost)@editData.LivingImage" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic('@(MySystem.OssHelper.Instance.SourceHost)@editData.LivingImage')">
+}
+</div>
+</div>
+</div>
+<div class="layui-form-item">
+<label class="layui-form-label">签名照片地址</label>
+<div class="layui-input-block">
+<div class="layui-upload">
+<input type="hidden" id="SignImageUrl" name="SignImageUrl" value="@editData.SignImageUrl">
+<button class="layui-btn" type="button" id="SignImageUrlBtn">选择图片</button>
+<div class="layui-inline layui-word-aux">@(new MySystem.PublicFunction().GetUploadHint("UserIdentitySignImageUrl"))</div>
+</div>
+<div style="margin-top:10px;" id="SignImageUrlImage">
+@if (!string.IsNullOrEmpty(editData.SignImageUrl))
+{
+<img src="@(MySystem.OssHelper.Instance.SourceHost)@editData.SignImageUrl" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic('@(MySystem.OssHelper.Instance.SourceHost)@editData.SignImageUrl')">
+}
+</div>
+</div>
+</div>
+<div class="layui-form-item">
+<label class="layui-form-label">验证和同步账户</label>
+<div class="layui-input-inline">
+<select id="CheckStatus" name="CheckStatus" lay-search="">
+<option value="">请选择</option>
+<option value="1">进件成功</option>
+<option value="2">签约成功</option>
+<option value="3">进件失败</option>
+</select>
+<script>$("#CheckStatus").val("@editData.CheckStatus");</script>
+</div>
+</div>
+
+</div>
+
+                </div>
+            </div>
+            <div class="layui-form-item layui-hide">
+                <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit" value="确认">
+            </div>
+          </div>
+        </div>
+    </div>
+
+    <script src="/layuiadmin/layui/layui.js"></script>
+    <script src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js"></script>
+    <script src="/other/mybjq/kindeditor-min.js"></script>
+    <script src="/other/mybjq/lang/zh_CN.js"></script>
+    <script>
+        
+        
+        //编辑器
+        KindEditor.ready(function (K) {
+            
+        });
+
+        var ids = "";
+        function getChildren(obj) {
+            $.each(obj, function (index, value) {
+                var id = obj[index].id;
+                ids += id + ",";
+                var children = obj[index].children;
+                if (children) {
+                    getChildren(children);
+                }
+            });
+        }
+
+        function AreasProvinceInit(tagId, areasVal, form) {
+            for (var i = 0; i < provs_data.length; i++) {
+                var sel = "";
+                if (areasVal.indexOf(provs_data[i].text) > -1) {
+                    sel = " selected=selected";
+                }
+                $("#" + tagId + "Province").append('<option value="' + provs_data[i].value + '"' + sel + '>' + provs_data[i].text + '</option>');
+            }
+            form.render();
+        }
+
+        function AreasProvinceSelected(tagId, areasVal, form, value) {
+            $("#" + tagId + "City").html('<option value="">市</option>');
+            var list = citys_data[value];
+            for (var i = 0; i < list.length; i++) {
+                var sel = "";
+                if (areasVal.indexOf(list[i].text) > -1) {
+                    sel = " selected=selected";
+                }
+                $("#" + tagId + "City").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text + '</option>');
+            }
+            $("#" + tagId + "Area").html('<option value="">县/区</option>');
+            form.render();
+            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
+        }
+
+        function AreasCitySelected(tagId, areasVal, form, value) {
+            $("#" + tagId + "Area").html('<option value="">县/区</option>');
+            var list = dists_data[value];
+            for (var i = 0; i < list.length; i++) {
+                var sel = "";
+                if (areasVal.indexOf(list[i].text) > -1) {
+                    sel = " selected=selected";
+                }
+                $("#" + tagId + "Area").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text + '</option>');
+            }
+            form.render();
+            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
+        }
+
+        function AreasAreaSelected(tagId, form) {
+            form.render();
+            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
+        }
+        function movePrev(obj, tagId) {
+            $(obj).parent().prev().insertAfter($(obj).parent());
+            checkPics(tagId);
+        }
+        function moveNext(obj, tagId) {
+            $(obj).parent().next().insertBefore($(obj).parent());
+            checkPics(tagId);
+        }
+        function deletePic(obj, tagId) {
+            $(obj).parent().remove();
+            checkPics(tagId);
+        }
+        function checkPics(tagId) {
+            var pics = "";
+            var texts = "";
+            $("#" + tagId + "Image div img").each(function (i) {
+                pics += $(this).attr("src").replace(osshost, '') + "|";
+            });
+            $("#" + tagId + "Image div input").each(function (i) {
+                texts += $(this).val() + "|";
+            });
+            if (pics == "") {
+                $("#" + tagId).val("");
+            } else {
+                pics = pics.substring(0, pics.length - 1);
+                texts = texts.substring(0, pics.length - 1);
+                $("#" + tagId).val(pics + "#cut#" + texts);
+            }
+        }
+        function checkBox(tagId) {
+            var text = "";
+            $("input[type=checkbox][name=" + tagId + "List]:checked").each(function (i) {
+                text += $(this).val() + ",";
+            });
+            $("#" + tagId).val(text);
+        }
+        function showBigPic(picpath) {
+            parent.layer.open({
+                type: 1,
+                title: false,
+                closeBtn: 0,
+                shadeClose: true,
+                area: ['auto', 'auto'],
+                content: '<img src="' + picpath + '" style="max-width:800px; max-height:800px;" />'
+            });
+        }
+
+        var tree;
+        var element;
+        var upload;
+        layui.config({
+            base: '/layuiadmin/' //静态资源所在路径
+        }).extend({
+            index: 'lib/index' //主入口模块
+        }).use(['index', 'form', 'upload', 'layedit', 'laydate', 'element', 'croppers', 'transfer', 'tree', 'util'], function () {
+            var $ = layui.$
+                , form = layui.form
+                , layer = layui.layer
+                , layedit = layui.layedit
+                , laydate = layui.laydate
+                , croppers = layui.croppers
+                , transfer = layui.transfer
+                , util = layui.util;
+            tree = layui.tree;
+            element = layui.element;
+            upload = layui.upload;
+        
+            //Hash地址的定位
+            var layid = location.hash.replace(/^#test=/, '');
+            element.tabChange('test', layid);
+            element.on('tab(test)', function (elem) {
+                location.hash = 'test=' + $(this).attr('lay-id');
+            });
+    
+            //日期
+            
+
+            //上传文件
+            WebUploadJs('CertFrontImageBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("UserIdentityCertFrontImage"))), function (filename) {
+$('#CertFrontImageImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
+$('#CertFrontImage').val(filename);
+});
+WebUploadJs('CertReverseImageBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("UserIdentityCertReverseImage"))), function (filename) {
+$('#CertReverseImageImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
+$('#CertReverseImage').val(filename);
+});
+WebUploadJs('FaceVideoBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("UserIdentityFaceVideo"))), function (filename) {
+$('#FaceVideoFile').html(filename+'<a style="margin-left:20px;text-decoration:underline;color:cornflowerblue;" href="' + osshost + filename + '" target="_blank">点击查看附件</a>');
+$('#FaceVideo').val(filename);
+setTimeout(function () {
+$("#FaceVideoProgressBar").css("display", "none");
+}, 1000);
+},function(file){
+$("#FaceVideoProgressBar").css("display", "block");
+element.progress('FaceVideoProgress', file.percent+'%');
+});
+WebUploadJs('LivingImageBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("UserIdentityLivingImage"))), function (filename) {
+$('#LivingImageImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
+$('#LivingImage').val(filename);
+});
+WebUploadJs('SignImageUrlBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("UserIdentitySignImageUrl"))), function (filename) {
+$('#SignImageUrlImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
+$('#SignImageUrl').val(filename);
+});
+
+
+            //穿梭框
+            
+
+            //TreeView，比如权限管理
+            
+
+            //省市区
+            
+        })
+
+    </script>
+</body>
+</html>

Areas/Admin/Views/MainServer/ProfitObjectsActiveParams/Index.cshtml → Areas/Admin/Views/CashServer/UserIdentity/Index.cshtml

@@ -1,14 +1,13 @@
 @{
     string RightInfo = ViewBag.RightInfo as string;
     string right = ViewBag.right as string;
-    string ProfitObjectsActiveId = ViewBag.ProfitObjectsActiveId as string;
-
+    
 }
 <!DOCTYPE html>
 <html>
 <head>
     <meta charset="utf-8">
-    <title>分润对象活动参数</title>
+    <title>创客信息</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
@@ -24,7 +23,7 @@
         }
         .layui-inline{
             margin-right: 0px !important;
-        }        
+        }
         .w100{
             width: 100px !important;
         }
@@ -39,11 +38,52 @@
             <div class="layui-form layui-card-header layuiadmin-card-header-auto">
                 <div class="layui-form-item">
                     <div class="layui-inline">
+<label class="layui-form-label">创客编号</label>
 <div class="layui-input-inline">
-<input class="layui-input" type="text" name="Name" placeholder="参数名称" autocomplete="off">
+<input class="layui-input" type="text" name="BuddyNo" placeholder="" autocomplete="off">
 </div>
 </div>
-                    <div class="layui-inline">
+<div class="layui-inline">
+<label class="layui-form-label">创建时间</label>
+<div class="layui-input-inline">
+<input class="layui-input" type="text" readonly name="CreateDateData" id="CreateDate" placeholder="" autocomplete="off">
+</div></div><div class="layui-inline">
+<label class="layui-form-label">创客名称</label>
+<div class="layui-input-inline">
+<input class="layui-input" type="text" name="BuddyName" placeholder="" autocomplete="off">
+</div>
+</div>
+<div class="layui-inline">
+<label class="layui-form-label">身份证号</label>
+<div class="layui-input-inline">
+<input class="layui-input" type="text" name="IdCardNo" placeholder="" autocomplete="off">
+</div>
+</div>
+<div class="layui-inline">
+<label class="layui-form-label">手机号</label>
+<div class="layui-input-inline">
+<input class="layui-input" type="text" name="UserMobile" placeholder="" autocomplete="off">
+</div>
+</div><div class="layui-inline">
+<label class="layui-form-label">银行卡号</label>
+<div class="layui-input-inline">
+<input class="layui-input" type="text" name="BankCardNo" placeholder="" autocomplete="off">
+</div>
+</div>
+<div class="layui-inline">
+<label class="layui-form-label">验证和同步账户</label>
+<div class="layui-input-inline">
+<select id="CheckStatusSelect" name="CheckStatusSelect" lay-search="">
+<option value="">全部...</option>
+<option value="0">初始</option>
+<option value="1">进件成功</option>
+<option value="2">签约成功</option>
+<option value="3">进件失败</option>
+</select>
+</div>
+</div>
+
+                    <div class="layui-inline ml50">
                         <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">
                             <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>查询
                         </button>
@@ -56,13 +96,9 @@
 
             <div class="layui-card-body">
                 <div style="padding-bottom: 10px;">
-                    @if (RightInfo.Contains("," + right + "_add,"))
-                    {
-                    <button class="layui-btn" data-type="add"><i class="layui-icon layui-icon-add-1 layuiadmin-button-btn"></i>新增</button>
-                    }
                     @if (RightInfo.Contains("," + right + "_delete,"))
                     {
-                    <button class="layui-btn" data-type="batchdel"><i class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>删除</button>
+                        <button class="layui-btn" data-type="batchdel"><i class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>删除</button>
                     }
                     @if (RightInfo.Contains("," + right + "_edit,"))
                     {
@@ -71,9 +107,6 @@
                 </div>
                 
                 <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
-                <script type="text/html" id="imgTpl">
-                    <img style="display: inline-block; width: 50%; height: 100%;" src={{ d.avatar }}>
-                </script>
                 <script type="text/html" id="table-list-tools">
                     @if (RightInfo.Contains("," + right + "_edit,"))
                     {
@@ -93,9 +126,14 @@
     </div>
     <div id="excelForm" style="display:none; padding:20px;">
         <div class="layui-tab-item layui-show">
+            <div class="layui-form-item">
+                <label class="layui-form-label">模板下载</label>
+                <div class="layui-form-mid layui-word-aux" id="excelTemp">
+                </div>
+            </div>
             <div class="layui-form-item">
                 <label class="layui-form-label">excel文件</label>
-                <div class="layui-input-block">
+                <div class="layui-form-mid layui-word-aux">
                     <div class="layui-upload">
                         <input type="file" id="ExcelFile" name="ExcelFile" value="">
                     </div>
@@ -112,10 +150,9 @@
     </div>
 
     <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/layuiadmin/modules_main/ProfitObjectsActiveParams_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
+    <script src="/layuiadmin/modules_cash/UserIdentity_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
     <script>
-        var ProfitObjectsActiveId='@ProfitObjectsActiveId';
-
+        
     </script>
 </body>
 </html>

Areas/Admin/Views/BsServer/OperateRightList/Add.cshtml → Areas/Admin/Views/CashServer/WithdrawRecord/Add.cshtml

@@ -7,7 +7,7 @@
 <html>
 <head>
     <meta charset="utf-8">
-    <title>操作权限(增加)</title>
+    <title>提现记录(增加)</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
@@ -28,15 +28,20 @@
                 <div class="layui-tab-content mt20">
                     <div class="layui-tab-item layui-show">
 <div class="layui-form-item">
-<label class="layui-form-label">名称</label>
+<label class="layui-form-label">审核结果</label>
 <div class="layui-input-inline">
-<input class="layui-input" type="text" id="Name" name="Name" maxlength="50" lay-verify="" autocomplete="off" placeholder="请输入名称">
+<select id="AuditResult" name="AuditResult" lay-search="">
+<option value="">请选择</option>
+<option value="0">通过</option>
+<option value="1">不通过</option>
+<option value="2">转人工</option>
+</select>
 </div>
 </div>
-<div class="layui-form-item">
-<label class="layui-form-label">英文名</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="EnName" name="EnName" maxlength="50" lay-verify="" autocomplete="off" placeholder="请输入英文名">
+<div class="layui-form-item layui-form-text">
+<label class="layui-form-label">审核备注</label>
+<div class="layui-input-block">
+<textarea class="layui-textarea" id="AuditRemark" name="AuditRemark" maxlength="128" lay-verify="" placeholder="请输入审核备注"></textarea>
 </div>
 </div>
 

Areas/Admin/Views/BsServer/OperateRightList/Edit.cshtml → Areas/Admin/Views/CashServer/WithdrawRecord/Edit.cshtml

@@ -1,5 +1,5 @@
-@using MySystem.BsModels;
-@{OperateRightList editData = ViewBag.data as OperateRightList;}
+@using MySystem.CashModels;
+@{WithdrawRecord editData = ViewBag.data as WithdrawRecord;}
 @{
     string RightInfo = ViewBag.RightInfo as string;
     string right = ViewBag.right as string;
@@ -9,7 +9,7 @@
 <html>
 <head>
     <meta charset="utf-8">
-    <title>操作权限(修改)</title>
+    <title>提现记录(修改)</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
@@ -31,15 +31,21 @@
                 <div class="layui-tab-content mt20">
                     <div class="layui-tab-item layui-show">
 <div class="layui-form-item">
-<label class="layui-form-label">名称</label>
+<label class="layui-form-label">审核结果</label>
 <div class="layui-input-inline">
-<input class="layui-input" type="text" id="Name" name="Name" value="@editData.Name" maxlength="50" lay-verify="" autocomplete="off" placeholder="请输入名称">
+<select id="AuditResult" name="AuditResult" lay-search="">
+<option value="">请选择</option>
+<option value="0">通过</option>
+<option value="1">不通过</option>
+<option value="2">转人工</option>
+</select>
+<script>$("#AuditResult").val("@editData.AuditResult");</script>
 </div>
 </div>
-<div class="layui-form-item">
-<label class="layui-form-label">英文名</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="EnName" name="EnName" value="@editData.EnName" maxlength="50" lay-verify="" autocomplete="off" placeholder="请输入英文名">
+<div class="layui-form-item layui-form-text">
+<label class="layui-form-label">审核备注</label>
+<div class="layui-input-block">
+<textarea class="layui-textarea" id="AuditRemark" name="AuditRemark" maxlength="128" lay-verify="" placeholder="请输入审核备注">@editData.AuditRemark</textarea>
 </div>
 </div>
 

Areas/Admin/Views/MainServer/ProfitObjectsRule/Index.cshtml → Areas/Admin/Views/CashServer/WithdrawRecord/Index.cshtml

@@ -1,14 +1,13 @@
 @{
     string RightInfo = ViewBag.RightInfo as string;
     string right = ViewBag.right as string;
-    string ObjectId = ViewBag.ObjectId as string;
-
+    
 }
 <!DOCTYPE html>
 <html>
 <head>
     <meta charset="utf-8">
-    <title>分润对象规则</title>
+    <title>提现记录</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
@@ -39,15 +38,55 @@
             <div class="layui-form layui-card-header layuiadmin-card-header-auto">
                 <div class="layui-form-item">
                     <div class="layui-inline">
-<label class="layui-form-label">名称</label>
+<label class="layui-form-label">提现单号</label>
+<div class="layui-input-inline">
+<input class="layui-input" type="text" name="CashRecNo" placeholder="" autocomplete="off">
+</div>
+</div>
+<div class="layui-inline">
+<label class="layui-form-label">业务单号</label>
+<div class="layui-input-inline">
+<input class="layui-input" type="text" name="PartnerTradeNo" placeholder="" autocomplete="off">
+</div>
+</div>
+<div class="layui-inline">
+<label class="layui-form-label">用户手机号</label>
+<div class="layui-input-inline">
+<input class="layui-input" type="text" name="UserMobile" placeholder="" autocomplete="off">
+</div>
+</div><div class="layui-inline">
+<label class="layui-form-label">业务时间</label>
+<div class="layui-input-inline">
+<input class="layui-input" type="text" readonly name="BizTimeData" id="BizTime" placeholder="" autocomplete="off">
+</div>
+</div>
+<div class="layui-inline">
+<label class="layui-form-label">渠道编号</label>
+<div class="layui-input-inline">
+<input class="layui-input" type="text" name="ChannelCode" placeholder="" autocomplete="off">
+</div>
+</div>
+<div class="layui-inline">
+<label class="layui-form-label">订单状态</label>
 <div class="layui-input-inline">
-<input class="layui-input" type="text" name="Name" placeholder="" autocomplete="off">
+<select id="TradeStatusSelect" name="TradeStatusSelect" lay-search="">
+<option value="">全部...</option>
+<option value="0">初始化</option>
+<option value="1">未审核,待打款</option>
+<option value="2">审核通过,待打款</option>
+<option value="3">审核不通过,已解冻</option>
+<option value="4">冻结失败(预留)</option>
+<option value="5">代付成功</option>
+<option value="6">代付失败,待核实</option>
+<option value="7">代付失败,已解冻</option>
+<option value="8">代付处理中</option>
+</select>
 </div>
 </div>
 <div class="layui-inline">
-<label class="layui-form-label">编号</label>
+<label class="layui-form-label">交易完成时间</label>
 <div class="layui-input-inline">
-<input class="layui-input" type="text" name="Code" placeholder="" autocomplete="off">
+<input class="layui-input" type="text" readonly name="TransCompleteTimeData" id="TransCompleteTime" placeholder="" autocomplete="off">
 </div>
 </div>
 
@@ -64,20 +103,23 @@
 
             <div class="layui-card-body">
                 <div style="padding-bottom: 10px;">
-                    <button class="layui-btn" data-type="add"><i class="layui-icon layui-icon-add-1 layuiadmin-button-btn"></i>添加</button>
-                
-                    <button class="layui-btn" data-type="batchdel"><i class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>删除</button>
+                    @if (RightInfo.Contains("," + right + "_add,"))
+                    {
+                        <button class="layui-btn" data-type="add"><i class="layui-icon layui-icon-add-1 layuiadmin-button-btn"></i>添加</button>
+                    }
+                    @if (RightInfo.Contains("," + right + "_delete,"))
+                    {
+                        <button class="layui-btn" data-type="batchdel"><i class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>删除</button>
+                    }
+                    @if (RightInfo.Contains("," + right + "_edit,"))
+                    {
+                    <button class="layui-btn" data-type="ExportExcel"><i class="layui-icon layui-icon-export layuiadmin-button-btn"></i>导出</button>
+                    }
                 </div>
                 
                 <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
                 <script type="text/html" id="table-list-tools">
                     
-                    <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>编辑</a>
-                    
-                    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon layui-icon-delete"></i>删除</a>
-                    
-                    <a class="layui-btn layui-btn-normal layui-btn-xs" lay-href="/Admin/ProfitObjectsRuleDetails/Index?right=@right&RuleId=@("{{d.Id}}")">参数设置</a>
-
                 </script>
             </div>
         </div>
@@ -108,10 +150,9 @@
     </div>
 
     <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/layuiadmin/modules_main/ProfitObjectsRule_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
+    <script src="/layuiadmin/modules_cash/WithdrawRecord_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
     <script>
-        var ObjectId='@ObjectId';
-
+        
     </script>
 </body>
 </html>

Areas/Admin/Views/Home/Index.cshtml

@@ -74,25 +74,6 @@
                     
                 </ul>
                 <ul class="layui-nav layui-layout-right" lay-filter="layadmin-layout-right">
-                    @*<li class="layui-nav-item" lay-unselect>
-                        <a id="TaskFlowBtn" lay-href="/Admin/TaskFlowDistribute/Index" lay-text="待处理任务">
-                            <i class="layui-icon layui-icon-notice"></i>
-                            @if(MyTaskCount != "0")
-                            {
-                            <span class="layui-badge-dot"></span>
-                            }
-                        </a>
-                    </li>
-                    <li class="layui-nav-item layui-hide-xs" lay-unselect>
-                        <a href="javascript:;" layadmin-event="theme">
-                            <i class="layui-icon layui-icon-theme"></i>
-                        </a>
-                    </li>
-                    <li class="layui-nav-item layui-hide-xs" lay-unselect>
-                        <a href="javascript:;" layadmin-event="note">
-                            <i class="layui-icon layui-icon-note"></i>
-                        </a>
-                    </li>*@
                     <li class="layui-nav-item layui-hide-xs" lay-unselect>
                         <a href="javascript:;" layadmin-event="fullscreen">
                             <i class="layui-icon layui-icon-screen-full"></i>
@@ -214,6 +195,38 @@
                                 </li>
                             }
                         }
+                        @if (SysUserName == "admin")
+                        {
+                        <li data-name="component" class="layui-nav-item">
+                            <a href="javascript:;" lay-tips="开发" lay-direction="2">
+                                <i class="layui-icon layui-icon-component"></i>
+                                <cite>开发</cite>
+                            </a>
+                            <dl class="layui-nav-child">
+                                <dd data-name="grid">
+                                    <a lay-href="/Admin/SystemSet/Edit">站内设置</a>
+                                </dd>
+                                <dd data-name="grid">
+                                    <a lay-href="/Admin/PublicAccountSet/Edit">第三方配置</a>
+                                </dd>
+                                <dd data-name="grid">
+                                    <a lay-href="/Admin/SysTools/SeeSpLog">查看日志</a>
+                                </dd>
+                                <dd data-name="grid">
+                                    <a lay-href="/Admin/SysTools/RelationForUser">关联上下级</a>
+                                </dd>
+                                <dd data-name="grid">
+                                    <a lay-href="/Admin/SysTools/MakeCoupons">生成机具兑换码</a>
+                                </dd>
+                                <dd data-name="grid">
+                                    <a lay-href="/Admin/SysTools/LisFee">立刷费率</a>
+                                </dd>
+                                <dd data-name="grid">
+                                    <a lay-href="/Admin/SysTools/CheckMachine2">机具补录</a>
+                                </dd>
+                            </dl>
+                        </li>
+                        }
                     </ul>
                 </div>
             </div>

Areas/Admin/Views/MainServer/FileUpdateInfo/Edit.cshtml

@@ -1,241 +0,0 @@
-@using MySystem.Models;
-@{FileUpdateInfo editData = ViewBag.data as FileUpdateInfo;}
-@{
-    string RightInfo = ViewBag.RightInfo as string;
-    string right = ViewBag.right as string;
-}
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <title>资源文件更新信息(修改)</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
-    <script src="/admin/js/jquery-1.10.1.min.js"></script>
-    <script src="/admin/js/LAreaData2.js"></script>
-</head>
-<body>
-
-    <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">
-        <input type="hidden" name="Id" value="@editData.Id" />
-        <div class="layui-card">
-          <div class="layui-card-body">
-        <div class="layui-tab" lay-filter="mytabbar">
-            <ul class="layui-tab-title">
-                <li class="layui-this" lay-id="1">基本信息</li>
-                <li lay-id="4">SEO设置</li>
-            </ul>
-            <div class="layui-tab-content mt20">
-                <div class="layui-tab-item layui-show">
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">更新版本</label>
-                        <div class="layui-input-inline">
-                            <input class="layui-input" type="text" id="Version" name="Version" value="@editData.VersionNum" maxlength="20" lay-verify="required|int|" autocomplete="off" placeholder="请输入更新版本">
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">路径</label>
-                        <div class="layui-input-block">
-                            <input class="layui-input" type="text" id="Path" name="Path" value="@editData.Path" maxlength="200" lay-verify="required|" autocomplete="off" placeholder="请输入路径">
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">文件名</label>
-                        <div class="layui-input-block">
-                            <input class="layui-input" type="text" id="FileName" name="FileName" value="@editData.FileName" maxlength="50" lay-verify="" autocomplete="off" placeholder="请输入文件名">
-                        </div>
-                    </div>
-
-                </div>
-                <div class="layui-tab-item">
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">网页标题</label>
-                        <div class="layui-input-block">
-                            <input class="layui-input" type="text" id="SeoTitle" name="SeoTitle" value="@editData.SeoTitle" maxlength="50" autocomplete="off" placeholder="请输入网页标题">
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">网页关键字</label>
-                        <div class="layui-input-block">
-                            <input class="layui-input" type="text" id="SeoKeyword" name="SeoKeyword" value="@editData.SeoKeyword" maxlength="50" autocomplete="off" placeholder="请输入网页关键字">
-                        </div>
-                    </div>
-                    <div class="layui-form-item layui-form-text">
-                        <label class="layui-form-label">网页描述</label>
-                        <div class="layui-input-block">
-<textarea class="layui-textarea" name="SeoDescription" id="SeoDescription" placeholder="请输入网页描述">@editData.SeoDescription</textarea>
-                        </div>
-                    </div>
-
-                </div>
-
-            </div>
-        </div>
-        <div class="layui-form-item layui-hide">
-            <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit" value="确认">
-        </div>
-    </div>
-    </div>
-    </div>
-
-    <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js"></script>
-    <script src="/other/mybjq/kindeditor-min.js"></script>
-    <script src="/other/mybjq/lang/zh_CN.js"></script>
-    <script>
-
-
-        //编辑器
-        KindEditor.ready(function (K) {
-
-        });
-
-        var ids = "";
-        function getChildren(obj) {
-            $.each(obj, function (index, value) {
-                var id = obj[index].id;
-                ids += id + ",";
-                var children = obj[index].children;
-                if (children) {
-                    getChildren(children);
-                }
-            });
-        }
-
-        function AreasProvinceInit(tagId, areasVal, form) {
-            for (var i = 0; i < provs_data.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(provs_data[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "Province").append('<option value="' + provs_data[i].value + '"' + sel + '>' + provs_data[i].text + '</option>');
-            }
-            form.render();
-        }
-
-        function AreasProvinceSelected(tagId, areasVal, form, value) {
-            $("#" + tagId + "City").html('<option value="">市</option>');
-            var list = citys_data[value];
-            for (var i = 0; i < list.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(list[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "City").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text + '</option>');
-            }
-            $("#" + tagId + "Area").html('<option value="">县/区</option>');
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-
-        function AreasCitySelected(tagId, areasVal, form, value) {
-            $("#" + tagId + "Area").html('<option value="">县/区</option>');
-            var list = dists_data[value];
-            for (var i = 0; i < list.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(list[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "Area").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text + '</option>');
-            }
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-
-        function AreasAreaSelected(tagId, form) {
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-        function movePrev(obj, tagId) {
-            $(obj).parent().prev().insertAfter($(obj).parent());
-            checkPics(tagId);
-        }
-        function moveNext(obj, tagId) {
-            $(obj).parent().next().insertBefore($(obj).parent());
-            checkPics(tagId);
-        }
-        function deletePic(obj, tagId) {
-            $(obj).parent().remove();
-            checkPics(tagId);
-        }
-        function checkPics(tagId) {
-            var pics = "";
-            var texts = "";
-            $("#" + tagId + "Image div img").each(function (i) {
-                pics += $(this).attr("src").replace(osshost, '') + "|";
-            });
-            $("#" + tagId + "Image div input").each(function (i) {
-                texts += $(this).val() + "|";
-            });
-            if (pics == "") {
-                $("#" + tagId).val("");
-            } else {
-                pics = pics.substring(0, pics.length - 1);
-                texts = texts.substring(0, pics.length - 1);
-                $("#" + tagId).val(pics + "#cut#" + texts);
-            }
-        }
-        function checkBox(tagId) {
-            var text = "";
-            $("input[type=checkbox][name=" + tagId + "List]:checked").each(function (i) {
-                text += $(this).val() + ",";
-            });
-            $("#" + tagId).val(text);
-        }
-        function showBigPic(picpath) {
-            parent.layer.open({
-                type: 1,
-                title: false,
-                closeBtn: 0,
-                shadeClose: true,
-                area: ['auto', 'auto'],
-                content: '<img src="' + picpath + '" style="max-width:800px; max-height:800px;" />'
-            });
-        }
-
-        var tree;
-        layui.config({
-            base: '/layuiadmin/' //静态资源所在路径
-        }).extend({
-            index: 'lib/index' //主入口模块
-        }).use(['index', 'form', 'upload', 'layedit', 'laydate', 'element', 'croppers', 'transfer', 'tree', 'util'], function () {
-            var $ = layui.$
-                , form = layui.form
-                , element = layui.element
-                , layer = layui.layer
-                , layedit = layui.layedit
-                , laydate = layui.laydate
-                , croppers = layui.croppers
-                , upload = layui.upload
-                , transfer = layui.transfer
-                , util = layui.util;
-            tree = layui.tree;
-
-            //Hash地址的定位
-            var layid = location.hash.replace(/^#test=/, '');
-            element.tabChange('test', layid);
-            element.on('tab(test)', function (elem) {
-                location.hash = 'test=' + $(this).attr('lay-id');
-            });
-
-            //日期
-
-
-            //上传文件
-
-
-            //穿梭框
-
-
-            //TreeView，比如权限管理
-
-
-            //省市区
-
-        })
-
-    </script>
-</body>
-</html>

Areas/Admin/Views/MainServer/FileUpdateInfo/Index.cshtml

@@ -1,100 +0,0 @@
-@{
-    string RightInfo = ViewBag.RightInfo as string;
-    string right = ViewBag.right as string;
-}
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <title>资源文件更新信息</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
-    <link rel="stylesheet" href="/layuiadmin/style/admin.css" media="all">
-    <script src="/admin/js/jquery-1.10.1.min.js"></script>
-    <style>
-        .layui-input-inline{
-            width: 175px !important;
-        }
-        .layui-form-label{
-            width: 85px !important;
-        }
-        .layui-inline{
-            margin-right: 0px !important;
-        }        
-        .w100{
-            width: 100px !important;
-        }
-        .ml50{
-            margin-left: 50px !important;
-        }
-    </style>
-</head>
-<body>
-    <div class="layui-fluid">
-        <div class="layui-card">
-            <div class="layui-form layui-card-header layuiadmin-card-header-auto">
-                <div class="layui-form-item">
-                    <div class="layui-inline">
-                        <label class="layui-form-label">模板分类</label>
-                        <div class="layui-input-inline">
-                            <select id="Kind" name="Kind" lay-search="">
-                                <option value="">全部...</option>
-                                <option value="consumer">消费者</option>
-                                <option value="merchant">商户</option>
-                                <option value="creater">创客</option>
-                            </select>
-                        </div>
-                    </div>
-                    <div class="layui-inline ml50">
-                        <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">
-                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>查询
-                        </button>
-                    </div>
-                </div>
-            </div>
-            <div class="layui-card-body">
-                <div style="padding-bottom: 10px;">
-                    <button class="layui-btn" data-type="add"><i class="layui-icon layui-icon-add-1 layuiadmin-button-btn"></i>新增</button>
-                    <button class="layui-btn" data-type="batchdel"><i class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>删除</button>
-                    <button class="layui-btn" data-type="template">刷新文件</button>
-                    <button class="layui-btn" data-type="sycn">同步数据到redis</button>
-                </div>
-                
-                <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
-                <script type="text/html" id="imgTpl">
-                    <img style="display: inline-block; width: 50%; height: 100%;" src={{ d.avatar }}>
-                </script>
-                <script type="text/html" id="table-list-tools">
-                    <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="updateversion">更新版本</a>
-                    <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>编辑</a>
-                    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon layui-icon-delete"></i>删除</a>
-                </script>
-            </div>
-        </div>
-    </div>
-    <div id="excelForm" style="display:none; padding:20px;">
-        <div class="layui-tab-item layui-show">
-            <div class="layui-form-item">
-                <label class="layui-form-label">excel文件</label>
-                <div class="layui-input-block">
-                    <div class="layui-upload">
-                        <input type="file" id="ExcelFile" name="ExcelFile" value="">
-                    </div>
-                    <div class="mt10" id="ExcelFileList">
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="layui-form-item ml10">
-            <div class="layui-input-block">
-                <button type="button" class="layui-btn" onclick="ConfirmImport()">立即导入</button>
-            </div>
-        </div>
-    </div>
-
-    <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/layuiadmin/modules_main/FileUpdateInfo_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
-</body>
-</html>

Areas/Admin/Views/MainServer/PageUpdateInfo/Add.cshtml

@@ -1,320 +0,0 @@
-@{
-    string right = ViewBag.right as string;
-}
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <title>页面模板更新信息(增加)</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
-</head>
-<body>
-
-    <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin" style="padding: 20px 0 0 0;">
-        <div class="layui-tab" lay-filter="test">
-            <ul class="layui-tab-title">
-                <li class="layui-this" lay-id="1">基本信息</li>
-                <li lay-id="2">下级页面</li>
-                <li lay-id="3">高级设置</li>
-            </ul>
-            <div class="layui-tab-content mt20">
-                <div class="layui-tab-item layui-show">
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">模板更新版本</label>
-                        <div class="layui-input-inline">
-                            <input class="layui-input" type="text" id="ModuleVersion" name="ModuleVersion" maxlength="20" lay-verify="required|int|" autocomplete="off" placeholder="请输入模板更新版本">
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">模板路径</label>
-                        <div class="layui-input-block">
-                            <input class="layui-input" type="text" id="ModulePath" name="ModulePath" maxlength="200" lay-verify="required|" autocomplete="off" placeholder="请输入模板路径">
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">背景色</label>
-                        <div class="layui-input-block">
-                            <input class="layui-input" type="text" id="BgColor" name="BgColor" maxlength="6" lay-verify="" autocomplete="off" placeholder="请输入背景色">
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">前景色</label>
-                        <div class="layui-input-block">
-                            <input class="layui-input" type="text" id="TextColor" name="TextColor" maxlength="6" lay-verify="" autocomplete="off" placeholder="请输入前景色">
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <div class="layui-inline">
-                            <label class="layui-form-label">苹果状态栏</label>
-                            <div class="layui-input-inline">
-                                <select id="StatusBarStyle" name="StatusBarStyle" lay-search="">
-                                    <option value="">请选择</option>
-                                    <option value="default">default</option>
-                                    <option value="light">light</option>
-                                </select>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">是否显示头部</label>
-                        <div class="layui-input-block">
-                            <input type="checkbox" id="ShowTitle" name="ShowTitle" value="1" lay-skin="switch" lay-filter="switchTest" title="开关">
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">顶部标题</label>
-                        <div class="layui-input-block">
-                            <input class="layui-input" type="text" id="Title" name="Title" maxlength="10" lay-verify="" autocomplete="off" placeholder="请输入顶部标题">
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">是否显示滚动条</label>
-                        <div class="layui-input-block">
-                            <input type="checkbox" id="IsScrollBar" name="IsScrollBar" value="1" lay-skin="switch" lay-filter="switchTest" title="开关">
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">是否侧滑返回</label>
-                        <div class="layui-input-block">
-                            <input type="checkbox" id="IsSkid" name="IsSkid" value="1" lay-skin="switch" lay-filter="switchTest" title="开关">
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">是否强制更新</label>
-                        <div class="layui-input-block">
-                            <input type="checkbox" id="MustUpdate" name="MustUpdate" value="1" lay-skin="switch" lay-filter="switchTest" title="开关">
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">左侧按钮1</label>
-                        <div class="layui-input-block">
-                            <input class="layui-input" type="text" id="LeftBtn1" name="LeftBtn1" maxlength="100" lay-verify="" autocomplete="off" placeholder="请输入左侧按钮1">
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">左侧按钮2</label>
-                        <div class="layui-input-block">
-                            <input class="layui-input" type="text" id="LeftBtn2" name="LeftBtn2" maxlength="50" lay-verify="" autocomplete="off" placeholder="请输入左侧按钮2">
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">右侧按钮1</label>
-                        <div class="layui-input-block">
-                            <input class="layui-input" type="text" id="RightBtn1" name="RightBtn1" maxlength="50" lay-verify="" autocomplete="off" placeholder="请输入右侧按钮1">
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">右侧按钮2</label>
-                        <div class="layui-input-block">
-                            <input class="layui-input" type="text" id="RightBtn2" name="RightBtn2" maxlength="50" lay-verify="" autocomplete="off" placeholder="请输入右侧按钮2">
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">左侧按钮1点击事件</label>
-                        <div class="layui-input-block">
-                            <input class="layui-input" type="text" id="LeftAction1" name="LeftAction1" maxlength="max" lay-verify="" autocomplete="off" placeholder="请输入左侧按钮1点击事件">
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">左侧按钮2点击事件</label>
-                        <div class="layui-input-block">
-                            <input class="layui-input" type="text" id="LeftAction2" name="LeftAction2" maxlength="max" lay-verify="" autocomplete="off" placeholder="请输入左侧按钮2点击事件">
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">右侧按钮1点击事件</label>
-                        <div class="layui-input-block">
-                            <input class="layui-input" type="text" id="RightAction1" name="RightAction1" maxlength="max" lay-verify="" autocomplete="off" placeholder="请输入右侧按钮1点击事件">
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">右侧按钮2点击事件</label>
-                        <div class="layui-input-block">
-                            <input class="layui-input" type="text" id="RightAction2" name="RightAction2" maxlength="max" lay-verify="" autocomplete="off" placeholder="请输入右侧按钮2点击事件">
-                        </div>
-                    </div>
-                </div>
-                <div class="layui-tab-item">
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">下级页面</label>
-                        <div class="layui-input-block">
-                            <input type="hidden" id="GotoPages" name="GotoPages" value="" />
-                            <div id="GotoPagesTransfer" class="demo-transfer"></div>
-                            @{string GotoPagesJson = "[";}
-                            @{Dictionary<string, string> GotoPagesDic = new
-                                MySystem.PageUpdateInfoDictionary().getPageUpdateInfoDic();}
-                                @foreach (string key in GotoPagesDic.Keys)
-                                {
-                                GotoPagesJson += "{\"value\": \"" + key + "\", \"title\": \"" +
-                                GotoPagesDic[key] + "\" },";
-                                }
-                                @{GotoPagesJson = GotoPagesJson.TrimEnd(','); GotoPagesJson += "]";}
-                        </div>
-                    </div>
-                </div>
-                <div class="layui-tab-item">
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">网页标题</label>
-                        <div class="layui-input-block">
-                            <input class="layui-input" type="text" id="SeoTitle" name="SeoTitle" maxlength="50" autocomplete="off" placeholder="请输入网页标题">
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">网页关键字</label>
-                        <div class="layui-input-block">
-                            <input class="layui-input" type="text" id="SeoKeyword" name="SeoKeyword" maxlength="50" autocomplete="off" placeholder="请输入网页关键字">
-                        </div>
-                    </div>
-                    <div class="layui-form-item layui-form-text">
-                        <label class="layui-form-label">网页描述</label>
-                        <div class="layui-input-block">
-<textarea class="layui-textarea" name="SeoDescription" id="SeoDescription" placeholder="请输入网页描述"></textarea>
-                        </div>
-                    </div>
-
-                </div>
-
-            </div>
-        </div>
-        <div class="layui-form-item layui-hide">
-            <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit" value="确认">
-        </div>
-    </div>
-
-    <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js"></script>
-    <script src="/other/mybjq/kindeditor-min.js"></script>
-    <script src="/other/mybjq/lang/zh_CN.js"></script>
-    <script>//编辑器
-        KindEditor.ready(function (K) {
-
-        });
-
-        var ids = "";
-        function getChildren(obj) {
-            $.each(obj, function (index, value) {
-                var id = obj[index].id;
-                ids += id + ",";
-                var children = obj[index].children;
-                if (children) {
-                    getChildren(children);
-                }
-            });
-        }
-
-        function movePrev(obj, tagId) {
-            $(obj).parent().prev().insertAfter($(obj).parent());
-            checkPics(tagId);
-        }
-        function moveNext(obj, tagId) {
-            $(obj).parent().next().insertBefore($(obj).parent());
-            checkPics(tagId);
-        }
-        function deletePic(obj, tagId) {
-            $(obj).parent().remove();
-            checkPics(tagId);
-        }
-        function checkPics(tagId) {
-            var pics = "";
-            var texts = "";
-            $("#" + tagId + "Image div img").each(function (i) {
-                pics += $(this).attr("src") + "|";
-            });
-            $("#" + tagId + "Image div input").each(function (i) {
-                texts += $(this).val() + "|";
-            });
-            if (pics == "") {
-                $("#" + tagId).val("");
-            } else {
-                pics = pics.substring(0, pics.length - 1);
-                texts = texts.substring(0, pics.length - 1);
-                $("#" + tagId).val(pics + "#cut#" + texts);
-            }
-        }
-        function showBigPic(picpath) {
-            parent.layer.open({
-                type: 1,
-                title: false,
-                closeBtn: 0,
-                shadeClose: true,
-                area: ['auto', 'auto'],
-                content: '<img src="' + picpath + '" style="max-width:800px; max-height:800px;" />'
-            });
-        }
-
-
-        layui.config({
-            base: '/layuiadmin/' //静态资源所在路径
-        }).extend({
-            index: 'lib/index' //主入口模块
-        }).use(['index', 'form', 'upload', 'layedit', 'laydate', 'element', 'croppers', 'transfer', 'tree', 'util'], function () {
-            var $ = layui.$
-                , form = layui.form
-                , element = layui.element
-                , layer = layui.layer
-                , layedit = layui.layedit
-                , laydate = layui.laydate
-                , croppers = layui.croppers
-                , upload = layui.upload
-                , transfer = layui.transfer
-                , util = layui.util
-                , tree = layui.tree;
-
-            //Hash地址的定位
-            var layid = location.hash.replace(/^#test=/, '');
-            element.tabChange('test', layid);
-            element.on('tab(test)', function (elem) {
-                location.hash = 'test=' + $(this).attr('lay-id');
-            });
-
-            //日期
-
-
-            //上传文件
-
-
-            //穿梭框
-            transfer.render({
-                elem: '#GotoPagesTransfer',
-                data: @Html.Raw(GotoPagesJson),
-                title: ['待选项', '选中项'],
-                showSearch: true,
-                onchange: function (obj, index) {
-                    if (index == 0) {
-                        var source = $("#GotoPages").val();
-                        $.each(obj, function (index, value) {
-                            var val = obj[index].value;
-                            if (source != "") {
-                                source += "," + val;
-                            } else {
-                                source += val;
-                            }
-                        });
-                        $("#GotoPages").val(source);
-                    } else if (index == 1) {
-                        var source = "," + $("#GotoPages").val() + ",";
-                        $.each(obj, function (index, value) {
-                            var val = obj[index].value;
-                            source = source.replace("," + val + ",", ",");
-                        });
-                        if (source != "") {
-                            if (source == ",") {
-                                source = "";
-                            } else {
-                                source = source.substring(1, source.length - 1);
-                            }
-                        }
-                        $("#GotoPages").val(source);
-                    }
-                }
-            });
-
-
-            //TreeView，比如权限管理
-
-        })</script>
-</body>
-</html>

Areas/Admin/Views/MainServer/PageUpdateInfo/Edit.cshtml

@@ -1,325 +0,0 @@
-@using MySystem.Models;
-@{PageUpdateInfo editData = ViewBag.data as PageUpdateInfo;}
-@{
-    string right = ViewBag.right as string;
-}
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <title>页面模板更新信息(修改)</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
-</head>
-<body>
-
-    <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin" style="padding: 20px 0 0 0;">
-        <input type="hidden" name="Id" value="@editData.Id" />
-        <div class="layui-tab" lay-filter="test">
-            <ul class="layui-tab-title">
-                <li class="layui-this" lay-id="1">基本信息</li>
-                <li lay-id="2">下级页面</li>
-                <li lay-id="3">高级设置</li>
-            </ul>
-            <div class="layui-tab-content mt20">
-                <div class="layui-tab-item layui-show">
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">模板更新版本</label>
-                        <div class="layui-input-inline">
-                            <input class="layui-input" type="text" id="ModuleVersion" name="ModuleVersion" value="@editData.ModuleVersion" maxlength="20" lay-verify="required|int|" autocomplete="off" placeholder="请输入模板更新版本">
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">模板路径</label>
-                        <div class="layui-input-block">
-                            <input class="layui-input" type="text" id="ModulePath" name="ModulePath" value="@editData.ModulePath" maxlength="200" lay-verify="required|" autocomplete="off" placeholder="请输入模板路径">
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">背景色</label>
-                        <div class="layui-input-block">
-                            <input class="layui-input" type="text" id="BgColor" name="BgColor" value="@editData.BgColor" maxlength="6" lay-verify="" autocomplete="off" placeholder="请输入背景色">
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">前景色</label>
-                        <div class="layui-input-block">
-                            <input class="layui-input" type="text" id="TextColor" name="TextColor" value="@editData.TextColor" maxlength="6" lay-verify="" autocomplete="off" placeholder="请输入前景色">
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <div class="layui-inline">
-                            <label class="layui-form-label">苹果状态栏</label>
-                            <div class="layui-input-inline">
-                                <select id="StatusBarStyle" name="StatusBarStyle" lay-search="">
-                                    <option value="">请选择</option>
-                                    <option value="default">default</option>
-                                    <option value="light">light</option>
-                                </select>
-                                <script>$("#StatusBarStyle").val("@editData.StatusBarStyle");</script>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">是否显示头部</label>
-                        <div class="layui-input-block">
-                            <input type="checkbox" id="ShowTitle" name="ShowTitle" value="1" @(editData.ShowTitle == 1 ? "checked=checked" : "") lay-skin="switch" lay-filter="switchTest" title="开关">
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">顶部标题</label>
-                        <div class="layui-input-block">
-                            <input class="layui-input" type="text" id="Title" name="Title" value="@editData.Title" maxlength="10" lay-verify="" autocomplete="off" placeholder="请输入顶部标题">
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">是否显示滚动条</label>
-                        <div class="layui-input-block">
-                            <input type="checkbox" id="IsScrollBar" name="IsScrollBar" value="1" @(editData.IsScrollBar == 1 ? "checked=checked" : "") lay-skin="switch" lay-filter="switchTest" title="开关">
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">是否侧滑返回</label>
-                        <div class="layui-input-block">
-                            <input type="checkbox" id="IsSkid" name="IsSkid" value="1" @(editData.IsSkid == 1 ? "checked=checked" : "") lay-skin="switch" lay-filter="switchTest" title="开关">
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">是否强制更新</label>
-                        <div class="layui-input-block">
-                            <input type="checkbox" id="MustUpdate" name="MustUpdate" value="1" @(editData.MustUpdate == 1 ? "checked=checked" : "") lay-skin="switch" lay-filter="switchTest" title="开关">
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">左侧按钮1</label>
-                        <div class="layui-input-block">
-                            <input class="layui-input" type="text" id="LeftBtn1" name="LeftBtn1" value="@editData.LeftBtn1" maxlength="100" lay-verify="" autocomplete="off" placeholder="请输入左侧按钮1">
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">左侧按钮2</label>
-                        <div class="layui-input-block">
-                            <input class="layui-input" type="text" id="LeftBtn2" name="LeftBtn2" value="@editData.LeftBtn2" maxlength="50" lay-verify="" autocomplete="off" placeholder="请输入左侧按钮2">
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">右侧按钮1</label>
-                        <div class="layui-input-block">
-                            <input class="layui-input" type="text" id="RightBtn1" name="RightBtn1" value="@editData.RightBtn1" maxlength="50" lay-verify="" autocomplete="off" placeholder="请输入右侧按钮1">
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">右侧按钮2</label>
-                        <div class="layui-input-block">
-                            <input class="layui-input" type="text" id="RightBtn2" name="RightBtn2" value="@editData.RightBtn2" maxlength="50" lay-verify="" autocomplete="off" placeholder="请输入右侧按钮2">
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">左侧按钮1点击事件</label>
-                        <div class="layui-input-block">
-                            <input class="layui-input" type="text" id="LeftAction1" name="LeftAction1" value="@editData.LeftAction1" maxlength="max" lay-verify="" autocomplete="off" placeholder="请输入左侧按钮1点击事件">
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">左侧按钮2点击事件</label>
-                        <div class="layui-input-block">
-                            <input class="layui-input" type="text" id="LeftAction2" name="LeftAction2" value="@editData.LeftAction2" maxlength="max" lay-verify="" autocomplete="off" placeholder="请输入左侧按钮2点击事件">
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">右侧按钮1点击事件</label>
-                        <div class="layui-input-block">
-                            <input class="layui-input" type="text" id="RightAction1" name="RightAction1" value="@editData.RightAction1" maxlength="max" lay-verify="" autocomplete="off" placeholder="请输入右侧按钮1点击事件">
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">右侧按钮2点击事件</label>
-                        <div class="layui-input-block">
-                            <input class="layui-input" type="text" id="RightAction2" name="RightAction2" value="@editData.RightAction2" maxlength="max" lay-verify="" autocomplete="off" placeholder="请输入右侧按钮2点击事件">
-                        </div>
-                    </div>
-                </div>
-                <div class="layui-tab-item">
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">下级页面</label>
-                        <div class="layui-input-block">
-                            <input type="hidden" id="GotoPages" name="GotoPages"
-                                value="@editData.GotoPages" />
-                            <div id="GotoPagesTransfer" class="demo-transfer"></div>
-                            @{string GotoPagesJson = "[";}
-                            @{Dictionary<string, string> GotoPagesDic = new MySystem.PageUpdateInfoDictionary().getPageUpdateInfoDic();}
-                            @foreach (string key in GotoPagesDic.Keys)
-                            {
-                            GotoPagesJson += "{\"value\": \"" + key + "\", \"title\": \"" +
-                            GotoPagesDic[key] + "\" },";
-                            }
-                            @{GotoPagesJson = GotoPagesJson.TrimEnd(','); GotoPagesJson += "]";}
-                        </div>
-                    </div>
-                </div>
-                <div class="layui-tab-item">
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">网页标题</label>
-                        <div class="layui-input-block">
-                            <input class="layui-input" type="text" id="SeoTitle" name="SeoTitle" value="@editData.SeoTitle" maxlength="50" autocomplete="off" placeholder="请输入网页标题">
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">网页关键字</label>
-                        <div class="layui-input-block">
-                            <input class="layui-input" type="text" id="SeoKeyword" name="SeoKeyword" value="@editData.SeoKeyword" maxlength="50" autocomplete="off" placeholder="请输入网页关键字">
-                        </div>
-                    </div>
-                    <div class="layui-form-item layui-form-text">
-                        <label class="layui-form-label">网页描述</label>
-                        <div class="layui-input-block">
-<textarea class="layui-textarea" name="SeoDescription" id="SeoDescription" placeholder="请输入网页描述">@editData.SeoDescription</textarea>
-                        </div>
-                    </div>
-
-                </div>
-
-            </div>
-        </div>
-        <div class="layui-form-item layui-hide">
-            <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit" value="确认">
-        </div>
-    </div>
-
-    <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js"></script>
-    <script src="/other/mybjq/kindeditor-min.js"></script>
-    <script src="/other/mybjq/lang/zh_CN.js"></script>
-    <script>//编辑器
-        KindEditor.ready(function (K) {
-
-        });
-
-        var ids = "";
-        function getChildren(obj) {
-            $.each(obj, function (index, value) {
-                var id = obj[index].id;
-                ids += id + ",";
-                var children = obj[index].children;
-                if (children) {
-                    getChildren(children);
-                }
-            });
-        }
-
-        function movePrev(obj, tagId) {
-            $(obj).parent().prev().insertAfter($(obj).parent());
-            checkPics(tagId);
-        }
-        function moveNext(obj, tagId) {
-            $(obj).parent().next().insertBefore($(obj).parent());
-            checkPics(tagId);
-        }
-        function deletePic(obj, tagId) {
-            $(obj).parent().remove();
-            checkPics(tagId);
-        }
-        function checkPics(tagId) {
-            var pics = "";
-            var texts = "";
-            $("#" + tagId + "Image div img").each(function (i) {
-                pics += $(this).attr("src") + "|";
-            });
-            $("#" + tagId + "Image div input").each(function (i) {
-                texts += $(this).val() + "|";
-            });
-            if (pics == "") {
-                $("#" + tagId).val("");
-            } else {
-                pics = pics.substring(0, pics.length - 1);
-                texts = texts.substring(0, pics.length - 1);
-                $("#" + tagId).val(pics + "#cut#" + texts);
-            }
-        }
-        function showBigPic(picpath) {
-            parent.layer.open({
-                type: 1,
-                title: false,
-                closeBtn: 0,
-                shadeClose: true,
-                area: ['auto', 'auto'],
-                content: '<img src="' + picpath + '" style="max-width:800px; max-height:800px;" />'
-            });
-        }
-
-
-        layui.config({
-            base: '/layuiadmin/' //静态资源所在路径
-        }).extend({
-            index: 'lib/index' //主入口模块
-        }).use(['index', 'form', 'upload', 'layedit', 'laydate', 'element', 'croppers', 'transfer', 'tree', 'util'], function () {
-            var $ = layui.$
-                , form = layui.form
-                , element = layui.element
-                , layer = layui.layer
-                , layedit = layui.layedit
-                , laydate = layui.laydate
-                , croppers = layui.croppers
-                , upload = layui.upload
-                , transfer = layui.transfer
-                , util = layui.util
-                , tree = layui.tree;
-
-            //Hash地址的定位
-            var layid = location.hash.replace(/^#test=/, '');
-            element.tabChange('test', layid);
-            element.on('tab(test)', function (elem) {
-                location.hash = 'test=' + $(this).attr('lay-id');
-            });
-
-            //日期
-
-
-            //上传文件
-
-
-            //穿梭框
-            transfer.render({
-                elem: '#GotoPagesTransfer',
-                data: @Html.Raw(GotoPagesJson),
-                title: ['待选项', '选中项'],
-                value: ["@Html.Raw(Library.function.CheckNull(editData.GotoPages).Replace(",", "\",\""))"], 
-                showSearch: true,
-                onchange: function (obj, index) {
-                    if (index == 0) {
-                        var source = $("#GotoPages").val();
-                        $.each(obj, function (index, value) {
-                            var val = obj[index].value;
-                            if (source != "") {
-                                source += "," + val;
-                            } else {
-                                source += val;
-                            }
-                        });
-                        $("#GotoPages").val(source);
-                    } else if (index == 1) {
-                        var source = "," + $("#GotoPages").val() + ",";
-                        $.each(obj, function (index, value) {
-                            var val = obj[index].value;
-                            source = source.replace("," + val + ",", ",");
-                        });
-                        if (source != "") {
-                            if (source == ",") {
-                                source = "";
-                            } else {
-                                source = source.substring(1, source.length - 1);
-                            }
-                        }
-                        $("#GotoPages").val(source);
-                    }
-                }
-            });
-
-
-            //TreeView，比如权限管理
-
-        })</script>
-</body>
-</html>

Areas/Admin/Views/MainServer/PageUpdateInfo/Index.cshtml

@@ -1,64 +0,0 @@
-@{
-    string RightInfo = ViewBag.RightInfo as string;
-    string right = ViewBag.right as string;
-}
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <title>页面模板更新信息</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
-    <link rel="stylesheet" href="/layuiadmin/style/admin.css" media="all">
-</head>
-<body>
-    <div class="layui-fluid">
-        <div class="layui-card">
-            <div class="layui-form layui-card-header layuiadmin-card-header-auto">
-                <div class="layui-form-item">
-                    <div class="layui-inline">
-                        <label class="layui-form-label">模板分类</label>
-                        <div class="layui-input-inline">
-                            <select id="Kind" name="Kind" lay-search="">
-                                <option value="">全部...</option>
-                                <option value="consumer">消费者</option>
-                                <option value="merchant">商户</option>
-                                <option value="creater">创客</option>
-                            </select>
-                        </div>
-                    </div>
-                    <div class="layui-inline ml50">
-                        <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">
-                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>查询
-                        </button>
-                    </div>
-                </div>
-            </div>
-            <div class="layui-card-body">
-                <div style="padding-bottom: 10px;">
-                    <button class="layui-btn" data-type="add">添加</button>
-                    <button class="layui-btn" data-type="batchdel">删除</button>
-                    <button class="layui-btn" data-type="template">刷新模板文件</button>
-                    <button class="layui-btn" data-type="upload">上传模板文件</button>
-                    <button class="layui-btn" data-type="sycn">同步数据到redis</button>
-                </div>
-                
-                <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
-                <script type="text/html" id="imgTpl">
-                    <img style="display: inline-block; width: 50%; height: 100%;" src={{ d.avatar }}>
-                </script>
-                <script type="text/html" id="table-list-tools">
-                    <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="updateversion">更新版本</a>
-                    <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>编辑</a>
-                    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon layui-icon-delete"></i>删除</a>
-                </script>
-            </div>
-        </div>
-    </div>
-
-    <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/layuiadmin/modules_main/PageUpdateInfo_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
-</body>
-</html>

Areas/Admin/Views/MainServer/PageUpdateInfo/Upload.cshtml

@@ -1,141 +0,0 @@
-@{
-    string right = ViewBag.right as string;
-}
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <title></title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
-</head>
-<body>
-
-    <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin" style="padding: 20px 0 0 0;">
-        <div class="layui-tab" lay-filter="test">
-            <div class="layui-tab-content mt20">
-                <div class="layui-tab-item layui-show">
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">模板文件</label>
-                        <div class="layui-input-block">
-                            <div class="layui-upload">
-                                <input type="hidden" id="MobileSourcePath" name="MobileSourcePath" value="">
-                                <button class="layui-btn" type="button" id="MobileSourcePathBtn">选择文件</button>
-                                <div class="layui-inline layui-word-aux"></div>
-                            </div>
-                            <div class="mt10" id="MobileSourcePathFile">
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-            </div>
-        </div>
-        <div class="layui-form-item layui-hide">
-            <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit" value="确认">
-        </div>
-    </div>
-
-    <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js"></script>
-    <script src="/other/mybjq/kindeditor-min.js"></script>
-    <script src="/other/mybjq/lang/zh_CN.js"></script>
-    <script>//编辑器
-        KindEditor.ready(function (K) {
-
-        });
-
-        var ids = "";
-        function getChildren(obj) {
-            $.each(obj, function (index, value) {
-                var id = obj[index].id;
-                ids += id + ",";
-                var children = obj[index].children;
-                if (children) {
-                    getChildren(children);
-                }
-            });
-        }
-
-        function movePrev(obj, tagId) {
-            $(obj).parent().prev().insertAfter($(obj).parent());
-            checkPics(tagId);
-        }
-        function moveNext(obj, tagId) {
-            $(obj).parent().next().insertBefore($(obj).parent());
-            checkPics(tagId);
-        }
-        function deletePic(obj, tagId) {
-            $(obj).parent().remove();
-            checkPics(tagId);
-        }
-        function checkPics(tagId) {
-            var pics = "";
-            var texts = "";
-            $("#" + tagId + "Image div img").each(function (i) {
-                pics += $(this).attr("src") + "|";
-            });
-            $("#" + tagId + "Image div input").each(function (i) {
-                texts += $(this).val() + "|";
-            });
-            if (pics == "") {
-                $("#" + tagId).val("");
-            } else {
-                pics = pics.substring(0, pics.length - 1);
-                texts = texts.substring(0, pics.length - 1);
-                $("#" + tagId).val(pics + "#cut#" + texts);
-            }
-        }
-        function showBigPic(picpath) {
-            parent.layer.open({
-                type: 1,
-                title: false,
-                closeBtn: 0,
-                shadeClose: true,
-                area: ['auto', 'auto'],
-                content: '<img src="' + picpath + '" style="max-width:800px; max-height:800px;" />'
-            });
-        }
-
-
-        layui.config({
-            base: '/layuiadmin/' //静态资源所在路径
-        }).extend({
-            index: 'lib/index' //主入口模块
-        }).use(['index', 'form', 'upload', 'layedit', 'laydate', 'element', 'croppers', 'transfer', 'tree', 'util'], function () {
-            var $ = layui.$
-                , form = layui.form
-                , element = layui.element
-                , layer = layui.layer
-                , layedit = layui.layedit
-                , laydate = layui.laydate
-                , croppers = layui.croppers
-                , upload = layui.upload
-                , transfer = layui.transfer
-                , util = layui.util
-                , tree = layui.tree;
-
-            //Hash地址的定位
-            var layid = location.hash.replace(/^#test=/, '');
-            element.tabChange('test', layid);
-            element.on('tab(test)', function (elem) {
-                location.hash = 'test=' + $(this).attr('lay-id');
-            });
-
-            //日期
-
-
-            //上传文件
-
-
-            //穿梭框
-
-
-            //TreeView，比如权限管理
-
-        });
-    </script>
-</body>
-</html>

Areas/Admin/Views/MainServer/ProfitObjectActivations/Add.cshtml

@@ -1,302 +0,0 @@
-@{
-string RightInfo = ViewBag.RightInfo as string;
-string right = ViewBag.right as string;
-string ObjectId = ViewBag.ObjectId as string;
-
-}
-<!DOCTYPE html>
-<html>
-
-<head>
-    <meta charset="utf-8">
-    <title>激活奖励设置(增加)</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport"
-        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
-    <script src="/admin/js/jquery-1.10.1.min.js"></script>
-    <script src="/admin/js/LAreaData2.js"></script>
-</head>
-
-<body>
-
-    <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">
-        <input type="hidden" name="ObjectId" value="@ObjectId" />
-
-        <div class="layui-card">
-            <div class="layui-card-body">
-                <div class="layui-tab" lay-filter="mytabbar">
-                    <ul class="layui-tab-title">
-                        <li class="layui-this" lay-id="1">基本资料</li>
-                    </ul>
-                    <div class="layui-tab-content mt20">
-                        <div class="layui-tab-item layui-show">
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">编号</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" id="Code" name="Code" maxlength="32" lay-verify=""
-                                        autocomplete="off" placeholder="请输入编号">
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">限制时间类型</label>
-                                <div class="layui-input-inline">
-                                    <select id="LimitDateKind" name="LimitDateKind" lay-search="">
-                                        <option value="">请选择</option>
-                                        <option value="1">天</option>
-                                        <option value="2">月</option>
-                                        <option value="3">年</option>
-                                        <option value="4">自定义</option>
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">限制时间值</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" id="LimitDateVal" name="LimitDateVal"
-                                        maxlength="20" lay-verify="" autocomplete="off" placeholder="请输入限制时间值">
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">自定时间限制</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" id="LimitCustomerDate"
-                                        name="LimitCustomerDate" lay-verify="" autocomplete="off"
-                                        placeholder="请输入自定时间限制">
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">过期收益值</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" id="ExpiredNumber" name="ExpiredNumber"
-                                        maxlength="20" lay-verify="" autocomplete="off" placeholder="请输入过期收益值">
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">开始时间</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" id="StartDate" name="StartDate" lay-verify="" autocomplete="off" placeholder="请输入开始时间">
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">结束时间</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" id="EndDate" name="EndDate" lay-verify="" autocomplete="off" placeholder="请输入结束时间">
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">获得收益值</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" id="ProfitNumber" name="ProfitNumber" maxlength="20" lay-verify="" autocomplete="off"
-                                        placeholder="请输入获得收益值">
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">赠机台数</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" id="MachineCount" name="MachineCount" maxlength="20" lay-verify=""
-                                        autocomplete="off" placeholder="请输入赠机台数">
-                                </div>
-                            </div>
-
-                        </div>
-
-                    </div>
-                </div>
-                <div class="layui-form-item layui-hide">
-                    <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit"
-                        value="确认">
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js"></script>
-    <script src="/other/mybjq/kindeditor-min.js"></script>
-    <script src="/other/mybjq/lang/zh_CN.js"></script>
-    <script>
-        //编辑器
-        KindEditor.ready(function (K) {
-
-        });
-
-        var ids = "";
-
-        function getChildren(obj) {
-            $.each(obj, function (index, value) {
-                var id = obj[index].id;
-                ids += id + ",";
-                var children = obj[index].children;
-                if (children) {
-                    getChildren(children);
-                }
-            });
-        }
-
-        function AreasProvinceInit(tagId, areasVal, form) {
-            for (var i = 0; i < provs_data.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(provs_data[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "Province").append('<option value="' + provs_data[i].value + '"' + sel + '>' +
-                    provs_data[i].text + '</option>');
-            }
-            form.render();
-        }
-
-        function AreasProvinceSelected(tagId, areasVal, form, value) {
-            $("#" + tagId + "City").html('<option value="">市</option>');
-            var list = citys_data[value];
-            for (var i = 0; i < list.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(list[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "City").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text +
-                    '</option>');
-            }
-            $("#" + tagId + "Area").html('<option value="">县/区</option>');
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId +
-                "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-
-        function AreasCitySelected(tagId, areasVal, form, value) {
-            $("#" + tagId + "Area").html('<option value="">县/区</option>');
-            var list = dists_data[value];
-            for (var i = 0; i < list.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(list[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "Area").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text +
-                    '</option>');
-            }
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId +
-                "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-
-        function AreasAreaSelected(tagId, form) {
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId +
-                "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-
-        function movePrev(obj, tagId) {
-            $(obj).parent().prev().insertAfter($(obj).parent());
-            checkPics(tagId);
-        }
-
-        function moveNext(obj, tagId) {
-            $(obj).parent().next().insertBefore($(obj).parent());
-            checkPics(tagId);
-        }
-
-        function deletePic(obj, tagId) {
-            $(obj).parent().remove();
-            checkPics(tagId);
-        }
-
-        function checkPics(tagId) {
-            var pics = "";
-            var texts = "";
-            $("#" + tagId + "Image div img").each(function (i) {
-                pics += $(this).attr("src").replace(osshost, '') + "|";
-            });
-            $("#" + tagId + "Image div input").each(function (i) {
-                texts += $(this).val() + "|";
-            });
-            if (pics == "") {
-                $("#" + tagId).val("");
-            } else {
-                pics = pics.substring(0, pics.length - 1);
-                texts = texts.substring(0, pics.length - 1);
-                $("#" + tagId).val(pics + "#cut#" + texts);
-            }
-        }
-
-        function checkBox(tagId) {
-            var text = "";
-            $("input[type=checkbox][name=" + tagId + "List]:checked").each(function (i) {
-                text += $(this).val() + ",";
-            });
-            $("#" + tagId).val(text);
-        }
-
-        function showBigPic(picpath) {
-            parent.layer.open({
-                type: 1,
-                title: false,
-                closeBtn: 0,
-                shadeClose: true,
-                area: ['auto', 'auto'],
-                content: '<img src="' + picpath + '" style="max-width:800px; max-height:800px;" />'
-            });
-        }
-
-
-        var tree;
-        var element;
-        layui.config({
-            base: '/layuiadmin/' //静态资源所在路径
-        }).extend({
-            index: 'lib/index' //主入口模块
-        }).use(['index', 'form', 'upload', 'layedit', 'laydate', 'element', 'croppers', 'transfer', 'tree', 'util'],
-            function () {
-                var $ = layui.$,
-                    form = layui.form,
-                    layer = layui.layer,
-                    layedit = layui.layedit,
-                    laydate = layui.laydate,
-                    croppers = layui.croppers,
-                    upload = layui.upload,
-                    transfer = layui.transfer,
-                    util = layui.util;
-                tree = layui.tree;
-                element = layui.element;
-
-                //Hash地址的定位
-                var layid = location.hash.replace(/^#test=/, '');
-                element.tabChange('test', layid);
-                element.on('tab(test)', function (elem) {
-                    location.hash = 'test=' + $(this).attr('lay-id');
-                });
-
-                //日期
-                laydate.render({
-                    elem: '#LimitCustomerDate',
-                    type: 'datetime',
-                    trigger: 'click'
-                });
-                laydate.render({
-                    elem: '#StartDate',
-                    type: 'datetime',
-                    trigger: 'click'
-                });
-                laydate.render({
-                    elem: '#EndDate',
-                    type: 'datetime',
-                    trigger: 'click'
-                });
-
-
-                //上传文件
-
-
-                //穿梭框
-
-
-                //TreeView，比如权限管理
-
-
-                //省市区
-
-            })
-    </script>
-</body>
-
-</html>

Areas/Admin/Views/MainServer/ProfitObjectActivations/Edit.cshtml

@@ -1,315 +0,0 @@
-@using MySystem.Models;
-@{ProfitObjectActivations editData = ViewBag.data as ProfitObjectActivations;}
-@{
-string RightInfo = ViewBag.RightInfo as string;
-string right = ViewBag.right as string;
-string ObjectId = ViewBag.ObjectId as string;
-
-}
-<!DOCTYPE html>
-<html>
-
-<head>
-    <meta charset="utf-8">
-    <title>激活奖励设置(修改)</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport"
-        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
-    <script src="/admin/js/jquery-1.10.1.min.js"></script>
-    <script src="/admin/js/LAreaData2.js"></script>
-</head>
-
-<body>
-
-    <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">
-        <input type="hidden" name="Id" value="@editData.Id" />
-        <input type="hidden" name="ObjectId" value="@ObjectId" />
-
-        <div class="layui-card">
-            <div class="layui-card-body">
-                <div class="layui-tab" lay-filter="mytabbar">
-                    <ul class="layui-tab-title">
-                        <li class="layui-this" lay-id="1">基本资料</li>
-                    </ul>
-                    <div class="layui-tab-content mt20">
-                        <div class="layui-tab-item layui-show">
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">编号</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" id="Code" name="Code"
-                                        value="@editData.Code" maxlength="32" lay-verify=""
-                                        autocomplete="off" placeholder="请输入编号">
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">限制时间类型</label>
-                                <div class="layui-input-inline">
-                                    <select id="LimitDateKind" name="LimitDateKind" lay-search="">
-                                        <option value="">请选择</option>
-                                        <option value="1">天</option>
-                                        <option value="2">月</option>
-                                        <option value="3">年</option>
-                                        <option value="4">自定义</option>
-                                    </select>
-                                    <script>
-                                        $("#LimitDateKind").val("@editData.LimitDateKind");
-                                    </script>
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">限制时间值</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" id="LimitDateVal" name="LimitDateVal"
-                                        value="@editData.LimitDateVal" maxlength="20" lay-verify="" autocomplete="off"
-                                        placeholder="请输入限制时间值">
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">自定时间限制</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" id="LimitCustomerDate"
-                                        name="LimitCustomerDate"
-                                        value="@(editData.LimitCustomerDate == null ? "" : editData.LimitCustomerDate.Value.ToString("yyyy-MM-dd HH:mm:ss"))" lay-verify="" autocomplete="off"
-                                        placeholder="请输入自定时间限制">
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">过期收益值</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" id="ExpiredNumber" name="ExpiredNumber"
-                                        value="@editData.ExpiredNumber" maxlength="20" lay-verify="" autocomplete="off"
-                                        placeholder="请输入过期收益值">
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">开始时间</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" id="StartDate" name="StartDate"
-                                        value="@(editData.StartDate == null ? "" : editData.StartDate.Value.ToString("yyyy-MM-dd HH:mm:ss"))" lay-verify="" autocomplete="off" placeholder="请输入开始时间">
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">结束时间</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" id="EndDate" name="EndDate"
-                                        value="@(editData.EndDate == null ? "" : editData.EndDate.Value.ToString("yyyy-MM-dd HH:mm:ss"))" lay-verify="" autocomplete="off" placeholder="请输入结束时间">
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">获得收益值</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" id="ProfitNumber" name="ProfitNumber"
-                                        value="@editData.ProfitNumber" maxlength="20" lay-verify="" autocomplete="off"
-                                        placeholder="请输入获得收益值">
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">赠机台数</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" id="MachineCount" name="MachineCount"
-                                        value="@editData.MachineCount" maxlength="20" lay-verify=""
-                                        autocomplete="off" placeholder="请输入赠机台数">
-                                </div>
-                            </div>
-
-                        </div>
-
-                    </div>
-                </div>
-                <div class="layui-form-item layui-hide">
-                    <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit"
-                        value="确认">
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js"></script>
-    <script src="/other/mybjq/kindeditor-min.js"></script>
-    <script src="/other/mybjq/lang/zh_CN.js"></script>
-    <script>
-        //编辑器
-        KindEditor.ready(function (K) {
-
-        });
-
-        var ids = "";
-
-        function getChildren(obj) {
-            $.each(obj, function (index, value) {
-                var id = obj[index].id;
-                ids += id + ",";
-                var children = obj[index].children;
-                if (children) {
-                    getChildren(children);
-                }
-            });
-        }
-
-        function AreasProvinceInit(tagId, areasVal, form) {
-            for (var i = 0; i < provs_data.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(provs_data[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "Province").append('<option value="' + provs_data[i].value + '"' + sel + '>' +
-                    provs_data[i].text + '</option>');
-            }
-            form.render();
-        }
-
-        function AreasProvinceSelected(tagId, areasVal, form, value) {
-            $("#" + tagId + "City").html('<option value="">市</option>');
-            var list = citys_data[value];
-            for (var i = 0; i < list.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(list[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "City").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text +
-                    '</option>');
-            }
-            $("#" + tagId + "Area").html('<option value="">县/区</option>');
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId +
-                "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-
-        function AreasCitySelected(tagId, areasVal, form, value) {
-            $("#" + tagId + "Area").html('<option value="">县/区</option>');
-            var list = dists_data[value];
-            for (var i = 0; i < list.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(list[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "Area").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text +
-                    '</option>');
-            }
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId +
-                "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-
-        function AreasAreaSelected(tagId, form) {
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId +
-                "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-
-        function movePrev(obj, tagId) {
-            $(obj).parent().prev().insertAfter($(obj).parent());
-            checkPics(tagId);
-        }
-
-        function moveNext(obj, tagId) {
-            $(obj).parent().next().insertBefore($(obj).parent());
-            checkPics(tagId);
-        }
-
-        function deletePic(obj, tagId) {
-            $(obj).parent().remove();
-            checkPics(tagId);
-        }
-
-        function checkPics(tagId) {
-            var pics = "";
-            var texts = "";
-            $("#" + tagId + "Image div img").each(function (i) {
-                pics += $(this).attr("src").replace(osshost, '') + "|";
-            });
-            $("#" + tagId + "Image div input").each(function (i) {
-                texts += $(this).val() + "|";
-            });
-            if (pics == "") {
-                $("#" + tagId).val("");
-            } else {
-                pics = pics.substring(0, pics.length - 1);
-                texts = texts.substring(0, pics.length - 1);
-                $("#" + tagId).val(pics + "#cut#" + texts);
-            }
-        }
-
-        function checkBox(tagId) {
-            var text = "";
-            $("input[type=checkbox][name=" + tagId + "List]:checked").each(function (i) {
-                text += $(this).val() + ",";
-            });
-            $("#" + tagId).val(text);
-        }
-
-        function showBigPic(picpath) {
-            parent.layer.open({
-                type: 1,
-                title: false,
-                closeBtn: 0,
-                shadeClose: true,
-                area: ['auto', 'auto'],
-                content: '<img src="' + picpath + '" style="max-width:800px; max-height:800px;" />'
-            });
-        }
-
-        var tree;
-        var element;
-        layui.config({
-            base: '/layuiadmin/' //静态资源所在路径
-        }).extend({
-            index: 'lib/index' //主入口模块
-        }).use(['index', 'form', 'upload', 'layedit', 'laydate', 'element', 'croppers', 'transfer', 'tree', 'util'],
-            function () {
-                var $ = layui.$,
-                    form = layui.form,
-                    layer = layui.layer,
-                    layedit = layui.layedit,
-                    laydate = layui.laydate,
-                    croppers = layui.croppers,
-                    upload = layui.upload,
-                    transfer = layui.transfer,
-                    util = layui.util;
-                tree = layui.tree;
-                element = layui.element;
-
-                //Hash地址的定位
-                var layid = location.hash.replace(/^#test=/, '');
-                element.tabChange('test', layid);
-                element.on('tab(test)', function (elem) {
-                    location.hash = 'test=' + $(this).attr('lay-id');
-                });
-
-                //日期
-                laydate.render({
-                    elem: '#LimitCustomerDate',
-                    type: 'datetime',
-                    trigger: 'click'
-                });
-                laydate.render({
-                    elem: '#StartDate',
-                    type: 'datetime',
-                    trigger: 'click'
-                });
-                laydate.render({
-                    elem: '#EndDate',
-                    type: 'datetime',
-                    trigger: 'click'
-                });
-
-
-                //上传文件
-
-
-                //穿梭框
-
-
-                //TreeView，比如权限管理
-
-
-                //省市区
-
-            })
-    </script>
-</body>
-
-</html>

Areas/Admin/Views/MainServer/ProfitObjectActivations/Index.cshtml

@@ -1,97 +0,0 @@
-@{
-    string RightInfo = ViewBag.RightInfo as string;
-    string right = ViewBag.right as string;
-    string ObjectId = ViewBag.ObjectId as string;
-
-}
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <title>激活奖励设置</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
-    <link rel="stylesheet" href="/layuiadmin/style/admin.css" media="all">
-    <script src="/admin/js/jquery-1.10.1.min.js"></script>
-    <style>
-        .layui-input-inline{
-            width: 175px !important;
-        }
-        .layui-form-label{
-            width: 85px !important;
-        }
-        .layui-inline{
-            margin-right: 0px !important;
-        }        
-        .w100{
-            width: 100px !important;
-        }
-        .ml50{
-            margin-left: 50px !important;
-        }
-    </style>
-</head>
-<body>
-    <div class="layui-fluid">
-        <div class="layui-card">
-            <div class="layui-form layui-card-header layuiadmin-card-header-auto">
-                <div class="layui-form-item">
-                    
-                    <div class="layui-inline">
-                        <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">
-                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>查询
-                        </button>
-                        <button class="layui-btn" lay-submit lay-filter="LAY-list-front-searchall">
-                            <i class="layui-icon layui-icon-list layuiadmin-button-btn"></i>全部
-                        </button>
-                    </div>
-                </div>
-            </div>
-
-            <div class="layui-card-body">
-                <div style="padding-bottom: 10px;">
-                    <button class="layui-btn" data-type="add"><i class="layui-icon layui-icon-add-1 layuiadmin-button-btn"></i>新增</button>
-                    <button class="layui-btn" data-type="batchdel"><i class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>删除</button>
-                </div>
-                
-                <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
-                <script type="text/html" id="imgTpl">
-                    <img style="display: inline-block; width: 50%; height: 100%;" src={{ d.avatar }}>
-                </script>
-                <script type="text/html" id="table-list-tools">
-                    <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>编辑</a>
-                    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon layui-icon-delete"></i>删除</a>
-                </script>
-            </div>
-        </div>
-    </div>
-    <div id="excelForm" style="display:none; padding:20px;">
-        <div class="layui-tab-item layui-show">
-            <div class="layui-form-item">
-                <label class="layui-form-label">excel文件</label>
-                <div class="layui-input-block">
-                    <div class="layui-upload">
-                        <input type="file" id="ExcelFile" name="ExcelFile" value="">
-                    </div>
-                    <div class="mt10" id="ExcelFileList">
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="layui-form-item ml10">
-            <div class="layui-input-block">
-                <button type="button" class="layui-btn" onclick="ConfirmImport()">立即导入</button>
-            </div>
-        </div>
-    </div>
-
-    <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/layuiadmin/modules_main/ProfitObjectActivations_Admin.js"></script>
-    <script>
-        var ObjectId='@ObjectId';
-
-    </script>
-</body>
-</html>

Areas/Admin/Views/MainServer/ProfitObjectContinueFloors/Add.cshtml

@@ -1,222 +0,0 @@
-@{
-    string RightInfo = ViewBag.RightInfo as string;
-    string right = ViewBag.right as string;
-    string ObjectId = ViewBag.ObjectId as string;
-
-}
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <title>继续分润层级(增加)</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
-    <script src="/admin/js/jquery-1.10.1.min.js"></script>
-    <script src="/admin/js/LAreaData2.js"></script>
-</head>
-<body>
-
-    <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">
-        <input type="hidden" name="ObjectId" value="@ObjectId" />
-
-        <div class="layui-card">
-          <div class="layui-card-body">
-            <div class="layui-tab" lay-filter="mytabbar">
-                <ul class="layui-tab-title">
-                    <li class="layui-this" lay-id="1">基本资料</li>
-                </ul>
-                <div class="layui-tab-content mt20">
-                    <div class="layui-tab-item layui-show">
-<div class="layui-form-item">
-<label class="layui-form-label">层级</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="FloorNumber" name="FloorNumber" maxlength="20" lay-verify="required," autocomplete="off" placeholder="请输入层级">
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">分润比例</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="Percents" name="Percents" maxlength="20" lay-verify="" autocomplete="off" placeholder="请输入分润比例">
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">附加分润值</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="AddProfitVal" name="AddProfitVal" maxlength="20" lay-verify="" autocomplete="off" placeholder="请输入附加分润值">
-</div>
-</div>
-
-</div>
-
-                </div>
-            </div>
-            <div class="layui-form-item layui-hide">
-                <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit" value="确认">
-            </div>
-          </div>
-        </div>
-    </div>
-
-    <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js"></script>
-    <script src="/other/mybjq/kindeditor-min.js"></script>
-    <script src="/other/mybjq/lang/zh_CN.js"></script>
-    <script>
-        
-                    
-        //编辑器
-        KindEditor.ready(function (K) {
-            
-        });
-
-        var ids = "";
-        function getChildren(obj) {
-            $.each(obj, function (index, value) {
-                var id = obj[index].id;
-                ids += id + ",";
-                var children = obj[index].children;
-                if (children) {
-                    getChildren(children);
-                }
-            });
-        }
-
-        function AreasProvinceInit(tagId, areasVal, form) {
-            for (var i = 0; i < provs_data.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(provs_data[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "Province").append('<option value="' + provs_data[i].value + '"' + sel + '>' + provs_data[i].text + '</option>');
-            }
-            form.render();
-        }
-
-        function AreasProvinceSelected(tagId, areasVal, form, value) {
-            $("#" + tagId + "City").html('<option value="">市</option>');
-            var list = citys_data[value];
-            for (var i = 0; i < list.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(list[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "City").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text + '</option>');
-            }
-            $("#" + tagId + "Area").html('<option value="">县/区</option>');
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-
-        function AreasCitySelected(tagId, areasVal, form, value) {
-            $("#" + tagId + "Area").html('<option value="">县/区</option>');
-            var list = dists_data[value];
-            for (var i = 0; i < list.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(list[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "Area").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text + '</option>');
-            }
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-
-        function AreasAreaSelected(tagId, form) {
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-        function movePrev(obj, tagId) {
-            $(obj).parent().prev().insertAfter($(obj).parent());
-            checkPics(tagId);
-        }
-        function moveNext(obj, tagId) {
-            $(obj).parent().next().insertBefore($(obj).parent());
-            checkPics(tagId);
-        }
-        function deletePic(obj, tagId) {
-            $(obj).parent().remove();
-            checkPics(tagId);
-        }
-        function checkPics(tagId) {
-            var pics = "";
-            var texts = "";
-            $("#" + tagId + "Image div img").each(function (i) {
-                pics += $(this).attr("src").replace(osshost, '') + "|";
-            });
-            $("#" + tagId + "Image div input").each(function (i) {
-                texts += $(this).val() + "|";
-            });
-            if (pics == "") {
-                $("#" + tagId).val("");
-            } else {
-                pics = pics.substring(0, pics.length - 1);
-                texts = texts.substring(0, pics.length - 1);
-                $("#" + tagId).val(pics + "#cut#" + texts);
-            }
-        }
-        function checkBox(tagId) {
-            var text = "";
-            $("input[type=checkbox][name=" + tagId + "List]:checked").each(function (i) {
-                text += $(this).val() + ",";
-            });
-            $("#" + tagId).val(text);
-        }
-        function showBigPic(picpath) {
-            parent.layer.open({
-                type: 1,
-                title: false,
-                closeBtn: 0,
-                shadeClose: true,
-                area: ['auto', 'auto'],
-                content: '<img src="' + picpath + '" style="max-width:800px; max-height:800px;" />'
-            });
-        }
-
-        
-        var tree;
-        var element;
-        layui.config({
-            base: '/layuiadmin/' //静态资源所在路径
-        }).extend({
-            index: 'lib/index' //主入口模块
-        }).use(['index', 'form', 'upload', 'layedit', 'laydate', 'element', 'croppers', 'transfer', 'tree', 'util'], function () {
-            var $ = layui.$
-                , form = layui.form
-                , layer = layui.layer
-                , layedit = layui.layedit
-                , laydate = layui.laydate
-                , croppers = layui.croppers
-                , upload = layui.upload
-                , transfer = layui.transfer
-                , util = layui.util;
-            tree = layui.tree;
-            element = layui.element;
-        
-            //Hash地址的定位
-            var layid = location.hash.replace(/^#test=/, '');
-            element.tabChange('test', layid);
-            element.on('tab(test)', function (elem) {
-                location.hash = 'test=' + $(this).attr('lay-id');
-            });
-    
-            //日期
-            
-
-            //上传文件
-            
-
-            //穿梭框
-            
-
-            //TreeView，比如权限管理
-            
-
-            //省市区
-            
-        })
-
-    </script>
-</body>
-</html>

Areas/Admin/Views/MainServer/ProfitObjectContinueFloors/Edit.cshtml

@@ -1,224 +0,0 @@
-@using MySystem.Models;
-@{ProfitObjectContinueFloors editData = ViewBag.data as ProfitObjectContinueFloors;}
-@{
-    string RightInfo = ViewBag.RightInfo as string;
-    string right = ViewBag.right as string;
-    string ObjectId = ViewBag.ObjectId as string;
-
-}
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <title>继续分润层级(修改)</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
-    <script src="/admin/js/jquery-1.10.1.min.js"></script>
-    <script src="/admin/js/LAreaData2.js"></script>
-</head>
-<body>
-
-    <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">
-        <input type="hidden" name="Id" value="@editData.Id" />
-        <input type="hidden" name="ObjectId" value="@ObjectId" />
-
-        <div class="layui-card">
-          <div class="layui-card-body">
-            <div class="layui-tab" lay-filter="mytabbar">
-                <ul class="layui-tab-title">
-                    <li class="layui-this" lay-id="1">基本资料</li>
-                </ul>
-                <div class="layui-tab-content mt20">
-                    <div class="layui-tab-item layui-show">
-<div class="layui-form-item">
-<label class="layui-form-label">层级</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="FloorNumber" name="FloorNumber" value="@editData.FloorNumber" maxlength="20" lay-verify="required," autocomplete="off" placeholder="请输入层级">
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">分润比例</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="Percents" name="Percents" value="@editData.Percents" maxlength="20" lay-verify="" autocomplete="off" placeholder="请输入分润比例">
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">附加分润值</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="AddProfitVal" name="AddProfitVal" value="@editData.AddProfitVal" maxlength="20" lay-verify="" autocomplete="off" placeholder="请输入附加分润值">
-</div>
-</div>
-
-</div>
-
-                </div>
-            </div>
-            <div class="layui-form-item layui-hide">
-                <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit" value="确认">
-            </div>
-          </div>
-        </div>
-    </div>
-
-    <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js"></script>
-    <script src="/other/mybjq/kindeditor-min.js"></script>
-    <script src="/other/mybjq/lang/zh_CN.js"></script>
-    <script>
-        
-        
-        //编辑器
-        KindEditor.ready(function (K) {
-            
-        });
-
-        var ids = "";
-        function getChildren(obj) {
-            $.each(obj, function (index, value) {
-                var id = obj[index].id;
-                ids += id + ",";
-                var children = obj[index].children;
-                if (children) {
-                    getChildren(children);
-                }
-            });
-        }
-
-        function AreasProvinceInit(tagId, areasVal, form) {
-            for (var i = 0; i < provs_data.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(provs_data[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "Province").append('<option value="' + provs_data[i].value + '"' + sel + '>' + provs_data[i].text + '</option>');
-            }
-            form.render();
-        }
-
-        function AreasProvinceSelected(tagId, areasVal, form, value) {
-            $("#" + tagId + "City").html('<option value="">市</option>');
-            var list = citys_data[value];
-            for (var i = 0; i < list.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(list[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "City").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text + '</option>');
-            }
-            $("#" + tagId + "Area").html('<option value="">县/区</option>');
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-
-        function AreasCitySelected(tagId, areasVal, form, value) {
-            $("#" + tagId + "Area").html('<option value="">县/区</option>');
-            var list = dists_data[value];
-            for (var i = 0; i < list.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(list[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "Area").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text + '</option>');
-            }
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-
-        function AreasAreaSelected(tagId, form) {
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-        function movePrev(obj, tagId) {
-            $(obj).parent().prev().insertAfter($(obj).parent());
-            checkPics(tagId);
-        }
-        function moveNext(obj, tagId) {
-            $(obj).parent().next().insertBefore($(obj).parent());
-            checkPics(tagId);
-        }
-        function deletePic(obj, tagId) {
-            $(obj).parent().remove();
-            checkPics(tagId);
-        }
-        function checkPics(tagId) {
-            var pics = "";
-            var texts = "";
-            $("#" + tagId + "Image div img").each(function (i) {
-                pics += $(this).attr("src").replace(osshost, '') + "|";
-            });
-            $("#" + tagId + "Image div input").each(function (i) {
-                texts += $(this).val() + "|";
-            });
-            if (pics == "") {
-                $("#" + tagId).val("");
-            } else {
-                pics = pics.substring(0, pics.length - 1);
-                texts = texts.substring(0, pics.length - 1);
-                $("#" + tagId).val(pics + "#cut#" + texts);
-            }
-        }
-        function checkBox(tagId) {
-            var text = "";
-            $("input[type=checkbox][name=" + tagId + "List]:checked").each(function (i) {
-                text += $(this).val() + ",";
-            });
-            $("#" + tagId).val(text);
-        }
-        function showBigPic(picpath) {
-            parent.layer.open({
-                type: 1,
-                title: false,
-                closeBtn: 0,
-                shadeClose: true,
-                area: ['auto', 'auto'],
-                content: '<img src="' + picpath + '" style="max-width:800px; max-height:800px;" />'
-            });
-        }
-
-        var tree;
-        var element;
-        layui.config({
-            base: '/layuiadmin/' //静态资源所在路径
-        }).extend({
-            index: 'lib/index' //主入口模块
-        }).use(['index', 'form', 'upload', 'layedit', 'laydate', 'element', 'croppers', 'transfer', 'tree', 'util'], function () {
-            var $ = layui.$
-                , form = layui.form
-                , layer = layui.layer
-                , layedit = layui.layedit
-                , laydate = layui.laydate
-                , croppers = layui.croppers
-                , upload = layui.upload
-                , transfer = layui.transfer
-                , util = layui.util;
-            tree = layui.tree;
-            element = layui.element;
-        
-            //Hash地址的定位
-            var layid = location.hash.replace(/^#test=/, '');
-            element.tabChange('test', layid);
-            element.on('tab(test)', function (elem) {
-                location.hash = 'test=' + $(this).attr('lay-id');
-            });
-    
-            //日期
-            
-
-            //上传文件
-            
-
-            //穿梭框
-            
-
-            //TreeView，比如权限管理
-            
-
-            //省市区
-            
-        })
-
-    </script>
-</body>
-</html>

Areas/Admin/Views/MainServer/ProfitObjectContinueFloors/Index.cshtml

@@ -1,97 +0,0 @@
-@{
-    string RightInfo = ViewBag.RightInfo as string;
-    string right = ViewBag.right as string;
-    string ObjectId = ViewBag.ObjectId as string;
-
-}
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <title>继续分润层级</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
-    <link rel="stylesheet" href="/layuiadmin/style/admin.css" media="all">
-    <script src="/admin/js/jquery-1.10.1.min.js"></script>
-    <style>
-        .layui-input-inline{
-            width: 175px !important;
-        }
-        .layui-form-label{
-            width: 85px !important;
-        }
-        .layui-inline{
-            margin-right: 0px !important;
-        }        
-        .w100{
-            width: 100px !important;
-        }
-        .ml50{
-            margin-left: 50px !important;
-        }
-    </style>
-</head>
-<body>
-    <div class="layui-fluid">
-        <div class="layui-card">
-            <div class="layui-form layui-card-header layuiadmin-card-header-auto">
-                <div class="layui-form-item">
-                    
-                    <div class="layui-inline">
-                        <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">
-                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>查询
-                        </button>
-                        <button class="layui-btn" lay-submit lay-filter="LAY-list-front-searchall">
-                            <i class="layui-icon layui-icon-list layuiadmin-button-btn"></i>全部
-                        </button>
-                    </div>
-                </div>
-            </div>
-
-            <div class="layui-card-body">
-                <div style="padding-bottom: 10px;">
-                    <button class="layui-btn" data-type="add"><i class="layui-icon layui-icon-add-1 layuiadmin-button-btn"></i>新增</button>
-                    <button class="layui-btn" data-type="batchdel"><i class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>删除</button>
-                </div>
-                
-                <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
-                <script type="text/html" id="imgTpl">
-                    <img style="display: inline-block; width: 50%; height: 100%;" src={{ d.avatar }}>
-                </script>
-                <script type="text/html" id="table-list-tools">
-                    <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>编辑</a>
-                    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon layui-icon-delete"></i>删除</a>
-                </script>
-            </div>
-        </div>
-    </div>
-    <div id="excelForm" style="display:none; padding:20px;">
-        <div class="layui-tab-item layui-show">
-            <div class="layui-form-item">
-                <label class="layui-form-label">excel文件</label>
-                <div class="layui-input-block">
-                    <div class="layui-upload">
-                        <input type="file" id="ExcelFile" name="ExcelFile" value="">
-                    </div>
-                    <div class="mt10" id="ExcelFileList">
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="layui-form-item ml10">
-            <div class="layui-input-block">
-                <button type="button" class="layui-btn" onclick="ConfirmImport()">立即导入</button>
-            </div>
-        </div>
-    </div>
-
-    <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/layuiadmin/modules_main/ProfitObjectContinueFloors_Admin.js"></script>
-    <script>
-        var ObjectId='@ObjectId';
-
-    </script>
-</body>
-</html>

Areas/Admin/Views/MainServer/ProfitObjectFloors/Add.cshtml

@@ -1,228 +0,0 @@
-@{
-    string RightInfo = ViewBag.RightInfo as string;
-    string right = ViewBag.right as string;
-    string ObjectId = ViewBag.ObjectId as string;
-
-}
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <title>分润对象层级(增加)</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
-    <script src="/admin/js/jquery-1.10.1.min.js"></script>
-    <script src="/admin/js/LAreaData2.js"></script>
-</head>
-<body>
-
-    <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">
-        <input type="hidden" name="ObjectId" value="@ObjectId" />
-
-        <div class="layui-card">
-          <div class="layui-card-body">
-            <div class="layui-tab" lay-filter="mytabbar">
-                <ul class="layui-tab-title">
-                    <li class="layui-this" lay-id="1">基本资料</li>
-                </ul>
-                <div class="layui-tab-content mt20">
-                    <div class="layui-tab-item layui-show">
-<div class="layui-form-item">
-<label class="layui-form-label">层级</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="FloorNumber" name="FloorNumber" maxlength="20" lay-verify="required," autocomplete="off" placeholder="请输入层级">
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">分润比例</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="Percents" name="Percents" maxlength="20" lay-verify="" autocomplete="off" placeholder="请输入分润比例">
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">附加分润值</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="AddProfitVal" name="AddProfitVal" maxlength="20" lay-verify="" autocomplete="off" placeholder="请输入附加分润值">
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">级差</label>
-<div class="layui-input-block">
-<input type="checkbox" id="FloorDiff" name="FloorDiff" value="1" lay-skin="switch" lay-filter="switchTest" title="开关">
-</div>
-</div>
-
-</div>
-
-                </div>
-            </div>
-            <div class="layui-form-item layui-hide">
-                <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit" value="确认">
-            </div>
-          </div>
-        </div>
-    </div>
-
-    <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js"></script>
-    <script src="/other/mybjq/kindeditor-min.js"></script>
-    <script src="/other/mybjq/lang/zh_CN.js"></script>
-    <script>
-        
-                    
-        //编辑器
-        KindEditor.ready(function (K) {
-            
-        });
-
-        var ids = "";
-        function getChildren(obj) {
-            $.each(obj, function (index, value) {
-                var id = obj[index].id;
-                ids += id + ",";
-                var children = obj[index].children;
-                if (children) {
-                    getChildren(children);
-                }
-            });
-        }
-
-        function AreasProvinceInit(tagId, areasVal, form) {
-            for (var i = 0; i < provs_data.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(provs_data[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "Province").append('<option value="' + provs_data[i].value + '"' + sel + '>' + provs_data[i].text + '</option>');
-            }
-            form.render();
-        }
-
-        function AreasProvinceSelected(tagId, areasVal, form, value) {
-            $("#" + tagId + "City").html('<option value="">市</option>');
-            var list = citys_data[value];
-            for (var i = 0; i < list.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(list[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "City").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text + '</option>');
-            }
-            $("#" + tagId + "Area").html('<option value="">县/区</option>');
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-
-        function AreasCitySelected(tagId, areasVal, form, value) {
-            $("#" + tagId + "Area").html('<option value="">县/区</option>');
-            var list = dists_data[value];
-            for (var i = 0; i < list.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(list[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "Area").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text + '</option>');
-            }
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-
-        function AreasAreaSelected(tagId, form) {
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-        function movePrev(obj, tagId) {
-            $(obj).parent().prev().insertAfter($(obj).parent());
-            checkPics(tagId);
-        }
-        function moveNext(obj, tagId) {
-            $(obj).parent().next().insertBefore($(obj).parent());
-            checkPics(tagId);
-        }
-        function deletePic(obj, tagId) {
-            $(obj).parent().remove();
-            checkPics(tagId);
-        }
-        function checkPics(tagId) {
-            var pics = "";
-            var texts = "";
-            $("#" + tagId + "Image div img").each(function (i) {
-                pics += $(this).attr("src").replace(osshost, '') + "|";
-            });
-            $("#" + tagId + "Image div input").each(function (i) {
-                texts += $(this).val() + "|";
-            });
-            if (pics == "") {
-                $("#" + tagId).val("");
-            } else {
-                pics = pics.substring(0, pics.length - 1);
-                texts = texts.substring(0, pics.length - 1);
-                $("#" + tagId).val(pics + "#cut#" + texts);
-            }
-        }
-        function checkBox(tagId) {
-            var text = "";
-            $("input[type=checkbox][name=" + tagId + "List]:checked").each(function (i) {
-                text += $(this).val() + ",";
-            });
-            $("#" + tagId).val(text);
-        }
-        function showBigPic(picpath) {
-            parent.layer.open({
-                type: 1,
-                title: false,
-                closeBtn: 0,
-                shadeClose: true,
-                area: ['auto', 'auto'],
-                content: '<img src="' + picpath + '" style="max-width:800px; max-height:800px;" />'
-            });
-        }
-
-        
-        var tree;
-        var element;
-        layui.config({
-            base: '/layuiadmin/' //静态资源所在路径
-        }).extend({
-            index: 'lib/index' //主入口模块
-        }).use(['index', 'form', 'upload', 'layedit', 'laydate', 'element', 'croppers', 'transfer', 'tree', 'util'], function () {
-            var $ = layui.$
-                , form = layui.form
-                , layer = layui.layer
-                , layedit = layui.layedit
-                , laydate = layui.laydate
-                , croppers = layui.croppers
-                , upload = layui.upload
-                , transfer = layui.transfer
-                , util = layui.util;
-            tree = layui.tree;
-            element = layui.element;
-        
-            //Hash地址的定位
-            var layid = location.hash.replace(/^#test=/, '');
-            element.tabChange('test', layid);
-            element.on('tab(test)', function (elem) {
-                location.hash = 'test=' + $(this).attr('lay-id');
-            });
-    
-            //日期
-            
-
-            //上传文件
-            
-
-            //穿梭框
-            
-
-            //TreeView，比如权限管理
-            
-
-            //省市区
-            
-        })
-
-    </script>
-</body>
-</html>

Areas/Admin/Views/MainServer/ProfitObjectFloors/Edit.cshtml

@@ -1,230 +0,0 @@
-@using MySystem.Models;
-@{ProfitObjectFloors editData = ViewBag.data as ProfitObjectFloors;}
-@{
-    string RightInfo = ViewBag.RightInfo as string;
-    string right = ViewBag.right as string;
-    string ObjectId = ViewBag.ObjectId as string;
-
-}
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <title>分润对象层级(修改)</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
-    <script src="/admin/js/jquery-1.10.1.min.js"></script>
-    <script src="/admin/js/LAreaData2.js"></script>
-</head>
-<body>
-
-    <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">
-        <input type="hidden" name="Id" value="@editData.Id" />
-        <input type="hidden" name="ObjectId" value="@ObjectId" />
-
-        <div class="layui-card">
-          <div class="layui-card-body">
-            <div class="layui-tab" lay-filter="mytabbar">
-                <ul class="layui-tab-title">
-                    <li class="layui-this" lay-id="1">基本资料</li>
-                </ul>
-                <div class="layui-tab-content mt20">
-                    <div class="layui-tab-item layui-show">
-<div class="layui-form-item">
-<label class="layui-form-label">层级</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="FloorNumber" name="FloorNumber" value="@editData.FloorNumber" maxlength="20" lay-verify="required," autocomplete="off" placeholder="请输入层级">
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">分润比例</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="Percents" name="Percents" value="@editData.Percents" maxlength="20" lay-verify="" autocomplete="off" placeholder="请输入分润比例">
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">附加分润值</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="AddProfitVal" name="AddProfitVal" value="@editData.AddProfitVal" maxlength="20" lay-verify="" autocomplete="off" placeholder="请输入附加分润值">
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">级差</label>
-<div class="layui-input-block">
-<input type="checkbox" id="FloorDiff" name="FloorDiff" value="1" @(editData.FloorDiff == 1 ? "checked=checked" : "") lay-skin="switch" lay-filter="switchTest" title="开关">
-</div>
-</div>
-
-</div>
-
-                </div>
-            </div>
-            <div class="layui-form-item layui-hide">
-                <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit" value="确认">
-            </div>
-          </div>
-        </div>
-    </div>
-
-    <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js"></script>
-    <script src="/other/mybjq/kindeditor-min.js"></script>
-    <script src="/other/mybjq/lang/zh_CN.js"></script>
-    <script>
-        
-        
-        //编辑器
-        KindEditor.ready(function (K) {
-            
-        });
-
-        var ids = "";
-        function getChildren(obj) {
-            $.each(obj, function (index, value) {
-                var id = obj[index].id;
-                ids += id + ",";
-                var children = obj[index].children;
-                if (children) {
-                    getChildren(children);
-                }
-            });
-        }
-
-        function AreasProvinceInit(tagId, areasVal, form) {
-            for (var i = 0; i < provs_data.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(provs_data[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "Province").append('<option value="' + provs_data[i].value + '"' + sel + '>' + provs_data[i].text + '</option>');
-            }
-            form.render();
-        }
-
-        function AreasProvinceSelected(tagId, areasVal, form, value) {
-            $("#" + tagId + "City").html('<option value="">市</option>');
-            var list = citys_data[value];
-            for (var i = 0; i < list.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(list[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "City").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text + '</option>');
-            }
-            $("#" + tagId + "Area").html('<option value="">县/区</option>');
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-
-        function AreasCitySelected(tagId, areasVal, form, value) {
-            $("#" + tagId + "Area").html('<option value="">县/区</option>');
-            var list = dists_data[value];
-            for (var i = 0; i < list.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(list[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "Area").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text + '</option>');
-            }
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-
-        function AreasAreaSelected(tagId, form) {
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-        function movePrev(obj, tagId) {
-            $(obj).parent().prev().insertAfter($(obj).parent());
-            checkPics(tagId);
-        }
-        function moveNext(obj, tagId) {
-            $(obj).parent().next().insertBefore($(obj).parent());
-            checkPics(tagId);
-        }
-        function deletePic(obj, tagId) {
-            $(obj).parent().remove();
-            checkPics(tagId);
-        }
-        function checkPics(tagId) {
-            var pics = "";
-            var texts = "";
-            $("#" + tagId + "Image div img").each(function (i) {
-                pics += $(this).attr("src").replace(osshost, '') + "|";
-            });
-            $("#" + tagId + "Image div input").each(function (i) {
-                texts += $(this).val() + "|";
-            });
-            if (pics == "") {
-                $("#" + tagId).val("");
-            } else {
-                pics = pics.substring(0, pics.length - 1);
-                texts = texts.substring(0, pics.length - 1);
-                $("#" + tagId).val(pics + "#cut#" + texts);
-            }
-        }
-        function checkBox(tagId) {
-            var text = "";
-            $("input[type=checkbox][name=" + tagId + "List]:checked").each(function (i) {
-                text += $(this).val() + ",";
-            });
-            $("#" + tagId).val(text);
-        }
-        function showBigPic(picpath) {
-            parent.layer.open({
-                type: 1,
-                title: false,
-                closeBtn: 0,
-                shadeClose: true,
-                area: ['auto', 'auto'],
-                content: '<img src="' + picpath + '" style="max-width:800px; max-height:800px;" />'
-            });
-        }
-
-        var tree;
-        var element;
-        layui.config({
-            base: '/layuiadmin/' //静态资源所在路径
-        }).extend({
-            index: 'lib/index' //主入口模块
-        }).use(['index', 'form', 'upload', 'layedit', 'laydate', 'element', 'croppers', 'transfer', 'tree', 'util'], function () {
-            var $ = layui.$
-                , form = layui.form
-                , layer = layui.layer
-                , layedit = layui.layedit
-                , laydate = layui.laydate
-                , croppers = layui.croppers
-                , upload = layui.upload
-                , transfer = layui.transfer
-                , util = layui.util;
-            tree = layui.tree;
-            element = layui.element;
-        
-            //Hash地址的定位
-            var layid = location.hash.replace(/^#test=/, '');
-            element.tabChange('test', layid);
-            element.on('tab(test)', function (elem) {
-                location.hash = 'test=' + $(this).attr('lay-id');
-            });
-    
-            //日期
-            
-
-            //上传文件
-            
-
-            //穿梭框
-            
-
-            //TreeView，比如权限管理
-            
-
-            //省市区
-            
-        })
-
-    </script>
-</body>
-</html>

Areas/Admin/Views/MainServer/ProfitObjectFloors/Index.cshtml

@@ -1,97 +0,0 @@
-@{
-    string RightInfo = ViewBag.RightInfo as string;
-    string right = ViewBag.right as string;
-    string ObjectId = ViewBag.ObjectId as string;
-
-}
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <title>分润对象层级</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
-    <link rel="stylesheet" href="/layuiadmin/style/admin.css" media="all">
-    <script src="/admin/js/jquery-1.10.1.min.js"></script>
-    <style>
-        .layui-input-inline{
-            width: 175px !important;
-        }
-        .layui-form-label{
-            width: 85px !important;
-        }
-        .layui-inline{
-            margin-right: 0px !important;
-        }        
-        .w100{
-            width: 100px !important;
-        }
-        .ml50{
-            margin-left: 50px !important;
-        }
-    </style>
-</head>
-<body>
-    <div class="layui-fluid">
-        <div class="layui-card">
-            <div class="layui-form layui-card-header layuiadmin-card-header-auto">
-                <div class="layui-form-item">
-                    
-                    <div class="layui-inline">
-                        <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">
-                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>查询
-                        </button>
-                        <button class="layui-btn" lay-submit lay-filter="LAY-list-front-searchall">
-                            <i class="layui-icon layui-icon-list layuiadmin-button-btn"></i>全部
-                        </button>
-                    </div>
-                </div>
-            </div>
-
-            <div class="layui-card-body">
-                <div style="padding-bottom: 10px;">
-                    <button class="layui-btn" data-type="add"><i class="layui-icon layui-icon-add-1 layuiadmin-button-btn"></i>新增</button>
-                    <button class="layui-btn" data-type="batchdel"><i class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>删除</button>
-                </div>
-                
-                <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
-                <script type="text/html" id="imgTpl">
-                    <img style="display: inline-block; width: 50%; height: 100%;" src={{ d.avatar }}>
-                </script>
-                <script type="text/html" id="table-list-tools">
-                    <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>编辑</a>
-                    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon layui-icon-delete"></i>删除</a>
-                </script>
-            </div>
-        </div>
-    </div>
-    <div id="excelForm" style="display:none; padding:20px;">
-        <div class="layui-tab-item layui-show">
-            <div class="layui-form-item">
-                <label class="layui-form-label">excel文件</label>
-                <div class="layui-input-block">
-                    <div class="layui-upload">
-                        <input type="file" id="ExcelFile" name="ExcelFile" value="">
-                    </div>
-                    <div class="mt10" id="ExcelFileList">
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="layui-form-item ml10">
-            <div class="layui-input-block">
-                <button type="button" class="layui-btn" onclick="ConfirmImport()">立即导入</button>
-            </div>
-        </div>
-    </div>
-
-    <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/layuiadmin/modules_main/ProfitObjectFloors_Admin.js"></script>
-    <script>
-        var ObjectId='@ObjectId';
-
-    </script>
-</body>
-</html>

Areas/Admin/Views/MainServer/ProfitObjectLevelKinds/Index.cshtml

@@ -1,108 +0,0 @@
-@{
-string RightInfo = ViewBag.RightInfo as string;
-string right = ViewBag.right as string;
-string ObjectId = ViewBag.ObjectId as string;
-
-}
-<!DOCTYPE html>
-<html>
-
-<head>
-    <meta charset="utf-8">
-    <title>分润对象等级分类</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport"
-        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
-    <link rel="stylesheet" href="/layuiadmin/style/admin.css" media="all">
-    <script src="/admin/js/jquery-1.10.1.min.js"></script>
-    <style>
-        .layui-input-inline{
-            width: 175px !important;
-        }
-        .layui-form-label{
-            width: 85px !important;
-        }
-        .layui-inline{
-            margin-right: 0px !important;
-        }        
-        .w100{
-            width: 100px !important;
-        }
-        .ml50{
-            margin-left: 50px !important;
-        }
-    </style>
-</head>
-
-<body>
-    <div class="layui-fluid">
-        <div class="layui-card">
-            <div class="layui-form layui-card-header layuiadmin-card-header-auto">
-                <div class="layui-form-item">
-                    <div class="layui-inline">
-                        <div class="layui-input-inline">
-                            <input class="layui-input" type="text" name="Name" placeholder="名称" autocomplete="off">
-                        </div>
-                    </div>
-                    <div class="layui-inline">
-                        <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">
-                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>查询
-                        </button>
-                        <button class="layui-btn" lay-submit lay-filter="LAY-list-front-searchall">
-                            <i class="layui-icon layui-icon-list layuiadmin-button-btn"></i>全部
-                        </button>
-                    </div>
-                </div>
-            </div>
-
-            <div class="layui-card-body">
-                <div style="padding-bottom: 10px;">
-                    <button class="layui-btn" data-type="add"><i class="layui-icon layui-icon-add-1 layuiadmin-button-btn"></i>新增</button>
-                    <button class="layui-btn" data-type="batchdel"><i class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>删除</button>
-                </div>
-
-                <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
-                <script type="text/html" id="imgTpl">
-                    <img style="display: inline-block; width: 50%; height: 100%;" src={{ d.avatar }}>
-                </script>
-                <script type="text/html" id="table-list-tools">
-                    <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit"><i
-                            class="layui-icon layui-icon-edit"></i>编辑</a>
-                    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i
-                            class="layui-icon layui-icon-delete"></i>删除</a>
-                    <a class="layui-btn layui-btn-normal layui-btn-xs"
-                        lay-href="/Admin/ProfitObjectLevels/Index?right=@right&KindId=@(" {{d.Id}}")">分润对象等级</a>
-                </script>
-            </div>
-        </div>
-    </div>
-    <div id="excelForm" style="display:none; padding:20px;">
-        <div class="layui-tab-item layui-show">
-            <div class="layui-form-item">
-                <label class="layui-form-label">excel文件</label>
-                <div class="layui-input-block">
-                    <div class="layui-upload">
-                        <input type="file" id="ExcelFile" name="ExcelFile" value="">
-                    </div>
-                    <div class="mt10" id="ExcelFileList">
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="layui-form-item ml10">
-            <div class="layui-input-block">
-                <button type="button" class="layui-btn" onclick="ConfirmImport()">立即导入</button>
-            </div>
-        </div>
-    </div>
-
-    <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/layuiadmin/modules_main/ProfitObjectLevelKinds_Admin.js"></script>
-    <script>
-        var ObjectId = '@ObjectId';
-    </script>
-</body>
-
-</html>

Areas/Admin/Views/MainServer/ProfitObjectLevels/Add.cshtml

@@ -1,234 +0,0 @@
-@{
-    string RightInfo = ViewBag.RightInfo as string;
-    string right = ViewBag.right as string;
-    string KindId = ViewBag.KindId as string;
-
-}
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <title>分润对象等级(增加)</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
-    <script src="/admin/js/jquery-1.10.1.min.js"></script>
-    <script src="/admin/js/LAreaData2.js"></script>
-</head>
-<body>
-
-    <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">
-        <input type="hidden" name="KindId" value="@KindId" />
-
-        <div class="layui-card">
-          <div class="layui-card-body">
-            <div class="layui-tab" lay-filter="mytabbar">
-                <ul class="layui-tab-title">
-                    <li class="layui-this" lay-id="1">基本资料</li>
-                </ul>
-                <div class="layui-tab-content mt20">
-                    <div class="layui-tab-item layui-show">
-<div class="layui-form-item">
-<label class="layui-form-label">级别</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="LevelNumber" name="LevelNumber" maxlength="20" lay-verify="required," autocomplete="off" placeholder="请输入级别">
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">名称</label>
-<div class="layui-input-block">
-<input class="layui-input" type="text" id="Name" name="Name" maxlength="50" lay-verify="required," autocomplete="off" placeholder="请输入名称">
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">分润比例</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="Percents" name="Percents" maxlength="20" lay-verify="required," autocomplete="off" placeholder="请输入分润比例">
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">附加分润值</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="AddProfitVal" name="AddProfitVal" maxlength="20" lay-verify="" autocomplete="off" placeholder="请输入附加分润值">
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">级差</label>
-<div class="layui-input-block">
-<input type="checkbox" id="LevelDiff" name="LevelDiff" value="1" lay-skin="switch" lay-filter="switchTest" title="开关">
-</div>
-</div>
-
-</div>
-
-                </div>
-            </div>
-            <div class="layui-form-item layui-hide">
-                <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit" value="确认">
-            </div>
-          </div>
-        </div>
-    </div>
-
-    <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js"></script>
-    <script src="/other/mybjq/kindeditor-min.js"></script>
-    <script src="/other/mybjq/lang/zh_CN.js"></script>
-    <script>
-        
-                    
-        //编辑器
-        KindEditor.ready(function (K) {
-            
-        });
-
-        var ids = "";
-        function getChildren(obj) {
-            $.each(obj, function (index, value) {
-                var id = obj[index].id;
-                ids += id + ",";
-                var children = obj[index].children;
-                if (children) {
-                    getChildren(children);
-                }
-            });
-        }
-
-        function AreasProvinceInit(tagId, areasVal, form) {
-            for (var i = 0; i < provs_data.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(provs_data[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "Province").append('<option value="' + provs_data[i].value + '"' + sel + '>' + provs_data[i].text + '</option>');
-            }
-            form.render();
-        }
-
-        function AreasProvinceSelected(tagId, areasVal, form, value) {
-            $("#" + tagId + "City").html('<option value="">市</option>');
-            var list = citys_data[value];
-            for (var i = 0; i < list.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(list[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "City").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text + '</option>');
-            }
-            $("#" + tagId + "Area").html('<option value="">县/区</option>');
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-
-        function AreasCitySelected(tagId, areasVal, form, value) {
-            $("#" + tagId + "Area").html('<option value="">县/区</option>');
-            var list = dists_data[value];
-            for (var i = 0; i < list.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(list[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "Area").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text + '</option>');
-            }
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-
-        function AreasAreaSelected(tagId, form) {
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-        function movePrev(obj, tagId) {
-            $(obj).parent().prev().insertAfter($(obj).parent());
-            checkPics(tagId);
-        }
-        function moveNext(obj, tagId) {
-            $(obj).parent().next().insertBefore($(obj).parent());
-            checkPics(tagId);
-        }
-        function deletePic(obj, tagId) {
-            $(obj).parent().remove();
-            checkPics(tagId);
-        }
-        function checkPics(tagId) {
-            var pics = "";
-            var texts = "";
-            $("#" + tagId + "Image div img").each(function (i) {
-                pics += $(this).attr("src").replace(osshost, '') + "|";
-            });
-            $("#" + tagId + "Image div input").each(function (i) {
-                texts += $(this).val() + "|";
-            });
-            if (pics == "") {
-                $("#" + tagId).val("");
-            } else {
-                pics = pics.substring(0, pics.length - 1);
-                texts = texts.substring(0, pics.length - 1);
-                $("#" + tagId).val(pics + "#cut#" + texts);
-            }
-        }
-        function checkBox(tagId) {
-            var text = "";
-            $("input[type=checkbox][name=" + tagId + "List]:checked").each(function (i) {
-                text += $(this).val() + ",";
-            });
-            $("#" + tagId).val(text);
-        }
-        function showBigPic(picpath) {
-            parent.layer.open({
-                type: 1,
-                title: false,
-                closeBtn: 0,
-                shadeClose: true,
-                area: ['auto', 'auto'],
-                content: '<img src="' + picpath + '" style="max-width:800px; max-height:800px;" />'
-            });
-        }
-
-        
-        var tree;
-        var element;
-        layui.config({
-            base: '/layuiadmin/' //静态资源所在路径
-        }).extend({
-            index: 'lib/index' //主入口模块
-        }).use(['index', 'form', 'upload', 'layedit', 'laydate', 'element', 'croppers', 'transfer', 'tree', 'util'], function () {
-            var $ = layui.$
-                , form = layui.form
-                , layer = layui.layer
-                , layedit = layui.layedit
-                , laydate = layui.laydate
-                , croppers = layui.croppers
-                , upload = layui.upload
-                , transfer = layui.transfer
-                , util = layui.util;
-            tree = layui.tree;
-            element = layui.element;
-        
-            //Hash地址的定位
-            var layid = location.hash.replace(/^#test=/, '');
-            element.tabChange('test', layid);
-            element.on('tab(test)', function (elem) {
-                location.hash = 'test=' + $(this).attr('lay-id');
-            });
-    
-            //日期
-            
-
-            //上传文件
-            
-
-            //穿梭框
-            
-
-            //TreeView，比如权限管理
-            
-
-            //省市区
-            
-        })
-
-    </script>
-</body>
-</html>

Areas/Admin/Views/MainServer/ProfitObjectLevels/Edit.cshtml

@@ -1,236 +0,0 @@
-@using MySystem.Models;
-@{ProfitObjectLevels editData = ViewBag.data as ProfitObjectLevels;}
-@{
-    string RightInfo = ViewBag.RightInfo as string;
-    string right = ViewBag.right as string;
-    string KindId = ViewBag.KindId as string;
-
-}
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <title>分润对象等级(修改)</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
-    <script src="/admin/js/jquery-1.10.1.min.js"></script>
-    <script src="/admin/js/LAreaData2.js"></script>
-</head>
-<body>
-
-    <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">
-        <input type="hidden" name="Id" value="@editData.Id" />
-        <input type="hidden" name="KindId" value="@KindId" />
-
-        <div class="layui-card">
-          <div class="layui-card-body">
-            <div class="layui-tab" lay-filter="mytabbar">
-                <ul class="layui-tab-title">
-                    <li class="layui-this" lay-id="1">基本资料</li>
-                </ul>
-                <div class="layui-tab-content mt20">
-                    <div class="layui-tab-item layui-show">
-<div class="layui-form-item">
-<label class="layui-form-label">级别</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="LevelNumber" name="LevelNumber" value="@editData.LevelNumber" maxlength="20" lay-verify="required," autocomplete="off" placeholder="请输入级别">
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">名称</label>
-<div class="layui-input-block">
-<input class="layui-input" type="text" id="Name" name="Name" value="@editData.Name" maxlength="50" lay-verify="required," autocomplete="off" placeholder="请输入名称">
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">分润比例</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="Percents" name="Percents" value="@editData.Percents" maxlength="20" lay-verify="required," autocomplete="off" placeholder="请输入分润比例">
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">附加分润值</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="AddProfitVal" name="AddProfitVal" value="@editData.AddProfitVal" maxlength="20" lay-verify="" autocomplete="off" placeholder="请输入附加分润值">
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">级差</label>
-<div class="layui-input-block">
-<input type="checkbox" id="LevelDiff" name="LevelDiff" value="1" @(editData.LevelDiff == 1 ? "checked=checked" : "") lay-skin="switch" lay-filter="switchTest" title="开关">
-</div>
-</div>
-
-</div>
-
-                </div>
-            </div>
-            <div class="layui-form-item layui-hide">
-                <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit" value="确认">
-            </div>
-          </div>
-        </div>
-    </div>
-
-    <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js"></script>
-    <script src="/other/mybjq/kindeditor-min.js"></script>
-    <script src="/other/mybjq/lang/zh_CN.js"></script>
-    <script>
-        
-        
-        //编辑器
-        KindEditor.ready(function (K) {
-            
-        });
-
-        var ids = "";
-        function getChildren(obj) {
-            $.each(obj, function (index, value) {
-                var id = obj[index].id;
-                ids += id + ",";
-                var children = obj[index].children;
-                if (children) {
-                    getChildren(children);
-                }
-            });
-        }
-
-        function AreasProvinceInit(tagId, areasVal, form) {
-            for (var i = 0; i < provs_data.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(provs_data[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "Province").append('<option value="' + provs_data[i].value + '"' + sel + '>' + provs_data[i].text + '</option>');
-            }
-            form.render();
-        }
-
-        function AreasProvinceSelected(tagId, areasVal, form, value) {
-            $("#" + tagId + "City").html('<option value="">市</option>');
-            var list = citys_data[value];
-            for (var i = 0; i < list.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(list[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "City").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text + '</option>');
-            }
-            $("#" + tagId + "Area").html('<option value="">县/区</option>');
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-
-        function AreasCitySelected(tagId, areasVal, form, value) {
-            $("#" + tagId + "Area").html('<option value="">县/区</option>');
-            var list = dists_data[value];
-            for (var i = 0; i < list.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(list[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "Area").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text + '</option>');
-            }
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-
-        function AreasAreaSelected(tagId, form) {
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-        function movePrev(obj, tagId) {
-            $(obj).parent().prev().insertAfter($(obj).parent());
-            checkPics(tagId);
-        }
-        function moveNext(obj, tagId) {
-            $(obj).parent().next().insertBefore($(obj).parent());
-            checkPics(tagId);
-        }
-        function deletePic(obj, tagId) {
-            $(obj).parent().remove();
-            checkPics(tagId);
-        }
-        function checkPics(tagId) {
-            var pics = "";
-            var texts = "";
-            $("#" + tagId + "Image div img").each(function (i) {
-                pics += $(this).attr("src").replace(osshost, '') + "|";
-            });
-            $("#" + tagId + "Image div input").each(function (i) {
-                texts += $(this).val() + "|";
-            });
-            if (pics == "") {
-                $("#" + tagId).val("");
-            } else {
-                pics = pics.substring(0, pics.length - 1);
-                texts = texts.substring(0, pics.length - 1);
-                $("#" + tagId).val(pics + "#cut#" + texts);
-            }
-        }
-        function checkBox(tagId) {
-            var text = "";
-            $("input[type=checkbox][name=" + tagId + "List]:checked").each(function (i) {
-                text += $(this).val() + ",";
-            });
-            $("#" + tagId).val(text);
-        }
-        function showBigPic(picpath) {
-            parent.layer.open({
-                type: 1,
-                title: false,
-                closeBtn: 0,
-                shadeClose: true,
-                area: ['auto', 'auto'],
-                content: '<img src="' + picpath + '" style="max-width:800px; max-height:800px;" />'
-            });
-        }
-
-        var tree;
-        var element;
-        layui.config({
-            base: '/layuiadmin/' //静态资源所在路径
-        }).extend({
-            index: 'lib/index' //主入口模块
-        }).use(['index', 'form', 'upload', 'layedit', 'laydate', 'element', 'croppers', 'transfer', 'tree', 'util'], function () {
-            var $ = layui.$
-                , form = layui.form
-                , layer = layui.layer
-                , layedit = layui.layedit
-                , laydate = layui.laydate
-                , croppers = layui.croppers
-                , upload = layui.upload
-                , transfer = layui.transfer
-                , util = layui.util;
-            tree = layui.tree;
-            element = layui.element;
-        
-            //Hash地址的定位
-            var layid = location.hash.replace(/^#test=/, '');
-            element.tabChange('test', layid);
-            element.on('tab(test)', function (elem) {
-                location.hash = 'test=' + $(this).attr('lay-id');
-            });
-    
-            //日期
-            
-
-            //上传文件
-            
-
-            //穿梭框
-            
-
-            //TreeView，比如权限管理
-            
-
-            //省市区
-            
-        })
-
-    </script>
-</body>
-</html>

Areas/Admin/Views/MainServer/ProfitObjectLevels/Index.cshtml

@@ -1,106 +0,0 @@
-@{
-string RightInfo = ViewBag.RightInfo as string;
-string right = ViewBag.right as string;
-string KindId = ViewBag.KindId as string;
-
-}
-<!DOCTYPE html>
-<html>
-
-<head>
-    <meta charset="utf-8">
-    <title>分润对象等级</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport"
-        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
-    <link rel="stylesheet" href="/layuiadmin/style/admin.css" media="all">
-    <script src="/admin/js/jquery-1.10.1.min.js"></script>
-    <style>
-        .layui-input-inline{
-            width: 175px !important;
-        }
-        .layui-form-label{
-            width: 85px !important;
-        }
-        .layui-inline{
-            margin-right: 0px !important;
-        }        
-        .w100{
-            width: 100px !important;
-        }
-        .ml50{
-            margin-left: 50px !important;
-        }
-    </style>
-</head>
-
-<body>
-    <div class="layui-fluid">
-        <div class="layui-card">
-            <div class="layui-form layui-card-header layuiadmin-card-header-auto">
-                <div class="layui-form-item">
-                    <div class="layui-inline">
-                        <div class="layui-input-inline">
-                            <input class="layui-input" type="text" name="Name" placeholder="名称" autocomplete="off">
-                        </div>
-                    </div>
-                    <div class="layui-inline">
-                        <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">
-                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>查询
-                        </button>
-                        <button class="layui-btn" lay-submit lay-filter="LAY-list-front-searchall">
-                            <i class="layui-icon layui-icon-list layuiadmin-button-btn"></i>全部
-                        </button>
-                    </div>
-                </div>
-            </div>
-
-            <div class="layui-card-body">
-                <div style="padding-bottom: 10px;">
-                    <button class="layui-btn" data-type="add"><i class="layui-icon layui-icon-add-1 layuiadmin-button-btn"></i>新增</button>
-                    <button class="layui-btn" data-type="batchdel"><i class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>删除</button>
-                </div>
-
-                <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
-                <script type="text/html" id="imgTpl">
-                    <img style="display: inline-block; width: 50%; height: 100%;" src={{ d.avatar }}>
-                </script>
-                <script type="text/html" id="table-list-tools">
-                    <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit"><i
-                            class="layui-icon layui-icon-edit"></i>编辑</a>
-                    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i
-                            class="layui-icon layui-icon-delete"></i>删除</a>
-                </script>
-            </div>
-        </div>
-    </div>
-    <div id="excelForm" style="display:none; padding:20px;">
-        <div class="layui-tab-item layui-show">
-            <div class="layui-form-item">
-                <label class="layui-form-label">excel文件</label>
-                <div class="layui-input-block">
-                    <div class="layui-upload">
-                        <input type="file" id="ExcelFile" name="ExcelFile" value="">
-                    </div>
-                    <div class="mt10" id="ExcelFileList">
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="layui-form-item ml10">
-            <div class="layui-input-block">
-                <button type="button" class="layui-btn" onclick="ConfirmImport()">立即导入</button>
-            </div>
-        </div>
-    </div>
-
-    <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/layuiadmin/modules_main/ProfitObjectLevels_Admin.js?r=@(DateTime.Now.ToString("yyyyMMddHHmmss"))"></script>
-    <script>
-        var KindId = '@KindId';
-    </script>
-</body>
-
-</html>

Areas/Admin/Views/MainServer/ProfitObjects/Add.cshtml

@@ -1,269 +0,0 @@
-@using MySystem.Models;
-@{
-string RightInfo = ViewBag.RightInfo as string;
-string right = ViewBag.right as string;
-List<ProfitObjects> objs = ViewBag.objs as List<ProfitObjects>;
-}
-<!DOCTYPE html>
-<html>
-
-<head>
-    <meta charset="utf-8">
-    <title>分润对象(增加)</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport"
-        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
-    <script src="/admin/js/jquery-1.10.1.min.js"></script>
-    <script src="/admin/js/LAreaData2.js"></script>
-</head>
-
-<body>
-
-    <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">
-
-        <div class="layui-card">
-            <div class="layui-card-body">
-                <div class="layui-tab" lay-filter="mytabbar">
-                    <ul class="layui-tab-title">
-                        <li class="layui-this" lay-id="1">基本资料</li>
-                        <li lay-id="2">分润参数</li>
-                    </ul>
-                    <div class="layui-tab-content mt20">
-                        <div class="layui-tab-item layui-show">
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">名称</label>
-                                <div class="layui-input-block">
-                                    <input class="layui-input" type="text" id="Name" name="Name" maxlength="50"
-                                        lay-verify="" autocomplete="off" placeholder="请输入名称">
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">复制对象</label>
-                                <div class="layui-input-inline">
-                                    <select id="CopyId" name="CopyId" lay-search="">
-                                        <option value="0">请选择</option>
-                                        @foreach (ProfitObjects obj in objs)
-                                        {
-                                        <option value="@obj.Id">@obj.Name</option>
-                                        }
-                                    </select>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="layui-tab-item">
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">最大层级</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" id="MaxFloor" name="MaxFloor" maxlength="20"
-                                        lay-verify="required," autocomplete="off" placeholder="请输入最大层级">
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">最大等级</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" id="MaxLevel" name="MaxLevel" maxlength="20"
-                                        lay-verify="required," autocomplete="off" placeholder="请输入最大等级">
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">到顶级是否继续</label>
-                                <div class="layui-input-block">
-                                    <input type="checkbox" id="MaxLevelContinue" name="MaxLevelContinue" value="1"
-                                        lay-skin="switch" lay-filter="switchTest" title="开关">
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">最小分润值</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" id="MinProfitVal" name="MinProfitVal"
-                                        maxlength="20" lay-verify="" autocomplete="off" placeholder="请输入最小分润值">
-                                </div>
-                            </div>
-
-                        </div>
-
-                    </div>
-                </div>
-                <div class="layui-form-item layui-hide">
-                    <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit"
-                        value="确认">
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js"></script>
-    <script src="/other/mybjq/kindeditor-min.js"></script>
-    <script src="/other/mybjq/lang/zh_CN.js"></script>
-    <script>
-        //编辑器
-        KindEditor.ready(function (K) {
-
-        });
-
-        var ids = "";
-
-        function getChildren(obj) {
-            $.each(obj, function (index, value) {
-                var id = obj[index].id;
-                ids += id + ",";
-                var children = obj[index].children;
-                if (children) {
-                    getChildren(children);
-                }
-            });
-        }
-
-        function AreasProvinceInit(tagId, areasVal, form) {
-            for (var i = 0; i < provs_data.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(provs_data[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "Province").append('<option value="' + provs_data[i].value + '"' + sel + '>' +
-                    provs_data[i].text + '</option>');
-            }
-            form.render();
-        }
-
-        function AreasProvinceSelected(tagId, areasVal, form, value) {
-            $("#" + tagId + "City").html('<option value="">市</option>');
-            var list = citys_data[value];
-            for (var i = 0; i < list.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(list[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "City").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text +
-                    '</option>');
-            }
-            $("#" + tagId + "Area").html('<option value="">县/区</option>');
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId +
-                "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-
-        function AreasCitySelected(tagId, areasVal, form, value) {
-            $("#" + tagId + "Area").html('<option value="">县/区</option>');
-            var list = dists_data[value];
-            for (var i = 0; i < list.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(list[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "Area").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text +
-                    '</option>');
-            }
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId +
-                "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-
-        function AreasAreaSelected(tagId, form) {
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId +
-                "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-
-        function movePrev(obj, tagId) {
-            $(obj).parent().prev().insertAfter($(obj).parent());
-            checkPics(tagId);
-        }
-
-        function moveNext(obj, tagId) {
-            $(obj).parent().next().insertBefore($(obj).parent());
-            checkPics(tagId);
-        }
-
-        function deletePic(obj, tagId) {
-            $(obj).parent().remove();
-            checkPics(tagId);
-        }
-
-        function checkPics(tagId) {
-            var pics = "";
-            var texts = "";
-            $("#" + tagId + "Image div img").each(function (i) {
-                pics += $(this).attr("src").replace(osshost, '') + "|";
-            });
-            $("#" + tagId + "Image div input").each(function (i) {
-                texts += $(this).val() + "|";
-            });
-            if (pics == "") {
-                $("#" + tagId).val("");
-            } else {
-                pics = pics.substring(0, pics.length - 1);
-                texts = texts.substring(0, pics.length - 1);
-                $("#" + tagId).val(pics + "#cut#" + texts);
-            }
-        }
-
-        function checkBox(tagId) {
-            var text = "";
-            $("input[type=checkbox][name=" + tagId + "List]:checked").each(function (i) {
-                text += $(this).val() + ",";
-            });
-            $("#" + tagId).val(text);
-        }
-
-        function showBigPic(picpath) {
-            parent.layer.open({
-                type: 1,
-                title: false,
-                closeBtn: 0,
-                shadeClose: true,
-                area: ['auto', 'auto'],
-                content: '<img src="' + picpath + '" style="max-width:800px; max-height:800px;" />'
-            });
-        }
-
-
-        var tree;
-        var element;
-        layui.config({
-            base: '/layuiadmin/' //静态资源所在路径
-        }).extend({
-            index: 'lib/index' //主入口模块
-        }).use(['index', 'form', 'upload', 'layedit', 'laydate', 'element', 'croppers', 'transfer', 'tree', 'util'],
-            function () {
-                var $ = layui.$,
-                    form = layui.form,
-                    layer = layui.layer,
-                    layedit = layui.layedit,
-                    laydate = layui.laydate,
-                    croppers = layui.croppers,
-                    upload = layui.upload,
-                    transfer = layui.transfer,
-                    util = layui.util;
-                tree = layui.tree;
-                element = layui.element;
-
-                //Hash地址的定位
-                var layid = location.hash.replace(/^#test=/, '');
-                element.tabChange('test', layid);
-                element.on('tab(test)', function (elem) {
-                    location.hash = 'test=' + $(this).attr('lay-id');
-                });
-
-                //日期
-
-
-                //上传文件
-
-
-                //穿梭框
-
-
-                //TreeView，比如权限管理
-
-
-                //省市区
-
-            })
-    </script>
-</body>
-
-</html>

Areas/Admin/Views/MainServer/ProfitObjects/Edit.cshtml

@@ -1,237 +0,0 @@
-@using MySystem.Models;
-@{ProfitObjects editData = ViewBag.data as ProfitObjects;}
-@{
-    string RightInfo = ViewBag.RightInfo as string;
-    string right = ViewBag.right as string;
-    
-}
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <title>分润对象(修改)</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
-    <script src="/admin/js/jquery-1.10.1.min.js"></script>
-    <script src="/admin/js/LAreaData2.js"></script>
-</head>
-<body>
-
-    <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">
-        <input type="hidden" name="Id" value="@editData.Id" />
-        
-        <div class="layui-card">
-          <div class="layui-card-body">
-            <div class="layui-tab" lay-filter="mytabbar">
-                <ul class="layui-tab-title">
-                    <li class="layui-this" lay-id="1">基本资料</li><li lay-id="2">分润参数</li>
-                </ul>
-                <div class="layui-tab-content mt20">
-                    <div class="layui-tab-item layui-show">
-<div class="layui-form-item">
-<label class="layui-form-label">名称</label>
-<div class="layui-input-block">
-<input class="layui-input" type="text" id="Name" name="Name" value="@editData.Name" maxlength="50" lay-verify="" autocomplete="off" placeholder="请输入名称">
-</div>
-</div>
-
-</div>
-<div class="layui-tab-item">
-<div class="layui-form-item">
-<label class="layui-form-label">最大层级</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="MaxFloor" name="MaxFloor" value="@editData.MaxFloor" maxlength="20" lay-verify="required," autocomplete="off" placeholder="请输入最大层级">
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">最大等级</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="MaxLevel" name="MaxLevel" value="@editData.MaxLevel" maxlength="20" lay-verify="required," autocomplete="off" placeholder="请输入最大等级">
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">到顶级是否继续</label>
-<div class="layui-input-block">
-<input type="checkbox" id="MaxLevelContinue" name="MaxLevelContinue" value="1" @(editData.MaxLevelContinue == 1 ? "checked=checked" : "") lay-skin="switch" lay-filter="switchTest" title="开关">
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">最小分润值</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="MinProfitVal" name="MinProfitVal" value="@editData.MinProfitVal" maxlength="20" lay-verify="" autocomplete="off" placeholder="请输入最小分润值">
-</div>
-</div>
-
-</div>
-
-                </div>
-            </div>
-            <div class="layui-form-item layui-hide">
-                <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit" value="确认">
-            </div>
-          </div>
-        </div>
-    </div>
-
-    <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js"></script>
-    <script src="/other/mybjq/kindeditor-min.js"></script>
-    <script src="/other/mybjq/lang/zh_CN.js"></script>
-    <script>
-        
-        
-        //编辑器
-        KindEditor.ready(function (K) {
-            
-        });
-
-        var ids = "";
-        function getChildren(obj) {
-            $.each(obj, function (index, value) {
-                var id = obj[index].id;
-                ids += id + ",";
-                var children = obj[index].children;
-                if (children) {
-                    getChildren(children);
-                }
-            });
-        }
-
-        function AreasProvinceInit(tagId, areasVal, form) {
-            for (var i = 0; i < provs_data.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(provs_data[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "Province").append('<option value="' + provs_data[i].value + '"' + sel + '>' + provs_data[i].text + '</option>');
-            }
-            form.render();
-        }
-
-        function AreasProvinceSelected(tagId, areasVal, form, value) {
-            $("#" + tagId + "City").html('<option value="">市</option>');
-            var list = citys_data[value];
-            for (var i = 0; i < list.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(list[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "City").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text + '</option>');
-            }
-            $("#" + tagId + "Area").html('<option value="">县/区</option>');
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-
-        function AreasCitySelected(tagId, areasVal, form, value) {
-            $("#" + tagId + "Area").html('<option value="">县/区</option>');
-            var list = dists_data[value];
-            for (var i = 0; i < list.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(list[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "Area").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text + '</option>');
-            }
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-
-        function AreasAreaSelected(tagId, form) {
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-        function movePrev(obj, tagId) {
-            $(obj).parent().prev().insertAfter($(obj).parent());
-            checkPics(tagId);
-        }
-        function moveNext(obj, tagId) {
-            $(obj).parent().next().insertBefore($(obj).parent());
-            checkPics(tagId);
-        }
-        function deletePic(obj, tagId) {
-            $(obj).parent().remove();
-            checkPics(tagId);
-        }
-        function checkPics(tagId) {
-            var pics = "";
-            var texts = "";
-            $("#" + tagId + "Image div img").each(function (i) {
-                pics += $(this).attr("src").replace(osshost, '') + "|";
-            });
-            $("#" + tagId + "Image div input").each(function (i) {
-                texts += $(this).val() + "|";
-            });
-            if (pics == "") {
-                $("#" + tagId).val("");
-            } else {
-                pics = pics.substring(0, pics.length - 1);
-                texts = texts.substring(0, pics.length - 1);
-                $("#" + tagId).val(pics + "#cut#" + texts);
-            }
-        }
-        function checkBox(tagId) {
-            var text = "";
-            $("input[type=checkbox][name=" + tagId + "List]:checked").each(function (i) {
-                text += $(this).val() + ",";
-            });
-            $("#" + tagId).val(text);
-        }
-        function showBigPic(picpath) {
-            parent.layer.open({
-                type: 1,
-                title: false,
-                closeBtn: 0,
-                shadeClose: true,
-                area: ['auto', 'auto'],
-                content: '<img src="' + picpath + '" style="max-width:800px; max-height:800px;" />'
-            });
-        }
-
-        var tree;
-        var element;
-        layui.config({
-            base: '/layuiadmin/' //静态资源所在路径
-        }).extend({
-            index: 'lib/index' //主入口模块
-        }).use(['index', 'form', 'upload', 'layedit', 'laydate', 'element', 'croppers', 'transfer', 'tree', 'util'], function () {
-            var $ = layui.$
-                , form = layui.form
-                , layer = layui.layer
-                , layedit = layui.layedit
-                , laydate = layui.laydate
-                , croppers = layui.croppers
-                , upload = layui.upload
-                , transfer = layui.transfer
-                , util = layui.util;
-            tree = layui.tree;
-            element = layui.element;
-        
-            //Hash地址的定位
-            var layid = location.hash.replace(/^#test=/, '');
-            element.tabChange('test', layid);
-            element.on('tab(test)', function (elem) {
-                location.hash = 'test=' + $(this).attr('lay-id');
-            });
-    
-            //日期
-            
-
-            //上传文件
-            
-
-            //穿梭框
-            
-
-            //TreeView，比如权限管理
-            
-
-            //省市区
-            
-        })
-
-    </script>
-</body>
-</html>

Areas/Admin/Views/MainServer/ProfitObjects/Index.cshtml

@@ -1,120 +0,0 @@
-@{
-string RightInfo = ViewBag.RightInfo as string;
-string right = ViewBag.right as string;
-
-}
-<!DOCTYPE html>
-<html>
-
-<head>
-    <meta charset="utf-8">
-    <title>分润对象</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport"
-        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
-    <link rel="stylesheet" href="/layuiadmin/style/admin.css" media="all">
-    <script src="/admin/js/jquery-1.10.1.min.js"></script>
-    <style>
-        .layui-input-inline{
-            width: 175px !important;
-        }
-        .layui-form-label{
-            width: 85px !important;
-        }
-        .layui-inline{
-            margin-right: 0px !important;
-        }        
-        .w100{
-            width: 100px !important;
-        }
-        .ml50{
-            margin-left: 50px !important;
-        }
-    </style>
-</head>
-
-<body>
-    <div class="layui-fluid">
-        <div class="layui-card">
-            <div class="layui-form layui-card-header layuiadmin-card-header-auto">
-                <div class="layui-form-item">
-                    <div class="layui-inline">
-                        <div class="layui-input-inline">
-                            <input class="layui-input" type="text" name="Name" placeholder="名称" autocomplete="off">
-                        </div>
-                    </div>
-                    <div class="layui-inline">
-                        <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">
-                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>查询
-                        </button>
-                        <button class="layui-btn" lay-submit lay-filter="LAY-list-front-searchall">
-                            <i class="layui-icon layui-icon-list layuiadmin-button-btn"></i>全部
-                        </button>
-                    </div>
-                </div>
-            </div>
-
-            <div class="layui-card-body">
-                <div style="padding-bottom: 10px;">
-                    <button class="layui-btn" data-type="add"><i class="layui-icon layui-icon-add-1 layuiadmin-button-btn"></i>新增</button>
-                    <button class="layui-btn" data-type="batchdel"><i class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>删除</button>
-                    <button class="layui-btn" data-type="Open">开启</button>
-                    <button class="layui-btn" data-type="Close">关闭</button>
-                    <button class="layui-btn" data-type="syncredis">同步redis</button>
-                </div>
-
-                <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
-                <script type="text/html" id="imgTpl">
-                    <img style="display: inline-block; width: 50%; height: 100%;" src={{ d.avatar }}>
-                </script>
-                <script type="text/html" id="table-list-tools">
-                    <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit"><i
-                            class="layui-icon layui-icon-edit"></i>编辑</a>
-                    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i
-                            class="layui-icon layui-icon-delete"></i>删除</a>
-                    <a class="layui-btn layui-btn-normal layui-btn-xs"
-                        lay-href="/Admin/ProfitObjectActivations/Index?right=@right&ObjectId=@("{{d.Id}}")">激活奖</a>
-                    <a class="layui-btn layui-btn-normal layui-btn-xs"
-                        lay-href="/Admin/ProfitObjectContinueFloors/Index?right=@right&ObjectId=@("{{d.Id}}")">继续分润</a>
-                    <a class="layui-btn layui-btn-normal layui-btn-xs"
-                        lay-href="/Admin/ProfitObjectFloors/Index?right=@right&ObjectId=@("{{d.Id}}")">层级</a>
-                    <a class="layui-btn layui-btn-normal layui-btn-xs"
-                        lay-href="/Admin/ProfitObjectLevelKinds/Index?right=@right&ObjectId=@("{{d.Id}}")">等级</a>
-                    <a class="layui-btn layui-btn-normal layui-btn-xs"
-                        lay-href="/Admin/ProfitObjectsActives/Index?right=@right&ObjectId=@("{{d.Id}}")">活动奖</a>
-                    <a class="layui-btn layui-btn-normal layui-btn-xs"
-                        lay-href="/Admin/ProfitObjectsRule/Index?right=@right&ObjectId=@("{{d.Id}}")">规则</a>
-                </script>
-            </div>
-        </div>
-    </div>
-    <div id="excelForm" style="display:none; padding:20px;">
-        <div class="layui-tab-item layui-show">
-            <div class="layui-form-item">
-                <label class="layui-form-label">excel文件</label>
-                <div class="layui-input-block">
-                    <div class="layui-upload">
-                        <input type="file" id="ExcelFile" name="ExcelFile" value="">
-                    </div>
-                    <div class="mt10" id="ExcelFileList">
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="layui-form-item ml10">
-            <div class="layui-input-block">
-                <button type="button" class="layui-btn" onclick="ConfirmImport()">立即导入</button>
-            </div>
-        </div>
-    </div>
-
-    <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/layuiadmin/modules_main/ProfitObjects_Admin.js?r=@(DateTime.Now.ToString("yyyyMMddHHmmssfff"))"></script>
-    <script>
-
-    </script>
-</body>
-
-</html>

Areas/Admin/Views/MainServer/ProfitObjectsActiveParams/Add.cshtml

@@ -1,223 +0,0 @@
-@{
-    string RightInfo = ViewBag.RightInfo as string;
-    string right = ViewBag.right as string;
-    string ProfitObjectsActiveId = ViewBag.ProfitObjectsActiveId as string;
-
-}
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <title>分润对象活动参数(增加)</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
-    <script src="/admin/js/jquery-1.10.1.min.js"></script>
-    <script src="/admin/js/LAreaData2.js"></script>
-</head>
-<body>
-
-    <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">
-        <input type="hidden" name="ProfitObjectsActiveId" value="@ProfitObjectsActiveId" />
-
-        <div class="layui-card">
-          <div class="layui-card-body">
-            <div class="layui-tab" lay-filter="mytabbar">
-                <ul class="layui-tab-title">
-                    <li class="layui-this" lay-id="1">基本资料</li>
-                </ul>
-                <div class="layui-tab-content mt20">
-                    <div class="layui-tab-item layui-show">
-<div class="layui-form-item">
-<label class="layui-form-label">参数名称</label>
-<div class="layui-input-block">
-<input class="layui-input" type="text" id="Name" name="Name" maxlength="50" lay-verify="required," autocomplete="off" placeholder="请输入参数名称">
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">参数值</label>
-<div class="layui-input-block">
-<input class="layui-input" type="text" id="TextValue" name="TextValue" maxlength="20" lay-verify="" autocomplete="off" placeholder="请输入参数值">
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">参数说明</label>
-<div class="layui-input-block">
-<input class="layui-input" type="text" id="Remark" name="Remark" maxlength="200" lay-verify="" autocomplete="off" placeholder="请输入参数说明">
-</div>
-</div>
-
-</div>
-
-                </div>
-            </div>
-            <div class="layui-form-item layui-hide">
-                <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit" value="确认">
-            </div>
-          </div>
-        </div>
-    </div>
-
-    <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js"></script>
-    <script src="/other/mybjq/kindeditor-min.js"></script>
-    <script src="/other/mybjq/lang/zh_CN.js"></script>
-    <script>
-        
-                    
-        //编辑器
-        KindEditor.ready(function (K) {
-            
-        });
-
-        var ids = "";
-        function getChildren(obj) {
-            $.each(obj, function (index, value) {
-                var id = obj[index].id;
-                ids += id + ",";
-                var children = obj[index].children;
-                if (children) {
-                    getChildren(children);
-                }
-            });
-        }
-
-        function AreasProvinceInit(tagId, areasVal, form) {
-            for (var i = 0; i < provs_data.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(provs_data[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "Province").append('<option value="' + provs_data[i].value + '"' + sel + '>' + provs_data[i].text + '</option>');
-            }
-            form.render();
-        }
-
-        function AreasProvinceSelected(tagId, areasVal, form, value) {
-            $("#" + tagId + "City").html('<option value="">市</option>');
-            var list = citys_data[value];
-            for (var i = 0; i < list.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(list[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "City").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text + '</option>');
-            }
-            $("#" + tagId + "Area").html('<option value="">县/区</option>');
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-
-        function AreasCitySelected(tagId, areasVal, form, value) {
-            $("#" + tagId + "Area").html('<option value="">县/区</option>');
-            var list = dists_data[value];
-            for (var i = 0; i < list.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(list[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "Area").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text + '</option>');
-            }
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-
-        function AreasAreaSelected(tagId, form) {
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-        function movePrev(obj, tagId) {
-            $(obj).parent().prev().insertAfter($(obj).parent());
-            checkPics(tagId);
-        }
-        function moveNext(obj, tagId) {
-            $(obj).parent().next().insertBefore($(obj).parent());
-            checkPics(tagId);
-        }
-        function deletePic(obj, tagId) {
-            $(obj).parent().remove();
-            checkPics(tagId);
-        }
-        function checkPics(tagId) {
-            var pics = "";
-            var texts = "";
-            $("#" + tagId + "Image div img").each(function (i) {
-                pics += $(this).attr("src").replace(osshost, '') + "|";
-            });
-            $("#" + tagId + "Image div input").each(function (i) {
-                texts += $(this).val() + "|";
-            });
-            if (pics == "") {
-                $("#" + tagId).val("");
-            } else {
-                pics = pics.substring(0, pics.length - 1);
-                texts = texts.substring(0, pics.length - 1);
-                $("#" + tagId).val(pics + "#cut#" + texts);
-            }
-        }
-        function checkBox(tagId) {
-            var text = "";
-            $("input[type=checkbox][name=" + tagId + "List]:checked").each(function (i) {
-                text += $(this).val() + ",";
-            });
-            $("#" + tagId).val(text);
-        }
-        function showBigPic(picpath) {
-            parent.layer.open({
-                type: 1,
-                title: false,
-                closeBtn: 0,
-                shadeClose: true,
-                area: ['auto', 'auto'],
-                content: '<img src="' + picpath + '" style="max-width:800px; max-height:800px;" />'
-            });
-        }
-
-        
-        var tree;
-        var element;
-        var upload;
-        layui.config({
-            base: '/layuiadmin/' //静态资源所在路径
-        }).extend({
-            index: 'lib/index' //主入口模块
-        }).use(['index', 'form', 'upload', 'layedit', 'laydate', 'element', 'croppers', 'transfer', 'tree', 'util'], function () {
-            var $ = layui.$
-                , form = layui.form
-                , layer = layui.layer
-                , layedit = layui.layedit
-                , laydate = layui.laydate
-                , croppers = layui.croppers
-                , transfer = layui.transfer
-                , util = layui.util;
-            tree = layui.tree;
-            element = layui.element;
-            upload = layui.upload;
-        
-            //Hash地址的定位
-            var layid = location.hash.replace(/^#test=/, '');
-            element.tabChange('test', layid);
-            element.on('tab(test)', function (elem) {
-                location.hash = 'test=' + $(this).attr('lay-id');
-            });
-    
-            //日期
-            
-
-            //上传文件
-            
-
-            //穿梭框
-            
-
-            //TreeView，比如权限管理
-            
-
-            //省市区
-            
-        })
-
-    </script>
-</body>
-</html>

Areas/Admin/Views/MainServer/ProfitObjectsActiveParams/Edit.cshtml

@@ -1,225 +0,0 @@
-@using MySystem.Models;
-@{ProfitObjectsActiveParams editData = ViewBag.data as ProfitObjectsActiveParams;}
-@{
-    string RightInfo = ViewBag.RightInfo as string;
-    string right = ViewBag.right as string;
-    string ProfitObjectsActiveId = ViewBag.ProfitObjectsActiveId as string;
-
-}
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <title>分润对象活动参数(修改)</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
-    <script src="/admin/js/jquery-1.10.1.min.js"></script>
-    <script src="/admin/js/LAreaData2.js"></script>
-</head>
-<body>
-
-    <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">
-        <input type="hidden" name="Id" value="@editData.Id" />
-        <input type="hidden" name="ProfitObjectsActiveId" value="@ProfitObjectsActiveId" />
-
-        <div class="layui-card">
-          <div class="layui-card-body">
-            <div class="layui-tab" lay-filter="mytabbar">
-                <ul class="layui-tab-title">
-                    <li class="layui-this" lay-id="1">基本资料</li>
-                </ul>
-                <div class="layui-tab-content mt20">
-                    <div class="layui-tab-item layui-show">
-<div class="layui-form-item">
-<label class="layui-form-label">参数名称</label>
-<div class="layui-input-block">
-<input class="layui-input" type="text" id="Name" name="Name" value="@editData.Name" maxlength="50" lay-verify="required," autocomplete="off" placeholder="请输入参数名称">
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">参数值</label>
-<div class="layui-input-block">
-<input class="layui-input" type="text" id="TextValue" name="TextValue" value="@editData.TextValue" maxlength="20" lay-verify="" autocomplete="off" placeholder="请输入参数值">
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">参数说明</label>
-<div class="layui-input-block">
-<input class="layui-input" type="text" id="Remark" name="Remark" value="@editData.Remark" maxlength="200" lay-verify="" autocomplete="off" placeholder="请输入参数说明">
-</div>
-</div>
-
-</div>
-
-                </div>
-            </div>
-            <div class="layui-form-item layui-hide">
-                <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit" value="确认">
-            </div>
-          </div>
-        </div>
-    </div>
-
-    <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js"></script>
-    <script src="/other/mybjq/kindeditor-min.js"></script>
-    <script src="/other/mybjq/lang/zh_CN.js"></script>
-    <script>
-        
-        
-        //编辑器
-        KindEditor.ready(function (K) {
-            
-        });
-
-        var ids = "";
-        function getChildren(obj) {
-            $.each(obj, function (index, value) {
-                var id = obj[index].id;
-                ids += id + ",";
-                var children = obj[index].children;
-                if (children) {
-                    getChildren(children);
-                }
-            });
-        }
-
-        function AreasProvinceInit(tagId, areasVal, form) {
-            for (var i = 0; i < provs_data.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(provs_data[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "Province").append('<option value="' + provs_data[i].value + '"' + sel + '>' + provs_data[i].text + '</option>');
-            }
-            form.render();
-        }
-
-        function AreasProvinceSelected(tagId, areasVal, form, value) {
-            $("#" + tagId + "City").html('<option value="">市</option>');
-            var list = citys_data[value];
-            for (var i = 0; i < list.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(list[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "City").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text + '</option>');
-            }
-            $("#" + tagId + "Area").html('<option value="">县/区</option>');
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-
-        function AreasCitySelected(tagId, areasVal, form, value) {
-            $("#" + tagId + "Area").html('<option value="">县/区</option>');
-            var list = dists_data[value];
-            for (var i = 0; i < list.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(list[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "Area").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text + '</option>');
-            }
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-
-        function AreasAreaSelected(tagId, form) {
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-        function movePrev(obj, tagId) {
-            $(obj).parent().prev().insertAfter($(obj).parent());
-            checkPics(tagId);
-        }
-        function moveNext(obj, tagId) {
-            $(obj).parent().next().insertBefore($(obj).parent());
-            checkPics(tagId);
-        }
-        function deletePic(obj, tagId) {
-            $(obj).parent().remove();
-            checkPics(tagId);
-        }
-        function checkPics(tagId) {
-            var pics = "";
-            var texts = "";
-            $("#" + tagId + "Image div img").each(function (i) {
-                pics += $(this).attr("src").replace(osshost, '') + "|";
-            });
-            $("#" + tagId + "Image div input").each(function (i) {
-                texts += $(this).val() + "|";
-            });
-            if (pics == "") {
-                $("#" + tagId).val("");
-            } else {
-                pics = pics.substring(0, pics.length - 1);
-                texts = texts.substring(0, pics.length - 1);
-                $("#" + tagId).val(pics + "#cut#" + texts);
-            }
-        }
-        function checkBox(tagId) {
-            var text = "";
-            $("input[type=checkbox][name=" + tagId + "List]:checked").each(function (i) {
-                text += $(this).val() + ",";
-            });
-            $("#" + tagId).val(text);
-        }
-        function showBigPic(picpath) {
-            parent.layer.open({
-                type: 1,
-                title: false,
-                closeBtn: 0,
-                shadeClose: true,
-                area: ['auto', 'auto'],
-                content: '<img src="' + picpath + '" style="max-width:800px; max-height:800px;" />'
-            });
-        }
-
-        var tree;
-        var element;
-        var upload;
-        layui.config({
-            base: '/layuiadmin/' //静态资源所在路径
-        }).extend({
-            index: 'lib/index' //主入口模块
-        }).use(['index', 'form', 'upload', 'layedit', 'laydate', 'element', 'croppers', 'transfer', 'tree', 'util'], function () {
-            var $ = layui.$
-                , form = layui.form
-                , layer = layui.layer
-                , layedit = layui.layedit
-                , laydate = layui.laydate
-                , croppers = layui.croppers
-                , transfer = layui.transfer
-                , util = layui.util;
-            tree = layui.tree;
-            element = layui.element;
-            upload = layui.upload;
-        
-            //Hash地址的定位
-            var layid = location.hash.replace(/^#test=/, '');
-            element.tabChange('test', layid);
-            element.on('tab(test)', function (elem) {
-                location.hash = 'test=' + $(this).attr('lay-id');
-            });
-    
-            //日期
-            
-
-            //上传文件
-            
-
-            //穿梭框
-            
-
-            //TreeView，比如权限管理
-            
-
-            //省市区
-            
-        })
-
-    </script>
-</body>
-</html>

Areas/Admin/Views/MainServer/ProfitObjectsActives/Add.cshtml

@@ -1,321 +0,0 @@
-@{
-string RightInfo = ViewBag.RightInfo as string;
-string right = ViewBag.right as string;
-string ObjectId = ViewBag.ObjectId as string;
-
-}
-<!DOCTYPE html>
-<html>
-
-<head>
-    <meta charset="utf-8">
-    <title>分润对象活动奖(增加)</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport"
-        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
-    <script src="/admin/js/jquery-1.10.1.min.js"></script>
-    <script src="/admin/js/LAreaData2.js"></script>
-</head>
-
-<body>
-
-    <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">
-        <input type="hidden" name="ObjectId" value="@ObjectId" />
-
-        <div class="layui-card">
-            <div class="layui-card-body">
-                <div class="layui-tab" lay-filter="mytabbar">
-                    <ul class="layui-tab-title">
-                        <li class="layui-this" lay-id="1">基本资料</li>
-                    </ul>
-                    <div class="layui-tab-content mt20">
-                        <div class="layui-tab-item layui-show">
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">名称</label>
-                                <div class="layui-input-block">
-                                    <input class="layui-input" type="text" id="Name" name="Name" maxlength="50"
-                                        lay-verify="required," autocomplete="off" placeholder="请输入名称">
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">限制时间类型</label>
-                                <div class="layui-input-inline">
-                                    <select id="LimitDateKind" name="LimitDateKind" lay-search="">
-                                        <option value="">请选择</option>
-                                        <option value="1">天</option>
-                                        <option value="2">月</option>
-                                        <option value="3">年</option>
-                                        <option value="4">自定义</option>
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">限制时间值</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" id="LimitDateVal" name="LimitDateVal"
-                                        maxlength="20" lay-verify="" autocomplete="off" placeholder="请输入限制时间值">
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">自定时间限制</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" id="LimitCustomerDate"
-                                        name="LimitCustomerDate" lay-verify="" autocomplete="off"
-                                        placeholder="请输入自定时间限制">
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">满足条件的数值</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" id="FinishNumber" name="FinishNumber"
-                                        maxlength="20" lay-verify="" autocomplete="off" placeholder="请输入满足条件的数值">
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">获得收益值</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" id="ProfitNumber" name="ProfitNumber"
-                                        maxlength="20" lay-verify="" autocomplete="off" placeholder="请输入获得收益值">
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">活动开始时间</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" id="StartDate" name="StartDate" lay-verify="" autocomplete="off"
-                                        placeholder="请输入活动开始时间">
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">活动结束时间</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" id="EndDate" name="EndDate" lay-verify="" autocomplete="off"
-                                        placeholder="请输入活动结束时间">
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">赠机台数</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" id="MachineCount" name="MachineCount" maxlength="20" lay-verify=""
-                                        autocomplete="off" placeholder="请输入赠机台数">
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">卡类型</label>
-                                <div class="layui-input-inline">
-                                    <select id="CardType" name="CardType" lay-search="">
-                                        <option value="">请选择</option>
-                                        <option value="0">贷记卡</option>
-                                        <option value="1">借记卡</option>
-                                        <option value="2">不限</option>
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">获得收益值2</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" id="ProfitNumber2" name="ProfitNumber2" maxlength="20" lay-verify="" autocomplete="off" placeholder="请输入获得收益值2">
-                                </div>
-                            </div>
-
-                        </div>
-
-                    </div>
-                </div>
-                <div class="layui-form-item layui-hide">
-                    <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit"
-                        value="确认">
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js"></script>
-    <script src="/other/mybjq/kindeditor-min.js"></script>
-    <script src="/other/mybjq/lang/zh_CN.js"></script>
-    <script>
-        //编辑器
-        KindEditor.ready(function (K) {
-
-        });
-
-        var ids = "";
-
-        function getChildren(obj) {
-            $.each(obj, function (index, value) {
-                var id = obj[index].id;
-                ids += id + ",";
-                var children = obj[index].children;
-                if (children) {
-                    getChildren(children);
-                }
-            });
-        }
-
-        function AreasProvinceInit(tagId, areasVal, form) {
-            for (var i = 0; i < provs_data.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(provs_data[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "Province").append('<option value="' + provs_data[i].value + '"' + sel + '>' +
-                    provs_data[i].text + '</option>');
-            }
-            form.render();
-        }
-
-        function AreasProvinceSelected(tagId, areasVal, form, value) {
-            $("#" + tagId + "City").html('<option value="">市</option>');
-            var list = citys_data[value];
-            for (var i = 0; i < list.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(list[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "City").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text +
-                    '</option>');
-            }
-            $("#" + tagId + "Area").html('<option value="">县/区</option>');
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId +
-                "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-
-        function AreasCitySelected(tagId, areasVal, form, value) {
-            $("#" + tagId + "Area").html('<option value="">县/区</option>');
-            var list = dists_data[value];
-            for (var i = 0; i < list.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(list[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "Area").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text +
-                    '</option>');
-            }
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId +
-                "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-
-        function AreasAreaSelected(tagId, form) {
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId +
-                "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-
-        function movePrev(obj, tagId) {
-            $(obj).parent().prev().insertAfter($(obj).parent());
-            checkPics(tagId);
-        }
-
-        function moveNext(obj, tagId) {
-            $(obj).parent().next().insertBefore($(obj).parent());
-            checkPics(tagId);
-        }
-
-        function deletePic(obj, tagId) {
-            $(obj).parent().remove();
-            checkPics(tagId);
-        }
-
-        function checkPics(tagId) {
-            var pics = "";
-            var texts = "";
-            $("#" + tagId + "Image div img").each(function (i) {
-                pics += $(this).attr("src").replace(osshost, '') + "|";
-            });
-            $("#" + tagId + "Image div input").each(function (i) {
-                texts += $(this).val() + "|";
-            });
-            if (pics == "") {
-                $("#" + tagId).val("");
-            } else {
-                pics = pics.substring(0, pics.length - 1);
-                texts = texts.substring(0, pics.length - 1);
-                $("#" + tagId).val(pics + "#cut#" + texts);
-            }
-        }
-
-        function checkBox(tagId) {
-            var text = "";
-            $("input[type=checkbox][name=" + tagId + "List]:checked").each(function (i) {
-                text += $(this).val() + ",";
-            });
-            $("#" + tagId).val(text);
-        }
-
-        function showBigPic(picpath) {
-            parent.layer.open({
-                type: 1,
-                title: false,
-                closeBtn: 0,
-                shadeClose: true,
-                area: ['auto', 'auto'],
-                content: '<img src="' + picpath + '" style="max-width:800px; max-height:800px;" />'
-            });
-        }
-
-
-        var tree;
-        var element;
-        layui.config({
-            base: '/layuiadmin/' //静态资源所在路径
-        }).extend({
-            index: 'lib/index' //主入口模块
-        }).use(['index', 'form', 'upload', 'layedit', 'laydate', 'element', 'croppers', 'transfer', 'tree', 'util'],
-            function () {
-                var $ = layui.$,
-                    form = layui.form,
-                    layer = layui.layer,
-                    layedit = layui.layedit,
-                    laydate = layui.laydate,
-                    croppers = layui.croppers,
-                    upload = layui.upload,
-                    transfer = layui.transfer,
-                    util = layui.util;
-                tree = layui.tree;
-                element = layui.element;
-
-                //Hash地址的定位
-                var layid = location.hash.replace(/^#test=/, '');
-                element.tabChange('test', layid);
-                element.on('tab(test)', function (elem) {
-                    location.hash = 'test=' + $(this).attr('lay-id');
-                });
-
-                //日期
-                laydate.render({
-                    elem: '#LimitCustomerDate',
-                    type: 'datetime',
-                    trigger: 'click'
-                });
-                laydate.render({
-                    elem: '#StartDate',
-                    type: 'datetime',
-                    trigger: 'click'
-                });
-                laydate.render({
-                    elem: '#EndDate',
-                    type: 'datetime',
-                    trigger: 'click'
-                });
-
-
-                //上传文件
-
-
-                //穿梭框
-
-
-                //TreeView，比如权限管理
-
-
-                //省市区
-
-            })
-    </script>
-</body>
-
-</html>

Areas/Admin/Views/MainServer/ProfitObjectsActives/Edit.cshtml

@@ -1,338 +0,0 @@
-@using MySystem.Models;
-@{ProfitObjectsActives editData = ViewBag.data as ProfitObjectsActives;}
-@{
-string RightInfo = ViewBag.RightInfo as string;
-string right = ViewBag.right as string;
-string ObjectId = ViewBag.ObjectId as string;
-
-}
-<!DOCTYPE html>
-<html>
-
-<head>
-    <meta charset="utf-8">
-    <title>分润对象活动奖(修改)</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport"
-        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
-    <script src="/admin/js/jquery-1.10.1.min.js"></script>
-    <script src="/admin/js/LAreaData2.js"></script>
-</head>
-
-<body>
-
-    <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">
-        <input type="hidden" name="Id" value="@editData.Id" />
-        <input type="hidden" name="ObjectId" value="@ObjectId" />
-
-        <div class="layui-card">
-            <div class="layui-card-body">
-                <div class="layui-tab" lay-filter="mytabbar">
-                    <ul class="layui-tab-title">
-                        <li class="layui-this" lay-id="1">基本资料</li>
-                    </ul>
-                    <div class="layui-tab-content mt20">
-                        <div class="layui-tab-item layui-show">
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">名称</label>
-                                <div class="layui-input-block">
-                                    <input class="layui-input" type="text" id="Name" name="Name" value="@editData.Name"
-                                        maxlength="50" lay-verify="required," autocomplete="off" placeholder="请输入名称">
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">限制时间类型</label>
-                                <div class="layui-input-inline">
-                                    <select id="LimitDateKind" name="LimitDateKind" lay-search="">
-                                        <option value="">请选择</option>
-                                        <option value="1">天</option>
-                                        <option value="2">月</option>
-                                        <option value="3">年</option>
-                                        <option value="4">自定义</option>
-                                    </select>
-                                    <script>
-                                        $("#LimitDateKind").val("@editData.LimitDateKind");
-                                    </script>
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">限制时间值</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" id="LimitDateVal" name="LimitDateVal"
-                                        value="@editData.LimitDateVal" maxlength="20" lay-verify="" autocomplete="off"
-                                        placeholder="请输入限制时间值">
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">自定时间限制</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" id="LimitCustomerDate"
-                                        name="LimitCustomerDate"
-                                        value="@(editData.LimitCustomerDate == null ? "" : editData.LimitCustomerDate.Value.ToString("yyyy-MM-dd HH:mm:ss"))" lay-verify="" autocomplete="off"
-                                        placeholder="请输入自定时间限制">
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">满足条件的数值</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" id="FinishNumber" name="FinishNumber"
-                                        value="@editData.FinishNumber" maxlength="20" lay-verify="" autocomplete="off"
-                                        placeholder="请输入满足条件的数值">
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">获得收益值</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" id="ProfitNumber" name="ProfitNumber"
-                                        value="@editData.ProfitNumber" maxlength="20" lay-verify="" autocomplete="off"
-                                        placeholder="请输入获得收益值">
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">活动开始时间</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" id="StartDate" name="StartDate"
-                                        value="@(editData.StartDate == null ? "" : editData.StartDate.Value.ToString("yyyy-MM-dd HH:mm:ss"))" lay-verify="" autocomplete="off"
-                                        placeholder="请输入活动开始时间">
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">活动结束时间</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" id="EndDate" name="EndDate"
-                                        value="@(editData.EndDate == null ? "" : editData.EndDate.Value.ToString("yyyy-MM-dd HH:mm:ss"))" lay-verify="" autocomplete="off"
-                                        placeholder="请输入活动结束时间">
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">赠机台数</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" id="MachineCount" name="MachineCount"
-                                        value="@editData.MachineCount" maxlength="20" lay-verify=""
-                                        autocomplete="off" placeholder="请输入赠机台数">
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">卡类型</label>
-                                <div class="layui-input-inline">
-                                    <select id="CardType" name="CardType" lay-search="">
-                                        <option value="">请选择</option>
-                                        <option value="0">贷记卡</option>
-                                        <option value="1">借记卡</option>
-                                        <option value="2">不限</option>
-                                    </select>
-                                    <script>
-                                        $("#CardType").val("@editData.CardType");
-                                    </script>
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">获得收益值2</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" id="ProfitNumber2" name="ProfitNumber2"
-                                        value="@editData.ProfitNumber2" maxlength="20" lay-verify="" autocomplete="off"
-                                        placeholder="请输入获得收益值2">
-                                </div>
-                            </div>
-
-                        </div>
-
-                    </div>
-                </div>
-                <div class="layui-form-item layui-hide">
-                    <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit"
-                        value="确认">
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js"></script>
-    <script src="/other/mybjq/kindeditor-min.js"></script>
-    <script src="/other/mybjq/lang/zh_CN.js"></script>
-    <script>
-        //编辑器
-        KindEditor.ready(function (K) {
-
-        });
-
-        var ids = "";
-
-        function getChildren(obj) {
-            $.each(obj, function (index, value) {
-                var id = obj[index].id;
-                ids += id + ",";
-                var children = obj[index].children;
-                if (children) {
-                    getChildren(children);
-                }
-            });
-        }
-
-        function AreasProvinceInit(tagId, areasVal, form) {
-            for (var i = 0; i < provs_data.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(provs_data[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "Province").append('<option value="' + provs_data[i].value + '"' + sel + '>' +
-                    provs_data[i].text + '</option>');
-            }
-            form.render();
-        }
-
-        function AreasProvinceSelected(tagId, areasVal, form, value) {
-            $("#" + tagId + "City").html('<option value="">市</option>');
-            var list = citys_data[value];
-            for (var i = 0; i < list.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(list[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "City").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text +
-                    '</option>');
-            }
-            $("#" + tagId + "Area").html('<option value="">县/区</option>');
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId +
-                "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-
-        function AreasCitySelected(tagId, areasVal, form, value) {
-            $("#" + tagId + "Area").html('<option value="">县/区</option>');
-            var list = dists_data[value];
-            for (var i = 0; i < list.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(list[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "Area").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text +
-                    '</option>');
-            }
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId +
-                "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-
-        function AreasAreaSelected(tagId, form) {
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId +
-                "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-
-        function movePrev(obj, tagId) {
-            $(obj).parent().prev().insertAfter($(obj).parent());
-            checkPics(tagId);
-        }
-
-        function moveNext(obj, tagId) {
-            $(obj).parent().next().insertBefore($(obj).parent());
-            checkPics(tagId);
-        }
-
-        function deletePic(obj, tagId) {
-            $(obj).parent().remove();
-            checkPics(tagId);
-        }
-
-        function checkPics(tagId) {
-            var pics = "";
-            var texts = "";
-            $("#" + tagId + "Image div img").each(function (i) {
-                pics += $(this).attr("src").replace(osshost, '') + "|";
-            });
-            $("#" + tagId + "Image div input").each(function (i) {
-                texts += $(this).val() + "|";
-            });
-            if (pics == "") {
-                $("#" + tagId).val("");
-            } else {
-                pics = pics.substring(0, pics.length - 1);
-                texts = texts.substring(0, pics.length - 1);
-                $("#" + tagId).val(pics + "#cut#" + texts);
-            }
-        }
-
-        function checkBox(tagId) {
-            var text = "";
-            $("input[type=checkbox][name=" + tagId + "List]:checked").each(function (i) {
-                text += $(this).val() + ",";
-            });
-            $("#" + tagId).val(text);
-        }
-
-        function showBigPic(picpath) {
-            parent.layer.open({
-                type: 1,
-                title: false,
-                closeBtn: 0,
-                shadeClose: true,
-                area: ['auto', 'auto'],
-                content: '<img src="' + picpath + '" style="max-width:800px; max-height:800px;" />'
-            });
-        }
-
-        var tree;
-        var element;
-        layui.config({
-            base: '/layuiadmin/' //静态资源所在路径
-        }).extend({
-            index: 'lib/index' //主入口模块
-        }).use(['index', 'form', 'upload', 'layedit', 'laydate', 'element', 'croppers', 'transfer', 'tree', 'util'],
-            function () {
-                var $ = layui.$,
-                    form = layui.form,
-                    layer = layui.layer,
-                    layedit = layui.layedit,
-                    laydate = layui.laydate,
-                    croppers = layui.croppers,
-                    upload = layui.upload,
-                    transfer = layui.transfer,
-                    util = layui.util;
-                tree = layui.tree;
-                element = layui.element;
-
-                //Hash地址的定位
-                var layid = location.hash.replace(/^#test=/, '');
-                element.tabChange('test', layid);
-                element.on('tab(test)', function (elem) {
-                    location.hash = 'test=' + $(this).attr('lay-id');
-                });
-
-                //日期
-                laydate.render({
-                    elem: '#LimitCustomerDate',
-                    type: 'datetime',
-                    trigger: 'click'
-                });
-                laydate.render({
-                    elem: '#StartDate',
-                    type: 'datetime',
-                    trigger: 'click'
-                });
-                laydate.render({
-                    elem: '#EndDate',
-                    type: 'datetime',
-                    trigger: 'click'
-                });
-
-
-                //上传文件
-
-
-                //穿梭框
-
-
-                //TreeView，比如权限管理
-
-
-                //省市区
-
-            })
-    </script>
-</body>
-
-</html>

Areas/Admin/Views/MainServer/ProfitObjectsActives/Index.cshtml

@@ -1,106 +0,0 @@
-@{
-string RightInfo = ViewBag.RightInfo as string;
-string right = ViewBag.right as string;
-string ObjectId = ViewBag.ObjectId as string;
-
-}
-<!DOCTYPE html>
-<html>
-
-<head>
-    <meta charset="utf-8">
-    <title>分润对象活动奖</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport"
-        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
-    <link rel="stylesheet" href="/layuiadmin/style/admin.css" media="all">
-    <script src="/admin/js/jquery-1.10.1.min.js"></script>
-    <style>
-        .layui-input-inline{
-            width: 175px !important;
-        }
-        .layui-form-label{
-            width: 85px !important;
-        }
-        .layui-inline{
-            margin-right: 0px !important;
-        }        
-        .w100{
-            width: 100px !important;
-        }
-        .ml50{
-            margin-left: 50px !important;
-        }
-    </style>
-</head>
-
-<body>
-    <div class="layui-fluid">
-        <div class="layui-card">
-            <div class="layui-form layui-card-header layuiadmin-card-header-auto">
-                <div class="layui-form-item">
-                    <div class="layui-inline">
-                        <div class="layui-input-inline">
-                            <input class="layui-input" type="text" name="Name" placeholder="名称" autocomplete="off">
-                        </div>
-                    </div>
-                    <div class="layui-inline">
-                        <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">
-                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>查询
-                        </button>
-                        <button class="layui-btn" lay-submit lay-filter="LAY-list-front-searchall">
-                            <i class="layui-icon layui-icon-list layuiadmin-button-btn"></i>全部
-                        </button>
-                    </div>
-                </div>
-            </div>
-
-            <div class="layui-card-body">
-                <div style="padding-bottom: 10px;">
-                    <button class="layui-btn" data-type="add"><i class="layui-icon layui-icon-add-1 layuiadmin-button-btn"></i>新增</button>
-                    <button class="layui-btn" data-type="batchdel"><i class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>删除</button>
-                </div>
-
-                <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
-                <script type="text/html" id="imgTpl">
-                    <img style="display: inline-block; width: 50%; height: 100%;" src={{ d.avatar }}>
-                </script>
-                <script type="text/html" id="table-list-tools">
-                    <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit"><i
-                            class="layui-icon layui-icon-edit"></i>编辑</a>
-                    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i
-                            class="layui-icon layui-icon-delete"></i>删除</a>
-                </script>
-            </div>
-        </div>
-    </div>
-    <div id="excelForm" style="display:none; padding:20px;">
-        <div class="layui-tab-item layui-show">
-            <div class="layui-form-item">
-                <label class="layui-form-label">excel文件</label>
-                <div class="layui-input-block">
-                    <div class="layui-upload">
-                        <input type="file" id="ExcelFile" name="ExcelFile" value="">
-                    </div>
-                    <div class="mt10" id="ExcelFileList">
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="layui-form-item ml10">
-            <div class="layui-input-block">
-                <button type="button" class="layui-btn" onclick="ConfirmImport()">立即导入</button>
-            </div>
-        </div>
-    </div>
-
-    <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/layuiadmin/modules_main/ProfitObjectsActives_Admin.js"></script>
-    <script>
-        var ObjectId = '@ObjectId';
-    </script>
-</body>
-
-</html>

Areas/Admin/Views/MainServer/ProfitObjectsRule/Edit.cshtml

@@ -1,241 +0,0 @@
-@using MySystem.Models;
-@{ProfitObjectsRule editData = ViewBag.data as ProfitObjectsRule;}
-@{
-    string RightInfo = ViewBag.RightInfo as string;
-    string right = ViewBag.right as string;
-    string ObjectId = ViewBag.ObjectId as string;
-
-}
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <title>分润对象规则(修改)</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
-    <script src="/admin/js/jquery-1.10.1.min.js"></script>
-    <script src="/admin/js/LAreaData2.js"></script>
-</head>
-<body>
-
-    <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">
-        <input type="hidden" name="Id" value="@editData.Id" />
-        <input type="hidden" name="ObjectId" value="@ObjectId" />
-
-        <div class="layui-card">
-          <div class="layui-card-body">
-            <div class="layui-tab" lay-filter="mytabbar">
-                <ul class="layui-tab-title">
-                    <li class="layui-this" lay-id="1">基本信息</li>
-                </ul>
-                <div class="layui-tab-content mt20">
-                    <div class="layui-tab-item layui-show">
-<div class="layui-form-item">
-<label class="layui-form-label">名称</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="Name" name="Name" value="@editData.Name" maxlength="50" lay-verify="required|" autocomplete="off" placeholder="请输入名称">
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">活动开始时间</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="StartDate" name="StartDate" value="@(editData.StartDate == null ? "" : editData.StartDate.Value.ToString("yyyy-MM-dd HH:mm:ss"))" lay-verify="required|" autocomplete="off" placeholder="请输入活动开始时间">
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">活动结束时间</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="EndDate" name="EndDate" value="@(editData.EndDate == null ? "" : editData.EndDate.Value.ToString("yyyy-MM-dd HH:mm:ss"))" lay-verify="required|" autocomplete="off" placeholder="请输入活动结束时间">
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">编号</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="Code" name="Code" value="@editData.Code" maxlength="50" lay-verify="required|" autocomplete="off" placeholder="请输入编号">
-</div>
-</div>
-
-</div>
-
-                </div>
-            </div>
-            <div class="layui-form-item layui-hide">
-                <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit" value="确认">
-            </div>
-          </div>
-        </div>
-    </div>
-
-    <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js"></script>
-    <script src="/other/mybjq/kindeditor-min.js"></script>
-    <script src="/other/mybjq/lang/zh_CN.js"></script>
-    <script>
-        
-        
-        //编辑器
-        KindEditor.ready(function (K) {
-            
-        });
-
-        var ids = "";
-        function getChildren(obj) {
-            $.each(obj, function (index, value) {
-                var id = obj[index].id;
-                ids += id + ",";
-                var children = obj[index].children;
-                if (children) {
-                    getChildren(children);
-                }
-            });
-        }
-
-        function AreasProvinceInit(tagId, areasVal, form) {
-            for (var i = 0; i < provs_data.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(provs_data[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "Province").append('<option value="' + provs_data[i].value + '"' + sel + '>' + provs_data[i].text + '</option>');
-            }
-            form.render();
-        }
-
-        function AreasProvinceSelected(tagId, areasVal, form, value) {
-            $("#" + tagId + "City").html('<option value="">市</option>');
-            var list = citys_data[value];
-            for (var i = 0; i < list.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(list[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "City").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text + '</option>');
-            }
-            $("#" + tagId + "Area").html('<option value="">县/区</option>');
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-
-        function AreasCitySelected(tagId, areasVal, form, value) {
-            $("#" + tagId + "Area").html('<option value="">县/区</option>');
-            var list = dists_data[value];
-            for (var i = 0; i < list.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(list[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "Area").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text + '</option>');
-            }
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-
-        function AreasAreaSelected(tagId, form) {
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-        function movePrev(obj, tagId) {
-            $(obj).parent().prev().insertAfter($(obj).parent());
-            checkPics(tagId);
-        }
-        function moveNext(obj, tagId) {
-            $(obj).parent().next().insertBefore($(obj).parent());
-            checkPics(tagId);
-        }
-        function deletePic(obj, tagId) {
-            $(obj).parent().remove();
-            checkPics(tagId);
-        }
-        function checkPics(tagId) {
-            var pics = "";
-            var texts = "";
-            $("#" + tagId + "Image div img").each(function (i) {
-                pics += $(this).attr("src").replace(osshost, '') + "|";
-            });
-            $("#" + tagId + "Image div input").each(function (i) {
-                texts += $(this).val() + "|";
-            });
-            if (pics == "") {
-                $("#" + tagId).val("");
-            } else {
-                pics = pics.substring(0, pics.length - 1);
-                texts = texts.substring(0, pics.length - 1);
-                $("#" + tagId).val(pics + "#cut#" + texts);
-            }
-        }
-        function checkBox(tagId) {
-            var text = "";
-            $("input[type=checkbox][name=" + tagId + "List]:checked").each(function (i) {
-                text += $(this).val() + ",";
-            });
-            $("#" + tagId).val(text);
-        }
-        function showBigPic(picpath) {
-            parent.layer.open({
-                type: 1,
-                title: false,
-                closeBtn: 0,
-                shadeClose: true,
-                area: ['auto', 'auto'],
-                content: '<img src="' + picpath + '" style="max-width:800px; max-height:800px;" />'
-            });
-        }
-
-        var tree;
-        var element;
-        var upload;
-        layui.config({
-            base: '/layuiadmin/' //静态资源所在路径
-        }).extend({
-            index: 'lib/index' //主入口模块
-        }).use(['index', 'form', 'upload', 'layedit', 'laydate', 'element', 'croppers', 'transfer', 'tree', 'util'], function () {
-            var $ = layui.$
-                , form = layui.form
-                , layer = layui.layer
-                , layedit = layui.layedit
-                , laydate = layui.laydate
-                , croppers = layui.croppers
-                , transfer = layui.transfer
-                , util = layui.util;
-            tree = layui.tree;
-            element = layui.element;
-            upload = layui.upload;
-        
-            //Hash地址的定位
-            var layid = location.hash.replace(/^#test=/, '');
-            element.tabChange('test', layid);
-            element.on('tab(test)', function (elem) {
-                location.hash = 'test=' + $(this).attr('lay-id');
-            });
-    
-            //日期
-            laydate.render({
-elem: '#StartDate',
-type: 'datetime',
-trigger: 'click'
-});
-laydate.render({
-elem: '#EndDate',
-type: 'datetime',
-trigger: 'click'
-});
-
-
-            //上传文件
-            
-
-            //穿梭框
-            
-
-            //TreeView，比如权限管理
-            
-
-            //省市区
-            
-        })
-
-    </script>
-</body>
-</html>

Areas/Admin/Views/MainServer/ProfitObjectsRuleDetails/Add.cshtml

@@ -1,223 +0,0 @@
-@{
-    string RightInfo = ViewBag.RightInfo as string;
-    string right = ViewBag.right as string;
-    string RuleId = ViewBag.RuleId as string;
-
-}
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <title>参数设置(增加)</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
-    <script src="/admin/js/jquery-1.10.1.min.js"></script>
-    <script src="/admin/js/LAreaData2.js"></script>
-</head>
-<body>
-
-    <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">
-        <input type="hidden" name="RuleId" value="@RuleId" />
-
-        <div class="layui-card">
-          <div class="layui-card-body">
-            <div class="layui-tab" lay-filter="mytabbar">
-                <ul class="layui-tab-title">
-                    <li class="layui-this" lay-id="1">基本信息</li>
-                </ul>
-                <div class="layui-tab-content mt20">
-                    <div class="layui-tab-item layui-show">
-<div class="layui-form-item">
-<label class="layui-form-label">名称</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="Name" name="Name" maxlength="50" lay-verify="required|" autocomplete="off" placeholder="请输入名称">
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">编号</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="Code" name="Code" maxlength="50" lay-verify="required|" autocomplete="off" placeholder="请输入编号">
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">设置值</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="DataValue" name="DataValue" maxlength="50" lay-verify="required|" autocomplete="off" placeholder="请输入设置值">
-</div>
-</div>
-
-</div>
-
-                </div>
-            </div>
-            <div class="layui-form-item layui-hide">
-                <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit" value="确认">
-            </div>
-          </div>
-        </div>
-    </div>
-
-    <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js"></script>
-    <script src="/other/mybjq/kindeditor-min.js"></script>
-    <script src="/other/mybjq/lang/zh_CN.js"></script>
-    <script>
-        
-                    
-        //编辑器
-        KindEditor.ready(function (K) {
-            
-        });
-
-        var ids = "";
-        function getChildren(obj) {
-            $.each(obj, function (index, value) {
-                var id = obj[index].id;
-                ids += id + ",";
-                var children = obj[index].children;
-                if (children) {
-                    getChildren(children);
-                }
-            });
-        }
-
-        function AreasProvinceInit(tagId, areasVal, form) {
-            for (var i = 0; i < provs_data.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(provs_data[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "Province").append('<option value="' + provs_data[i].value + '"' + sel + '>' + provs_data[i].text + '</option>');
-            }
-            form.render();
-        }
-
-        function AreasProvinceSelected(tagId, areasVal, form, value) {
-            $("#" + tagId + "City").html('<option value="">市</option>');
-            var list = citys_data[value];
-            for (var i = 0; i < list.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(list[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "City").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text + '</option>');
-            }
-            $("#" + tagId + "Area").html('<option value="">县/区</option>');
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-
-        function AreasCitySelected(tagId, areasVal, form, value) {
-            $("#" + tagId + "Area").html('<option value="">县/区</option>');
-            var list = dists_data[value];
-            for (var i = 0; i < list.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(list[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "Area").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text + '</option>');
-            }
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-
-        function AreasAreaSelected(tagId, form) {
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-        function movePrev(obj, tagId) {
-            $(obj).parent().prev().insertAfter($(obj).parent());
-            checkPics(tagId);
-        }
-        function moveNext(obj, tagId) {
-            $(obj).parent().next().insertBefore($(obj).parent());
-            checkPics(tagId);
-        }
-        function deletePic(obj, tagId) {
-            $(obj).parent().remove();
-            checkPics(tagId);
-        }
-        function checkPics(tagId) {
-            var pics = "";
-            var texts = "";
-            $("#" + tagId + "Image div img").each(function (i) {
-                pics += $(this).attr("src").replace(osshost, '') + "|";
-            });
-            $("#" + tagId + "Image div input").each(function (i) {
-                texts += $(this).val() + "|";
-            });
-            if (pics == "") {
-                $("#" + tagId).val("");
-            } else {
-                pics = pics.substring(0, pics.length - 1);
-                texts = texts.substring(0, pics.length - 1);
-                $("#" + tagId).val(pics + "#cut#" + texts);
-            }
-        }
-        function checkBox(tagId) {
-            var text = "";
-            $("input[type=checkbox][name=" + tagId + "List]:checked").each(function (i) {
-                text += $(this).val() + ",";
-            });
-            $("#" + tagId).val(text);
-        }
-        function showBigPic(picpath) {
-            parent.layer.open({
-                type: 1,
-                title: false,
-                closeBtn: 0,
-                shadeClose: true,
-                area: ['auto', 'auto'],
-                content: '<img src="' + picpath + '" style="max-width:800px; max-height:800px;" />'
-            });
-        }
-
-        
-        var tree;
-        var element;
-        var upload;
-        layui.config({
-            base: '/layuiadmin/' //静态资源所在路径
-        }).extend({
-            index: 'lib/index' //主入口模块
-        }).use(['index', 'form', 'upload', 'layedit', 'laydate', 'element', 'croppers', 'transfer', 'tree', 'util'], function () {
-            var $ = layui.$
-                , form = layui.form
-                , layer = layui.layer
-                , layedit = layui.layedit
-                , laydate = layui.laydate
-                , croppers = layui.croppers
-                , transfer = layui.transfer
-                , util = layui.util;
-            tree = layui.tree;
-            element = layui.element;
-            upload = layui.upload;
-        
-            //Hash地址的定位
-            var layid = location.hash.replace(/^#test=/, '');
-            element.tabChange('test', layid);
-            element.on('tab(test)', function (elem) {
-                location.hash = 'test=' + $(this).attr('lay-id');
-            });
-    
-            //日期
-            
-
-            //上传文件
-            
-
-            //穿梭框
-            
-
-            //TreeView，比如权限管理
-            
-
-            //省市区
-            
-        })
-
-    </script>
-</body>
-</html>

Areas/Admin/Views/MainServer/ProfitObjectsRuleDetails/Edit.cshtml

@@ -1,225 +0,0 @@
-@using MySystem.Models;
-@{ProfitObjectsRuleDetails editData = ViewBag.data as ProfitObjectsRuleDetails;}
-@{
-    string RightInfo = ViewBag.RightInfo as string;
-    string right = ViewBag.right as string;
-    string RuleId = ViewBag.RuleId as string;
-
-}
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <title>参数设置(修改)</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
-    <script src="/admin/js/jquery-1.10.1.min.js"></script>
-    <script src="/admin/js/LAreaData2.js"></script>
-</head>
-<body>
-
-    <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">
-        <input type="hidden" name="Id" value="@editData.Id" />
-        <input type="hidden" name="RuleId" value="@RuleId" />
-
-        <div class="layui-card">
-          <div class="layui-card-body">
-            <div class="layui-tab" lay-filter="mytabbar">
-                <ul class="layui-tab-title">
-                    <li class="layui-this" lay-id="1">基本信息</li>
-                </ul>
-                <div class="layui-tab-content mt20">
-                    <div class="layui-tab-item layui-show">
-<div class="layui-form-item">
-<label class="layui-form-label">名称</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="Name" name="Name" value="@editData.Name" maxlength="50" lay-verify="required|" autocomplete="off" placeholder="请输入名称">
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">编号</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="Code" name="Code" value="@editData.Code" maxlength="50" lay-verify="required|" autocomplete="off" placeholder="请输入编号">
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">设置值</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="DataValue" name="DataValue" value="@editData.DataValue" maxlength="50" lay-verify="required|" autocomplete="off" placeholder="请输入设置值">
-</div>
-</div>
-
-</div>
-
-                </div>
-            </div>
-            <div class="layui-form-item layui-hide">
-                <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit" value="确认">
-            </div>
-          </div>
-        </div>
-    </div>
-
-    <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js"></script>
-    <script src="/other/mybjq/kindeditor-min.js"></script>
-    <script src="/other/mybjq/lang/zh_CN.js"></script>
-    <script>
-        
-        
-        //编辑器
-        KindEditor.ready(function (K) {
-            
-        });
-
-        var ids = "";
-        function getChildren(obj) {
-            $.each(obj, function (index, value) {
-                var id = obj[index].id;
-                ids += id + ",";
-                var children = obj[index].children;
-                if (children) {
-                    getChildren(children);
-                }
-            });
-        }
-
-        function AreasProvinceInit(tagId, areasVal, form) {
-            for (var i = 0; i < provs_data.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(provs_data[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "Province").append('<option value="' + provs_data[i].value + '"' + sel + '>' + provs_data[i].text + '</option>');
-            }
-            form.render();
-        }
-
-        function AreasProvinceSelected(tagId, areasVal, form, value) {
-            $("#" + tagId + "City").html('<option value="">市</option>');
-            var list = citys_data[value];
-            for (var i = 0; i < list.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(list[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "City").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text + '</option>');
-            }
-            $("#" + tagId + "Area").html('<option value="">县/区</option>');
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-
-        function AreasCitySelected(tagId, areasVal, form, value) {
-            $("#" + tagId + "Area").html('<option value="">县/区</option>');
-            var list = dists_data[value];
-            for (var i = 0; i < list.length; i++) {
-                var sel = "";
-                if (areasVal.indexOf(list[i].text) > -1) {
-                    sel = " selected=selected";
-                }
-                $("#" + tagId + "Area").append('<option value="' + list[i].value + '"' + sel + '>' + list[i].text + '</option>');
-            }
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-
-        function AreasAreaSelected(tagId, form) {
-            form.render();
-            $("#" + tagId + "").val($("#" + tagId + "Province option:selected").text() + "," + $("#" + tagId + "City option:selected").text() + "," + $("#" + tagId + "Area option:selected").text());
-        }
-        function movePrev(obj, tagId) {
-            $(obj).parent().prev().insertAfter($(obj).parent());
-            checkPics(tagId);
-        }
-        function moveNext(obj, tagId) {
-            $(obj).parent().next().insertBefore($(obj).parent());
-            checkPics(tagId);
-        }
-        function deletePic(obj, tagId) {
-            $(obj).parent().remove();
-            checkPics(tagId);
-        }
-        function checkPics(tagId) {
-            var pics = "";
-            var texts = "";
-            $("#" + tagId + "Image div img").each(function (i) {
-                pics += $(this).attr("src").replace(osshost, '') + "|";
-            });
-            $("#" + tagId + "Image div input").each(function (i) {
-                texts += $(this).val() + "|";
-            });
-            if (pics == "") {
-                $("#" + tagId).val("");
-            } else {
-                pics = pics.substring(0, pics.length - 1);
-                texts = texts.substring(0, pics.length - 1);
-                $("#" + tagId).val(pics + "#cut#" + texts);
-            }
-        }
-        function checkBox(tagId) {
-            var text = "";
-            $("input[type=checkbox][name=" + tagId + "List]:checked").each(function (i) {
-                text += $(this).val() + ",";
-            });
-            $("#" + tagId).val(text);
-        }
-        function showBigPic(picpath) {
-            parent.layer.open({
-                type: 1,
-                title: false,
-                closeBtn: 0,
-                shadeClose: true,
-                area: ['auto', 'auto'],
-                content: '<img src="' + picpath + '" style="max-width:800px; max-height:800px;" />'
-            });
-        }
-
-        var tree;
-        var element;
-        var upload;
-        layui.config({
-            base: '/layuiadmin/' //静态资源所在路径
-        }).extend({
-            index: 'lib/index' //主入口模块
-        }).use(['index', 'form', 'upload', 'layedit', 'laydate', 'element', 'croppers', 'transfer', 'tree', 'util'], function () {
-            var $ = layui.$
-                , form = layui.form
-                , layer = layui.layer
-                , layedit = layui.layedit
-                , laydate = layui.laydate
-                , croppers = layui.croppers
-                , transfer = layui.transfer
-                , util = layui.util;
-            tree = layui.tree;
-            element = layui.element;
-            upload = layui.upload;
-        
-            //Hash地址的定位
-            var layid = location.hash.replace(/^#test=/, '');
-            element.tabChange('test', layid);
-            element.on('tab(test)', function (elem) {
-                location.hash = 'test=' + $(this).attr('lay-id');
-            });
-    
-            //日期
-            
-
-            //上传文件
-            
-
-            //穿梭框
-            
-
-            //TreeView，比如权限管理
-            
-
-            //省市区
-            
-        })
-
-    </script>
-</body>
-</html>

Areas/Admin/Views/MainServer/ProfitObjectsRuleDetails/Index.cshtml

@@ -1,117 +0,0 @@
-@{
-    string RightInfo = ViewBag.RightInfo as string;
-    string right = ViewBag.right as string;
-    string RuleId = ViewBag.RuleId as string;
-
-}
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <title>分润对象规则</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
-    <link rel="stylesheet" href="/layuiadmin/style/admin.css" media="all">
-    <script src="/admin/js/jquery-1.10.1.min.js"></script>
-    <style>
-        .layui-input-inline{
-            width: 175px !important;
-        }
-        .layui-form-label{
-            width: 85px !important;
-        }
-        .layui-inline{
-            margin-right: 0px !important;
-        }
-        .w100{
-            width: 100px !important;
-        }
-        .ml50{
-            margin-left: 50px !important;
-        }
-    </style>
-</head>
-<body>
-    <div class="layui-fluid">
-        <div class="layui-card">
-            <div class="layui-form layui-card-header layuiadmin-card-header-auto">
-                <div class="layui-form-item">
-                    <div class="layui-inline">
-<label class="layui-form-label">名称</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="Name" placeholder="" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">编号</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="Code" placeholder="" autocomplete="off">
-</div>
-</div>
-
-                    <div class="layui-inline ml50">
-                        <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">
-                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>查询
-                        </button>
-                        <button class="layui-btn" lay-submit lay-filter="LAY-list-front-searchall">
-                            <i class="layui-icon layui-icon-list layuiadmin-button-btn"></i>全部
-                        </button>
-                    </div>
-                </div>
-            </div>
-
-            <div class="layui-card-body">
-                <div style="padding-bottom: 10px;">
-                    
-                    <button class="layui-btn" data-type="add"><i class="layui-icon layui-icon-add-1 layuiadmin-button-btn"></i>添加</button>
-                
-                    <button class="layui-btn" data-type="batchdel"><i class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>删除</button>
-                    
-                </div>
-                
-                <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
-                <script type="text/html" id="table-list-tools">
-                    
-                    <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>编辑</a>
-                    
-                    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon layui-icon-delete"></i>删除</a>
-                    
-                </script>
-            </div>
-        </div>
-    </div>
-    <div id="excelForm" style="display:none; padding:20px;">
-        <div class="layui-tab-item layui-show">
-            <div class="layui-form-item">
-                <label class="layui-form-label">模板下载</label>
-                <div class="layui-form-mid layui-word-aux" id="excelTemp">
-                </div>
-            </div>
-            <div class="layui-form-item">
-                <label class="layui-form-label">excel文件</label>
-                <div class="layui-form-mid layui-word-aux">
-                    <div class="layui-upload">
-                        <input type="file" id="ExcelFile" name="ExcelFile" value="">
-                    </div>
-                    <div class="mt10" id="ExcelFileList">
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="layui-form-item ml10">
-            <div class="layui-input-block">
-                <button type="button" class="layui-btn" onclick="ConfirmImport()">立即导入</button>
-            </div>
-        </div>
-    </div>
-
-    <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/layuiadmin/modules_main/ProfitObjectsRuleDetails_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
-    <script>
-        var RuleId='@RuleId';
-
-    </script>
-</body>
-</html>

Areas/Admin/Views/MainServer/StoreMachineApply/AuditSend.cshtml

@@ -1,196 +0,0 @@
-@using MySystem.Models;
-@{
-    StoreMachineApply editData = ViewBag.data as StoreMachineApply;
-}
-@{
-    string RightInfo = ViewBag.RightInfo as string;
-    string right = ViewBag.right as string;
-
-}
-<!DOCTYPE html>
-<html>
-
-<head>
-    <meta charset="utf-8">
-    <title>审核发货</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport"
-        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
-    <script src="/admin/js/jquery-1.10.1.min.js"></script>
-    <script src="/admin/js/LAreaData2.js"></script>
-</head>
-
-<body>
-
-    <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">
-        <input type="hidden" name="Id" value="@editData.Id" />
-
-        <div class="layui-card">
-            <div class="layui-card-body">
-                <div class="layui-tab" lay-filter="mytabbar">
-                    <div class="layui-tab-content mt20">
-                        <div class="layui-tab-item layui-show">
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">创客编号</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" readonly id="MakerCode" name="MakerCode"
-                                        value="@ViewBag.MakerCode" lay-verify="">
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">创客名称</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" readonly id="RealName" name="RealName"
-                                        value="@ViewBag.RealName" lay-verify="">
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">申请箱数</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" readonly id="ApplyNum" name="ApplyNum"
-                                        value="@editData.ApplyNum" maxlength="32" lay-verify="" autocomplete="off"
-                                        placeholder="请输入申请箱数">
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">*发货箱数</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" id="SendNum" name="SendNum"
-                                        value="@editData.SendNum" maxlength="32" lay-verify="required|"
-                                        autocomplete="off" placeholder="请输入发货箱数">
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">*审核结果</label>
-                                <div class="layui-input-inline">
-                                    <select id="Status" name="Status" lay-verify="required|" lay-search="">
-                                        <option value="">请选择</option>
-                                        <option value="0">待审核</option>
-                                        <option value="1">审核通过</option>
-                                        <option value="2">审核不通过</option>
-                                    </select>
-                                    <script>
-                                        $("#Status").val("@editData.Status");
-                                    </script>
-                                </div>
-                            </div>
-                            @* <div class="layui-form-item layui-form-text">
-                                <label class="layui-form-label">*SN编号</label>
-                                <div class="layui-input-block">
-                                <textarea class="layui-textarea" id="SwapSnExpand" name="SwapSnExpand"
-                                lay-verify="required|" placeholder="请输入SN号,多个以逗号隔开">@editData.SwapSnExpand</textarea>
-                                </div>
-                                </div> *@
-                            <div class="layui-form-item layui-form-text">
-                                <label class="layui-form-label">申请描述</label>
-                                <div class="layui-input-block">
-                                    <textarea class="layui-textarea" id="SeoDescription" name="SeoDescription"
-                                        maxlength="128" lay-verify=""
-                                        placeholder="请输入申请描述">@editData.SeoDescription</textarea>
-                                </div>
-                            </div>
-                            @* <div class="layui-form-item"">
-                                <label class=" layui-form-label">模板下载</label>
-                                <div class="layui-form-mid layui-word-aux" id="excelTemp">
-                                </div>
-                                </div> *@
-                        </div>
-                        <div class="layui-form-item"">
-                                <label class=" layui-form-label">导入机具SN</label>
-                            <div class=" layui-input-block">
-                            <div class="layui-upload">
-                                @* <input type="hidden" id="SwapSnExpand" name="SwapSnExpand" value=""> *@
-                                <button class="layui-btn" type="button" id="ExcelPathBtn">选择</button>
-                                <div class="layui-inline layui-word-aux"></div>
-                            </div>
-                            <div class="mt10" id="ExcelPathFile">
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="layui-form-item layui-hide">
-            <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit" value="确认">
-        </div>
-    </div>
-    </div>
-    </div>
-
-    <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js"></script>
-    <script src="/other/mybjq/kindeditor-min.js"></script>
-    <script src="/other/mybjq/lang/zh_CN.js"></script>
-    <script>
-
-
-        //编辑器
-        KindEditor.ready(function (K) {
-
-        });
-
-        var ids = "";
-        function getChildren(obj) {
-            $.each(obj, function (index, value) {
-                var id = obj[index].id;
-                ids += id + ",";
-                var children = obj[index].children;
-                if (children) {
-                    getChildren(children);
-                }
-            });
-        }
-
-        var tree;
-        var element;
-        var upload;
-        layui.config({
-            base: '/layuiadmin/' //静态资源所在路径
-        }).extend({
-            index: 'lib/index' //主入口模块
-        }).use(['index', 'form', 'upload', 'layedit', 'laydate', 'element', 'croppers', 'transfer', 'tree', 'util'], function () {
-            var $ = layui.$
-                , form = layui.form
-                , layer = layui.layer
-                , layedit = layui.layedit
-                , laydate = layui.laydate
-                , croppers = layui.croppers
-                , transfer = layui.transfer
-                , util = layui.util;
-            tree = layui.tree;
-            element = layui.element;
-            upload = layui.upload;
-
-            //Hash地址的定位
-            var layid = location.hash.replace(/^#test=/, '');
-            element.tabChange('test', layid);
-            element.on('tab(test)', function (elem) {
-                location.hash = 'test=' + $(this).attr('lay-id');
-            });
-
-            //日期
-
-
-            //上传文件
-            WebUploadJs('ExcelPathBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload', { width: 0, height: 0, quality: 0 }, { max_file_size: 1048576 }, function (filename) {
-                $('#ExcelPathFile').html(filename);
-                $('#ExcelPath').val(filename);
-            });
-
-
-            //穿梭框
-
-
-            //TreeView，比如权限管理
-
-
-            //省市区
-
-        })
-
-    </script>
-</body>
-
-</html>