333

CoreCms.Net.Configuration/SystemSettingConstVars.cs

@@ -51,6 +51,10 @@ namespace CoreCms.Net.Configuration
         /// </summary>
         public const string ShopDefaultImage = "shopDefaultImage";
 
+        /// <summary>
+        /// 默认图
+        /// </summary>
+        public const string UserDefaultImage = "userDefaultImage";
         /// <summary>
         /// 商家手机号
         /// </summary>

CoreCms.Net.Configuration/SystemSettingDictionary.cs

@@ -34,7 +34,8 @@ namespace CoreCms.Net.Configuration
             di.Add(SystemSettingConstVars.ShopBeiAn, new DictionaryKeyValues() { sKey = "备案信息", sValue = "网站备案信息" });
             di.Add(SystemSettingConstVars.ShopLogo, new DictionaryKeyValues() { sKey = "平台logo", sValue = "" });
             di.Add(SystemSettingConstVars.ShopFavicon, new DictionaryKeyValues() { sKey = "Favicon图标", sValue = "" });
-            di.Add(SystemSettingConstVars.ShopDefaultImage, new DictionaryKeyValues() { sKey = "默认图", sValue = "" });
+            di.Add(SystemSettingConstVars.ShopDefaultImage, new DictionaryKeyValues() { sKey = "首页背景图", sValue = "" });
+            di.Add(SystemSettingConstVars.UserDefaultImage, new DictionaryKeyValues() { sKey = "用户默认头像", sValue = "" });
             di.Add(SystemSettingConstVars.StoreSwitch, new DictionaryKeyValues() { sKey = "开启门店自提", sValue = "2" });
             di.Add(SystemSettingConstVars.CateStyle, new DictionaryKeyValues() { sKey = "分类样式", sValue = "3" });
             di.Add(SystemSettingConstVars.CateType, new DictionaryKeyValues() { sKey = "H5分类样式", sValue = "1" });

CoreCms.Net.Model/Entities/Article/CoreCmsArticlePartial.cs

@@ -20,27 +20,27 @@ namespace CoreCms.Net.Model.Entities
     public partial class CoreCmsArticle
     {
 
-        /// <summary>
+        ///// <summary>
-        /// 文章分类
+        ///// 文章分类
-        /// </summary>
+        ///// </summary>
-        [SugarColumn(IsIgnore = true)]
+        //[SugarColumn(IsIgnore = true)]
 
-        public CoreCmsArticleType articleType { get; set; }
+        //public CoreCmsArticleType articleType { get; set; }
 
 
-        /// <summary>
+        ///// <summary>
-        /// 上一篇
+        ///// 上一篇
-        /// </summary>
+        ///// </summary>
-        [SugarColumn(IsIgnore = true)]
+        //[SugarColumn(IsIgnore = true)]
 
-        public CoreCmsArticle upArticle { get; set; }
+        //public CoreCmsArticle upArticle { get; set; }
 
 
-        /// <summary>
+        ///// <summary>
-        /// 下一篇
+        ///// 下一篇
-        /// </summary>
+        ///// </summary>
-        [SugarColumn(IsIgnore = true)]
+        //[SugarColumn(IsIgnore = true)]
 
-        public CoreCmsArticle downArticle { get; set; }
+        //public CoreCmsArticle downArticle { get; set; }
     }
 }

CoreCms.Net.Repository/Article/CoreCmsArticleRepository.cs

@@ -49,40 +49,40 @@ namespace CoreCms.Net.Repository
             article.contentBody = article.contentBody.Replace("oembed url=", "video  width=\"100%\"  controls=\"controls\" src=");
             article.contentBody = article.contentBody.Replace("/oembed", "/video");
 
-            if (article.typeId > 0)
+            //if (article.typeId > 0)
-            {
+            //{
-                article.articleType = await DbClient.Queryable<CoreCmsArticleType>().InSingleAsync(article.typeId);
+            //    article.articleType = await DbClient.Queryable<CoreCmsArticleType>().InSingleAsync(article.typeId);
-            }
+            //}
-            //上一篇
+            ////上一篇
-            article.upArticle = await DbClient.Queryable<CoreCmsArticle>().Where(p => p.id < article.id && p.isPub == true).Select(p => new CoreCmsArticle
+            //article.upArticle = await DbClient.Queryable<CoreCmsArticle>().Where(p => p.id < article.id && p.isPub == true).Select(p => new CoreCmsArticle
-            {
+            //{
-                id = p.id,
+            //    id = p.id,
-                title = p.title,
+            //    title = p.title,
-                brief = p.brief,
+            //    brief = p.brief,
-                coverImage = p.coverImage,
+            //    coverImage = p.coverImage,
-                typeId = p.typeId,
+            //    typeId = p.typeId,
-                sort = p.sort,
+            //    sort = p.sort,
-                isPub = p.isPub,
+            //    isPub = p.isPub,
-                isDel = p.isDel,
+            //    isDel = p.isDel,
-                pv = p.pv,
+            //    pv = p.pv,
-                createTime = p.createTime,
+            //    createTime = p.createTime,
-                updateTime = p.updateTime
+            //    updateTime = p.updateTime
-            }).FirstAsync();
+            //}).FirstAsync();
-            //下一篇
+            ////下一篇
-            article.downArticle = await DbClient.Queryable<CoreCmsArticle>().Where(p => p.id > article.id && p.isPub == true).Select(p => new CoreCmsArticle
+            //article.downArticle = await DbClient.Queryable<CoreCmsArticle>().Where(p => p.id > article.id && p.isPub == true).Select(p => new CoreCmsArticle
-            {
+            //{
-                id = p.id,
+            //    id = p.id,
-                title = p.title,
+            //    title = p.title,
-                brief = p.brief,
+            //    brief = p.brief,
-                coverImage = p.coverImage,
+            //    coverImage = p.coverImage,
-                typeId = p.typeId,
+            //    typeId = p.typeId,
-                sort = p.sort,
+            //    sort = p.sort,
-                isPub = p.isPub,
+            //    isPub = p.isPub,
-                isDel = p.isDel,
+            //    isDel = p.isDel,
-                pv = p.pv,
+            //    pv = p.pv,
-                createTime = p.createTime,
+            //    createTime = p.createTime,
-                updateTime = p.updateTime
+            //    updateTime = p.updateTime
-            }).FirstAsync();
+            //}).FirstAsync();
 
             await DbClient.Updateable<CoreCmsArticle>().SetColumns(p => p.pv == (p.pv + 1)).Where(p => p.id == article.id).ExecuteCommandAsync();
 

CoreCms.Net.Web.Admin/appsettings.json

@@ -22,7 +22,7 @@
     "UseCache": true, //启用redis作为内存选择
     "UseTimedTask": true, //启用redis作为定时任务
     // 如果采用容器化部署Service 要写成redis的服务名，否则写地址
-    "ConnectionString": "192.168.195.8:6379,password=,connectTimeout=3000,connectRetry=1,syncTimeout=10000,DefaultDatabase=10" //redis数据库连接字符串
+    "ConnectionString": "192.168.195.8:6379,password=,connectTimeout=3000,connectRetry=1,syncTimeout=10000,DefaultDatabase=9" //redis数据库连接字符串
   },
   //jwt授权认证的一些设置
   "JwtConfig": {

CoreCms.Net.Web.Admin/wwwroot/views/shop/setting/index.html

@@ -115,7 +115,19 @@
                                                 </div>
                                             </div>
                                         </div>
-
+                                        <div class="layui-form-item">
+                                            <label class="layui-form-label">{{d.data.configs['userDefaultImage']['sKey']}}：</label>
+                                            <div class="layui-input-inline layui-inline-6">
+                                                <input type="hidden" name="userDefaultImage" id="userDefaultImage" value="{{d.data.configs['userDefaultImage']['sValue']}}" lay-verify="title" autocomplete="off" placeholder="" class="layui-input">
+                                                <div class="layui-upload">
+                                                    <button type="button" class="layui-btn" id="upUserImageBtn">上传图片</button>
+                                                    <div class="layui-upload-list">
+                                                        <img class="layui-upload-img" id="viewUserImgBox" src="{{d.data.configs['userDefaultImage']['sValue'] ? d.data.configs['userDefaultImage']['sValue']:'/static/images/common/empty.png'}}">
+                                                        <p id="viewTextBox"></p>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
                                         <div class="layui-form-item">
                                             <label class="layui-form-label">{{d.data.configs['shopBeiAn']['sKey']}}：</label>
                                             <div class="layui-input-inline layui-inline-5">
@@ -477,6 +489,27 @@
                     }
                 });
             });
+            //系统默认图
+            $('#upUserImageBtn').click(function () {
+                cropperImg.cropImg({
+                    aspectRatio: 1 / 1,
+                    imgSrc: $('#viewUserImgBox').attr('src'),
+                    onCrop: function (data) {
+                        var loadIndex = layer.load(2);
+                        coreHelper.Post("api/Tools/UploadFilesFByBase64", { base64: data }, function (res) {
+                            if (0 === res.code) {
+                                $('#viewUserImgBox').attr('src', res.data.fileUrl);
+                                $("#userDefaultImage").val(res.data.fileUrl);
+                                layer.msg(res.msg);
+                                layer.close(loadIndex);
+                            } else {
+                                layer.close(loadIndex);
+                                layer.msg(res.msg, { icon: 2, anim: 6 });
+                            }
+                        });
+                    }
+                });
+            });
             //logo
             $('#upLogoBtn').click(function () {
                 cropperImg.cropImg({

CoreCms.Net.Web.WebApi/Controllers/ArticleController.cs

@@ -10,11 +10,14 @@
 
 using System.Linq;
 using System.Threading.Tasks;
+
 using CoreCms.Net.Auth.HttpContextUser;
 using CoreCms.Net.IServices;
 using CoreCms.Net.Model.FromBody;
 using CoreCms.Net.Model.ViewModels.UI;
+
 using Microsoft.AspNetCore.Mvc;
+
 using SqlSugar;
 
 namespace CoreCms.Net.Web.WebApi.Controllers
@@ -105,14 +108,14 @@ namespace CoreCms.Net.Web.WebApi.Controllers
         /// <summary>
         /// 获取单个文章内容
         /// </summary>
-        /// <param name="entity"></param>
+        /// <param name="id"></param>
         /// <returns></returns>
-        [HttpPost]
+        [HttpGet]
-        public async Task<WebApiCallBack> GetArticleDetail([FromBody] FMIntId entity)
+        public async Task<WebApiCallBack> GetArticleDetail([FromQuery] int id)
         {
             var jm = new WebApiCallBack();
 
-            var model = await _articleServices.ArticleDetail(entity.id);
+            var model = await _articleServices.ArticleDetail(id);
             if (model == null)
             {
                 jm.msg = "数据获取失败";

CoreCms.Net.Web.WebApi/Doc.xml

@@ -121,11 +121,11 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:CoreCms.Net.Web.WebApi.Controllers.ArticleController.GetArticleDetail(CoreCms.Net.Model.FromBody.FMIntId)">
+        <member name="M:CoreCms.Net.Web.WebApi.Controllers.ArticleController.GetArticleDetail(System.Int32)">
             <summary>
             获取单个文章内容
             </summary>
-            <param name="entity"></param>
+            <param name="id"></param>
             <returns></returns>
         </member>
         <member name="T:CoreCms.Net.Web.WebApi.Controllers.CartController">

CoreCms.Net.Web.WebApi/appsettings.json

@@ -30,7 +30,7 @@
     "UseCache": true, //启用redis作为内存选择
     "UseTimedTask": true, //启用redis作为定时任务
     // 如果采用容器化部署Service 要写成redis的服务名，否则写地址
-    "ConnectionString": "192.168.195.8:6379,password=,connectTimeout=3000,connectRetry=1,syncTimeout=10000,DefaultDatabase=10" //redis数据库连接字符串
+    "ConnectionString": "192.168.195.8:6379,password=,connectTimeout=3000,connectRetry=1,syncTimeout=10000,DefaultDatabase=9" //redis数据库连接字符串
   },
   //jwt授权认证的一些设置
   "JwtConfig": {