页面修改

Mall.WebApi/Controllers/Mall/MallController.cs

@@ -80,6 +80,11 @@ namespace Mall.WebApi.Controllers.MallBase
         /// </summary>
         private readonly MallBaseModule mallBaseModule = new MallBaseModule();
 
+        /// <summary>
+        /// 小程序页面处理类
+        /// </summary>
+        private Module.User.MiniProgramPageModule programPageModule = new Module.User.MiniProgramPageModule();
+
 
         /// <summary>
         /// 小程序首页
@@ -104,6 +109,8 @@ namespace Mall.WebApi.Controllers.MallBase
             var homePage = new object();
             //底部导航
             var navbar = new object();
+            //授权页面
+            var auth_page = new object();
             if (MiniAppId != null && !string.IsNullOrEmpty(MiniAppId))
             {
                 //获取小程序信息
@@ -135,6 +142,31 @@ namespace Mall.WebApi.Controllers.MallBase
                         }),
                     };
 
+                    //授权页面热区
+                    var hotspotCancel = new object();
+                    var hotspotLogin = new object();
+                    if (miniProgram.AuthDataList != null && miniProgram.AuthDataList.Count > 0)
+                    {
+                        var first = miniProgram.AuthDataList[0];
+                        var second = miniProgram.AuthDataList[1];
+                        if (first.open_type == "login")
+                        {
+                            hotspotLogin = first;
+                            hotspotCancel = second;
+                        }
+                        else
+                        {
+                            hotspotLogin = second;
+                            hotspotCancel = first;
+                        }
+                    }
+                    auth_page = new
+                    {
+                        pic_url = miniProgram.AuthUrl,
+                        hotspot = hotspotLogin,
+                        hotspot_cancel = hotspotCancel
+                    };
+
                     var selfHomePage = miniprogramPageTemplModule.GetMiniprogramPageTemplModule(new RB_Miniprogram_Page_Templ_Extend()
                     {
                         MallBaseId = miniProgram.MallBaseId,
@@ -1198,12 +1230,14 @@ namespace Mall.WebApi.Controllers.MallBase
                 var memberModel = userModule.GetAppletUserCenterStatistics(RequestParm.OpenId);
                 user_info = memberModel;
             }
-
+            var miniPageList= programPageModule.GetMiniprogram_Page_ListExtModule(new RB_MiniProgram_Page_Extend() { MallBaseId = RequestParm.MallBaseId });
             var objResult = new
             {
                 home_pages = homePage,
                 navbar,
-                user_info
+                user_info,
+                auth_page,//授权页面
+                bar_title=miniPageList?.Select(qitem=>new { name= qitem.PageName, value=qitem.PageUrl, new_name=qitem.SelfPageName }),//导航标题
             };
             return ApiResult.Success(data: objResult);
         }