页面修改

Mall.WebApi/Controllers/Mall/MallController.cs

@@ -342,41 +342,6 @@ namespace Mall.WebApi.Controllers.MallBase
                             };
                         }
                     }
-                    //基础配置
-                    setting = MallHelper.GetBasicSetting(miniProgram);
-                    
-                    //分销基础信息
-                    share_setting = MallHelper.GetDistributorBasicsInfo(miniProgram);
-                    //分销商设置
-                    share_setting_custom = MallHelper.GetDistributorCustomInfo(miniProgram);
-
-                    #region 商品分类样式
-                    var productCategoryStyle = productModule.GetProductCategoryStyleInfo(miniProgram.TenantId ?? 0, miniProgram.MallBaseId);
-                    cat_style = new
-                    {
-                        cat_style = productCategoryStyle?.Type,
-                        recommend_count = productCategoryStyle?.Style,
-                        cat_goods_count = productCategoryStyle?.CategoryNum,
-                        cat_goods_cols = productCategoryStyle?.RowNum
-                    };
-                    #endregion
-
-
-                    mall = new
-                    {
-                        id = miniProgram.MallBaseId,
-                        name = miniProgram.MallName,
-                        user_id = 0,
-                        created_at = miniProgram.CreateDate.HasValue ? miniProgram.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
-                        updated_at = miniProgram.CreateDate.HasValue ? miniProgram.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
-                        deleted_at = "0000-00-00 00:00:00",
-                        is_delete = miniProgram.Status,
-                        is_recycle = 0,
-                        is_disable = miniProgram.Status,
-                        expired_at = "0000-00-00 00:00:00",
-                        option = new List<object>(),
-                        setting,
-                    };
                 }
 
                 if (RequestParm.OpenId != null && !string.IsNullOrWhiteSpace(RequestParm.OpenId))
@@ -386,6 +351,42 @@ namespace Mall.WebApi.Controllers.MallBase
                 }
             }
 
+            //基础配置
+            setting = MallHelper.GetBasicSetting(miniProgram);
+
+            //分销基础信息
+            share_setting = MallHelper.GetDistributorBasicsInfo(miniProgram);
+            //分销商设置
+            share_setting_custom = MallHelper.GetDistributorCustomInfo(miniProgram);
+
+            #region 商品分类样式
+            var productCategoryStyle = productModule.GetProductCategoryStyleInfo(miniProgram.TenantId ?? 0, miniProgram.MallBaseId);
+            cat_style = new
+            {
+                cat_style = productCategoryStyle?.Type,
+                recommend_count = productCategoryStyle?.Style,
+                cat_goods_count = productCategoryStyle?.CategoryNum,
+                cat_goods_cols = productCategoryStyle?.RowNum
+            };
+            #endregion
+
+
+            mall = new
+            {
+                id = miniProgram.MallBaseId,
+                name = miniProgram.MallName,
+                user_id = 0,
+                created_at = miniProgram.CreateDate.HasValue ? miniProgram.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
+                updated_at = miniProgram.CreateDate.HasValue ? miniProgram.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
+                deleted_at = "0000-00-00 00:00:00",
+                is_delete = miniProgram.Status,
+                is_recycle = 0,
+                is_disable = miniProgram.Status,
+                expired_at = "0000-00-00 00:00:00",
+                option = new List<object>(),
+                setting,
+            };
+
             var miniPageList = programPageModule.GetMiniprogram_Page_ListExtModule(new RB_MiniProgram_Page_Extend() { MallBaseId = RequestParm.MallBaseId });
             var objResult = new
             {