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

Mall.Common/API/RequestParm.cs

@@ -67,5 +67,10 @@ namespace Mall.Common.API
         /// 小程序Id
         /// </summary>
         public string MiniAppId { get; set; }
+
+        /// <summary>
+        /// 用户OpenId
+        /// </summary>
+        public string OpenId { get; set; }
     }
 }

Mall.Model/Entity/User/RB_Miniprogram_PageManage.cs

@@ -84,5 +84,10 @@ namespace Mall.Model.Entity.User
             get;
             set;
         }
+
+        /// <summary>
+        /// 参数PlaceHolder
+        /// </summary>
+        public string TipText { get; set; }
     }
 }

Mall.Module.User/MiniProgramPageModule.cs

@@ -208,6 +208,7 @@ namespace Mall.Module.User
                         PageUrl = "/pages/index/index?page_id=" + item.Id,
                         PageType = Common.Enum.MallBase.PageTypeEnum.DiyPage,
                         IsParameter = 0,
+                        TipText="",
                         SelfPageName = item.PageName,
                         ParameterValue = "",
                     });
@@ -250,6 +251,7 @@ namespace Mall.Module.User
             if (extModel.IsParameter == 0)
             {
                 extModel.ParameterValue = "";
+                extModel.TipText = "";
             }
             if (extModel.PageId > 0)
             {
@@ -261,6 +263,8 @@ namespace Mall.Module.User
                     { nameof(RB_Miniprogram_PageManage_Extend.PageSort),extModel.PageSort},
                     { nameof(RB_Miniprogram_PageManage_Extend.IsParameter),extModel.IsParameter},
                     { nameof(RB_Miniprogram_PageManage_Extend.ParameterValue),extModel.ParameterValue},
+                    { nameof(RB_Miniprogram_PageManage_Extend.TipText),extModel.TipText},
+
                 };
                 flag = miniprogram_PageManageRepository.Update(fileds, new WhereHelper(nameof(RB_Miniprogram_PageManage_Extend.PageId), extModel.PageId));
             }

Mall.Repository/User/RB_Miniprogram_PageManageRepository.cs

@@ -80,7 +80,7 @@ namespace Mall.Repository.User
         {
             StringBuilder builder = new StringBuilder();
             builder.Append(@"
-SELECT B.PageId, B.PageName,B.PageType,B.PageUrl,B.PageSort,B.IsParameter,B.ParameterValue,IFNULL(A.SelfPageName,'') AS SelfPageName,A.Id
+SELECT B.PageId, B.PageName,B.PageType,B.PageUrl,B.PageSort,B.IsParameter,B.ParameterValue,IFNULL(A.SelfPageName,'') AS SelfPageName,A.Id,B.TipText
 FROM rb_miniprogram_page AS A INNER JOIN rb_miniprogram_pagemanage AS B ON A.PageId = B.PageId
 WHERE B.`Status`= 0 ");
             if (query != null)

Mall.WebApi/Controllers/User/TenantController.cs

@@ -1042,6 +1042,7 @@ namespace Mall.WebApi.Controllers.User
                         qitem.PageUrl,
                         qitem.IsParameter,
                         qitem.ParameterValue,
+                        qitem.TipText,
                         qitem.Id,
                         qitem.SelfPageName
                     })