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

Mall.Model/Extend/MarketingCenter/RB_Miniprogram_Template_Extend.cs

@@ -66,11 +66,11 @@ namespace Mall.Model.Extend.MarketingCenter
     /// 背景组件
     /// </summary>
     public class backgroundItem
-    { 
+    {
         /// <summary>
         /// 背景颜色
         /// </summary>
-      public string backgroundColor { get; set; }
+        public string backgroundColor { get; set; }
 
         /// <summary>
         /// 背景高度
@@ -687,9 +687,9 @@ namespace Mall.Model.Extend.MarketingCenter
 
         public string backgroundImage { get; set; }
 
-        public  string backgroundRepeat { get; set; }
+        public string backgroundRepeat { get; set; }
 
-        public  string backgroundSize { get; set; }
+        public string backgroundSize { get; set; }
 
         public string backgroundPosition { get; set; }
 
@@ -959,7 +959,7 @@ namespace Mall.Model.Extend.MarketingCenter
         /// <summary>
         /// 商品名称
         /// </summary>
-         
+
         public string name { get; set; }
 
         /// <summary>
@@ -1013,7 +1013,7 @@ namespace Mall.Model.Extend.MarketingCenter
         /// </summary>
         public List<GoodsDetailsItem2> goodsList { get; set; }
     }
- 
+
 
     /// <summary>
     /// 门店插件
@@ -2026,4 +2026,36 @@ namespace Mall.Model.Extend.MarketingCenter
         public quicknavDetailsItem customize { get; set; }
     }
 
+    /// <summary>
+    /// 店铺用户信息
+    /// </summary>
+    public class shopinfoItem
+    {
+        /// <summary>
+        /// 头像
+        /// </summary>
+        public string headImg { get; set; }
+
+        /// <summary>
+        /// 用户信息
+        /// </summary>
+        public string headName { get; set; }
+
+        /// <summary>
+        /// 用户介绍
+        /// </summary>
+        public string headInfo { get; set; }
+
+        /// <summary>
+        /// 背景图片
+        /// </summary>
+        public string backgroundPicUrl { get; set; }
+
+        /// <summary>
+        /// 背景颜色
+        /// </summary>
+        public string backgroundColor { get; set; }
+
+
+    }
 }

Mall.Module.MarketingCenter/MiniprogramTemplateModule.cs

@@ -376,6 +376,8 @@ namespace Mall.Module.MarketingCenter
                 case "modal": item.data = JsonHelper.DeserializeObject<modalItem>(item.data.ToString()); break;
                 //快捷导航
                 case "quick-nav": item.data = JsonHelper.DeserializeObject<quicknavItem>(item.data.ToString()); break;
+                //店铺用户信息
+                case "shop-info": item.data = JsonHelper.DeserializeObject<shopinfoItem>(item.data.ToString());break;
             }
         }
 

Mall.WebApi/Controllers/Mall/MallHelper.cs

@@ -884,6 +884,15 @@ namespace Mall.WebApi.Controllers
                         data = quicknavData
                     };
                     break;
+                //店铺信息
+                case "shop-info":
+                    var shopInfo = subItem.data as shopinfoItem;
+                    obj = new
+                    {
+                        id=subItem.Id,
+                        data=shopInfo
+                    };
+                    break;
             }
             return obj;
         }

Mall.WebApi/Controllers/MarketingCenter/ShareController.cs

@@ -151,7 +151,7 @@ namespace Mall.WebApi.Controllers.MarketingCenter
             pagelist.pageData = list.Select(qitem => new
             {
                 HeadImg=Common.Config.ReadConfigKey("ShareConfig", "ShareImg"),
-                UserName= Common.Config.ReadConfigKey("ShareConfig", "ShareUserName"),
+                UserName= "赞羊生活",
                 qitem.Id,
                 qitem.MaterialInfo,
                 qitem.ImgList,

Mall.WebApi/appsettings.json

@@ -81,6 +81,5 @@
   },
   "ShareConfig": {
     "ShareImg": "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/zanyang.png",
-    "ShareUserName": "赞羊生活"
   }
 }
\ No newline at end of file