阿打发撒

Mall.WebApi/Controllers/Mall/MallController.cs

@@ -214,55 +214,7 @@ namespace Mall.WebApi.Controllers.MallBase
                             key = qitem.TagLink == "/pages/live/index" ? "live" : "",
                         }),
                     };
-                    //授权页面热区
-                    var hotspotCancel = new object();
-                    var hotspotLogin = new object();
-                    if (miniProgram.AuthDataList != null && miniProgram.AuthDataList.Count > 0 && miniProgram.AuthDataList.Count == 2)
-                    {
-                        var first = miniProgram.AuthDataList[0];
-                        var second = miniProgram.AuthDataList[1];
-                        if (first.open_type == "login")
-                        {
-                            hotspotLogin = first;
-                            hotspotCancel = second;
-                        }
-                        else
-                        {
-                            hotspotLogin = second;
-                            hotspotCancel = first;
-                        }
-                    }
-                    else
-                    {
-                        hotspotLogin = new AuthItem()
-                        {
-                            width = 224,
-                            height = 80,
-                            left = 340,
-                            top = 566,
-                            defaultX = 340,
-                            defaultY = 566,
-                            link = "",
-                            open_type = "login"
-                        };
-                        hotspotCancel = new AuthItem()
-                        {
-                            width = 224,
-                            height = 80,
-                            left = 84,
-                            top = 566,
-                            defaultX = 84,
-                            defaultY = 566,
-                            link = "",
-                            open_type = "cancel"
-                        };
-                    }
-                    auth_page = new
-                    {
-                        pic_url = miniProgram.AuthUrl,
-                        hotspot = hotspotLogin,
-                        hotspot_cancel = hotspotCancel
-                    };
+                  
 
                     var selfHomePage = miniprogramPageTemplModule.GetMiniprogramPageTemplModule(new RB_Miniprogram_Page_Templ_Extend()
                     {
@@ -385,7 +337,56 @@ namespace Mall.WebApi.Controllers.MallBase
                 option = new List<object>(),
                 setting,
             };
+            //授权页面热区
+            var hotspotCancel = new object();
+            var hotspotLogin = new object();
+            if (miniProgram.AuthDataList != null && miniProgram.AuthDataList.Count > 0 && miniProgram.AuthDataList.Count == 2)
+            {
+                var first = miniProgram.AuthDataList[0];
+                var second = miniProgram.AuthDataList[1];
+                if (first.open_type == "login")
+                {
+                    hotspotLogin = first;
+                    hotspotCancel = second;
+                }
+                else
+                {
+                    hotspotLogin = second;
+                    hotspotCancel = first;
+                }
+            }
+            else
+            {
+                hotspotLogin = new AuthItem()
+                {
+                    width = 224,
+                    height = 80,
+                    left = 340,
+                    top = 566,
+                    defaultX = 340,
+                    defaultY = 566,
+                    link = "",
+                    open_type = "login"
+                };
+                hotspotCancel = new AuthItem()
+                {
+                    width = 224,
+                    height = 80,
+                    left = 84,
+                    top = 566,
+                    defaultX = 84,
+                    defaultY = 566,
+                    link = "",
+                    open_type = "cancel"
+                };
+            }
 
+            auth_page = new
+            {
+                pic_url = miniProgram.AuthUrl,
+                hotspot = hotspotLogin,
+                hotspot_cancel = hotspotCancel
+            };
             var miniPageList = programPageModule.GetMiniprogram_Page_ListExtModule(new RB_MiniProgram_Page_Extend() { MallBaseId = RequestParm.MallBaseId });
             var objResult = new
             {