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

Mall.WebApi/Controllers/BaseController.cs

@@ -38,7 +38,10 @@ namespace Mall.WebApi.Controllers
                 {
                     JObject parms = JObject.Parse(Request.HttpContext.Items[GlobalKey.TokenUserInfo].ToString());
                     requestParm.uid = parms.GetStringValue("uid");
-                    requestParm.TenantId = Convert.ToInt32(requestParm.uid);
+                    if (requestParm.uid != null && !string.IsNullOrWhiteSpace(requestParm.uid))
+                    {
+                        requestParm.TenantId = Convert.ToInt32(requestParm.uid);
+                    }
                 }
                 #endregion
                 //根据token 获取uid

Mall.WebApi/Controllers/Mall/MallController.cs

@@ -80,10 +80,16 @@ namespace Mall.WebApi.Controllers.MallBase
         public ApiResult GetHome()
         {
             JObject parms = JObject.Parse(RequestParm.msg.ToString());
-            //小程序Id
-            var MiniAppId = parms.GetStringValue("MiniAppId");
-            MiniAppId = RequestParm.MiniAppId;
-           
+            string MiniAppId = "";
+            try
+            {
+                //小程序Id
+                MiniAppId = RequestParm.MiniAppId;
+            }
+            catch (Exception ex)
+            { 
+            
+            }
             var homePage = new object();
             //底部导航
             var navbar = new object();