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

Mall.Model/Extend/MarketingCenter/RB_Miniprogram_Template_Extend.cs

@@ -654,6 +654,11 @@ namespace Mall.Model.Extend.MarketingCenter
         /// 页面名称
         /// </summary>
         public string PageName { get; set; }
+
+        /// <summary>
+        /// App前端使用
+        /// </summary>
+        public string new_link_url { get; set; }
     }
 
     /// <summary>

Mall.Module.User/MiniProgramModule.cs

@@ -162,7 +162,18 @@ namespace Mall.Module.User
         /// <returns></returns>
         public List<RB_Mall_Magic_Extend> GetMallMagicListModule(RB_Mall_Magic_Extend query)
         {
-            return magicRepository.GetMallMagicListRepository(query);
+             var list= magicRepository.GetMallMagicListRepository(query);
+            if (list != null && list.Count > 0)
+            {
+                foreach (var item in list)
+                {
+                    if (item.MagicData != null && !string.IsNullOrEmpty(item.MagicData))
+                    {
+                        item.MagicDataList = Common.Plugin.JsonHelper.DeserializeObject<List<MagicItem>>(item.MagicData);
+                    }
+                }
+            }
+            return list;
         }
 
         /// <summary>