页面修改

Mall.Model/Entity/TradePavilion/RB_Company.cs

@@ -107,7 +107,7 @@ namespace Mall.Model.Entity.TradePavilion
 		public string ImportCountry { get; set; }
 
 		/// <summary>
-		/// 主要进口类目
+		/// 进口品目
 		/// </summary>
 		public string ImportCategory { get; set; }
 

Mall.Module.MarketingCenter/MiniprogramTemplateModule.cs

@@ -111,7 +111,7 @@ namespace Mall.Module.MarketingCenter
             }
             if (extModel.TemplateData != null && !string.IsNullOrEmpty(extModel.TemplateData))
             {
-                extModel.ComponentDataList = JsonHelper.DeserializeObject<List<ComponentItem>>(Common.ConvertHelper.JsonReplaceSign(extModel.TemplateData));
+                extModel.ComponentDataList = JsonHelper.DeserializeObject<List<ComponentItem>>(extModel.TemplateData);
                 if (extModel.ComponentDataList != null && extModel.ComponentDataList.Count > 0)
                 {
                     foreach (var item in extModel.ComponentDataList)
@@ -621,7 +621,8 @@ namespace Mall.Module.MarketingCenter
                     }
                     item.data = storeModel;
                     break;
-
+                //导航-页面
+                case "nav-page": item.data = JsonHelper.DeserializeObject<navItem>(item.data.ToString()); break;
 
             }
         }

Mall.Module.TradePavilion/ContractModule.cs

@@ -30,6 +30,16 @@ namespace Mall.Module.TradePavilion
             return contractRepository.GetContractPageListRepository(pageIndex, pageSize, out rowsCount, query);
         }
 
+        /// <summary>
+        /// 获取联系列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Contract_Extend> GetContractListModule(RB_Contract_Extend query)
+        {
+            return contractRepository.GetContractListRepository(query);
+        }
+
         /// <summary>
         /// 获取联系人实体
         /// </summary>

Mall.Repository/TradePavilion/RB_ContractRepository.cs

@@ -55,5 +55,43 @@ WHERE 1=1
             }
             return GetPage<RB_Contract_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
         }
+
+        /// <summary>
+        /// 获取联系列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Contract_Extend> GetContractListRepository(RB_Contract_Extend query)
+        {
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT * 
+FROM RB_Contract
+WHERE 1=1
+");
+            builder.AppendFormat(" AND {0}={1} ", nameof(RB_Contract_Extend.Status), (int)DateStateEnum.Normal);
+            if (query == null)
+            {
+                return new List<RB_Contract_Extend>();
+            }
+            else
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Contract_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Contract_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (!string.IsNullOrEmpty(query.Name))
+                {
+                    builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_Contract_Extend.Name));
+                    parameters.Add("Name", "%" + query.Name.Trim() + "%");
+                }
+            }
+            return Get<RB_Contract_Extend>(builder.ToString(), parameters).ToList();
+        }
     }
 }
\ No newline at end of file

Mall.WebApi/Controllers/Mall/MallHelper.cs

@@ -130,6 +130,14 @@ namespace Mall.WebApi.Controllers
                         data = navData
                     };
                     break;
+                case "nav-page":
+                    var navPageData = subItem.data as navItem;
+                    obj = new
+                    {
+                        id = subItem.Id,
+                        data = navPageData
+                    };
+                    break;
                 //轮播广告插件
                 case "banner":
                     var bannerData = subItem.data as bannerItem;

Mall.WebApi/Controllers/TradePavilion/TradeController.cs

@@ -6,6 +6,7 @@ using Mall.Common.Plugin;
 using Mall.Model.Extend.TradePavilion;
 using Mall.Module.TradePavilion;
 using Mall.WebApi.Filter;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
@@ -51,6 +52,9 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// 获取联系人分页列表
         /// </summary>
         /// <returns></returns>
+        [HttpGet]
+        [HttpPost]
+        [AllowAnonymous]
         public ApiResult GetContractPageList()
         {
             ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
@@ -77,6 +81,33 @@ namespace Mall.WebApi.Controllers.TradePavilion
             return ApiResult.Success(data: pageModel);
         }
 
+        /// <summary>
+        /// 获取联系人列表
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult GetContractList()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var query = new RB_Contract_Extend()
+            {
+                Name = parms.GetStringValue("Name")
+            };
+            query.MallBaseId = RequestParm.MallBaseId;
+            query.TenantId = RequestParm.TenantId;
+            var list = module.GetContractListModule(query);
+            if (list != null && list.Count > 0)
+            {
+                foreach (var item in list)
+                {
+                    if (item.CreateBy > 0)
+                    {
+                        item.CreateByName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.Account ?? "";
+                    }
+                }
+            }
+            return ApiResult.Success(data: list);
+        }
+
         /// <summary>
         /// 新增修改联系人
         /// </summary>
@@ -100,6 +131,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
             Int32.TryParse(RequestParm.uid, out int Uid);
             extModel.CreateBy = Uid;
             extModel.CreateDate = DateTime.Now;
+            extModel.UpdateBy = Uid;
+            extModel.UpdateDate = DateTime.Now;
             var flag = module.SetContractModule(extModel);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
@@ -108,6 +141,9 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// 获取角色实体
         /// </summary>
         /// <returns></returns>
+        [HttpGet]
+        [HttpPost]
+        [AllowAnonymous]
         public ApiResult GetContract()
         {
             JObject parms = JObject.Parse(RequestParm.msg.ToString());