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

Mall.WebApi/Controllers/Mall/MallHelper.cs

@@ -3358,6 +3358,11 @@ namespace Mall.WebApi.Controllers
                     break;
                 case MallShopStyleEnum.BusinessBlue:
                     resultMallShopStyle = new ResultMallShopStyle() { main = "#4a90e2", secondary = "#dbe9f9", IsEducation = 0 };
+                    //宜宾商再通特色颜色处理
+                    if ((miniProgram.TenantId ?? 0) == 30)
+                    {
+                        resultMallShopStyle = new ResultMallShopStyle() { main = "#017edf", secondary = "#ea850", IsEducation = 0 };
+                    }
                     break;
                 case MallShopStyleEnum.PureBlack:
                     resultMallShopStyle = new ResultMallShopStyle() { main = "#333333", secondary = "#dedede", IsEducation = 0 };

Mall.WebApi/Controllers/TradePavilion/TradeController.cs

@@ -3442,11 +3442,17 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 MetroName = parms.GetStringValue("MetroName"),
                 MetroNum = parms.GetInt("MetroNum"),
                 BuildingCarrierType = parms.GetInt("BuildingCarrierType"),
-                OpeningStatus = parms.GetInt("OpeningStatus", -1),
+                OpeningStatus = -1,
                 QShopType = parms.GetInt("QShopType"),
                 MallBaseId = RequestParm.MallBaseId,
                 TenantId = RequestParm.TenantId,
             };
+            string OpeningStatusStr = parms.GetStringValue("OpeningStatus");
+            if (!string.IsNullOrEmpty(OpeningStatusStr))
+            {
+                Int32.TryParse(OpeningStatusStr, out int OpeningStatus);
+                query.OpeningStatus = OpeningStatus;
+            }
             List<object> list = new List<object>();
             var dataList = buildingCarrierModule.GetBuildingCarrierPageModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
             foreach (var item in dataList)