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

Mall.WebApi/App_Code/PayUtil.cs

@@ -66,6 +66,8 @@ namespace Mall.WebApi.App_Code
             req.SetParameter("sign", req.CreateMd5Sign(_accessor, model.WeChatApiSecret));
 
             var reqXml = req.ParseXml();
+
+            LogHelper.Write(null, "订单号【" + sOrderNo + "】请求参数：" + reqXml);
             var result = Common.Pay.WeChatPat.HttpHelper.Post(new HttpParam()
             {
                 Url = Mall.Common.Pay.WeChatPat.Model.ApiList.UnifiedOrderUrl,

Mall.WebApi/Controllers/Mall/MallController.cs

@@ -60,7 +60,7 @@ namespace Mall.WebApi.Controllers.MallBase
         /// </summary>
         private readonly ProductModule productModule = new ProductModule();
 
- 
+
         /// <summary>
         /// 用户处理类
         /// </summary>
@@ -117,13 +117,15 @@ namespace Mall.WebApi.Controllers.MallBase
             var auth_page = new object();
             //用户信息
             var user_info = new object();
+            //小程序
+            var mall = new object();
             if (page_id > 0)
             {
                 var targetPage = miniprogramPageTemplModule.GetMiniprogramPageTemplModule(new RB_Miniprogram_Page_Templ_Extend()
                 {
                     MallBaseId = miniProgram.MallBaseId,
                     TenantId = miniProgram.TenantId,
-                    Id=page_id
+                    Id = page_id
                 }, isGetHome: false);
                 List<object> list = new List<object>();
                 //自定义首页
@@ -179,6 +181,7 @@ namespace Mall.WebApi.Controllers.MallBase
             {
                 if (miniProgram != null && miniProgram.MallBaseId > 0)
                 {
+
                     //底部导航
                     navbar = new
                     {
@@ -271,6 +274,7 @@ namespace Mall.WebApi.Controllers.MallBase
                             QIds = templateIds
                         }, IsAnalyzePlus: true);
                         //解析模板
+                        int index = 0;
                         foreach (var item in selfHomePage.DetailsList)
                         {
                             var templateData = new
@@ -290,12 +294,13 @@ namespace Mall.WebApi.Controllers.MallBase
                             var tempObj = new
                             {
                                 id = item.Id,
-                                name = item.NavName,
+                                name = (index == 0 ? "首页" : item.NavName),
                                 page_id = 0,
                                 template_id = item.Id,
                                 template = templateData
                             };
                             list.Add(tempObj);
+                            index++;
                         }
 
                         homePage = new
@@ -354,22 +359,39 @@ namespace Mall.WebApi.Controllers.MallBase
                         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))
                 {
                     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
             {
+                mall,
                 home_pages = homePage,
                 navbar,
                 user_info,
-                setting,
                 share_setting,
                 share_setting_custom,
                 cat_style,