Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com into sdzq-ld

Mall.Module.MarketingCenter/MiniprogramTemplateModule.cs

@@ -140,7 +140,37 @@ namespace Mall.Module.MarketingCenter
                 //轮播广告插件
                 case "banner": item.data = JsonHelper.DeserializeObject<bannerItem>(item.data.ToString()); break;
                 //公告组件
-                case "notice": item.data = JsonHelper.DeserializeObject<noticeItem>(item.data.ToString()); break;
+                case "notice":
+                    noticeItem nModel = new noticeItem();
+                    try
+                    {
+                        JObject nObj = JObject.Parse(item.data.ToString());
+                        nModel.name = (nObj["name"] != null && !string.IsNullOrEmpty(nObj["name"].ToString())) ? nObj["name"].ToString() : "公告";
+                        nModel.content = (nObj["content"] != null && !string.IsNullOrEmpty(nObj["content"].ToString())) ? nObj["content"].ToString() : "";
+                        nModel.icon = (nObj["icon"] != null && !string.IsNullOrEmpty(nObj["icon"].ToString())) ? nObj["icon"].ToString() : "";
+                        nModel.textColor = (nObj["textColor"] != null && !string.IsNullOrEmpty(nObj["textColor"].ToString())) ? nObj["textColor"].ToString() : "#ffffff";
+                        nModel.background = (nObj["background"] != null && !string.IsNullOrEmpty(nObj["background"].ToString())) ? nObj["background"].ToString() : "#f67f79";
+                        nModel.headerUrl = (nObj["headerUrl"] != null && !string.IsNullOrEmpty(nObj["headerUrl"].ToString())) ? nObj["headerUrl"].ToString() : "";
+                        nModel.btnColor = (nObj["btnColor"] != null && !string.IsNullOrEmpty(nObj["btnColor"].ToString())) ? nObj["btnColor"].ToString() : "#ff4544";
+                        
+                        Int32.TryParse(nObj["btnWidth"].ToString(), out int btnWidth);
+                        nModel.btnWidth = btnWidth>0 ?btnWidth: 500;
+
+                        Int32.TryParse(nObj["btnHeight"].ToString(), out int btnHeight);
+                        nModel.btnHeight = btnHeight>0?btnHeight: 80;
+
+                        Int32.TryParse(nObj["btnRadius"].ToString(), out int btnRadius);
+                        nModel.btnRadius = btnRadius>0?btnRadius: 40;
+
+                        nModel.btnText = (nObj["btnText"] != null && !string.IsNullOrEmpty(nObj["btnText"].ToString())) ? nObj["btnText"].ToString() : "我知道了";
+                        nModel.btnTextColor = (nObj["btnTextColor"] != null && !string.IsNullOrEmpty(nObj["btnTextColor"].ToString())) ? nObj["btnTextColor"].ToString() : "#ffffff";
+                    }
+                    catch (Exception ex)
+                    {
+                        Common.Plugin.LogHelper.Write(ex, "AnalyzePlusModule_notice:" + item.data.ToString());
+                    }
+                    item.data = nModel;
+                    break;
                 //专题
                 case "topic": item.data = JsonHelper.DeserializeObject<topicItem>(item.data.ToString()); break;
                 //标题组件