Merge branch 'feature-dgy-商城优化' into DuGuYang

# Conflicts:
#	Areas/Admin/Views/MainServer/LeaderReserveRecord/Index.cshtml

Areas/Admin/Controllers/BsServer/ColController.cs

@@ -67,7 +67,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("ColName", "2"); //名称
             Fields.Add("ColEnName", "2"); //英文名
             string condition = " and ColId like '" + CurColId + "%'";
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.BsTables).IndexData("Col", Fields, "ColId asc", "False", page, limit, condition);
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.BsTables).IndexData("Col", Fields, "Sort", "False", page, limit, condition);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             List<Dictionary<string, object>> result = new List<Dictionary<string, object>>();
             foreach (Dictionary<string, object> dic in diclist)
@@ -133,6 +133,10 @@ namespace MySystem.Areas.Admin.Controllers
         public string Add(Col col, string PColId = "", string CurColId = "")
         {
             //构造ColId
+            if (string.IsNullOrEmpty(PColId) && string.IsNullOrEmpty(CurColId))
+            {
+                return "请选择上级栏目！";
+            }
             string code = "";
             int len = PColId.Length + 3;
             Col model = bsdb.Col.Where(m => m.ColId.StartsWith(PColId) && m.ColId.Length == len).OrderByDescending(m => m.ColId).FirstOrDefault();

Areas/Admin/Controllers/MainServer/OrderRefundController.cs

@@ -38,18 +38,6 @@ namespace MySystem.Areas.Admin.Controllers
         {
             ViewBag.RightInfo = RightInfo;
             ViewBag.right = right;
-
-            string Condition = "";
-            Condition += "Reason:\"" + data.Reason + "\",";
-            Condition += "Mobile:\"" + data.Mobile + "\",";
-            Condition += "GoodStatus:\"" + data.GoodStatus + "\",";
-
-            if (!string.IsNullOrEmpty(Condition))
-            {
-                Condition = Condition.TrimEnd(',');
-                Condition = ", where: {" + Condition + "}";
-            }
-            ViewBag.Condition = Condition;
             return View();
         }
 
@@ -61,24 +49,48 @@ namespace MySystem.Areas.Admin.Controllers
         /// 退款申请列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(OrderRefund data, int page = 1, int limit = 30)
+        public JsonResult IndexData(OrderRefund data, string OrderNo, string CreateDateData, string UserIdMakerCode, string ProductIdSelect, string RefundStatusSelect, int page = 1, int limit = 30)
         {
-            Dictionary<string, string> OrderRefundReasonDic = new OrderDictionary().getOrderRefundReasonDic();
-            Dictionary<string, string> ErpCompanysDic = new OrderDictionary().getErpCompanysDic();
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
-            Fields.Add("Reason", "1"); //退款原因
-            Fields.Add("Mobile", "2"); //申请人手机号
-            Fields.Add("GoodStatus", "1"); //货物状态
+            string condition = " and Status>-1";
+            //平台订单号
+            if (!string.IsNullOrEmpty(OrderNo))
+            {
+                condition += " and OrderNo like '" + OrderNo + "'";
+            }
+            //退货时间
+            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 (!string.IsNullOrEmpty(UserIdMakerCode))
+            {
+                condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
+            }
+            //商品名称
+            if (!string.IsNullOrEmpty(ProductIdSelect))
+            {
+                condition += " and Id in (select OrderId from OrderProduct where ProductId=" + ProductIdSelect + ")";//表数据量过大时不适用
+            }
 
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("OrderRefund", Fields, "Id desc", "False", page, limit);
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("OrderRefund", Fields, "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)
             {
-                dic["Reason"] = new DictionaryClass().getDictionaryNameByKey(OrderRefundReasonDic, dic["Reason"].ToString());
-                dic["ErpCompany"] = new DictionaryClass().getDictionaryNameByKey(ErpCompanysDic, dic["ErpCompany"].ToString());
-                dic["GoodStatus"] = dic["GoodStatus"].ToString() == "1" ? "未收到货" : "已收到货";
-                dic["Status"] = dic["Status"].ToString() == "1" ? "已处理" : "未处理";
+                //创客
+                int UserId = int.Parse(function.CheckInt(dic["UserId"].ToString()));
+                Users userid_Users = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
+                dic["UserInfo"] = userid_Users.MakerCode + "<br />" + userid_Users.RealName;
+                dic.Remove("UserId");
+
+                //商品名称
+                dic["ProductName"] = RelationClass.GetProductsInfo(int.Parse(dic["ProductId"].ToString()));
+                
             }
             return Json(obj);
         }
@@ -186,7 +198,7 @@ namespace MySystem.Areas.Admin.Controllers
                 string result = "";
                 PublicAccountSet set = db.PublicAccountSet.FirstOrDefault() ?? new PublicAccountSet();
                 if (order.PayMode == 1)
-                { 
+                {
                     result = new Alipay.AlipayPublicClass(_accessor.HttpContext).Refund(set.AlipayAppId, set.AlipayPrivateKey, set.AlipayPublicKey, order.OrderNo, order.ActualPay);
                 }
                 else if (order.PayMode == 2)
@@ -195,17 +207,17 @@ namespace MySystem.Areas.Admin.Controllers
                 }
                 if (result.StartsWith("success|"))
                 {
-                    int OrderCount = db.OrderForNo.FirstOrDefault(m=>m.OrderNo == order.OrderNo).OrderIds.Split(',').Length;
+                    int OrderCount = db.OrderForNo.FirstOrDefault(m => m.OrderNo == order.OrderNo).OrderIds.Split(',').Length;
                     if (order.CouponId > 0 && OrderCount == 1)
                     {
                         Coupons coupon = db.Coupons.FirstOrDefault(m => m.Id == order.CouponId);
                         if (coupon != null)
                         {
                             if (coupon.IsReUse == 0)
-                            { 
+                            {
                                 CouponsForUser couponForUser = db.CouponsForUser.FirstOrDefault(m => m.UserId == order.UserId && m.CouponId == order.CouponId && m.IsUse == 1);
                                 if (couponForUser != null)
-                                { 
+                                {
                                     couponForUser.IsLock = 0;
                                     couponForUser.IsUse = 0;
                                 }

Areas/Admin/Controllers/MainServer/OrdersController.cs

@@ -70,6 +70,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("TopUserId", "0");
 
 
+            // string condition = " and Status>=-1 and  Status<4";
             string condition = " and Status>=-1";
             //平台订单号
             if (!string.IsNullOrEmpty(OrderNo))
@@ -248,7 +249,7 @@ namespace MySystem.Areas.Admin.Controllers
                 if (SendStatus == 2) dic["SendStatusName"] = "已退货";
                 if (SendStatus == 0)
                 {
-                    dic["SendInfo"] = dic["SendStatus"].ToString();
+                    dic["SendInfo"] = dic["SendStatusName"];
                 }
                 else
                 {
@@ -260,7 +261,10 @@ namespace MySystem.Areas.Admin.Controllers
                 //商品名称
                 int Id = int.Parse(function.CheckInt(dic["Id"].ToString()));
                 OrderProduct orderProducts = db.OrderProduct.FirstOrDefault(m => m.OrderId == Id) ?? new OrderProduct();
+                var product = db.Products.FirstOrDefault(m => m.Id == orderProducts.ProductId) ?? new Products();
                 dic["ProductName"] = orderProducts.ProductName;
+                if (product.ProductKind == 1) dic["ProductKind"] = "实物商品";
+                if (product.ProductKind == 2) dic["ProductKind"] = "虚拟商品";
 
                 //仓库归属创客
                 int StoreUserId = int.Parse(function.CheckInt(dic["StoreUserId"].ToString()));
@@ -274,11 +278,11 @@ namespace MySystem.Areas.Admin.Controllers
                 dic.Remove("TopUserId");
                 //支付状态
                 int PayStatus = int.Parse(dic["PayStatus"].ToString());
-                if (PayStatus == 0) dic["PayStatus"] = "未支付";
-                if (PayStatus == 1) dic["PayStatus"] = "支付成功";
-                if (PayStatus == 2) dic["PayStatus"] = "支付失败";
-                if (PayStatus == 3) dic["PayStatus"] = "支付锁定中";
-                if (PayStatus == 4) dic["PayStatus"] = "支付处理中";
+                if (PayStatus == 0) dic["PayStatusName"] = "未支付";
+                if (PayStatus == 1) dic["PayStatusName"] = "支付成功";
+                if (PayStatus == 2) dic["PayStatusName"] = "支付失败";
+                if (PayStatus == 3) dic["PayStatusName"] = "支付锁定中";
+                if (PayStatus == 4) dic["PayStatusName"] = "支付处理中";
 
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
@@ -299,82 +303,95 @@ namespace MySystem.Areas.Admin.Controllers
             obj.Add("other", other);
             return Json(obj);
         }
+        #endregion
+
 
+        #region 创客退货订单列表
 
-        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)
+        /// <summary>
+        /// 根据条件查询创客退货订单列表
+        /// </summary>
+        /// <returns></returns>
+        public IActionResult IndexRefund(Orders data, string right)
         {
-            string condition = " and Status>-1";
+            ViewBag.RightInfo = RightInfo;
+            ViewBag.right = right;
+
+            return View();
+        }
+
+        #endregion
+
+        #region 根据条件查询创客退货订单列表
+
+        /// <summary>
+        /// 创客退货订单列表
+        /// </summary>
+        /// <returns></returns>
+        public JsonResult IndexRefundData(Orders data, string OrderNo, string CreateDateData, string UserIdMakerCode, string UserIdRealName, string PayModeSelect, string ProductIdSelect, int page = 1, int limit = 30)
+        {
+
+            Dictionary<string, string> Fields = new Dictionary<string, string>();
+
+            string condition = " and Status in(4,5)";
+            //平台订单号
+            if (!string.IsNullOrEmpty(OrderNo))
+            {
+                condition += " and OrderNo like '" + OrderNo + "'";
+            }
+
             //创客编号
             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 + "')";
+                condition += " and Id in (select OrderId from OrderProduct where ProductId=" + ProductIdSelect + ")";//表数据量过大时不适用
             }
-            //支付状态
-            if (!string.IsNullOrEmpty(PayStatusSelect))
+
+
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("Orders", 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)
             {
-                condition += " and PayStatus=" + PayStatusSelect;
+                dic["OrderNo"] = dic["OrderNo"].ToString() + "<br />" + dic["TradeNo"].ToString();
+                //状态
+                int Status = int.Parse(dic["Status"].ToString());
+                if (Status == 4) dic["StatusName"] = "已退款";
+                // if (Status == 5) dic["StatusName"] = "已退货";
+                //创客
+                int UserId = int.Parse(function.CheckInt(dic["UserId"].ToString()));
+                Users userid_Users = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
+                dic["UserInfo"] = userid_Users.MakerCode + "<br />" + userid_Users.RealName;
+                dic.Remove("UserId");
+                //支付方式
+                int PayMode = int.Parse(dic["PayMode"].ToString());
+                if (PayMode == 1) dic["PayMode"] = "支付宝";
+                if (PayMode == 2) dic["PayMode"] = "微信";
+                if (PayMode == 3) dic["PayMode"] = "账户余额";
+                if (PayMode == 0) dic["PayMode"] = "";
+                //商品名称
+                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;
+
+                //退款时间
+                var info = db.OrderRefund.FirstOrDefault(m => m.OrderId == Id) ?? new OrderRefund();
+                dic["ReturnDate"] = info.CreateDate == null ? "" : info.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
+
             }
-            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;
+            return Json(obj);
         }
-
         #endregion
 
         #region 增加创客订单
@@ -490,6 +507,8 @@ namespace MySystem.Areas.Admin.Controllers
 
             List<OrderProduct> products = db.OrderProduct.Where(m => m.OrderId == editData.Id).ToList();
             ViewBag.products = products;
+            var orderProduct = db.OrderProduct.FirstOrDefault(m => m.OrderId == editData.Id);
+            ViewBag.productId = orderProduct.ProductId;
             return View();
         }
 
@@ -498,7 +517,7 @@ namespace MySystem.Areas.Admin.Controllers
         #region 发货
 
         [HttpPost]
-        public string Send(Orders data, string IdList, string StoreIdList, string SnNosList)
+        public string Send(Orders data, string IdList, string SnNosList)
         {
             Dictionary<string, object> Fields = new Dictionary<string, object>();
 
@@ -506,33 +525,9 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("ErpCode", data.ErpCode); //运单号
             Fields.Add("SnNos", SnNosList); //SN编号
             Fields.Add("SendStatus", 1); //发货状态
+            Fields.Add("Status", 3); //状态
             Fields.Add("SendDate", DateTime.Now); //发货时间
 
-            string[] Ids = IdList.TrimEnd('#').Split('#');
-            string[] StoreIds = StoreIdList.TrimEnd('#').Split('#');
-            string[] SnNoss = SnNosList.TrimEnd('#').Split('#');
-            int[] pIds = new int[] { 42, 41, 21, 20, 19, 18, 17, 16, 14, 13, 12, 9, 8, 7 };
-            for (int i = 0; i < Ids.Length; i++)
-            {
-                int Id = int.Parse(Ids[i]);
-                if (pIds.Contains(Id))
-                {
-                    Fields.Add("Status", 3);
-                }
-                int StoreId = int.Parse(StoreIds[i]);
-                string SnNos = SnNoss[i];
-                OrderProduct pro = db.OrderProduct.FirstOrDefault(m => m.Id == Id);
-                if (pro != null)
-                {
-                    pro.StoreId = StoreId;
-                    pro.SnNos = SnNos;
-                }
-                if (i == 0)
-                {
-                    Fields.Add("StoreId", StoreId);
-                }
-            }
-
             new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("Orders", Fields, data.Id);
             AddSysLog(data.Id.ToString(), "Orders", "Send");
             db.SaveChanges();
@@ -566,20 +561,31 @@ namespace MySystem.Areas.Admin.Controllers
             Orders order = db.Orders.FirstOrDefault(m => m.Id == data.Id);
             if (order != null)
             {
-                if (order.PayStatus > 0)
+                if (order.TotalPrice <= 0)
+                {
+                    return "该订单不符合退货规则！";
+                }
+                else if (order.TotalPrice < decimal.Parse(data.RefundActAmount.ToString()) || decimal.Parse(data.RefundActAmount.ToString()) <= 0)
                 {
-                    return "已支付订单不可退货";
+                    return "退款金额和订单金额不符！";
                 }
                 else
                 {
-                    order.RefundActAmount = data.RefundActAmount;
-                    order.RefundReason = data.RefundReason;
+                    // order.UpdateDate = DateTime.Now;
+                    order.Status = 4;
                     order.RefundStatus = 1;
+                    order.UpdateMan = SysUserName + "_" + SysRealName;
+                    order.RefundReason = data.RefundReason;
+                    order.RefundActAmount = data.RefundActAmount;
                     db.SaveChanges();
-                    return "success";
+                    var Remark = "";
+                    var orderProduct = db.OrderProduct.FirstOrDefault(m => m.OrderId == order.Id) ?? new OrderProduct();
+                    Remark = orderProduct.ProductName + "退款至余额";
+                    string SendData = "{\"OrderId\":\"" + data.Id + "\",\"Operator\":\"" + SysUserName + "_" + SysRealName + "\",\"Amount\":\"" + data.RefundActAmount + "\",\"Remark\":\"" + Remark + "\"}";
+                    RedisDbconn.Instance.AddList("RefundQueue", SendData);
                 }
             }
-            return "退货失败";
+            return "success";
         }
 
         #endregion

Areas/Admin/Controllers/MainServer/ProductNormController.cs

@@ -66,7 +66,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("ColName", "2"); //名称
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("ProductNorm", Fields, "Id desc", "False", page, limit);
-            
+
             return Json(obj);
         }
 
@@ -108,6 +108,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("BuyCount", data.BuyCount); //已购买数
             Fields.Add("CostPrice", data.CostPrice); //成本价
             Fields.Add("Code", data.Code); //编码
+            Fields.Add("StartBuyCount", data.StartBuyCount); //起购数量
             Fields.Add("LimitCount", data.LimitCount); //限购数量
 
             Fields.Add("SeoTitle", data.SeoTitle);
@@ -232,19 +233,21 @@ namespace MySystem.Areas.Admin.Controllers
                     int stock = int.Parse(function.CheckInt(jsonObj[i]["stock"].ToString()));
                     string code = jsonObj[i]["code"].ToString();
                     decimal costprice = decimal.Parse(function.CheckNum(jsonObj[i]["costprice"].ToString()));
+                    int startbuycount = int.Parse(function.CheckInt(jsonObj[i]["startbuycount"].ToString()));
                     int limitcount = int.Parse(function.CheckInt(jsonObj[i]["limitcount"].ToString()));
 
                     idlist = idlist.TrimEnd(',');
                     namelist = namelist.TrimEnd(',');
-                    ProductNorm check = db.ProductNorm.FirstOrDefault(m=>m.MerchantId == MerchantId && m.ProductId == Id && m.ColName == namelist);
+                    ProductNorm check = db.ProductNorm.FirstOrDefault(m => m.MerchantId == MerchantId && m.ProductId == Id && m.ColName == namelist);
                     if (check == null)
                     {
-                        check = db.ProductNorm.Add(new ProductNorm() {
+                        check = db.ProductNorm.Add(new ProductNorm()
+                        {
                             CreateDate = DateTime.Now,
                             UpdateDate = DateTime.Now,
                             ProductId = Id,
-                            MerchantId= MerchantId,
-                            ColName=namelist,
+                            MerchantId = MerchantId,
+                            ColName = namelist,
                             IdList = idlist,
                             Price = price,
                             Integral = integral,
@@ -253,6 +256,7 @@ namespace MySystem.Areas.Admin.Controllers
                             Stock = stock,
                             CostPrice = costprice,
                             Code = code,
+                            StartBuyCount = startbuycount,
                             LimitCount = limitcount,
                         }).Entity;
                         db.SaveChanges();
@@ -267,6 +271,7 @@ namespace MySystem.Areas.Admin.Controllers
                         check.Stock = stock;
                         check.CostPrice = costprice;
                         check.Code = code;
+                        check.StartBuyCount = startbuycount;
                         check.LimitCount = limitcount;
                         check.IdList = idlist;
                         AddSysLog(check.Id, "ProductNorm", "update");
@@ -296,7 +301,7 @@ namespace MySystem.Areas.Admin.Controllers
                     db.SaveChanges();
                 }
             }
-            
+
             return "success";
         }
 
@@ -446,7 +451,7 @@ namespace MySystem.Areas.Admin.Controllers
 
         public JsonResult GetTemplateDetail(int Id)
         {
-            ProductNormTemp detail = db.ProductNormTemp.FirstOrDefault(m=>m.Id == Id) ?? new ProductNormTemp();
+            ProductNormTemp detail = db.ProductNormTemp.FirstOrDefault(m => m.Id == Id) ?? new ProductNormTemp();
             return Json(detail);
         }
     }

Areas/Admin/Controllers/MainServer/ProductsController.cs

@@ -38,18 +38,6 @@ namespace MySystem.Areas.Admin.Controllers
         {
             ViewBag.RightInfo = RightInfo;
             ViewBag.right = right;
-            ViewBag.SysUserName = SysUserName;
-
-            string Condition = "";
-            Condition += "ProductName:\"" + data.ProductName + "\",";
-            Condition += "MerchantClassId:\"" + data.MerchantClassId + "\",";
-
-            if (!string.IsNullOrEmpty(Condition))
-            {
-                Condition = Condition.TrimEnd(',');
-                Condition = ", where: {" + Condition + "}";
-            }
-            ViewBag.Condition = Condition;
             return View();
         }
 
@@ -61,26 +49,30 @@ namespace MySystem.Areas.Admin.Controllers
         /// 商品信息列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(Products data, int page = 1, int limit = 30)
+        public JsonResult IndexData(Products data, string ColId, int page = 1, int limit = 30)
         {
-            Dictionary<string, string> ProductFareTempDic = new ProductDictionary().getProductFareTempDic(data.MerchantId);
-            Dictionary<string, string> MerchantClassDic = new MerchantDictionary().getMerchantClassDic(data.MerchantId);
+            // Dictionary<string, string> ProductFareTempDic = new ProductDictionary().getProductFareTempDic(data.MerchantId);
+            // Dictionary<string, string> MerchantClassDic = new MerchantDictionary().getMerchantClassDic(data.MerchantId);
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
-            Fields.Add("ColId", "1"); //分类
+            // Fields.Add("ColId", "1"); //分类
             Fields.Add("ProductName", "2"); //商品名称
-            Fields.Add("MerchantClassId", "1"); //商家分类
+            // Fields.Add("MerchantClassId", "1"); //商家分类
             string condition = "";
-            if (SysRealRole == 3)
+            // if (SysRealRole == 3)
+            // {
+            //     condition += " and MerchantId=" + SysId;
+            // }
+            if (!string.IsNullOrEmpty(ColId))
             {
-                condition += " and MerchantId=" + SysId;
+                condition += " and ColId like '%" + ColId + "%'";
             }
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("Products", Fields, "Id desc", "False", page, limit, condition);
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("Products", Fields, "Sort", "False", page, limit, condition);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {
-                dic["FareTemplateId"] = new DictionaryClass().getDictionaryNameByKey(ProductFareTempDic, dic["FareTemplateId"].ToString());
-                dic["MerchantClassId"] = new DictionaryClass().getDictionaryNameByKey(MerchantClassDic, dic["MerchantClassId"].ToString());
+                // dic["FareTemplateId"] = new DictionaryClass().getDictionaryNameByKey(ProductFareTempDic, dic["FareTemplateId"].ToString());
+                // dic["MerchantClassId"] = new DictionaryClass().getDictionaryNameByKey(MerchantClassDic, dic["MerchantClassId"].ToString());
                 dic["Status"] = dic["Status"].ToString() == "1" ? "已上架" : "已下架";
             }
             return Json(obj);
@@ -118,7 +110,7 @@ namespace MySystem.Areas.Admin.Controllers
         {
             Products product = db.Products.FirstOrDefault(m => m.ProductName == data.ProductName);
             if (product != null)
-            { 
+            {
                 return "商品名称已存在";
             }
             Dictionary<string, object> Fields = new Dictionary<string, object>();
@@ -129,7 +121,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("Stock", data.Stock); //库存
             Fields.Add("BuyCount", data.BuyCount); //已购买数
             Fields.Add("DetailPicPath", data.DetailPicPath); //图集
-            Fields.Add("ColId", data.ColId); //商品类型
+            // Fields.Add("ColId", data.ColId); //商品类型
             Fields.Add("CommentCount", data.CommentCount); //评价数
             Fields.Add("GoodPercent", data.GoodPercent); //好评率
             Fields.Add("IsRecommend", data.IsRecommend); //推荐
@@ -139,6 +131,10 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("EndDate", data.EndDate); //下架时间
             // Fields.Add("EndDate", data.EndDate); //下架时间
             Fields.Add("IsLimit", data.IsLimit); //限时抢购
+            Fields.Add("IsBanner", data.IsBanner); //是否Banner推荐
+            Fields.Add("BannerPhoto", data.BannerPhoto); //Banner图
+            Fields.Add("LinkUrl", data.LinkUrl); //外链
+            Fields.Add("BannerSort", data.BannerSort); //排序
             Fields.Add("SourcePrice", data.SourcePrice); //原价
             Fields.Add("Price", data.Price); //价格
             Fields.Add("Integral", data.Integral); //抵扣积分
@@ -147,6 +143,7 @@ namespace MySystem.Areas.Admin.Controllers
             // Fields.Add("PublishDate", data.PublishDate); //上架时间
             Fields.Add("CostPrice", data.CostPrice); //成本价
             Fields.Add("FareTemplateId", data.FareTemplateId); //运费模板Id
+            Fields.Add("StartBuyCount", data.StartBuyCount); //起购数量
             Fields.Add("LimitCount", data.LimitCount); //限购数量
             Fields.Add("KeyWord", data.KeyWord); //关键词
             Fields.Add("MerchantClassId", data.MerchantClassId); //商家分类
@@ -155,6 +152,8 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("MerchantColId", data.MerchantColId); //商品分类
             Fields.Add("Title", data.Title);
             Fields.Add("Title2", data.Title2);
+            Fields.Add("ColId", data.ColId);//分类
+            Fields.Add("ProductKind", data.ProductKind);//商品类型
 
             Fields.Add("SeoTitle", data.SeoTitle);
             Fields.Add("SeoKeyword", data.SeoKeyword);
@@ -208,7 +207,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("Stock", data.Stock); //库存
             Fields.Add("BuyCount", data.BuyCount); //已购买数
             Fields.Add("DetailPicPath", data.DetailPicPath); //图集
-            Fields.Add("ColId", data.ColId); //商品类型
+            // Fields.Add("ColId", data.ColId); //商品类型
             Fields.Add("CommentCount", data.CommentCount); //评价数
             Fields.Add("GoodPercent", data.GoodPercent); //好评率
             Fields.Add("IsRecommend", data.IsRecommend); //推荐
@@ -217,6 +216,10 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("StartDate", data.StartDate); //上架时间
             Fields.Add("EndDate", data.EndDate); //下架时间
             Fields.Add("IsLimit", data.IsLimit); //限时抢购
+            Fields.Add("IsBanner", data.IsBanner); //是否Banner推荐
+            Fields.Add("BannerPhoto", data.BannerPhoto); //Banner图
+            Fields.Add("LinkUrl", data.LinkUrl); //外链
+            Fields.Add("BannerSort", data.BannerSort); //排序
             Fields.Add("SourcePrice", data.SourcePrice); //原价
             Fields.Add("Price", data.Price); //价格
             Fields.Add("Integral", data.Integral); //抵扣积分
@@ -225,6 +228,7 @@ namespace MySystem.Areas.Admin.Controllers
             // Fields.Add("PublishDate", data.PublishDate); //上架时间
             Fields.Add("CostPrice", data.CostPrice); //成本价
             Fields.Add("FareTemplateId", data.FareTemplateId); //运费模板Id
+            Fields.Add("StartBuyCount", data.StartBuyCount); //起购数量
             Fields.Add("LimitCount", data.LimitCount); //限购数量
             Fields.Add("KeyWord", data.KeyWord); //关键词
             Fields.Add("MerchantClassId", data.MerchantClassId); //商家分类
@@ -233,6 +237,8 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("MerchantColId", data.MerchantColId); //商品分类
             Fields.Add("Title", data.Title);
             Fields.Add("Title2", data.Title2);
+            Fields.Add("ColId", data.ColId);//分类
+            Fields.Add("ProductKind", data.ProductKind);//商品类型
 
             Fields.Add("SeoTitle", data.SeoTitle);
             Fields.Add("SeoKeyword", data.SeoKeyword);
@@ -389,19 +395,19 @@ namespace MySystem.Areas.Admin.Controllers
         }
 
         #endregion
-   
-    
-    
-    
-    
+
+
+
+
+
         #region 根据分类获取商品列表
 
-        public List<Dictionary<string, object>> GetProductByCol(string ColIds,string MerchantIds)
-        { 
+        public List<Dictionary<string, object>> GetProductByCol(string ColIds, string MerchantIds)
+        {
             List<Dictionary<string, object>> list = new List<Dictionary<string, object>>();
             IQueryable<Products> products = db.Products;
             if (!string.IsNullOrEmpty(ColIds))
-            { 
+            {
                 List<string> colidlist = ColIds.Split(',').ToList();
                 products = products.Where(m => colidlist.Contains(m.ColId));
             }
@@ -417,7 +423,7 @@ namespace MySystem.Areas.Admin.Controllers
             }
             products = products.OrderByDescending(m => m.Id);
             foreach (Products product in products.ToList())
-            { 
+            {
                 Dictionary<string, object> row = new Dictionary<string, object>();
                 row.Add("title", product.ProductName);
                 row.Add("value", product.Id);
@@ -458,7 +464,7 @@ namespace MySystem.Areas.Admin.Controllers
         }
 
         #endregion
-    
-    
+
+
     }
 }

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

@@ -29,7 +29,7 @@
                                 <div class="layui-inline">
                                     <label class="layui-form-label">上级栏目</label>
                                     <div class="layui-input-inline">
-                                        <select id="PColId" name="PColId" lay-search="" lay-verify="required">
+                                        <select id="PColId" name="PColId" lay-search="" lay-verify="required|">
                                             <option value="@CurColId">作为顶级栏目</option>
                                             @{
                                                 List<MySystem.BsModels.Col> ColId = new MySystem.BsModels.WebCMSEntities().Col.Where(m => m.ColId.StartsWith(CurColId)).OrderBy(m

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

@@ -35,7 +35,7 @@
                                 <div class="layui-inline">
                                     <label class="layui-form-label">上级栏目</label>
                                     <div class="layui-input-inline">
-                                        <select id="PColId" name="PColId" lay-search="" lay-verify="required">
+                                        <select id="PColId" name="PColId" lay-search="" lay-verify="required|">
                                             <option value="@CurColId">作为顶级栏目</option>
                                             @{
                                                 List<MySystem.BsModels.Col> ColId = new MySystem.BsModels.WebCMSEntities().Col.Where(m => m.ColId.StartsWith(CurColId)).OrderBy(m

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

@@ -91,6 +91,7 @@
                             <button class="layui-btn" lay-submit lay-filter="LAY-list-front-searchall">
                                 <i class="layui-icon layui-icon-list layuiadmin-button-btn"></i>全部
                             </button>
+<<<<<<< HEAD
                             @if (RightInfo.Contains("," + right + "_export,"))
                             {
                                 <button class="layui-btn" data-type="ExportExcel"><i
@@ -99,6 +100,44 @@
                         </div>
                     </div>
                 </div>
+=======
+                        </div>
+                    </div>
+                </div>
+
+                <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>
+                        }
+                        @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">
+                        @* @if (RightInfo.Contains("," + right + "_edit,"))
+                    {
+                        <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>编辑</a>
+                    }
+                    @if (RightInfo.Contains("," + right + "_delete,"))
+                    {
+                        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon layui-icon-delete"></i>删除</a>
+                    }
+                    @if (RightInfo.Contains("," + right + "_edit,"))
+                    {
+>>>>>>> feature-dgy-商城优化
 
                 <div class="layui-card-body">
                     <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
@@ -131,10 +170,18 @@
                 </div>
             </div>
         </div>
+<<<<<<< HEAD
+=======
+
+>>>>>>> feature-dgy-商城优化
         <script src="/layuiadmin/layui/layui.js"></script>
         <script
             src="/layuiadmin/modules_main/LeaderReserveRecord_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
         <script>
+<<<<<<< HEAD
+=======
+
+>>>>>>> feature-dgy-商城优化
         </script>
 </body>
 

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

@@ -40,32 +40,46 @@ string right = ViewBag.right as string;
             <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">
-                            <select id="Reason" name="Reason" lay-search="">
+                            <input class="layui-input" type="text" readonly name="CreateDateData" id="CreateDate"
+                                placeholder="" autocomplete="off">
+                        </div>
+                    </div>
+                    @{Dictionary<string, string> ProductsDic = new MySystem.DictionaryClass().getProductsDic();}
+                    <div class="layui-inline">
+                        <label class="layui-form-label">商品</label>
+                        <div class="layui-input-inline">
+                            <select id="ProductIdSelect" name="ProductIdSelect" lay-search="">
                                 <option value="">全部...</option>
-                                @{Dictionary<string, string> OrderRefundReasonDic = new MySystem.OrderDictionary().getOrderRefundReasonDic();}
-                                    @foreach (string key in OrderRefundReasonDic.Keys)
-                                    {
-                                    <option value="@key">@OrderRefundReasonDic[key]</option>
-                                    }
+                                @foreach (string key in ProductsDic.Keys)
+                                {
+                                <option value="@key">@ProductsDic[key]</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="MakerCode" 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="Mobile" placeholder="申请人手机号"
+                            <input class="layui-input" type="text" name="OrderNo" placeholder="订单号"
                                 autocomplete="off">
                         </div>
                     </div>
                     <div class="layui-inline">
-                        <label class="layui-form-label">货物状态</label>
+                        <label class="layui-form-label">退回方式</label>
                         <div class="layui-input-inline">
-                            <select id="GoodStatus" name="GoodStatus" lay-search="">
+                            <select id="RefundStatusSelect" name="RefundStatusSelect" lay-search="">
                                 <option value="">全部...</option>
-                                <option value="1">未收到货</option>
-                                <option value="2">已收到货</option>
+                                <option value="1">余额</option>
+                                <option value="2">支付宝</option>
                             </select>
                         </div>
                     </div>

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

@@ -1,40 +1,48 @@
 @{
     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">
+    <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{
+        .layui-input-inline {
             width: 175px !important;
         }
-        .layui-form-label{
+
+        .layui-form-label {
             width: 115px !important;
         }
-        .layui-inline{
+
+        .layui-inline {
             margin-right: 0px !important;
         }
-        .w100{
+
+        .w100 {
             width: 100px !important;
         }
-        .ml50{
+
+        .ml50 {
             margin-left: 50px !important;
         }
-        tbody .layui-table-cell{
+
+        tbody .layui-table-cell {
             height: 60px !important;
         }
     </style>
 </head>
+
 <body>
     <div class="layui-fluid">
         <div class="layui-card">
@@ -184,7 +192,9 @@
                             </select>
                         </div>
                     </div>
-                    @{Dictionary<string, string> ProductsDic = new MySystem.DictionaryClass().getProductsDic();}
+                    @{
+                        Dictionary<string, string> ProductsDic = new MySystem.DictionaryClass().getProductsDic();
+                    }
                     <div class="layui-inline">
                         <label class="layui-form-label">产品类型</label>
                         <div class="layui-input-inline">
@@ -192,7 +202,7 @@
                                 <option value="">全部...</option>
                                 @foreach (string key in ProductsDic.Keys)
                                 {
-                                <option value="@key">@ProductsDic[key]</option>
+                                    <option value="@key">@ProductsDic[key]</option>
                                 }
                             </select>
                         </div>
@@ -220,7 +230,9 @@
                             </select>
                         </div>
                     </div>
-                    @{Dictionary<string, string> TopUserDic = new MySystem.DictionaryClass().getTopUserDic();}
+                    @{
+                        Dictionary<string, string> TopUserDic = new MySystem.DictionaryClass().getTopUserDic();
+                    }
                     <div class="layui-inline">
                         <label class="layui-form-label">顶级创客</label>
                         <div class="layui-input-inline">
@@ -228,7 +240,7 @@
                                 <option value="">全部...</option>
                                 @foreach (string key in TopUserDic.Keys)
                                 {
-                                <option value="@key">@TopUserDic[key]</option>
+                                    <option value="@key">@TopUserDic[key]</option>
                                 }
                             </select>
                         </div>
@@ -242,7 +254,8 @@
                         </button>
                         @if (RightInfo.Contains("," + right + "_export,"))
                         {
-                        <button class="layui-btn" data-type="ExportsExcel"><i class="layui-icon layui-icon-export layuiadmin-button-btn"></i>导出</button>
+                            <button class="layui-btn" data-type="ExportsExcel"><i
+                                    class="layui-icon layui-icon-export layuiadmin-button-btn"></i>导出</button>
                         }
                     </div>
                 </div>
@@ -250,21 +263,22 @@
 
             <div class="layui-card-body">
                 <blockquote class="layui-elem-quote layui-text">
-                    支付成功总金额(元)：<span style="color: #f00;" id="SuccessAmount">0.00</span>　|　支付失败总金额(元)：<span style="color: #f00;" id="FailAmount">0.00</span>
+                    支付成功总金额(元)：<span style="color: #f00;" id="SuccessAmount">0.00</span>　|　支付失败总金额(元)：<span
+                        style="color: #f00;" id="FailAmount">0.00</span>
                 </blockquote>
                 <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-warm layui-btn-xs" lay-event="detail"><i class="layui-icon layui-icon-read"></i>详情</a>
                     @if (RightInfo.Contains("," + right + "_send,"))
                     {
-                        @Html.Raw("{{#if (d.SendStatus == 0 && d.Sort == 0 && d.TotalPrice > 0){ }}")
-                        <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="send"><i class="layui-icon layui-icon-edit"></i>发货</a>
+                        @Html.Raw("{{#if (d.SendStatus == 0 && d.RefundStatus == 0 && d.PayStatus == 1 && d.Sort == 0 && d.TotalPrice > 0){ }}")
+                            <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="send"><i class="layui-icon layui-icon-edit"></i>发货</a>
                         @("{{#} }}")
                     }
                     @if (RightInfo.Contains("," + right + "_return,"))
                     {
-                        @("{{#if (d.RefundStatus == 0){ }}")
-                        <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="return"><i class="layui-icon layui-icon-edit"></i>退货</a>
+                        @Html.Raw("{{#if (d.RefundStatus == 0 && d.PayStatus == 1 && d.Sort == 0 && d.TotalPrice > 0){ }}")
+                            <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="return"><i class="layui-icon layui-icon-edit"></i>退货</a>
                         @("{{#} }}")
                     }
                     @*<a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="prize100"><i class="layui-icon layui-icon-edit"></i>查看推荐奖</a>*@
@@ -276,7 +290,8 @@
     <script src="/layuiadmin/layui/layui.js"></script>
     <script src="/layuiadmin/modules_main/Orders_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
     <script>
-        
+
     </script>
 </body>
+
 </html>

Areas/Admin/Views/MainServer/Orders/IndexRefund.cshtml

@@ -0,0 +1,118 @@
+@{
+    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: 115px !important;
+        }
+        .layui-inline{
+            margin-right: 0px !important;
+        }
+        .w100{
+            width: 100px !important;
+        }
+        .ml50{
+            margin-left: 50px !important;
+        }
+        tbody .layui-table-cell{
+            height: 60px !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" readonly name="UpdateDateData" 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="OrderNo" 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="UserIdMakerCode" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">退款渠道</label>
+                        <div class="layui-input-inline">
+                            <select id="PayModeSelect" name="PayModeSelect" lay-search="">
+                                <option value="">全部...</option>
+                                <option value="1">支付宝</option>
+                                <option value="3">账户余额</option>
+                            </select>
+                        </div>
+                    </div>
+                    @{Dictionary<string, string> ProductsDic = new MySystem.DictionaryClass().getProductsDic();}
+                    <div class="layui-inline">
+                        <label class="layui-form-label">商品</label>
+                        <div class="layui-input-inline">
+                            <select id="ProductIdSelect" name="ProductIdSelect" lay-search="">
+                                <option value="">全部...</option>
+                                @foreach (string key in ProductsDic.Keys)
+                                {
+                                <option value="@key">@ProductsDic[key]</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>
+                        <button class="layui-btn" lay-submit lay-filter="LAY-list-front-searchall">
+                            <i class="layui-icon layui-icon-list layuiadmin-button-btn"></i>全部
+                        </button>
+                        @if (RightInfo.Contains("," + right + "_export,"))
+                        {
+                        <button class="layui-btn" data-type="ExportsExcel"><i class="layui-icon layui-icon-export layuiadmin-button-btn"></i>导出</button>
+                        }
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-card-body">
+                <blockquote class="layui-elem-quote layui-text">
+                    @* 支付成功总金额(元)：<span style="color: #f00;" id="SuccessAmount">0.00</span>　|　支付失败总金额(元)：<span style="color: #f00;" id="FailAmount">0.00</span> *@
+                </blockquote>
+                <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-warm layui-btn-xs" lay-event="detail"><i class="layui-icon layui-icon-read"></i>详情</a>
+                </script>
+            </div>
+        </div>
+    </div>
+
+    <script src="/layuiadmin/layui/layui.js"></script>
+    <script src="/layuiadmin/modules_main/OrdersRefund_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
+    <script>
+        
+    </script>
+</body>
+</html>

Areas/Admin/Views/MainServer/Orders/Send.cshtml

@@ -1,115 +1,136 @@
 @using MySystem.Models;
-@{Orders editData = ViewBag.data as Orders;}
+@{
+    Orders editData = ViewBag.data as Orders;
+}
 @{
     string RightInfo = ViewBag.RightInfo as string;
     string right = ViewBag.right as string;
     List<OrderProduct> products = ViewBag.products as List<OrderProduct>;
+    string ProductId = ViewBag.productId 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">
+    <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">
-                            </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">
-                            </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="@editData.RealName">
+            <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">
+                                </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="ErpCode" name="ErpCode" maxlength="30"
-                                    lay-verify="required" autocomplete="off" placeholder="请输入快递单号">
+                            <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">
+                                </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="ErpName" name="ErpName" maxlength="30"
-                                    lay-verify="required" autocomplete="off" placeholder="请输入快递名称">
+                            <div class="layui-form-item" id="TakeName" style="display: none;">
+                                <label class="layui-form-label">*收件人</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" type="text" readonly id="RealName" name="RealName"
+                                        value="@editData.RealName">
+                                </div>
                             </div>
-                        </div>                        
-                        @{Dictionary<string, string> StoreHouseDic = new MySystem.DictionaryClass().getStoreHouseDic();}
-                        @foreach(OrderProduct product in products)
-                        {
-                            <fieldset class="layui-elem-field layui-field-title"></fieldset>
-                            <input type="hidden" name="IdList" value="@product.Id">
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">*产品名称</label>
+                            <div class="layui-form-item" id="ErpForCode" style="display: none;">
+                                <label class="layui-form-label">*快递单号</label>
                                 <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" readonly id="ProductName" name="ProductNameList" value="@product.ProductName">
+                                    <input class="layui-input" type="text" id="ErpCode" name="ErpCode" maxlength="30"
+                                        autocomplete="off" placeholder="请输入快递单号(必填)">
                                 </div>
                             </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">发货仓库</label>
+                            <div class="layui-form-item" id="ErpForName" style="display: none;">
+                                <label class="layui-form-label">*快递名称</label>
                                 <div class="layui-input-inline">
-                                    <select id="StoreId" name="StoreIdList" lay-verify="required" lay-search="">
-                                        <option value="">请选择</option>
-                                        @foreach (string key in StoreHouseDic.Keys)
-                                        {
-                                        <option value="@key">@StoreHouseDic[key]</option>
-                                        }
-                                    </select>
+                                    <input class="layui-input" type="text" id="ErpName" name="ErpName" maxlength="30"
+                                        autocomplete="off" placeholder="请输入快递名称(必填)">
                                 </div>
                             </div>
-                            <div class="layui-form-item layui-form-text">
-                                <label class="layui-form-label">*SN编号</label>
+                            <div class="layui-form-item layui-form-text" id="BUSN" style="display: none;">
+                                <label class="layui-form-label">补录备注</label>
                                 <div class="layui-input-block">
-                                    <textarea class="layui-textarea" id="SnNos" name="SnNosList" lay-verify="required" placeholder="请输入SN号,多个以逗号隔开"></textarea>
+                                    <textarea class="layui-textarea" id="SnNos" name="SnNosList"
+                                        placeholder="请输入补录备注(可选填所补录的机具Sn)"></textarea>
                                 </div>
                             </div>
-                        }
-                    </div>
+                            @* @{Dictionary<string, string> StoreHouseDic = new
+                                MySystem.DictionaryClass().getStoreHouseDic();} *@
+                            @foreach (OrderProduct product in products)
+                            {
+                                <fieldset class="layui-elem-field layui-field-title"></fieldset>
+                                <input type="hidden" name="IdList" value="@product.Id">
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">*产品名称</label>
+                                    <div class="layui-input-inline">
+                                        <input class="layui-input" type="text" readonly id="ProductName"
+                                        name="ProductNameList" value="@product.ProductName">
+                                    </div>
+                                </div>
+                                @* <div class="layui-form-item">
+                                    <label class="layui-form-label">发货仓库</label>
+                                    <div class="layui-input-inline">
+                                    <select id="StoreId" name="StoreIdList" lay-verify="required" lay-search="">
+                                    <option value="">请选择</option>
+                                    @foreach (string key in StoreHouseDic.Keys)
+                                    {
+                                    <option value="@key">@StoreHouseDic[key]</option>
+                                    }
+                                    </select>
+                                    </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="SnNos" name="SnNosList"
+                                    placeholder="请输入SN号,多个以逗号隔开"></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 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?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
+    <script
+        src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></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 = "";
@@ -123,7 +144,20 @@
                 }
             });
         }
-        
+        (function () {
+            if (@ViewBag.productId == "16") {
+                $('#TakeName').css('display', 'none');
+                $('#ErpForCode').css('display', 'none');
+                $('#ErpForName').css('display', 'none');
+                $('#BUSN').css('display', 'block');
+            } else {
+                $('#TakeName').css('display', 'block');
+                $('#ErpForCode').css('display', 'block');
+                $('#ErpForName').css('display', 'block');
+                $('#BUSN').css('display', 'none');
+            }
+        })();
+
         var tree;
         var element;
         var upload;
@@ -143,30 +177,31 @@
             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/ProductNorm/Add.cshtml

@@ -4,136 +4,164 @@
 }
 <!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">
+    <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="14">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-block">
-<input class="layui-input" type="text" id="ColName" name="ColName" maxlength="50" lay-verify="required;" autocomplete="off" placeholder="请输入名称">
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">Id集合</label>
-<div class="layui-input-block">
-<input class="layui-input" type="text" id="IdList" name="IdList" maxlength="50" lay-verify="" autocomplete="off" placeholder="请输入Id集合">
-</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="Price" name="Price" 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="Integral" name="Integral" 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="UserPrice" name="UserPrice" 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="UserIntegral" name="UserIntegral" 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="Stock" name="Stock" 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="BuyCount" name="BuyCount" 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="CostPrice" name="CostPrice" 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="Code" name="Code" 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">
-<input class="layui-input" type="text" id="LimitCount" name="LimitCount" maxlength="20" lay-verify="" autocomplete="off" placeholder="请输入限购数量">
-</div>
-</div>
+            <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="14">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-block">
+                                    <input class="layui-input" type="text" id="ColName" name="ColName" maxlength="50"
+                                        lay-verify="required;" autocomplete="off" placeholder="请输入名称">
+                                </div>
+                            </div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">Id集合</label>
+                                <div class="layui-input-block">
+                                    <input class="layui-input" type="text" id="IdList" name="IdList" maxlength="50"
+                                        lay-verify="" autocomplete="off" placeholder="请输入Id集合">
+                                </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="Price" name="Price" 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="Integral" name="Integral" 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="UserPrice" name="UserPrice"
+                                        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="UserIntegral" name="UserIntegral"
+                                        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="Stock" name="Stock" 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="BuyCount" name="BuyCount" 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="CostPrice" name="CostPrice"
+                                        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="Code" name="Code" 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">
+                                    <input class="layui-input" type="text" id="StartBuyCount" name="StartBuyCount"
+                                        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="LimitCount" name="LimitCount"
+                                        maxlength="20" 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" 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 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>
+                <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 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?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
+    <script
+        src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></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 = "";
@@ -239,7 +267,7 @@
             });
         }
 
-        
+
         var tree;
         layui.config({
             base: '/layuiadmin/' //静态资源所在路径
@@ -257,30 +285,31 @@
                 , 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/ProductNorm/Edit.cshtml

@@ -7,17 +7,20 @@
 }
 <!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">
+    <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>
     <script src="/admin/js/vue.min.js"></script>
 </head>
+
 <body>
 
     <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">
@@ -26,138 +29,170 @@
         <input type="hidden" id="ItemList" name="ItemList" value="" />
         <input type="hidden" id="DetailList" name="DetailList" value="" />
         <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" id="app">
-                <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="TempId" name="TempId" lay-filter="tempid" lay-search="">
-                                <option value="">请选择</option>
-                                <option v-for="item in tempList" :value="item.id">{{item.name}}</option>
-                            </select>
-                        </div>
-                        <div class="layui-form-mid layui-word-aux">
-                            <a href="###" v-on:click="showTemplate">刷新</a>
-                        </div>
-                        <div class="layui-form-mid layui-word-aux">
-                            <a href="###" lay-href="/Admin/ProductNormTemp/Index?MerchantId=@MerchantId&right=@right">模板管理</a>
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">商品规格</label>
-                        <div class="layui-input-block">
-                            <div>
-                                <table width="100%" v-for="item,i in itemList">
-                                    <thead>
-                                        <tr style="height:30px; line-height:30px; background-color:#eee;">
-                                            <th style="padding:10px;width:60px;">规格名：</th>
-                                            <th style="padding:10px;">
-                                                <input class="layui-input" style="width:150px;" type="text" maxlength="20" lay-verify="" autocomplete="off" placeholder="请输入规格名" v-model="item.name">
-                                            </th>
-                                            <th style="padding:10px;width:150px;">
-                                                <input type="button" value="上移" v-on:click="toup(i)" />
-                                                <input type="button" value="下移" v-on:click="todown(i)" />
-                                                <input type="button" value="删除" v-on:click="del(i)" />
-                                            </th>
-                                        </tr>
-                                    </thead>
-                                    <tbody>
+            <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" id="app">
+                        <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="TempId" name="TempId" lay-filter="tempid" lay-search="">
+                                        <option value="">请选择</option>
+                                        <option v-for="item in tempList" :value="item.id">{{item.name}}</option>
+                                    </select>
+                                </div>
+                                <div class="layui-form-mid layui-word-aux">
+                                    <a href="###" v-on:click="showTemplate">刷新</a>
+                                </div>
+                                <div class="layui-form-mid layui-word-aux">
+                                    <a href="###"
+                                        lay-href="/Admin/ProductNormTemp/Index?MerchantId=@MerchantId&right=@right">模板管理</a>
+                                </div>
+                            </div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">商品规格</label>
+                                <div class="layui-input-block">
+                                    <div>
+                                        <table width="100%" v-for="item,i in itemList">
+                                            <thead>
+                                                <tr style="height:30px; line-height:30px; background-color:#eee;">
+                                                    <th style="padding:10px;width:60px;">规格名：</th>
+                                                    <th style="padding:10px;">
+                                                        <input class="layui-input" style="width:150px;" type="text"
+                                                            maxlength="20" lay-verify="" autocomplete="off"
+                                                            placeholder="请输入规格名" v-model="item.name">
+                                                    </th>
+                                                    <th style="padding:10px;width:150px;">
+                                                        <input type="button" value="上移" v-on:click="toup(i)" />
+                                                        <input type="button" value="下移" v-on:click="todown(i)" />
+                                                        <input type="button" value="删除" v-on:click="del(i)" />
+                                                    </th>
+                                                </tr>
+                                            </thead>
+                                            <tbody>
+                                                <tr style="height:30px; line-height:30px;">
+                                                    <td style="padding:10px;width:60px;">规格值：</td>
+                                                    <td style="padding:10px;">
+                                                        <div style="float:left;width:150px;margin-right:5px;"
+                                                            v-for="subitem,j in item.vallist">
+                                                            <input class="layui-input" type="text" maxlength="20"
+                                                                lay-verify="" autocomplete="off" placeholder="请输入规格值"
+                                                                v-model="subitem.name" v-on:keyup="showDetail">
+                                                            <input type="button" value="左移"
+                                                                v-on:click="toleftsub(item,j)" />
+                                                            <input type="button" value="右移"
+                                                                v-on:click="torightsub(item,j)" />
+                                                            <input type="button" value="删除"
+                                                                v-on:click="delsub(item,j)" />
+                                                        </div>
+                                                    </td>
+                                                    <td style="padding:10px;">
+                                                        <input type="button" class="layui-btn" value="增加"
+                                                            v-on:click="addsub(item)" />
+                                                    </td>
+                                                </tr>
+                                            </tbody>
+                                        </table>
+                                    </div>
+                                    <table width="100%">
                                         <tr style="height:30px; line-height:30px;">
-                                            <td style="padding:10px;width:60px;">规格值：</td>
-                                            <td style="padding:10px;">
-                                                <div style="float:left;width:150px;margin-right:5px;" v-for="subitem,j in item.vallist">
-                                                    <input class="layui-input" type="text" maxlength="20" lay-verify="" autocomplete="off" placeholder="请输入规格值" v-model="subitem.name" v-on:keyup="showDetail">
-                                                    <input type="button" value="左移" v-on:click="toleftsub(item,j)" />
-                                                    <input type="button" value="右移" v-on:click="torightsub(item,j)" />
-                                                    <input type="button" value="删除" v-on:click="delsub(item,j)" />
-                                                </div>
-                                            </td>
                                             <td style="padding:10px;">
-                                                <input type="button" class="layui-btn" value="增加" v-on:click="addsub(item)" />
+                                                <input type="button" class="layui-btn" value="添加项" v-on:click="add" />
                                             </td>
                                         </tr>
-                                    </tbody>
-                                </table>
+                                    </table>
+                                </div>
                             </div>
-                            <table width="100%">
-                                <tr style="height:30px; line-height:30px;">
-                                    <td style="padding:10px;">
-                                        <input type="button" class="layui-btn" value="添加项" v-on:click="add" />
-                                    </td>
-                                </tr>
-                            </table>
                         </div>
-                    </div>
-                </div>
-                <div class="layui-tab-item">
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">规格明细</label>
-                        <div class="layui-input-block">
-                            <table width="100%">
-                                <thead>
-                                    <tr style="height:30px; line-height:30px; background-color:#eee;">
-                                        <th style="padding:10px;" v-for="item in itemList">{{item.name}}</th>
-                                        <th style="padding:10px;">价格</th>
-                                        <th style="padding:10px;">积分抵扣</th>
-                                        <th style="padding:10px;">创客价格</th>
-                                        <th style="padding:10px;">创客积分抵扣</th>
-                                        <th style="padding:10px;">库存</th>
-                                        <th style="padding:10px;">规格编码</th>
-                                        <th style="padding:10px;">成本价</th>
-                                        <th style="padding:10px;">限购数量</th>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                                    <tr style="height:30px; line-height:30px;" v-for="item in detailList">
-                                        <td style="padding:10px;width:80px;" v-for="subitem in item.title">{{subitem.name}}</td>
-                                        <td style="padding:10px;">
-                                            <input class="layui-input" type="text" maxlength="20" lay-verify="" autocomplete="off" placeholder="请输入价格" v-model="item.price">
-                                        </td>
-                                        <td style="padding:10px;">
-                                            <input class="layui-input" type="text" maxlength="20" lay-verify="" autocomplete="off" placeholder="请输入积分抵扣" v-model="item.integral">
-                                        </td>
-                                        <td style="padding:10px;">
-                                            <input class="layui-input" type="text" maxlength="20" lay-verify="" autocomplete="off" placeholder="请输入创客价格" v-model="item.userprice">
-                                        </td>
-                                        <td style="padding:10px;">
-                                            <input class="layui-input" type="text" maxlength="20" lay-verify="" autocomplete="off" placeholder="请输入创客积分抵扣" v-model="item.userintegral">
-                                        </td>
-                                        <td style="padding:10px;">
-                                            <input class="layui-input" type="text" maxlength="20" lay-verify="" autocomplete="off" placeholder="请输入库存" v-model="item.stock">
-                                        </td>
-                                        <td style="padding:10px;">
-                                            <input class="layui-input" type="text" maxlength="20" lay-verify="" autocomplete="off" placeholder="请输入规格编码" v-model="item.code">
-                                        </td>
-                                        <td style="padding:10px;">
-                                            <input class="layui-input" type="text" maxlength="20" lay-verify="" autocomplete="off" placeholder="请输入成本价" v-model="item.costprice">
-                                        </td>
-                                        <td style="padding:10px;">
-                                            <input class="layui-input" type="text" maxlength="20" lay-verify="" autocomplete="off" placeholder="请输入限购数量" v-model="item.limitcount">
-                                        </td>
-                                    </tr>
-                                </tbody>
-                            </table>
+                        <div class="layui-tab-item">
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">规格明细</label>
+                                <div class="layui-input-block">
+                                    <table width="100%">
+                                        <thead>
+                                            <tr style="height:30px; line-height:30px; background-color:#eee;">
+                                                <th style="padding:10px;" v-for="item in itemList">{{item.name}}</th>
+                                                <th style="padding:10px;">价格</th>
+                                                @* <th style="padding:10px;">积分抵扣</th>
+                                                <th style="padding:10px;">创客价格</th>
+                                                <th style="padding:10px;">创客积分抵扣</th> *@
+                                                <th style="padding:10px;">库存</th>
+                                                @* <th style="padding:10px;">规格编码</th>
+                                                <th style="padding:10px;">成本价</th> *@
+                                                <th style="padding:10px;">起购数量</th>
+                                                <th style="padding:10px;">限购数量</th>
+                                            </tr>
+                                        </thead>
+                                        <tbody>
+                                            <tr style="height:30px; line-height:30px;" v-for="item in detailList">
+                                                <td style="padding:10px;width:80px;" v-for="subitem in item.title">
+                                                    {{subitem.name}}</td>
+                                                <td style="padding:10px;">
+                                                    <input class="layui-input" type="text" maxlength="20" lay-verify=""
+                                                        autocomplete="off" placeholder="请输入价格" v-model="item.price">
+                                                </td>
+                                                @* <td style="padding:10px;">
+                                                    <input class="layui-input" type="text" maxlength="20" lay-verify=""
+                                                        autocomplete="off" placeholder="请输入积分抵扣"
+                                                        v-model="item.integral">
+                                                </td>
+                                                <td style="padding:10px;">
+                                                    <input class="layui-input" type="text" maxlength="20" lay-verify=""
+                                                        autocomplete="off" placeholder="请输入创客价格"
+                                                        v-model="item.userprice">
+                                                </td>
+                                                <td style="padding:10px;">
+                                                    <input class="layui-input" type="text" maxlength="20" lay-verify=""
+                                                        autocomplete="off" placeholder="请输入创客积分抵扣"
+                                                        v-model="item.userintegral">
+                                                </td> *@
+                                                <td style="padding:10px;">
+                                                    <input class="layui-input" type="text" maxlength="20" lay-verify=""
+                                                        autocomplete="off" placeholder="请输入库存" v-model="item.stock">
+                                                </td>
+                                                @* <td style="padding:10px;">
+                                                    <input class="layui-input" type="text" maxlength="20" lay-verify=""
+                                                        autocomplete="off" placeholder="请输入规格编码" v-model="item.code">
+                                                </td>
+                                                <td style="padding:10px;">
+                                                    <input class="layui-input" type="text" maxlength="20" lay-verify=""
+                                                        autocomplete="off" placeholder="请输入成本价"
+                                                        v-model="item.costprice">
+                                                </td> *@
+                                                <td style="padding:10px;">
+                                                    <input class="layui-input" type="text" maxlength="20" lay-verify=""
+                                                        autocomplete="off" placeholder="请输入起购数量"
+                                                        v-model="item.startbuycount">
+                                                </td>
+                                                <td style="padding:10px;">
+                                                    <input class="layui-input" type="text" maxlength="20" lay-verify=""
+                                                        autocomplete="off" placeholder="请输入限购数量"
+                                                        v-model="item.limitcount">
+                                                </td>
+                                            </tr>
+                                        </tbody>
+                                    </table>
+                                </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 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?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
+    <script
+        src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
     <script src="/other/mybjq/kindeditor-min.js"></script>
     <script src="/other/mybjq/lang/zh_CN.js"></script>
     <script>//编辑器
@@ -473,6 +508,7 @@
                                                                 stock: 0,
                                                                 code: '',
                                                                 costprice: 0,
+                                                                startbuycount: 0,
                                                                 limitcount: 0,
                                                             });
                                                         }
@@ -488,6 +524,7 @@
                                                             stock: 0,
                                                             code: '',
                                                             costprice: 0,
+                                                            startbuycount: 0,
                                                             limitcount: 0,
                                                         });
                                                     }
@@ -504,6 +541,7 @@
                                                     stock: 0,
                                                     code: '',
                                                     costprice: 0,
+                                                    startbuycount: 0,
                                                     limitcount: 0,
                                                 });
                                             }
@@ -520,6 +558,7 @@
                                             stock: 0,
                                             code: '',
                                             costprice: 0,
+                                            startbuycount: 0,
                                             limitcount: 0,
                                         });
                                     }
@@ -536,6 +575,7 @@
                                     stock: 0,
                                     code: '',
                                     costprice: 0,
+                                    startbuycount: 0,
                                     limitcount: 0,
                                 });
                             }
@@ -580,14 +620,14 @@
                                                 if (array5.length > 0) {
                                                     for (var m = 0; m < array5.length; m++) {
                                                         for (var num = 0; num < this.detailList.length; num++) {
-                                                            if (JSON.stringify(this.detailList[num].title) == JSON.stringify([array1[i],array2[j],array3[k],array4[l],array5[m]]) && !this.isTitle(JSON.stringify([array1[i],array2[j],array3[k],array4[l],array5[m]]))) {
+                                                            if (JSON.stringify(this.detailList[num].title) == JSON.stringify([array1[i], array2[j], array3[k], array4[l], array5[m]]) && !this.isTitle(JSON.stringify([array1[i], array2[j], array3[k], array4[l], array5[m]]))) {
                                                                 arr.push(this.detailList[num]);
                                                             }
                                                         }
                                                     }
                                                 } else {
                                                     for (var num = 0; num < this.detailList.length; num++) {
-                                                        if (JSON.stringify(this.detailList[num].title) == JSON.stringify([array1[i],array2[j],array3[k],array4[l]]) && !this.isTitle(JSON.stringify([array1[i],array2[j],array3[k],array4[l]]))) {
+                                                        if (JSON.stringify(this.detailList[num].title) == JSON.stringify([array1[i], array2[j], array3[k], array4[l]]) && !this.isTitle(JSON.stringify([array1[i], array2[j], array3[k], array4[l]]))) {
                                                             arr.push(this.detailList[num]);
                                                         }
                                                     }
@@ -595,7 +635,7 @@
                                             }
                                         } else {
                                             for (var num = 0; num < this.detailList.length; num++) {
-                                                if (JSON.stringify(this.detailList[num].title) == JSON.stringify([array1[i],array2[j],array3[k]]) && !this.isTitle(JSON.stringify([array1[i],array2[j],array3[k]]))) {
+                                                if (JSON.stringify(this.detailList[num].title) == JSON.stringify([array1[i], array2[j], array3[k]]) && !this.isTitle(JSON.stringify([array1[i], array2[j], array3[k]]))) {
                                                     arr.push(this.detailList[num]);
                                                 }
                                             }
@@ -603,7 +643,7 @@
                                     }
                                 } else {
                                     for (var num = 0; num < this.detailList.length; num++) {
-                                        if (JSON.stringify(this.detailList[num].title) == JSON.stringify([array1[i],array2[j]]) && !this.isTitle(JSON.stringify([array1[i],array2[j]]))) {
+                                        if (JSON.stringify(this.detailList[num].title) == JSON.stringify([array1[i], array2[j]]) && !this.isTitle(JSON.stringify([array1[i], array2[j]]))) {
                                             arr.push(this.detailList[num]);
                                         }
                                     }
@@ -631,4 +671,5 @@
         });
     </script>
 </body>
+
 </html>

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

@@ -7,310 +7,414 @@
 }
 <!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">
+    <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>
     <script src="/admin/js/vue.min.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>
-                <li lay-id="3">价格设置</li>
-                <li lay-id="5">运费设置</li>
-                @* <li lay-id="6">限时抢购</li> *@
-                <li lay-id="7">数据</li>
-                <li lay-id="8">宣传标语</li>
-                <li lay-id="9">SEO设置</li>
-            </ul>
-            <div class="layui-tab-content mt20" id="app">
-                <div class="layui-tab-item layui-show">
-                    @{Dictionary<string, string> KqProductsDic = new MySystem.DictionaryClass().getKqProductBrandDic();}
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">产品类型</label>
-                        <div class="layui-input-inline">
-                            <select id="MerchantClassId" name="MerchantClassId" lay-search="">
-                                <option value="">全部...</option>
-                                @foreach (string key in KqProductsDic.Keys)
-                                {
-                                <option value="@key">@KqProductsDic[key]</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="LinkUrl" name="LinkUrl" maxlength="500" 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="ProductName" name="ProductName" maxlength="100" 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="Details" name="Details" maxlength="200" 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="ShareDetail" name="ShareDetail" maxlength="200" lay-verify="" 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" id="Contents" name="Contents" placeholder="请输入内容" style="width:100%;height:500px;"></textarea>
-                        </div>
-                    </div>
-
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">推荐</label>
-                        <div class="layui-input-block">
-                            <input type="checkbox" id="IsRecommend" name="IsRecommend" 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="IsRecommend2" name="IsRecommend2" 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="PublishDate" name="PublishDate" 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="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" 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="LimitCount" name="LimitCount" maxlength="20" lay-verify="" 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" id="KeyWord" name="KeyWord" lay-verify="" placeholder="请输入关键词"></textarea>
-                        </div>
-                    </div>
+            <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>
+                        <li lay-id="3">价格设置</li>
+                        <li lay-id="5">运费设置</li>
+                        @* <li lay-id="6">限时抢购</li> *@
+                        <li lay-id="7">数据</li>
+                        @* <li lay-id="8">宣传标语</li> *@
+                        @* <li lay-id="9">SEO设置</li> *@
+                    </ul>
+                    <div class="layui-tab-content mt20" id="app">
+                        <div class="layui-tab-item layui-show">
+                            @* @{
+                                Dictionary<string, string> KqProductsDic = new MySystem.DictionaryClass().getKqProductBrandDic();
+                            }
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">产品类型</label>
+                                <div class="layui-input-inline">
+                                    <select id="MerchantClassId" name="MerchantClassId" lay-search="">
+                                        <option value="">全部...</option>
+                                        @foreach (string key in KqProductsDic.Keys)
+                                        {
+                                            <option value="@key">@KqProductsDic[key]</option>
+                                        }
+                                    </select>
+                                </div>
+                            </div> *@
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">商品类型</label>
+                                <div class="layui-input-inline">
+                                    <select id="ProductKind" name="ProductKind" lay-verify="required|">
+                                        <option value="">请选择</option>
+                                        <option value="1">实物商品</option>
+                                        <option value="2">虚拟商品</option>
+                                    </select>
+                                </div>
+                            </div>
+                            @{
+                                Dictionary<string, string> ColDic = new MySystem.DictionaryClass().getColDic("006");
+                            }
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">分类</label>
+                                <div class="layui-input-block">
+                                    <input type="hidden" id="ColId" name="ColId" value="" lay-verify="required|"/>
+                                    <div id="ColIdTransfer" class="demo-transfer"></div>
+                                    @{
+                                        string ColJson = "[";
+                                    }
+                                    @foreach (string key in ColDic.Keys)
+                                    {
+                                        ColJson += "{\"value\": \"" + key + "\", \"title\": \"" + ColDic[key] + "\" },";
+                                    }
+                                    @{
+                                        ColJson = ColJson.TrimEnd(','); ColJson += "]";
+                                    }
+                                </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="ProductName" name="ProductName"
+                                        maxlength="100" 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="Details" name="Details" maxlength="200"
+                                        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="ShareDetail" name="ShareDetail"
+                                        maxlength="200" lay-verify="" 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" id="Contents" name="Contents" placeholder="请输入内容"
+                                        style="width:100%;height:500px;"></textarea>
+                                </div>
+                            </div>
 
-                </div>
-                <div class="layui-tab-item">
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">图集</label>
-                        <div class="layui-input-block">
-                            <div class="layui-upload">
-                                <input type="hidden" id="DetailPicPath" name="DetailPicPath" value="">
-                                <button class="layui-btn" type="button" id="DetailPicPathBtn">选择图片</button>
-                                <div class="layui-inline layui-word-aux"></div>
+                            @* <div class="layui-form-item">
+                                <label class="layui-form-label">推荐</label>
+                                <div class="layui-input-block">
+                                    <input type="checkbox" id="IsRecommend" name="IsRecommend" value="1"
+                                        lay-skin="switch" lay-filter="switchTest" title="开关">
+                                </div>
                             </div>
-                            <div class="mt10" id="DetailPicPathImage">
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">有好货</label>
+                                <div class="layui-input-block">
+                                    <input type="checkbox" id="IsRecommend2" name="IsRecommend2" 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="PublishDate" name="PublishDate" 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="required" autocomplete="off" placeholder="请输入上架时间">
+                                </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="ListPicPath" name="ListPicPath" value="">
+                            <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="required" autocomplete="off" placeholder="请输入下架时间">
+                                </div>
                             </div>
-                            <div class="mt10" id="ListPicPathImage">
-                                <img src="" class="layui-upload-img" style="max-width:285px; max-height:285px;">
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">起购数量</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" type="text" id="StartBuyCount" name="StartBuyCount"
+                                        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="LimitCount" name="LimitCount"
+                                        maxlength="20" lay-verify="" autocomplete="off" placeholder="请输入限购数量">
+                                </div>
+                            </div>
+                            @* <div class="layui-form-item">
+                                <label class="layui-form-label">首页Banner推荐</label>
+                                <div class="layui-input-block">
+                                    <input type="checkbox" id="IsBanner" name="IsBanner" value="1"
+                                        lay-skin="switch" lay-filter="IsBanner" title="开关">
+                                </div>
+                            </div>
+                            <div class="layui-form-item" id="BannerList" style="display: none;">
+                                <label class="layui-form-label">Banner图片</label>
+                                <div class="layui-input-block">
+                                    <div class="layui-upload">
+                                        <input type="hidden" id="BannerPhoto" name="BannerPhoto" value="">
+                                        <button class="layui-btn" type="button" id="ListPicBtn">选择图片</button>
+                                        <div class="layui-inline layui-word-aux">@(new MySystem.PublicFunction().GetUploadHint("ProductsBannerPhoto"))</div>
+                                    </div>
+                                    <div style="margin-top:10px;" id="BannerPhotoImage">
+                                    </div>
+                                </div>
+                            </div> *@
+                            @* <div class="layui-form-item" id="OutLink" style="display: none;">
+                                <label class="layui-form-label">外部连接</label>
+                                <div class="layui-input-block">
+                                    <input class="layui-input" type="text" id="LinkUrl" name="LinkUrl" maxlength="500"
+                                        lay-verify="" autocomplete="off" placeholder="请输入外部连接，可不填">
+                                </div>
+                            </div>
+                            <div class="layui-form-item" id="SortBanner" style="display: none;">
+                                <label class="layui-form-label">Banner排序</label>
+                                <div class="layui-input-block">
+                                    <input class="layui-input" type="text" id="BannerSort" name="BannerSort" maxlength="500"
+                                        lay-verify="" autocomplete="off" placeholder="请输入Banner排序，可不填">
+                                </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="KeyWord" name="KeyWord" lay-verify=""
+                                        placeholder="请输入关键词"></textarea>
+                                </div>
+                            </div> *@
+
                         </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="CostPrice" name="CostPrice" 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="SourcePrice" name="SourcePrice" maxlength="20" lay-verify="required|number|" 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="Price" name="Price" 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="Integral" name="Integral" 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="MemberPrice" name="MemberPrice" maxlength="20" lay-verify="" autocomplete="off" placeholder="请输入创客价">
+                        <div class="layui-tab-item">
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">图集</label>
+                                <div class="layui-input-block">
+                                    <div class="layui-upload">
+                                        <input type="hidden" id="DetailPicPath" name="DetailPicPath" value="">
+                                        <button class="layui-btn" type="button" id="DetailPicPathBtn">选择图片</button>
+                                        <div class="layui-inline layui-word-aux"></div>
+                                    </div>
+                                    <div class="mt10" id="DetailPicPathImage">
+                                    </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="ListPicPath" name="ListPicPath" value="">
+                                    </div>
+                                    <div class="mt10" id="ListPicPathImage">
+                                        <img src="" class="layui-upload-img" style="max-width:285px; max-height:285px;">
+                                    </div>
+                                </div>
+                            </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="UserIntegral" name="UserIntegral" maxlength="20" lay-verify="" autocomplete="off" placeholder="请输入创客抵扣积分">
+                        <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="CostPrice" name="CostPrice"
+                                        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="SourcePrice" name="SourcePrice"
+                                        maxlength="20" lay-verify="required|number|" 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="Price" name="Price" 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="Integral" name="Integral" 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="MemberPrice" name="MemberPrice"
+                                        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="UserIntegral" name="UserIntegral"
+                                        maxlength="20" lay-verify="" autocomplete="off" placeholder="请输入创客抵扣积分">
+                                </div>
+                            </div> *@
+                        </div>
+                        <div class="layui-tab-item">
+                            <div class="layui-form-item">
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">运费模板</label>
+                                    <div class="layui-input-inline">
+                                        <select id="FareTemplateId" name="FareTemplateId" lay-search="">
+                                            <option value="">请选择</option>
+                                            <option v-for="item in tempList" :value="item.id">{{item.name}}</option>
+                                        </select>
+                                    </div>
+                                    <div class="layui-form-mid layui-word-aux">
+                                        <a href="###" v-on:click="showTemplate">刷新</a>
+                                    </div>
+                                    <div class="layui-form-mid layui-word-aux">
+                                        <a href="###" id="FareTempUrl" lay-href="">模板管理</a>
+                                    </div>
+                                </div>
+                            </div>
                         </div>
-                    </div>
-                </div>
-                <div class="layui-tab-item">
-                    <div class="layui-form-item">
-                        <div class="layui-inline">
-                            <label class="layui-form-label">运费模板</label>
+                        @* <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="IsLimit" name="IsLimit" 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">
-                                <select id="FareTemplateId" name="FareTemplateId" lay-search="">
-                                    <option value="">请选择</option>
-                                    <option v-for="item in tempList" :value="item.id">{{item.name}}</option>
-                                </select>
+                            <input class="layui-input" type="text" id="StartDate" name="StartDate" lay-verify=""
+                            autocomplete="off" placeholder="请输入开始时间">
                             </div>
-                            <div class="layui-form-mid layui-word-aux">
-                                <a href="###" v-on:click="showTemplate">刷新</a>
                             </div>
-                            <div class="layui-form-mid layui-word-aux">
-                                <a href="###" id="FareTempUrl" lay-href="">模板管理</a>
+                            <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>
-                    </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="IsLimit" name="IsLimit" 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="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> *@
-                <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="Stock" name="Stock" maxlength="20" value="0" 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="BuyCount" name="BuyCount" maxlength="20" value="0" lay-verify="required;integer;" 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="CommentCount" name="CommentCount" maxlength="20" value="0" lay-verify="required|int|" 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="GoodPercent" name="GoodPercent" maxlength="20" value="0" lay-verify="required|number|" autocomplete="off" placeholder="请输入好评率">
-                        </div>
-                    </div>
-                </div>
-                <div class="layui-tab-item">
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">标语1</label>
-                        <div class="layui-input-block">
-                            <input class="layui-input" type="text" id="Title" name="Title" maxlength="50" 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="Title2" name="Title2" maxlength="50" autocomplete="off" placeholder="请输入标语2">
+                            </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="Stock" name="Stock" maxlength="20"
+                                        value="0" 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="BuyCount" name="BuyCount" maxlength="20"
+                                        value="0" lay-verify="required;integer;" 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="CommentCount" name="CommentCount"
+                                        maxlength="20" value="0" lay-verify="required|int|" 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="GoodPercent" name="GoodPercent"
+                                        maxlength="20" value="0" lay-verify="required|number|" autocomplete="off"
+                                        placeholder="请输入好评率">
+                                </div>
+                            </div> *@
+                        </div>
+                        @* <div class="layui-tab-item">
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">标语1</label>
+                                <div class="layui-input-block">
+                                    <input class="layui-input" type="text" id="Title" name="Title" maxlength="50"
+                                        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="Title2" name="Title2" maxlength="50"
+                                        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 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-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 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 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?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
+    <script
+        src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
     <script src="/other/mybjq/kindeditor-min.js"></script>
     <script src="/other/mybjq/lang/zh_CN.js"></script>
     <script>
         //内容
- @(Html.Raw(Library.Control.kindeditorVar("Contents")))
+        @(Html.Raw(Library.Control.kindeditorVar("Contents")))
 
 
-        //编辑器
-        KindEditor.ready(function (K) {
-            //内容
- @(Html.Raw(Library.Control.kindeditor("Contents", 1)))
+            //编辑器
+            KindEditor.ready(function (K) {
+                //内容
+        @(Html.Raw(Library.Control.kindeditor("Contents", 1)))
 
         });
 
@@ -326,6 +430,7 @@
             });
         }
 
+
         function AreasProvinceInit(tagId, areasVal, form) {
             for (var i = 0; i < provs_data.length; i++) {
                 var sel = "";
@@ -466,6 +571,20 @@
                     location.hash = 'test=' + $(this).attr('lay-id');
                 });
 
+                form.on('switch(IsBanner)', function (data) {
+                    console.log(data);
+                    if (this.checked) {
+                        $('#BannerList').css('display', 'block');
+                        $('#OutLink').css('display', 'block');
+                        $('#SortBanner').css('display', 'block');
+                    } else {
+                        $('#BannerList').css('display', 'none');
+                        $('#OutLink').css('display', 'none');
+                        $('#SortBanner').css('display', 'none');
+                    }
+                    form.render();
+                });
+
                 //日期
                 laydate.render({
                     elem: '#StartDate',
@@ -482,12 +601,51 @@
 
 
                 //上传文件
-                WebUploadJs('DetailPicPathBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("ProductsDetailPicPath"))),  function (filename) {
+                WebUploadJs('DetailPicPathBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("ProductsDetailPicPath"))), function (filename) {
                     $('#DetailPicPathImage').append('<div style="float:left; width:285px; height:320px; margin:10px; padding:10px; border:1px solid #cccccc; text-align:center;"><div style="height:285px;"><img src="' + osshost + filename + '" style="max-width:285px; max-height:285px;" onclick="showBigPic(\'' + osshost + filename + '\')" /></div><input type="text" placeholder="图片说明" value="" style="width:285px; margin-top:5px; font-size:12px;" /><br><a href="javascript:;" onclick="movePrev(this,\'DetailPicPath\')" style="color:#000; font-size:12px; padding:0px 2px;">左移</a><a href="javascript:;" onclick="moveNext(this,\'DetailPicPath\')" style="color:#000; font-size:12px; padding:0px 2px;">右移</a><a href="javascript:;" onclick="deletePic(this,\'DetailPicPath\')" style="color:#000; font-size:12px; padding:0px 2px;">删除</a><a href="javascript:;" onclick="setListPhoto(\'' + filename + '\')" style="color:#000; font-size:12px; padding:0px 2px;">设为缩略图</a></div>');
                 });
 
+                WebUploadJs('ListPicBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("ProductBannerListPic"))), function (filename) {
+                    $('#BannerPhotoImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
+                    $('#BannerPhoto').val(filename);
+                });
+
 
                 //穿梭框
+                transfer.render({
+                    elem: '#ColIdTransfer'
+                    , data: @Html.Raw(ColJson)
+                    , title: ['待选项', '选中项']
+                    , showSearch: true
+                    , onchange: function (obj, index) {
+                        if (index == 0) {
+                            var source = $("#ColId").val();
+                            $.each(obj, function (index, value) {
+                                var val = obj[index].value;
+                                if (source != "") {
+                                    source += "," + val;
+                                } else {
+                                    source += val;
+                                }
+                            });
+                            $("#ColId").val(source);
+                        } else if (index == 1) {
+                            var source = "," + $("#ColId").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);
+                                }
+                            }
+                            $("#ColId").val(source);
+                        }
+                    }
+                });
 
 
                 //TreeView，比如权限管理
@@ -543,7 +701,7 @@
                 },
                 showMerchantCol() {
                     let that = this;
-                    $.ajax({
+                    @* $.ajax({
                         url: "/Admin/MerchantCol/GetSelect?r=" + Math.random(1),
                         data: "MerchantId=" + MerchantId,
                         dataType: "json",
@@ -553,19 +711,20 @@
                                 form.render();
                             }, 1000);
                         }
-                    });
+                    }); *@
                 },
             }
         });
     </script>
     @if (SysRealRole == "3")
     {
-    <script>
-        MerchantId = "@SysId";
-        setTimeout(function () {
-            changeMerchant();
-        }, 1000);
-    </script>
+        <script>
+            MerchantId = "@SysId";
+            setTimeout(function () {
+                changeMerchant();
+            }, 1000);
+        </script>
     }
 </body>
+
 </html>

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

@@ -1,5 +1,7 @@
 @using MySystem.Models;
-@{Products editData = ViewBag.data as Products;}
+@{
+    Products editData = ViewBag.data as Products;
+}
 @{
     string RightInfo = ViewBag.RightInfo as string;
     string SysRealRole = ViewBag.SysRealRole as string;
@@ -9,321 +11,482 @@
 }
 <!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">
+    <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>
     <script src="/admin/js/vue.min.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>
-                <li lay-id="3">价格设置</li>
-                <li lay-id="5">运费设置</li>
-                @* <li lay-id="6">限时抢购</li> *@
-                <li lay-id="7">数据</li>
-                <li lay-id="8">宣传标语</li>
-                <li lay-id="9">SEO设置</li>
-            </ul>
-            <div class="layui-tab-content mt20" id="app">
-                <div class="layui-tab-item layui-show">
-                    @{Dictionary<string, string> KqProductsDic = new MySystem.DictionaryClass().getKqProductBrandDic();}
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">产品类型</label>
-                        <div class="layui-input-inline">
-                            <select id="MerchantClassId" name="MerchantClassId" lay-search="">
-                                <option value="">全部...</option>
-                                @foreach (string key in KqProductsDic.Keys)
-                                {
-                                <option value="@key" @(editData.MerchantClassId.ToString() == key ? "selected" : "")>@KqProductsDic[key]</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="LinkUrl" name="LinkUrl" value="@editData.LinkUrl" maxlength="500" 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="ProductName" name="ProductName" value="@editData.ProductName" maxlength="100" 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="Details" name="Details" value="@editData.Details" maxlength="200" 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="ShareDetail" name="ShareDetail" value="@editData.ShareDetail" maxlength="200" lay-verify="" 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" id="Contents" name="Contents" placeholder="请输入内容" style="width:100%;height:500px;">@(MySystem.OssHelper.Instance.CheckOSSPic(editData.Contents))</textarea>
-                        </div>
-                    </div>
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">推荐</label>
-                        <div class="layui-input-block">
-                            <input type="checkbox" id="IsRecommend" name="IsRecommend" value="1" @(editData.IsRecommend == 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="IsRecommend2" name="IsRecommend2" value="1" @(editData.IsRecommend2 == 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="PublishDate" name="PublishDate" value="@(editData.PublishDate == null ? "" : editData.PublishDate.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="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="LimitCount" name="LimitCount" value="@editData.LimitCount" maxlength="20" lay-verify="" 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" id="KeyWord" name="KeyWord" lay-verify="" placeholder="请输入关键词">@editData.KeyWord</textarea>
-                        </div>
-                    </div>
-
-                </div>
-                <div class="layui-tab-item">
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">图集</label>
-                        <div class="layui-input-block">
-                            <div class="layui-upload">
-                                <input type="hidden" id="DetailPicPath" name="DetailPicPath" value="@editData.DetailPicPath">
-                                <button class="layui-btn" type="button" id="DetailPicPathBtn">选择图片</button>
-                                <div class="layui-inline layui-word-aux"></div>
-                            </div>
-                            <div class="mt10" id="DetailPicPathImage">
-                                @{string DetailPicPath = editData.DetailPicPath;}
-                                @if (!string.IsNullOrEmpty(DetailPicPath))
-                                {
-                                    string[] DetailPicPathList = DetailPicPath.Split(new string[] { "#cut#" }, StringSplitOptions.None)[0].Split('|');
-                                    string[] DetailPicPathTextList = DetailPicPath.Split(new string[] { "#cut#" }, StringSplitOptions.None)[1].Split('|');
-                                    for (int i = 0; i < DetailPicPathList.Length; i++)
+            <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>
+                        <li lay-id="3">价格设置</li>
+                        <li lay-id="5">运费设置</li>
+                        @* <li lay-id="6">限时抢购</li> *@
+                        <li lay-id="7">数据</li>
+                        @* <li lay-id="8">宣传标语</li> *@
+                        @* <li lay-id="9">SEO设置</li> *@
+                    </ul>
+                    <div class="layui-tab-content mt20" id="app">
+                        <div class="layui-tab-item layui-show">
+                            @* @{
+                                Dictionary<string, string> KqProductsDic = new MySystem.DictionaryClass().getKqProductBrandDic();
+                            }
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">产品类型</label>
+                                <div class="layui-input-inline">
+                                    <select id="MerchantClassId" name="MerchantClassId" lay-search="">
+                                        <option value="">全部...</option>
+                                        @foreach (string key in KqProductsDic.Keys)
+                                        {
+                                            <option value="@key" @(editData.MerchantClassId.ToString() == key ? "selected" :
+                                            "")>@KqProductsDic[key]</option>
+                                        }
+                                    </select>
+                                </div>
+                            </div> *@
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">商品类型</label>
+                                <div class="layui-input-inline">
+                                    <select id="ProductKind" name="ProductKind" lay-verify="required|">
+                                        <option value="">请选择</option>
+                                        <option value="1" @(editData.ProductKind == 1 ? "selected=selected" : "")>实物商品
+                                        </option>
+                                        <option value="2" @(editData.ProductKind == 2 ? "selected=selected" : "")>虚拟商品
+                                        </option>
+                                    </select>
+                                </div>
+                            </div>
+                            @{
+                                Dictionary<string, string> ColDic = new MySystem.DictionaryClass().getColDic("006");
+                            }
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">分类</label>
+                                <div class="layui-input-block">
+                                    <input type="hidden" id="ColId" name="ColId" value="@editData.ColId"
+                                        lay-verify="required|" />
+                                    <div id="ColIdTransfer" class="demo-transfer"></div>
+                                    @{
+                                        string ColJson = "[";
+                                    }
+                                    @foreach (string key in ColDic.Keys)
                                     {
-                                        <div style="float:left; width:285px; height:320px; margin:10px; padding:10px; border:1px solid #cccccc; text-align:center;"><div style="height:285px;"><img src="@(MySystem.OssHelper.Instance.SourceHost)@DetailPicPathList[i]" style="max-width:285px; max-height:285px;" onclick="showBigPic('@(MySystem.OssHelper.Instance.SourceHost)@DetailPicPathList[i]')" /></div><input type="text" placeholder="图片说明" value="@DetailPicPathTextList[i]" style="width:285px; margin-top:5px; font-size:12px;" /><br><a href="javascript:;" onclick="movePrev(this,'DetailPicPath')" style="color:#000; font-size:12px; padding:0px 2px;">左移</a><a href="javascript:;" onclick="moveNext(this,'DetailPicPath')" style="color:#000; font-size:12px; padding:0px 2px;">右移</a><a href="javascript:;" onclick="deletePic(this,'DetailPicPath')" style="color:#000; font-size:12px; padding:0px 2px;">删除</a><a href="javascript:;" onclick="setListPhoto('@DetailPicPathList[i]')" style="color:#000; font-size:12px; padding:0px 2px;">设为缩略图</a></div>
+                                        ColJson += "{\"value\": \"" + key + "\", \"title\": \"" + ColDic[key] + "\" },";
                                     }
-                                }
+                                    @{
+                                        ColJson = ColJson.TrimEnd(','); ColJson += "]";
+                                    }
+                                </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="ListPicPath" name="ListPicPath" value="@editData.ListPicPath">
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">商品名称</label>
+                                <div class="layui-input-block">
+                                    <input class="layui-input" type="text" id="ProductName" name="ProductName"
+                                        value="@editData.ProductName" maxlength="100" lay-verify="required"
+                                        autocomplete="off" placeholder="请输入商品名称">
+                                </div>
                             </div>
-                            <div class="mt10" id="ListPicPathImage">
-                                <img src="@(MySystem.OssHelper.Instance.SourceHost)@editData.ListPicPath" class="layui-upload-img" style="max-width:285px; max-height:285px;">
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">简介</label>
+                                <div class="layui-input-block">
+                                    <input class="layui-input" type="text" id="Details" name="Details"
+                                        value="@editData.Details" maxlength="200" 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="ShareDetail" name="ShareDetail"
+                                        value="@editData.ShareDetail" maxlength="200" lay-verify="" 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" id="Contents" name="Contents" placeholder="请输入内容"
+                                        style="width:100%;height:500px;">@(MySystem.OssHelper.Instance.CheckOSSPic(editData.Contents))</textarea>
+                                </div>
+                            </div>
+                            @* <div class="layui-form-item">
+                                <label class="layui-form-label">推荐</label>
+                                <div class="layui-input-block">
+                                <input type="checkbox" id="IsRecommend" name="IsRecommend" value="1"
+                                @(editData.IsRecommend == 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="IsRecommend2" name="IsRecommend2" value="1"
+                                @(editData.IsRecommend2 == 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="PublishDate" name="PublishDate"
+                                value="@(editData.PublishDate == null ? "" : editData.PublishDate.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="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="StartBuyCount" name="StartBuyCount"
+                                        value="@editData.StartBuyCount" 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="LimitCount" name="LimitCount"
+                                        value="@editData.LimitCount" maxlength="20" lay-verify="" autocomplete="off"
+                                        placeholder="请输入限购数量">
+                                </div>
+                            </div>
+                            @* <div class="layui-form-item">
+                                <label class="layui-form-label">首页Banner推荐</label>
+                                <div class="layui-input-block">
+                                    <input type="checkbox" id="IsBanner" name="IsBanner" value="1"
+                                        @(editData.IsBanner == 1 ? "checked=checked" : "") lay-skin="switch" lay-filter="IsBanner" title="开关">
+                                </div>
+                            </div>
+                            <div class="layui-form-item" id="BannerList" style="display: none;">
+                                <label class="layui-form-label">Banner图片</label>
+                                <div class="layui-input-block">
+                                    <div class="layui-upload">
+                                        <input type="hidden" id="BannerPhoto" name="BannerPhoto"
+                                            value="@editData.BannerPhoto">
+                                        <button class="layui-btn" type="button" id="ListPicBtn">选择图片</button>
+                                        <div class="layui-inline layui-word-aux">@(new MySystem.PublicFunction().GetUploadHint("ProductsBannerPhoto"))</div>
+                                    </div>
+                                    <div style="margin-top:10px;" id="BannerPhotoImage">
+                                        @if (!string.IsNullOrEmpty(editData.BannerPhoto))
+                                        {
+                                            <img src="@(MySystem.OssHelper.Instance.SourceHost)@editData.BannerPhoto"
+                                            class="layui-upload-img" style="max-width:85px; max-height:85px;"
+                                            onclick="showBigPic('@(MySystem.OssHelper.Instance.SourceHost)@editData.BannerPhoto')">
+                                        }
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="layui-form-item" id="OutLink" style="display: none;">
+                                <label class="layui-form-label">外部连接</label>
+                                <div class="layui-input-block">
+                                    <input class="layui-input" type="text" id="LinkUrl" name="LinkUrl"
+                                        value="@editData.LinkUrl" maxlength="500" lay-verify="" autocomplete="off"
+                                        placeholder="请输入外部连接，可不填">
+                                </div>
+                            </div>
+                            <div class="layui-form-item" id="SortBanner" style="display: none;">
+                                <label class="layui-form-label">Banner排序</label>
+                                <div class="layui-input-block">
+                                    <input class="layui-input" type="text" id="BannerSort" name="BannerSort" value="@editData.BannerSort" maxlength="500"
+                                        lay-verify="" autocomplete="off" placeholder="请输入Banner排序，可不填">
+                                </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="KeyWord" name="KeyWord" lay-verify=""
+                                placeholder="请输入关键词">@editData.KeyWord</textarea>
+                                </div>
+                                </div> *@
+
                         </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="CostPrice" name="CostPrice" value="@editData.CostPrice" 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="SourcePrice" name="SourcePrice" value="@editData.SourcePrice" maxlength="20" lay-verify="required|number|" 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="Price" name="Price" value="@editData.Price" 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="Integral" name="Integral" value="@editData.Integral" 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="MemberPrice" name="MemberPrice" value="@editData.MemberPrice" maxlength="20" lay-verify="" autocomplete="off" placeholder="请输入创客价">
+                        <div class="layui-tab-item">
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">图集</label>
+                                <div class="layui-input-block">
+                                    <div class="layui-upload">
+                                        <input type="hidden" id="DetailPicPath" name="DetailPicPath"
+                                            value="@editData.DetailPicPath">
+                                        <button class="layui-btn" type="button" id="DetailPicPathBtn">选择图片</button>
+                                        <div class="layui-inline layui-word-aux"></div>
+                                    </div>
+                                    <div class="mt10" id="DetailPicPathImage">
+                                        @{
+                                            string DetailPicPath = editData.DetailPicPath;
+                                        }
+                                        @if (!string.IsNullOrEmpty(DetailPicPath))
+                                        {
+                                            string[] DetailPicPathList = DetailPicPath.Split(new string[] { "#cut#" },
+                                            StringSplitOptions.None)[0].Split('|');
+                                            string[] DetailPicPathTextList = DetailPicPath.Split(new string[] { "#cut#" },
+                                            StringSplitOptions.None)[1].Split('|');
+                                            for (int i = 0; i < DetailPicPathList.Length; i++)
+                                            {
+                                                <div
+                                            style="float:left; width:285px; height:320px; margin:10px; padding:10px; border:1px solid #cccccc; text-align:center;">
+                                                    <div style="height:285px;"><img
+                                                    src="@(MySystem.OssHelper.Instance.SourceHost)@DetailPicPathList[i]"
+                                                    style="max-width:285px; max-height:285px;"
+                                                    onclick="showBigPic('@(MySystem.OssHelper.Instance.SourceHost)@DetailPicPathList[i]')" />
+                                                    </div><input type="text" placeholder="图片说明"
+                                                value="@DetailPicPathTextList[i]"
+                                                style="width:285px; margin-top:5px; font-size:12px;" /><br><a
+                                                href="javascript:;" onclick="movePrev(this,'DetailPicPath')"
+                                                style="color:#000; font-size:12px; padding:0px 2px;">左移</a><a
+                                                href="javascript:;" onclick="moveNext(this,'DetailPicPath')"
+                                                style="color:#000; font-size:12px; padding:0px 2px;">右移</a><a
+                                                href="javascript:;" onclick="deletePic(this,'DetailPicPath')"
+                                                style="color:#000; font-size:12px; padding:0px 2px;">删除</a><a
+                                                href="javascript:;" onclick="setListPhoto('@DetailPicPathList[i]')"
+                                                style="color:#000; font-size:12px; padding:0px 2px;">设为缩略图</a>
+                                                </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="ListPicPath" name="ListPicPath"
+                                            value="@editData.ListPicPath">
+                                    </div>
+                                    <div class="mt10" id="ListPicPathImage">
+                                        <img src="@(MySystem.OssHelper.Instance.SourceHost)@editData.ListPicPath"
+                                            class="layui-upload-img" style="max-width:285px; max-height:285px;">
+                                    </div>
+                                </div>
+                            </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="UserIntegral" name="UserIntegral" value="@editData.UserIntegral" maxlength="20" lay-verify="" autocomplete="off" placeholder="请输入创客抵扣积分">
+                        <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="CostPrice" name="CostPrice"
+                                        value="@editData.CostPrice" 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="SourcePrice" name="SourcePrice"
+                                        value="@editData.SourcePrice" maxlength="20" lay-verify="required|number|"
+                                        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="Price" name="Price"
+                                        value="@editData.Price" 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="Integral" name="Integral"
+                                        value="@editData.Integral" 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="MemberPrice" name="MemberPrice"
+                                        value="@editData.MemberPrice" 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="UserIntegral" name="UserIntegral"
+                                        value="@editData.UserIntegral" maxlength="20" lay-verify="" autocomplete="off"
+                                        placeholder="请输入创客抵扣积分">
+                                </div>
+                            </div> *@
+                        </div>
+                        <div class="layui-tab-item">
+                            <div class="layui-form-item">
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">运费模板</label>
+                                    <div class="layui-input-inline">
+                                        <select id="FareTemplateId" name="FareTemplateId" v-model="FareTemplateId"
+                                            lay-search="">
+                                            <option value="">请选择</option>
+                                            <option v-for="item in tempList" :value="item.id">{{item.name}}</option>
+                                        </select>
+                                    </div>
+                                    <div class="layui-form-mid layui-word-aux">
+                                        <a href="###" v-on:click="showTemplate">刷新</a>
+                                    </div>
+                                    <div class="layui-form-mid layui-word-aux">
+                                        <a href="###" id="FareTempUrl" lay-href="">模板管理</a>
+                                    </div>
+                                </div>
+                            </div>
                         </div>
-                    </div>
-                </div>
-                <div class="layui-tab-item">
-                    <div class="layui-form-item">
-                        <div class="layui-inline">
-                            <label class="layui-form-label">运费模板</label>
+                        @* <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="IsLimit" name="IsLimit" value="1" @(editData.IsLimit == 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">
-                                <select id="FareTemplateId" name="FareTemplateId" v-model="FareTemplateId" lay-search="">
-                                    <option value="">请选择</option>
-                                    <option v-for="item in tempList" :value="item.id">{{item.name}}</option>
-                                </select>
+                            <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 class="layui-form-mid layui-word-aux">
-                                <a href="###" v-on:click="showTemplate">刷新</a>
                             </div>
-                            <div class="layui-form-mid layui-word-aux">
-                                <a href="###" id="FareTempUrl" lay-href="">模板管理</a>
+                            <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>
-                    </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="IsLimit" name="IsLimit" value="1" @(editData.IsLimit == 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="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> *@
-                <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="Stock" name="Stock" value="@editData.Stock" 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="BuyCount" name="BuyCount" value="@editData.BuyCount" maxlength="20" lay-verify="required;integer;" 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="CommentCount" name="CommentCount" value="@editData.CommentCount" 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-inline">
-                            <input class="layui-input" type="text" id="GoodPercent" name="GoodPercent" value="@editData.GoodPercent" maxlength="20" lay-verify="required|number|" 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="Stock" name="Stock"
+                                        value="@editData.Stock" 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="BuyCount" name="BuyCount"
+                                        value="@editData.BuyCount" maxlength="20" lay-verify="required;integer;"
+                                        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="CommentCount" name="CommentCount"
+                                        value="@editData.CommentCount" 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-inline">
+                                    <input class="layui-input" type="text" id="GoodPercent" name="GoodPercent"
+                                        value="@editData.GoodPercent" maxlength="20" lay-verify="required|number|"
+                                        autocomplete="off" placeholder="请输入好评率">
+                                </div>
+                            </div> *@
 
-                </div>
-                <div class="layui-tab-item">
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">标语1</label>
-                        <div class="layui-input-block">
-                            <input class="layui-input" type="text" id="Title" name="Title" value="@editData.Title" maxlength="50" 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="Title2" name="Title2" value="@editData.Title2" maxlength="50" autocomplete="off" placeholder="请输入标语2">
+                        @* <div class="layui-tab-item">
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">标语1</label>
+                                <div class="layui-input-block">
+                                    <input class="layui-input" type="text" id="Title" name="Title"
+                                        value="@editData.Title" maxlength="50" 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="Title2" name="Title2"
+                                        value="@editData.Title2" maxlength="50" 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 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-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 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 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?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
+    <script
+        src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
     <script src="/other/mybjq/kindeditor-min.js"></script>
     <script src="/other/mybjq/lang/zh_CN.js"></script>
     <script>
         //内容
- @(Html.Raw(Library.Control.kindeditorVar("Contents")))
+        @(Html.Raw(Library.Control.kindeditorVar("Contents")))
 
 
-        //编辑器
-        KindEditor.ready(function (K) {
-            //内容
- @(Html.Raw(Library.Control.kindeditor("Contents", 1)))
+            //编辑器
+            KindEditor.ready(function (K) {
+                //内容
+        @(Html.Raw(Library.Control.kindeditor("Contents", 1)))
 
         });
 
@@ -468,7 +631,7 @@
                     app.showTemplate();
                     app.showMerchantCol();
                 });
-                
+
                 MerchantId = '@editData.MerchantId';
                 $("#FareTempUrl").attr("lay-href", "/Admin/ProductFareTemp/Index?MerchantId=" + MerchantId + "&right=@right");
                 $("#MerchantColUrl").attr("lay-href", "/Admin/MerchantCol/Index?MerchantId=" + MerchantId + "&right=@right");
@@ -483,6 +646,27 @@
                     location.hash = 'test=' + $(this).attr('lay-id');
                 });
 
+                form.on('switch(IsBanner)', function (data) {
+                    console.log(data);
+                    if (this.checked) {
+                        $('#BannerList').css('display', 'block');
+                        $('#OutLink').css('display', 'block');
+                        $('#SortBanner').css('display', 'block');
+                    } else {
+                        $('#BannerList').css('display', 'none');
+                        $('#OutLink').css('display', 'none');
+                        $('#SortBanner').css('display', 'none');
+                    }
+                    form.render();
+                });
+                var IsBanner = '@editData.IsBanner';
+                if(IsBanner == '1')
+                {
+                    $('#BannerList').css('display', 'block');
+                    $('#OutLink').css('display', 'block');
+                    $('#SortBanner').css('display', 'block');
+                }
+
                 //日期
                 laydate.render({
                     elem: '#StartDate',
@@ -499,12 +683,52 @@
 
 
                 //上传文件
-                WebUploadJs('DetailPicPathBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("ProductsDetailPicPath"))),  function (filename) {
+                WebUploadJs('DetailPicPathBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("ProductsDetailPicPath"))), function (filename) {
                     $('#DetailPicPathImage').append('<div style="float:left; width:285px; height:320px; margin:10px; padding:10px; border:1px solid #cccccc; text-align:center;"><div style="height:285px;"><img src="' + osshost + filename + '" style="max-width:285px; max-height:285px;" onclick="showBigPic(\'' + osshost + filename + '\')" /></div><input type="text" placeholder="图片说明" value="" style="width:285px; margin-top:5px; font-size:12px;" /><br><a href="javascript:;" onclick="movePrev(this,\'DetailPicPath\')" style="color:#000; font-size:12px; padding:0px 2px;">左移</a><a href="javascript:;" onclick="moveNext(this,\'DetailPicPath\')" style="color:#000; font-size:12px; padding:0px 2px;">右移</a><a href="javascript:;" onclick="deletePic(this,\'DetailPicPath\')" style="color:#000; font-size:12px; padding:0px 2px;">删除</a><a href="javascript:;" onclick="setListPhoto(\'' + filename + '\')" style="color:#000; font-size:12px; padding:0px 2px;">设为缩略图</a></div>')
                 });
 
+                WebUploadJs('ListPicBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("ProductBannerListPic"))), function (filename) {
+                    $('#BannerPhotoImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
+                    $('#BannerPhoto').val(filename);
+                });
+
 
                 //穿梭框
+                transfer.render({
+                    elem: '#ColIdTransfer'
+                    , data: @Html.Raw(ColJson)
+                    , title: ['待选项', '选中项']
+                    , value: ["@Html.Raw(Library.function.CheckNull(editData.ColId).Replace(",", "\",\""))"]
+                    , showSearch: true
+                    , onchange: function (obj, index) {
+                        if (index == 0) {
+                            var source = $("#ColId").val();
+                            $.each(obj, function (index, value) {
+                                var val = obj[index].value;
+                                if (source != "") {
+                                    source += "," + val;
+                                } else {
+                                    source += val;
+                                }
+                            });
+                            $("#ColId").val(source);
+                        } else if (index == 1) {
+                            var source = "," + $("#ColId").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);
+                                }
+                            }
+                            $("#ColId").val(source);
+                        }
+                    }
+                });
 
 
                 //TreeView，比如权限管理
@@ -549,20 +773,21 @@
                 },
                 showMerchantCol() {
                     let that = this;
-                    $.ajax({
-                        url: "/Admin/MerchantCol/GetSelect?r=" + Math.random(1),
-                        data: "MerchantId=" + MerchantId,
-                        dataType: "json",
-                        success: function (data) {
-                            that.merchantColList = data;
-                            setTimeout(function () {
-                                form.render();
-                            }, 1000);
-                        }
-                    });
+        @* $.ajax({
+            url: "/Admin/MerchantCol/GetSelect?r=" + Math.random(1),
+            data: "MerchantId=" + MerchantId,
+            dataType: "json",
+            success: function (data) {
+            that.merchantColList = data;
+            setTimeout(function () {
+            form.render();
+            }, 1000);
+            }
+            }); *@
                 },
             }
         });
     </script>
 </body>
+
 </html>

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

@@ -4,33 +4,40 @@
 }
 <!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">
+    <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{
+        .layui-input-inline {
             width: 175px !important;
         }
-        .layui-form-label{
+
+        .layui-form-label {
             width: 85px !important;
         }
-        .layui-inline{
+
+        .layui-inline {
             margin-right: 0px !important;
-        }        
-        .w100{
+        }
+
+        .w100 {
             width: 100px !important;
         }
-        .ml50{
+
+        .ml50 {
             margin-left: 50px !important;
         }
     </style>
 </head>
+
 <body>
     <div class="layui-fluid">
         <div class="layui-card">
@@ -38,21 +45,15 @@
                 <div class="layui-form-item">
                     <div class="layui-inline">
                         <label class="layui-form-label">分类</label>
+                        @{
+                            Dictionary<string, string> ColDic = new MySystem.DictionaryClass().getColDic("006");
+                        }
                         <div class="layui-input-inline">
                             <select id="ColId" name="ColId" lay-search="">
                                 <option value="">全部...</option>
-                                @{Dictionary<string, string> ColDic = new MySystem.DictionaryClass().getColDic("002");}
                                 @foreach (string key in ColDic.Keys)
                                 {
-                                    if (RightInfo.Contains("," + key + ","))
-                                    {
-                                        string kg = "";
-                                        for (int i = 1; i < key.Length / 3 - 1; i++)
-                                        {
-                                            kg += "　　";
-                                        }
-                                        <option value="@key">@kg@ColDic[key]</option>
-                                    }
+                                    <option value="@key">@ColDic[key]</option>
                                 }
                             </select>
                         </div>
@@ -78,19 +79,23 @@
                 <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>
+                        <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 + "_up,"))
                     {
-                        <button class="layui-btn" data-type="Open"><i class="layui-icon layui-icon-up layuiadmin-button-btn"></i>上架</button>
+                        <button class="layui-btn" data-type="Open"><i
+                            class="layui-icon layui-icon-up layuiadmin-button-btn"></i>上架</button>
                     }
                     @if (RightInfo.Contains("," + right + "_down,"))
                     {
-                        <button class="layui-btn" data-type="Close"><i class="layui-icon layui-icon-down layuiadmin-button-btn"></i>下架</button>
+                        <button class="layui-btn" data-type="Close"><i
+                            class="layui-icon layui-icon-down layuiadmin-button-btn"></i>下架</button>
                     }
                 </div>
 
@@ -101,15 +106,15 @@
                 <script type="text/html" id="table-list-tools">
                     @if (RightInfo.Contains("," + right + "_edit,"))
                     {
-                        <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="edit"><i class="layui-icon layui-icon-edit"></i>编辑</a>
                     }
                     @if (RightInfo.Contains("," + right + "_delete,"))
                     {
-                        <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-danger layui-btn-xs" lay-event="del"><i class="layui-icon layui-icon-delete"></i>删除</a>
                     }
                     @if (RightInfo.Contains("," + right + "_norm,"))
                     {
-                        <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="norm"><i class="layui-icon layui-icon-edit"></i>规格</a>
+                            <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="norm"><i class="layui-icon layui-icon-edit"></i>规格</a>
                     }
                 </script>
             </div>
@@ -136,9 +141,10 @@
     </div>
 
     <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/layuiadmin/modules_main/Products_Admin.js"></script>
+    <script src="/layuiadmin/modules_main/Products_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
     <script>
         var right = '@right';
     </script>
 </body>
+
 </html>

wwwroot/layuiadmin/modules_main/Main_Admin.js

@@ -212,6 +212,7 @@ var ProductNorm_cols = [[
 ,{field:'Stock', title:'库存', sort: true}
 ,{field:'BuyCount', title:'已购买数', sort: true}
 ,{field:'Code', title:'编码', sort: true}
+// ,{field:'StartBuyCount', title:'起购数量', sort: true}
 ,{field:'LimitCount', title:'限购数量', sort: true}
 ]];
 //商品规格模板

wwwroot/layuiadmin/modules_main/OrderRefund_Admin.js

@@ -57,7 +57,7 @@ layui.config({
                 url: "/Admin/OrderRefund/Sort?r=" + Math.random(1),
                 data: "Id=" + data.Id + "&Sort=" + value,
                 dataType: "text",
-                success: function (data) {}
+                success: function (data) { }
             });
         }
     });
@@ -66,46 +66,18 @@ layui.config({
     table.render({
         elem: '#LAY-list-manage',
         url: '/Admin/OrderRefund/IndexData' //模拟接口
-            ,
-        cols: [
-            [{
-                type: 'checkbox',
-                fixed: 'left'
-            }, {
-                field: 'Id',
-                fixed: 'left',
-                title: 'ID',
-                width: 80,
-                sort: true,
-                unresize: true
-            }, {
-                field: 'Reason',
-                title: '退款原因',
-                sort: true
-            }, {
-                field: 'Amount',
-                title: '退款金额',
-                sort: true
-            }, {
-                field: 'Mobile',
-                title: '申请人手机号',
-                sort: true
-            }, {
-                field: 'GoodStatus',
-                title: '货物状态',
-                sort: true
-            }, {
-                field: 'Status',
-                title: '申请状态',
-                sort: true
-            }, {
-                title: '操作',
-                width: 150,
-                align: 'center',
-                fixed: 'right',
-                toolbar: '#table-list-tools'
-            }]
-        ],
+        ,
+        cols: [[
+            { type: 'checkbox', fixed: 'left' },
+            { field: 'Id', fixed: 'left', title: 'ID', width: 80, sort: true, unresize: true },
+            { field: 'OrderNo', width: 200, title: '订单号', sort: true },
+            { field: 'Refund', width: 200, title: '退款原因', sort: true },
+            { field: 'ProductName', width: 200, title: '商品', sort: true },
+            { field: 'Amount', width: 200, title: '退款金额', sort: true },
+            { field: 'RefundType', width: 200, title: '退回方式', sort: true },
+            { field: 'UserInfo', width: 200, title: '创客信息', sort: true },
+            // { title: '操作', width: 150, align: 'center', fixed: 'right', toolbar: '#table-list-tools' }
+        ]],
         page: true,
         limit: 30,
         height: 'full-' + String($('.layui-card-header').height() + 130),
@@ -303,7 +275,7 @@ layui.config({
                 maxmin: false,
                 area: ['460px', '180px'],
                 content: $('#excelForm'),
-                cancel: function () {}
+                cancel: function () { }
             });
         },
         ExportExcel: function () {

wwwroot/layuiadmin/modules_main/OrdersRefund_Admin.js

@@ -0,0 +1,700 @@
+var ExcelData,ExcelKind;
+function ConfirmImport() {
+    $.ajax({
+        type: "POST",
+        url: "/Admin/Orders/Import?r=" + Math.random(1),
+        data: "ExcelData=" + encodeURIComponent(JSON.stringify(ExcelData)),
+        dataType: "text",
+        success: function (data) {
+            if (data == "success") {
+                layer.msg("导入成功", { time: 2000 }, function () {
+                    window.location.reload();
+                });
+            } else {
+                layer.msg(data);
+            }
+        }
+    });
+}
+
+var excel;
+layui.config({
+    base: '/layuiadmin/' //静态资源所在路径
+}).extend({
+    myexcel: 'layui/lay/modules/excel',
+    index: 'lib/index' //主入口模块
+}).use(['index', 'table', 'excel', 'laydate'], function () {
+    var $ = layui.$
+        , form = layui.form
+        , table = layui.table;
+
+    //- 筛选条件-日期
+    var laydate = layui.laydate;
+    var layPayeDate = laydate.render({
+        elem: '#PayDate',
+        type: 'date',
+        range: true,
+        trigger: 'click',
+        change: function (value, date, endDate) {
+            var op = true;
+            if (date.year == endDate.year && endDate.month - date.month <= 1) {
+                if (endDate.month - date.month == 1 && endDate.date > date.date) {
+                    op = false;
+                    layPayeDate.hint('日期范围请不要超过1个月');
+                    setTimeout(function () {
+                        $(".laydate-btns-confirm").addClass("laydate-disabled");
+                    }, 1);
+                }
+            } else {
+                op = false;
+                layPayeDate.hint('日期范围请不要超过1个月');
+                setTimeout(function () {
+                    $(".laydate-btns-confirm").addClass("laydate-disabled");
+                }, 1);
+            }
+            if (op) {
+                $('#PayDate').val(value);
+            }
+        }
+    });
+    var layCreateDate = laydate.render({
+        elem: '#CreateDate',
+        type: 'date',
+        range: true,
+        trigger: 'click',
+        change: function (value, date, endDate) {
+            var op = true;
+            if (date.year == endDate.year && endDate.month - date.month <= 1) {
+                if (endDate.month - date.month == 1 && endDate.date > date.date) {
+                    op = false;
+                    layCreateDate.hint('日期范围请不要超过1个月');
+                    setTimeout(function () {
+                        $(".laydate-btns-confirm").addClass("laydate-disabled");
+                    }, 1);
+                }
+            } else {
+                op = false;
+                layCreateDate.hint('日期范围请不要超过1个月');
+                setTimeout(function () {
+                    $(".laydate-btns-confirm").addClass("laydate-disabled");
+                }, 1);
+            }
+            if (op) {
+                $('#CreateDate').val(value);
+            }
+        }
+    });
+    var laySendDate = laydate.render({
+        elem: '#SendDate',
+        trigger: 'click',
+        type: 'date',
+        range: true,
+        change: function (value, date, endDate) {
+            var op = true;
+            if (date.year == endDate.year && endDate.month - date.month <= 1) {
+                if (endDate.month - date.month == 1 && endDate.date > date.date) {
+                    op = false;
+                    laySendDate.hint('日期范围请不要超过1个月');
+                    setTimeout(function () {
+                        $(".laydate-btns-confirm").addClass("laydate-disabled");
+                    }, 1);
+                }
+            } else {
+                op = false;
+                laySendDate.hint('日期范围请不要超过1个月');
+                setTimeout(function () {
+                    $(".laydate-btns-confirm").addClass("laydate-disabled");
+                }, 1);
+            }
+            if (op) {
+                $('#SendDate').val(value);
+            }
+        }
+    });
+
+
+    //excel导入
+    excel = layui.excel;        
+    $('#ExcelFile').change(function (e) {
+        var files = e.target.files;
+        excel.importExcel(files, { }, function (data) {
+            ExcelData = data[0].sheet1;
+        });
+    });
+
+    //监听单元格编辑
+    table.on('edit(LAY-list-manage)', function(obj){
+        var value = obj.value //得到修改后的值
+        ,data = obj.data //得到所在行所有键值
+        ,field = obj.field; //得到字段
+        if(field == "Sort"){
+            $.ajax({
+                type: "POST",
+                url: "/Admin/Orders/Sort?r=" + Math.random(1),
+                data: "Id=" + data.Id + "&Sort=" + value,
+                dataType: "text",
+                success: function (data) {
+                }
+            });
+        }
+    });
+    
+    //列表数据
+    table.render({
+        elem: '#LAY-list-manage'
+        , url: '/Admin/Orders/IndexRefundData' //模拟接口
+        , cols: [[
+            { type: 'checkbox', fixed: 'left' }
+            , { field: 'Id', fixed: 'left', title: 'ID', width: 80, sort: true, unresize: true }
+            ,{field:'StatusName', width: 200, title:'状态', sort: true}
+            ,{field:'TotalPrice', width: 200, title:'总金额', sort: true}
+            ,{field:'RefundActAmount', width: 200, title:'退款金额', sort: true}
+            ,{field:'OrderNo', width: 200, title:'平台订单号-渠道订单号', sort: true}
+            ,{field:'RefundReason', width: 200, title:'退款原因', sort: true}
+            ,{field:'ProductName', width: 200, title:'商品名称', sort: true}
+            ,{field:'UserInfo', width: 200, title:'创客信息', sort: true}
+            ,{field:'PayMode', width: 200, title:'退款渠道', sort: true}
+            ,{field:'ReturnDate', width: 200, title:'操作时间', sort: true}
+            ,{field:'UpdateMan', width: 200, title:'操作人', sort: true}
+
+            // , { title: '操作', align: 'center', width: 300, fixed: 'right', toolbar: '#table-list-tools' }
+        ]]
+        , where: {
+            
+        }
+        , page: true
+        , limit: 30
+        , height: 'full-220'
+        , text: '对不起，加载出现异常！'
+        , done: function (res, curr, count) {
+            $("#SuccessAmount").text(res.other.SuccessAmount);
+            $("#FailAmount").text(res.other.FailAmount);
+            $(".layui-none").text("无数据");
+        }
+    });
+
+    //监听工具条
+    table.on('tool(LAY-list-manage)', function (obj) {
+        var data = obj.data;
+        if (obj.event === 'del') {
+            var index = layer.confirm('确定要删除吗？删除后不能恢复！', function (index) {
+                $.ajax({
+                    type: "POST",
+                    url: "/Admin/Orders/Delete?r=" + Math.random(1),
+                    data: "Id=" + data.Id,
+                    dataType: "text",
+                    success: function (data) {
+                        if (data == "success") {
+                            obj.del();
+                            layer.close(index);
+                        } else {
+                            parent.layer.msg(data);
+                        }
+                    }
+                });
+            });
+        } else if (obj.event === 'edit') {
+            var tr = $(obj.tr);
+            var perContent = layer.open({
+                type: 2
+                , title: '创客订单-编辑'
+                , content: 'Edit?Id=' + data.Id + ''
+                , maxmin: true
+                , area: ['500px', '450px']
+                , btn: ['确定', '取消']
+                , yes: function (index, layero) {
+                    var iframeWindow = window['layui-layer-iframe' + index]
+                        , submitID = 'LAY-list-front-submit'
+                        , submit = layero.find('iframe').contents().find('#' + submitID);
+
+                    setTimeout(function () {
+                        layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
+                            var errObj = $(this).find('.layui-form-danger');
+                            if (errObj.length > 0) {
+                                iframeWindow.element.tabChange('mytabbar', String(i + 1));
+                                submit.click();
+                            }
+                        });
+                    }, 300);
+
+                    //监听提交
+                    iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
+                        var field = data.field; //获取提交的字段
+                        var userdata = "";
+                        for (var prop in field) {
+                            userdata += prop + "=" + encodeURIComponent(field[prop]) + "&";
+                        }
+                        //提交 Ajax 成功后，静态更新表格中的数据
+                        //$.ajax({});
+                        
+                        $.ajax({
+                            type: "POST",
+                            url: "/Admin/Orders/Edit?r=" + Math.random(1),
+                            data: userdata,
+                            dataType: "text",
+                            success: function (data) {
+                                layer.close(index); //关闭弹层
+                                if (data == "success") {
+                                    table.reload('LAY-list-manage'); //数据刷新
+                                } else {
+                                    layer.msg(data);
+                                }
+                            }
+                        });
+                    });
+
+                    submit.trigger('click');
+                }
+                , success: function (layero, index) {
+
+                }
+            });
+            layer.full(perContent);
+        } else if (obj.event === 'detail') {
+            var tr = $(obj.tr);
+            var perContent = layer.open({
+                type: 2
+                , title: '订单详情'
+                , content: 'Detail?Id=' + data.Id + ''
+                , maxmin: true
+                , area: ['700px', '650px']
+                , btn: ['关闭']
+                , yes: function (index, layero) {
+                    layer.close(index);
+                }
+                , success: function (layero, index) {
+
+                }
+            });
+            layer.full(perContent);
+        } else if (obj.event === 'send') {
+            var tr = $(obj.tr);
+            var perContent = layer.open({
+                type: 2
+                , title: '创客订单-编辑'
+                , content: 'Send?Id=' + data.Id + ''
+                , maxmin: true
+                , area: ['500px', '650px']
+                , btn: ['提交', '取消']
+                , yes: function (index, layero) {
+                    var iframeWindow = window['layui-layer-iframe' + index]
+                        , submitID = 'LAY-list-front-submit'
+                        , submit = layero.find('iframe').contents().find('#' + submitID);
+
+                    setTimeout(function () {
+                        layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
+                            var errObj = $(this).find('.layui-form-danger');
+                            if (errObj.length > 0) {
+                                iframeWindow.element.tabChange('mytabbar', String(i + 1));
+                                submit.click();
+                            }
+                        });
+                    }, 300);
+
+                    //监听提交
+                    iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
+                        var field = data.field; //获取提交的字段
+                        var userdata = "";
+                        for (var prop in field) {
+                            userdata += prop + "=" + encodeURIComponent(field[prop]) + "&";
+                        }
+                        //提交 Ajax 成功后，静态更新表格中的数据
+                        //$.ajax({});
+                        var IdList = '';
+                        layero.find('iframe').contents().find('input[type=hidden][name=IdList]').each(function (i) {
+                            IdList += $(this).val() + "#";
+                        });
+                        userdata += "&IdList=" + IdList;
+
+                        var StoreIdList = '';
+                        layero.find('iframe').contents().find('select[name=StoreIdList]').each(function (i) {
+                            StoreIdList += $(this).val() + "#";
+                        });
+                        userdata += "&StoreIdList=" + StoreIdList;
+
+                        var SnNosList = '';
+                        layero.find('iframe').contents().find('textarea[name=SnNosList]').each(function (i) {
+                            SnNosList += $(this).val() + "#";
+                        });
+                        userdata += "&SnNosList=" + SnNosList;
+
+                        
+                        $.ajax({
+                            type: "POST",
+                            url: "/Admin/Orders/Send?r=" + Math.random(1),
+                            data: userdata,
+                            dataType: "text",
+                            success: function (data) {
+                                if (data == "success") {
+                                    layer.close(index); //关闭弹层
+                                    layer.msg('提交成功', { time: 1500 }, function () {
+                                        table.reload('LAY-list-manage'); //数据刷新
+                                    });
+                                } else {
+                                    layer.msg(data);
+                                }
+                            }
+                        });
+                    });
+
+                    submit.trigger('click');
+                }
+                , success: function (layero, index) {
+
+                }
+            });
+        } else if (obj.event === 'return') {
+            var tr = $(obj.tr);
+            var perContent = layer.open({
+                type: 2
+                , title: '退货'
+                , content: 'Return?Id=' + data.Id + ''
+                , maxmin: true
+                , area: ['500px', '450px']
+                , btn: ['提交', '取消']
+                , yes: function (index, layero) {
+                    var iframeWindow = window['layui-layer-iframe' + index]
+                        , submitID = 'LAY-list-front-submit'
+                        , submit = layero.find('iframe').contents().find('#' + submitID);
+
+                    setTimeout(function () {
+                        layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
+                            var errObj = $(this).find('.layui-form-danger');
+                            if (errObj.length > 0) {
+                                iframeWindow.element.tabChange('mytabbar', String(i + 1));
+                                submit.click();
+                            }
+                        });
+                    }, 300);
+
+                    //监听提交
+                    iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
+                        var field = data.field; //获取提交的字段
+                        var userdata = "";
+                        for (var prop in field) {
+                            userdata += prop + "=" + encodeURIComponent(field[prop]) + "&";
+                        }
+                        //提交 Ajax 成功后，静态更新表格中的数据
+                        //$.ajax({});
+                        
+                        $.ajax({
+                            type: "POST",
+                            url: "/Admin/Orders/Return?r=" + Math.random(1),
+                            data: userdata,
+                            dataType: "text",
+                            success: function (data) {
+                                if (data == "success") {
+                                    layer.close(index); //关闭弹层
+                                    layer.msg('提交成功', { time: 1500 }, function () {
+                                        table.reload('LAY-list-manage'); //数据刷新
+                                    });
+                                } else {
+                                    layer.msg(data);
+                                }
+                            }
+                        });
+                    });
+
+                    submit.trigger('click');
+                }
+                , success: function (layero, index) {
+
+                }
+            });
+        } else if (obj.event === 'prize100') {
+            var loadindex = layer.load(1, {
+                shade: [0.5, '#000']
+            });
+            $.ajax({
+                url: "/Admin/Orders/Prize100?r=" + Math.random(1),
+                data: "Id=" + data.Id,
+                dataType: "json",
+                success: function (data) {
+                    layer.close(loadindex);
+                    if (data.code == '1') {
+                        layer.alert(data.result.replace(/\n/g, '<br />'), { area: ['680px', '460px'] });
+                    } else {
+                        var index = layer.confirm(data.result.replace(/\n/g, '<br />') + '<br />是否立即补发？', { area: ['500px', '460px'] }, function (index) {
+                            $.ajax({
+                                type: "POST",
+                                url: "/Admin/Orders/AddPrize100?r=" + Math.random(1),
+                                data: "Id=" + data.Id,
+                                dataType: "text",
+                                success: function (data) {
+                                    if (data == "success") {
+                                        layer.close(index);
+                                        layer.msg("补发成功");
+                                    } else {
+                                        layer.msg(data);
+                                    }
+                                }
+                            });
+                        });
+                    }
+                }
+            });
+        }
+    });
+
+
+    //监听搜索
+    form.on('submit(LAY-list-front-search)', function (data) {
+        var field = data.field;
+
+        //执行重载
+        table.reload('LAY-list-manage', {
+            where: field,
+            page: {
+                curr: 1
+            }
+        });
+    });
+    form.on('submit(LAY-list-front-searchall)', function (data) {
+        table.reload('LAY-list-manage', {
+            where: null,
+            page: {
+                curr: 1
+            }
+        });
+    });
+
+    //事件
+    var active = {
+        batchdel: function () {
+            var checkStatus = table.checkStatus('LAY-list-manage')
+                , data = checkStatus.data; //得到选中的数据
+            if (data.length < 1) {
+                parent.layer.msg("请选择要删除的项");
+            } else {
+                var ids = "";
+                $.each(data, function (index, value) {
+                    ids += data[index].Id + ",";
+                });
+                ids = ids.substring(0, ids.length - 1);
+                var index = layer.confirm('确定要删除吗？删除后不能恢复！', function (index) {
+                    $.ajax({
+                        type: "POST",
+                        url: "/Admin/Orders/Delete?r=" + Math.random(1),
+                        data: "Id=" + ids,
+                        dataType: "text",
+                        success: function (data) {
+                            layer.close(index);
+                            if (data == "success") {
+                                table.reload('LAY-list-manage');
+                            } else {
+                                layer.msg(data);
+                            }
+                        }
+                    });
+                });
+            }
+        }
+        , add: function () {
+            var perContent = layer.open({
+                type: 2
+                , title: '创客订单-添加'
+                , content: 'Add'
+                , maxmin: true
+                , area: ['500px', '450px']
+                , btn: ['确定', '取消']
+                , yes: function (index, layero) {
+                    var iframeWindow = window['layui-layer-iframe' + index]
+                        , submitID = 'LAY-list-front-submit'
+                        , submit = layero.find('iframe').contents().find('#' + submitID);
+
+                    setTimeout(function () { 
+                        layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
+                            var errObj = $(this).find('.layui-form-danger');
+                            if (errObj.length > 0) {
+                                iframeWindow.element.tabChange('mytabbar', String(i + 1));
+                                submit.click();
+                            }
+                        });                        
+                    }, 300);
+
+                    
+                    
+                    
+                    
+
+                    //监听提交
+                    iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
+                        var field = data.field; //获取提交的字段
+                        var userdata = "";
+                        for (var prop in field) {
+                            userdata += prop + "=" + encodeURIComponent(field[prop]) + "&";
+                        }
+                        //提交 Ajax 成功后，静态更新表格中的数据
+                        //$.ajax({});
+                        
+                        $.ajax({
+                            type: "POST",
+                            url: "/Admin/Orders/Add?r=" + Math.random(1),
+                            data: userdata,
+                            dataType: "text",
+                            success: function (data) {
+                                layer.close(index); //关闭弹层
+                                if (data == "success") {
+                                    table.reload('LAY-list-manage'); //数据刷新
+                                } else {
+                                    layer.msg(data);
+                                }
+                            }
+                        });
+                    });
+
+                    submit.trigger('click');
+                }
+            });
+            layer.full(perContent);
+        }
+        , ImportData: function () {
+            ExcelKind = 1;
+            layer.open({
+                type: 1,
+                title: '导入',
+                maxmin: false,
+                area: ['460px', '280px'],
+                content: $('#excelForm'),
+                cancel: function () {
+                }
+            });
+            $("#excelTemp").html('<a href="/excelfile/模板文件.xlsx">点击下载模板文件</a>');
+        },ExportsExcel: function () {
+            var userdata = '';
+            $(".layuiadmin-card-header-auto input").each(function (i) {
+                console.log($(this).attr('name'));
+                console.log($(this).val());
+                userdata += $(this).attr('name') + '=' + encodeURIComponent($(this).val()) + '&';
+            });
+            $(".layuiadmin-card-header-auto select").each(function (i) {
+                userdata += $(this).attr('name') + '=' + encodeURIComponent($(this).val()) + '&';
+            });
+            $.ajax({
+                type: "GET",
+                url: "/Admin/Orders/ExportsExcel?r=" + Math.random(1),
+                data: userdata,
+                dataType: "json",
+                success: function (data) {
+                    data.Obj.unshift(data.Fields);
+                    excel.exportExcel(data.Obj, data.Info, 'xlsx');
+                }
+            });
+        }
+        , ExportExcel: function () {
+            var userdata = '';
+            $(".layuiadmin-card-header-auto input").each(function (i) {
+                userdata += $(this).attr('name') + '=' + encodeURIComponent($(this).val()) + '&';
+            });
+            $(".layuiadmin-card-header-auto select").each(function (i) {
+                userdata += $(this).attr('name') + '=' + encodeURIComponent($(this).val()) + '&';
+            });
+            var index = layer.load(1, {
+                shade: [0.8, '#000'],
+                content: '',
+                success: function (layero) {
+                    var obj = layero.find('.layui-layer-content').css({
+                        'padding-top': '10px',
+                        'width': '200px',
+                        'color': '#fff',
+                        'text-align': 'center'
+                    });
+                    var st = setInterval(function () { 
+                        $.ajax({
+                            type: "GET",
+                            url: "/Admin/Orders/CheckExport?r=" + Math.random(1),
+                            dataType: "text",
+                            success: function (data) {
+                                if (data == "finish") {
+                                    clearInterval(st);
+                                } else { 
+                                    obj.text(data);
+                                }
+                            }
+                        });
+                    }, 1000);
+                }
+            });
+            $.ajax({
+                type: "GET",
+                url: "/Admin/Orders/ExportExcel?r=" + Math.random(1),
+                data: userdata,
+                dataType: "text",
+                success: function (data) {
+                    layer.close(index);
+                    if (data.indexOf("success|") > -1) {
+                        var datalist = data.split('|');
+                        window.location.href = datalist[1];
+                    } else { 
+                        layer.msg('导出失败');
+                    }
+                    // data.Obj.unshift(data.Fields);
+                    // excel.exportExcel(data.Obj, data.Info, 'xlsx');
+                }
+            });
+        }
+        , Open: function () {
+            var checkStatus = table.checkStatus('LAY-list-manage')
+                , data = checkStatus.data; //得到选中的数据
+            if(data.length < 1){
+                parent.layer.msg("请选择要开启的项");
+            }else{
+                var ids = "";
+                $.each(data, function (index, value) {
+                    ids += data[index].Id + ",";
+                });
+                ids = ids.substring(0, ids.length - 1);
+                var index = layer.confirm('确定要开启吗？', function (index) {
+                    $.ajax({
+                        type: "POST",
+                        url: "/Admin/Orders/Open?r=" + Math.random(1),
+                        data: "Id=" + ids,
+                        dataType: "text",
+                        success: function (data) {
+                            layer.close(index);
+                            if (data == "success") {
+                                table.reload('LAY-list-manage');
+                            } else {
+                                layer.msg(data);
+                            }
+                        }
+                    });
+                });
+            }
+        }
+        , Close: function () {
+            var checkStatus = table.checkStatus('LAY-list-manage')
+                , data = checkStatus.data; //得到选中的数据
+            if(data.length < 1){
+                parent.layer.msg("请选择要关闭的项");
+            }else{
+                var ids = "";
+                $.each(data, function (index, value) {
+                    ids += data[index].Id + ",";
+                });
+                ids = ids.substring(0, ids.length - 1);
+                var index = layer.confirm('确定要关闭吗？', function (index) {
+                    $.ajax({
+                        type: "POST",
+                        url: "/Admin/Orders/Close?r=" + Math.random(1),
+                        data: "Id=" + ids,
+                        dataType: "text",
+                        success: function (data) {
+                            layer.close(index);
+                            if (data == "success") {
+                                table.reload('LAY-list-manage');
+                            } else {
+                                layer.msg(data);
+                            }
+                        }
+                    });
+                });
+            }
+        }
+    };
+
+    $('.layui-btn').on('click', function () {
+        var type = $(this).data('type');
+        active[type] ? active[type].call(this) : '';
+    });
+});

wwwroot/layuiadmin/modules_main/Orders_Admin.js

@@ -1,4 +1,4 @@
-var ExcelData,ExcelKind;
+var ExcelData, ExcelKind;
 function ConfirmImport() {
     $.ajax({
         type: "POST",
@@ -114,20 +114,20 @@ layui.config({
 
 
     //excel导入
-    excel = layui.excel;        
+    excel = layui.excel;
     $('#ExcelFile').change(function (e) {
         var files = e.target.files;
-        excel.importExcel(files, { }, function (data) {
+        excel.importExcel(files, {}, function (data) {
             ExcelData = data[0].sheet1;
         });
     });
 
     //监听单元格编辑
-    table.on('edit(LAY-list-manage)', function(obj){
+    table.on('edit(LAY-list-manage)', function (obj) {
         var value = obj.value //得到修改后的值
-        ,data = obj.data //得到所在行所有键值
-        ,field = obj.field; //得到字段
-        if(field == "Sort"){
+            , data = obj.data //得到所在行所有键值
+            , field = obj.field; //得到字段
+        if (field == "Sort") {
             $.ajax({
                 type: "POST",
                 url: "/Admin/Orders/Sort?r=" + Math.random(1),
@@ -138,7 +138,7 @@ layui.config({
             });
         }
     });
-    
+
     //列表数据
     table.render({
         elem: '#LAY-list-manage'
@@ -146,30 +146,32 @@ layui.config({
         , cols: [[
             { type: 'checkbox', fixed: 'left' }
             , { field: 'Id', fixed: 'left', title: 'ID', width: 80, sort: true, unresize: true }
-            ,{field:'OrderNo', width: 200, title:'平台订单号-渠道订单号', sort: true}
-            ,{field:'ProductName', width: 200, title:'商品名称', sort: true}
-            ,{field:'Store', width: 200, title:'发货仓库信息', sort: true}
-            ,{field:'StoreContact', width: 200, title:'仓库联系人信息', sort: true}
-            ,{field:'StoreFrom', width: 200, title:'仓库归属信息', sort: true}
-            ,{field:'UserInfo', width: 200, title:'创客信息', sort: true}
-            ,{field:'TopUserInfo', width: 200, title:'顶级创客信息', sort: true}
-            ,{field:'Address', width: 200, title:'收货地址', sort: true}
-            ,{field:'RecieveInfo', width: 200, title:'收件人姓名-联系电话', sort: true}
-            ,{field:'PayMode', width: 200, title:'支付渠道', sort: true}
-            ,{field:'TotalPrice', width: 200, title:'订单金额', sort: true}
-            ,{field:'PayStatus', width: 200, title:'支付状态', sort: true}
-            ,{field:'DeliveryType', width: 200, title:'提货类型', sort: true}
-            ,{field:'Remark', width: 200, title:'订单备注', sort: true}
-            ,{field:'SendInfo', width: 200, title:'发货状态-发货时间', sort: true}
-            ,{field:'RefundStatusName', width: 200, title:'退款状态', sort: true}
-            ,{field:'ErpInfo', width: 200, title:'快递单号-快递名称', sort: true}
-            ,{field:'CreateDate', width: 200, title:'下单时间', sort: true}
-            ,{field:'PayDate', width: 200, title:'支付时间', sort: true}
+            , { field: 'SendInfo', width: 200, title: '发货状态-发货时间', sort: true }
+            , { field: 'OrderNo', width: 200, title: '平台订单号-渠道订单号', sort: true }
+            , { field: 'ProductName', width: 200, title: '商品名称', sort: true }
+            , { field: 'ProductKind', width: 200, title: '商品类型', sort: true }
+            , { field: 'TotalPrice', width: 200, title: '订单金额', sort: true }
+            , { field: 'BuyCount', width: 200, title: '购买数量', sort: true }
+            , { field: 'UserInfo', width: 200, title: '创客信息', sort: true }
+            , { field: 'Store', width: 200, title: '发货仓库信息', sort: true }
+            , { field: 'StoreContact', width: 200, title: '仓库联系人信息', sort: true }
+            , { field: 'StoreFrom', width: 200, title: '仓库归属信息', sort: true }
+            , { field: 'TopUserInfo', width: 200, title: '顶级创客信息', sort: true }
+            , { field: 'Address', width: 200, title: '收货地址', sort: true }
+            , { field: 'RecieveInfo', width: 200, title: '收件人姓名-联系电话', sort: true }
+            , { field: 'PayMode', width: 200, title: '支付渠道', sort: true }
+            , { field: 'PayStatusName', width: 200, title: '支付状态', sort: true }
+            , { field: 'DeliveryType', width: 200, title: '提货类型', sort: true }
+            , { field: 'Remark', width: 200, title: '订单备注', sort: true }
+            , { field: 'RefundStatusName', width: 200, title: '退款状态', sort: true }
+            , { field: 'ErpInfo', width: 200, title: '快递单号-快递名称', sort: true }
+            , { field: 'CreateDate', width: 200, title: '下单时间', sort: true }
+            , { field: 'PayDate', width: 200, title: '支付时间', sort: true }
 
             , { title: '操作', align: 'center', width: 300, fixed: 'right', toolbar: '#table-list-tools' }
         ]]
         , where: {
-            
+
         }
         , page: true
         , limit: 30
@@ -235,7 +237,7 @@ layui.config({
                         }
                         //提交 Ajax 成功后，静态更新表格中的数据
                         //$.ajax({});
-                        
+
                         $.ajax({
                             type: "POST",
                             url: "/Admin/Orders/Edit?r=" + Math.random(1),
@@ -280,11 +282,11 @@ layui.config({
             var tr = $(obj.tr);
             var perContent = layer.open({
                 type: 2
-                , title: '创客订单-编辑'
+                , title: '创客订单-发货'
                 , content: 'Send?Id=' + data.Id + ''
                 , maxmin: true
                 , area: ['500px', '650px']
-                , btn: ['提交', '取消']
+                , btn: ['确认发货', '取消']
                 , yes: function (index, layero) {
                     var iframeWindow = window['layui-layer-iframe' + index]
                         , submitID = 'LAY-list-front-submit'
@@ -327,7 +329,7 @@ layui.config({
                         });
                         userdata += "&SnNosList=" + SnNosList;
 
-                        
+
                         $.ajax({
                             type: "POST",
                             url: "/Admin/Orders/Send?r=" + Math.random(1),
@@ -360,7 +362,7 @@ layui.config({
                 , content: 'Return?Id=' + data.Id + ''
                 , maxmin: true
                 , area: ['500px', '450px']
-                , btn: ['提交', '取消']
+                , btn: ['确认退货', '取消']
                 , yes: function (index, layero) {
                     var iframeWindow = window['layui-layer-iframe' + index]
                         , submitID = 'LAY-list-front-submit'
@@ -385,7 +387,7 @@ layui.config({
                         }
                         //提交 Ajax 成功后，静态更新表格中的数据
                         //$.ajax({});
-                        
+
                         $.ajax({
                             type: "POST",
                             url: "/Admin/Orders/Return?r=" + Math.random(1),
@@ -511,20 +513,20 @@ layui.config({
                         , submitID = 'LAY-list-front-submit'
                         , submit = layero.find('iframe').contents().find('#' + submitID);
 
-                    setTimeout(function () { 
+                    setTimeout(function () {
                         layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
                             var errObj = $(this).find('.layui-form-danger');
                             if (errObj.length > 0) {
                                 iframeWindow.element.tabChange('mytabbar', String(i + 1));
                                 submit.click();
                             }
-                        });                        
+                        });
                     }, 300);
 
-                    
-                    
-                    
-                    
+
+
+
+
 
                     //监听提交
                     iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
@@ -535,7 +537,7 @@ layui.config({
                         }
                         //提交 Ajax 成功后，静态更新表格中的数据
                         //$.ajax({});
-                        
+
                         $.ajax({
                             type: "POST",
                             url: "/Admin/Orders/Add?r=" + Math.random(1),
@@ -569,7 +571,7 @@ layui.config({
                 }
             });
             $("#excelTemp").html('<a href="/excelfile/模板文件.xlsx">点击下载模板文件</a>');
-        },ExportsExcel: function () {
+        }, ExportsExcel: function () {
             var userdata = '';
             $(".layuiadmin-card-header-auto input").each(function (i) {
                 console.log($(this).attr('name'));
@@ -608,7 +610,7 @@ layui.config({
                         'color': '#fff',
                         'text-align': 'center'
                     });
-                    var st = setInterval(function () { 
+                    var st = setInterval(function () {
                         $.ajax({
                             type: "GET",
                             url: "/Admin/Orders/CheckExport?r=" + Math.random(1),
@@ -616,7 +618,7 @@ layui.config({
                             success: function (data) {
                                 if (data == "finish") {
                                     clearInterval(st);
-                                } else { 
+                                } else {
                                     obj.text(data);
                                 }
                             }
@@ -634,7 +636,7 @@ layui.config({
                     if (data.indexOf("success|") > -1) {
                         var datalist = data.split('|');
                         window.location.href = datalist[1];
-                    } else { 
+                    } else {
                         layer.msg('导出失败');
                     }
                     // data.Obj.unshift(data.Fields);
@@ -645,9 +647,9 @@ layui.config({
         , Open: function () {
             var checkStatus = table.checkStatus('LAY-list-manage')
                 , data = checkStatus.data; //得到选中的数据
-            if(data.length < 1){
+            if (data.length < 1) {
                 parent.layer.msg("请选择要开启的项");
-            }else{
+            } else {
                 var ids = "";
                 $.each(data, function (index, value) {
                     ids += data[index].Id + ",";
@@ -674,9 +676,9 @@ layui.config({
         , Close: function () {
             var checkStatus = table.checkStatus('LAY-list-manage')
                 , data = checkStatus.data; //得到选中的数据
-            if(data.length < 1){
+            if (data.length < 1) {
                 parent.layer.msg("请选择要关闭的项");
-            }else{
+            } else {
                 var ids = "";
                 $.each(data, function (index, value) {
                     ids += data[index].Id + ",";

wwwroot/layuiadmin/modules_main/ProductNorm_Admin.js

@@ -74,6 +74,7 @@ layui.config({
             , { field: 'Stock', width: 200, title: '库存', sort: true }
             , { field: 'BuyCount', width: 200, title: '已购买数', sort: true }
             , { field: 'Code', width: 200, title: '编码', sort: true }
+            // , { field: 'StartBuyCount', width: 200, title: '起购数量', sort: true }
             , { field: 'LimitCount', width: 200, title: '限购数量', sort: true }
 
             , { field: 'Sort', fixed: 'right', title: '排序', width: 80, edit: 'text' }

wwwroot/layuiadmin/modules_main/Products_Admin.js

@@ -67,13 +67,14 @@ layui.config({
             { type: 'checkbox', fixed: 'left' }
             , { field: 'Id', fixed: 'left', title: 'ID', width: 80, sort: true, unresize: true }
             , { field: 'ProductName', width: 200, title: '商品名称', sort: true }
+            , { field: 'Status', width: 200, title: '状态', sort: true }
             , { field: 'Stock', width: 200, title: '库存', sort: true }
             , { field: 'BuyCount', width: 200, title: '已购买数', sort: true }
-            , { field: 'Price', width: 200, title: '价格', sort: true }
-            , { field: 'Integral', width: 200, title: '抵扣积分', sort: true }
-            , { field: 'MemberPrice', width: 200, title: '创客价', sort: true }
-            , { field: 'UserIntegral', width: 200, title: '创客抵扣积分', sort: true }
-            , { field: 'Status', width: 200, title: '状态', sort: true }
+            , { field: 'Price', width: 200, title: '单价', sort: true }
+            // , { field: 'Integral', width: 200, title: '抵扣积分', sort: true }
+            // , { field: 'MemberPrice', width: 200, title: '创客价', sort: true }
+            // , { field: 'UserIntegral', width: 200, title: '创客抵扣积分', sort: true }
+            // , { field: 'Status', width: 200, title: '状态', sort: true }
 
             , { field: 'Sort', fixed: 'right', title: '排序', width: 80, edit: 'text' }
             , { title: '操作', width: 250, align: 'center', fixed: 'right', toolbar: '#table-list-tools' }