Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

@@ -4191,6 +4191,14 @@ namespace Mall.WebApi.Controllers.TradePavilion
             };
             var list = buildingCarrierModule.GetAllCarrierPageModule(pageModel.pageIndex, pageModel.pageSize, out long count, query);
             pageModel.count = Convert.ToInt32(count);
+            foreach (var item in list)
+            {
+                item.BannerList = new List<string>();
+                if (!string.IsNullOrWhiteSpace(item.Logo))
+                {
+                    item.BannerList.Add(item.Logo);
+                }
+            }
             pageModel.pageData = list.Select(x => new
             {
                 x.ID,
@@ -4204,6 +4212,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 x.CategoryName,
                 x.OpeningStatus,
                 x.Address,
+                x.BannerList,
                 x.FirstStoreTest,
             });
             return ApiResult.Success(data: pageModel);
@@ -4231,19 +4240,28 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 TenantId = parms.GetInt("TenantId", 0),
             };
             var list = buildingCarrierModule.GetAllBrandEnterprisePageModule(pageModel.pageIndex, pageModel.pageSize, out long count, query);
+            foreach (var item in list)
+            {
+                item.BannerList = new List<string>();
+                if (!string.IsNullOrWhiteSpace(item.Logo))
+                {
+                    item.BannerList.Add(item.Logo);
+                }
+            }
             pageModel.count = Convert.ToInt32(count);
             pageModel.pageData = list.Select(x => new
             {
                 x.ID,
                 x.BrandName,
                 Logo = x.Logo ?? "",
+                x.BannerList ,
                 x.TenantId,
                 x.MallBaseId,
                 x.FullBrandName,
                 ProjectType = x.CategoryId,
                 ProjectTypeName = x.CategoryName,
                 x.IsInChengdu,
-            });
+            }); ;
             return ApiResult.Success(data: pageModel);
         }
         #endregion