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

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

@@ -763,6 +763,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// 获取新闻前几条
         /// </summary>
         /// <returns></returns>
+        [HttpGet]
+        [HttpPost]
         public ApiResult GetNewsPage()
         {
             ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
@@ -772,9 +774,13 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 Title = parms.GetStringValue("Title"),
                 Type = parms.GetInt("Type")
             };
-            var userInfo = AppletUserInfo;
+          //  var userInfo = AppletUserInfo;
+           // query.MallBaseId = RequestParm.MallBaseId;
+          //  query.TenantId = userInfo?.TenantId ?? 0;
+
+
             query.MallBaseId = RequestParm.MallBaseId;
-            query.TenantId = userInfo?.TenantId ?? 0;
+            query.TenantId = RequestParm.TenantId;
             var list = commerceNewsModule.GetCommerceNewsPageListModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
             pageModel.count = Convert.ToInt32(rowsCount);
             pageModel.pageData = list;
@@ -785,6 +791,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// 获取新闻信息详情
         /// </summary>
         /// <returns></returns>
+        [HttpGet]
+        [HttpPost]
         public ApiResult GetCommerceNews()
         {
             JObject parms = JObject.Parse(RequestParm.msg.ToString());

Mall.WebApi/Controllers/TradePavilion/YBTradeController.cs

@@ -252,7 +252,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         [HttpPost]
         public ApiResult GetBuildingExportEnumList()
         {
-            var list = EnumHelper.GetEnumList(typeof(Common.Enum.TradePavilion.SZTCarrierExportEnum));
+            var list = EnumHelper.GetEnumList(typeof(Common.Enum.TradePavilion.SZTBuildExportEnum));
             return ApiResult.Success("", list.Select(x => new
             {
                 Name = x.Key,