From 8632c6fb2659701851f4785702d9694a528676c6 Mon Sep 17 00:00:00 2001 From: JianWeie Date: Tue, 10 Jan 2023 16:04:48 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=91=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=B9=BF=E5=91=8A=E7=BB=84=E4=BB=B6=EF=BC=8C=E8=A1=A8?= =?UTF-8?q?=E3=80=90CoreCmsAdvertPosition=E3=80=91=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E3=80=90platform=E3=80=91=E5=B9=BF=E5=91=8A=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E5=AD=97=E6=AE=B5,=E3=80=90type=E3=80=91=E5=B9=BF=E5=91=8A?= =?UTF-8?q?=E4=BD=8D=E7=B1=BB=E5=9E=8B=E4=B8=A4=E4=B8=AA=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=EF=BC=8C=E7=94=A8=E4=BA=8E=E5=8C=BA=E5=88=86pc=EF=BC=8Ch5?= =?UTF-8?q?=EF=BC=8C=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=A4=9A=E7=AB=AF=EF=BC=8C?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E5=9B=BE=E7=89=87=E8=BF=98=E6=98=AF=E8=BD=AE?= =?UTF-8?q?=E6=92=AD=E5=9B=BE=E5=B1=95=E7=A4=BA=E5=BD=A2=E5=BC=8F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CoreCms.Net.Configuration/GlobalEnumVars.cs | 52 +++++---- CoreCms.Net.Model/CoreCms.Net.Model.xml | 21 +++- .../Entities/Advert/CoreCmsAdvertPosition.cs | 108 ++++++++++++++---- CoreCms.Net.Model/FromBody/FMAdvert.cs | 9 +- .../coreshop-advert/coreshop-advert.vue | 39 +++++-- .../CoreShop/pages/category/index/index.vue | 5 + .../Advert/CoreCmsAdvertPositionController.cs | 45 +++++++- .../Advert/CoreCmsAdvertisementController.cs | 6 +- .../WeChat/WeChatMessageResponseController.cs | 2 - .../CoreCms.Net.Web.Admin.csproj | 39 +++++++ .../content/advert/advertisement/index.html | 1 + .../content/advert/advertposition/create.html | 26 ++++- .../content/advert/advertposition/edit.html | 38 +++++- .../content/advert/advertposition/index.html | 46 +++++++- .../Controllers/AdvertController.cs | 12 +- 数据库/MySql/20230110/升级脚本.sql | 2 + .../20230110/完整数据库带商品演示20230110.rar | Bin 0 -> 297153 bytes 数据库/MySql/数据库更新日志.txt | 4 + 数据库/SqlServer/20230110/1、升级脚本.rar | Bin 0 -> 358 bytes .../20230110/完整数据库带商品演示20230110.rar | Bin 0 -> 710922 bytes 数据库/SqlServer/数据库更新日志.txt | 4 + 21 files changed, 379 insertions(+), 80 deletions(-) create mode 100644 数据库/MySql/20230110/升级脚本.sql create mode 100644 数据库/MySql/20230110/完整数据库带商品演示20230110.rar create mode 100644 数据库/SqlServer/20230110/1、升级脚本.rar create mode 100644 数据库/SqlServer/20230110/完整数据库带商品演示20230110.rar diff --git a/CoreCms.Net.Configuration/GlobalEnumVars.cs b/CoreCms.Net.Configuration/GlobalEnumVars.cs index 4b00bd08..c7fc3386 100644 --- a/CoreCms.Net.Configuration/GlobalEnumVars.cs +++ b/CoreCms.Net.Configuration/GlobalEnumVars.cs @@ -1790,7 +1790,7 @@ namespace CoreCms.Net.Configuration /// /// 广告表类型【关联CoreCmsAdvertisement.type字段】 /// - public enum AdvertPositionType + public enum AdvertisementType { /// /// 网址URL @@ -1820,35 +1820,39 @@ namespace CoreCms.Net.Configuration } /// - /// 广告模板编码 + /// 广告表类型【关联CoreCmsAdvertPosition.type字段】 /// - public enum AdvertTemplateCode + public enum AdvertPositionType { /// - /// 首页幻灯片广告位 + /// 图片 /// - [Description("首页幻灯片广告位")] - TplSlider = 1, + [Description("")] + Image = 1, /// - /// 首页广告位1 + /// 轮播图 /// - [Description("首页广告位1")] - TplIndexBanner1 = 2, - /// - /// 首页广告位2 - /// - [Description("首页广告位2")] - TplIndexBanner2 = 3, - /// - /// 首页广告位3 - /// - [Description("首页广告位3")] - TplIndexBanner3 = 4, - /// - /// 分类页广告位 - /// - [Description("分类页广告位")] - TplClassBanner1 = 5 + [Description("")] + Swiper = 2 + } + + /// + /// 广告来源 + /// + public enum AdvertPlatform + { + [Description("PC页面")] + PC页面 = 1, + [Description("H5页面")] + H5页面 = 2, + [Description("微信小程序")] + 微信小程序 = 3, + [Description("支付宝小程序")] + 支付宝小程序 = 4, + [Description("APP")] + APP = 5, + [Description("头条系小程序")] + 头条 = 6 } #endregion diff --git a/CoreCms.Net.Model/CoreCms.Net.Model.xml b/CoreCms.Net.Model/CoreCms.Net.Model.xml index 80e4219b..0b433418 100644 --- a/CoreCms.Net.Model/CoreCms.Net.Model.xml +++ b/CoreCms.Net.Model/CoreCms.Net.Model.xml @@ -76,7 +76,7 @@ - 广告位置表 + 构造函数 @@ -104,6 +104,16 @@ 更新时间 + + + 广告平台 + + + + + 广告位类型 + + 是否启用 @@ -9394,9 +9404,14 @@ 用户统一标识 - + - 广告位置 + 广告位置编码 + + + + + 广告位值类型 diff --git a/CoreCms.Net.Model/Entities/Advert/CoreCmsAdvertPosition.cs b/CoreCms.Net.Model/Entities/Advert/CoreCmsAdvertPosition.cs index 302de128..23b0a2c7 100644 --- a/CoreCms.Net.Model/Entities/Advert/CoreCmsAdvertPosition.cs +++ b/CoreCms.Net.Model/Entities/Advert/CoreCmsAdvertPosition.cs @@ -3,11 +3,13 @@ * ProjectName: 核心内容管理系统 * Web: https://www.corecms.net * Author: 大灰灰 - * Email: jianweie@163.com - * CreateTime: 2021-06-08 22:14:58 + * Email: jianweie@163.com + * CreateTime: 2023/1/9 23:43:27 * Description: 暂无 -***********************************************************************/ + ***********************************************************************/ + using SqlSugar; +using System.ComponentModel; using System.ComponentModel.DataAnnotations; namespace CoreCms.Net.Model.Entities @@ -15,64 +17,124 @@ namespace CoreCms.Net.Model.Entities /// /// 广告位置表 /// - [SugarTable("CoreCmsAdvertPosition",TableDescription = "广告位置表")] public partial class CoreCmsAdvertPosition { /// - /// 广告位置表 + /// 构造函数 /// public CoreCmsAdvertPosition() { } - + /// /// 序列 /// [Display(Name = "序列")] - [SugarColumn(ColumnDescription = "序列", IsPrimaryKey = true, IsIdentity = true)] + + [SugarColumn(IsPrimaryKey = true, IsIdentity = true)] + [Required(ErrorMessage = "请输入{0}")] - public System.Int32 id { get; set; } + + + + public System.Int32 id { get; set; } + + /// /// 名称 /// [Display(Name = "名称")] - [SugarColumn(ColumnDescription = "名称")] + [Required(ErrorMessage = "请输入{0}")] - [StringLength(120, ErrorMessage = "【{0}】不能超过{1}字符长度")] - public System.String name { get; set; } + [StringLength(maximumLength:120,ErrorMessage = "{0}不能超过{1}字")] + + + public System.String name { get; set; } + + /// /// 位置编码 /// [Display(Name = "位置编码")] - [SugarColumn(ColumnDescription = "位置编码")] + [Required(ErrorMessage = "请输入{0}")] - [StringLength(32, ErrorMessage = "【{0}】不能超过{1}字符长度")] - public System.String code { get; set; } + [StringLength(maximumLength:32,ErrorMessage = "{0}不能超过{1}字")] + + + public System.String code { get; set; } + + /// /// 添加时间 /// [Display(Name = "添加时间")] - [SugarColumn(ColumnDescription = "添加时间", IsNullable = true)] - public System.DateTime? createTime { get; set; } + + + + + + public System.DateTime? createTime { get; set; } + + /// /// 更新时间 /// [Display(Name = "更新时间")] - [SugarColumn(ColumnDescription = "更新时间", IsNullable = true)] - public System.DateTime? updateTime { get; set; } + + + + + + public System.DateTime? updateTime { get; set; } + + + /// + /// 广告平台 + /// + [Display(Name = "广告平台")] + + [Required(ErrorMessage = "请输入{0}")] + + + + public System.Int32 platform { get; set; } + + + /// + /// 广告位类型 + /// + [Display(Name = "广告位类型")] + + [Required(ErrorMessage = "请输入{0}")] + + + + public System.Int32 type { get; set; } + + /// /// 是否启用 /// [Display(Name = "是否启用")] - [SugarColumn(ColumnDescription = "是否启用")] + [Required(ErrorMessage = "请输入{0}")] - public System.Boolean isEnable { get; set; } + + + + public System.Boolean isEnable { get; set; } + + /// /// 排序 /// [Display(Name = "排序")] - [SugarColumn(ColumnDescription = "排序")] + [Required(ErrorMessage = "请输入{0}")] - public System.Int32 sort { get; set; } + + + + public System.Int32 sort { get; set; } + + } -} \ No newline at end of file +} diff --git a/CoreCms.Net.Model/FromBody/FMAdvert.cs b/CoreCms.Net.Model/FromBody/FMAdvert.cs index 715e6f71..71b8eafd 100644 --- a/CoreCms.Net.Model/FromBody/FMAdvert.cs +++ b/CoreCms.Net.Model/FromBody/FMAdvert.cs @@ -20,9 +20,14 @@ namespace CoreCms.Net.Model.FromBody public class WxAdvert { /// - /// 广告位置 + /// 广告位置编码 /// - public string codes { get; set; } + public string code { get; set; } + + /// + /// 广告位值类型 + /// + public int platform { get; set; } } #endregion diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-advert/coreshop-advert.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-advert/coreshop-advert.vue index cb65f6de..52d0175d 100644 --- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-advert/coreshop-advert.vue +++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-advert/coreshop-advert.vue @@ -2,8 +2,15 @@ - - + + + + + + + + + @@ -11,29 +18,47 @@ diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/category/index/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/category/index/index.vue index e98a9efb..f0886f57 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/category/index/index.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/category/index/index.vue @@ -69,7 +69,12 @@ + + + + + diff --git a/CoreCms.Net.Web.Admin/Controllers/Advert/CoreCmsAdvertPositionController.cs b/CoreCms.Net.Web.Admin/Controllers/Advert/CoreCmsAdvertPositionController.cs index ee0d0f18..aeaab90a 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Advert/CoreCmsAdvertPositionController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Advert/CoreCmsAdvertPositionController.cs @@ -166,6 +166,20 @@ namespace CoreCms.Net.Web.Admin.Controllers //排序 int var sort = Request.Form["sort"].FirstOrDefault().ObjectToInt(0); if (sort > 0) @where = @where.And(p => p.sort == sort); + + //广告平台 int + var platform = Request.Form["platform"].FirstOrDefault().ObjectToInt(0); + if (platform > 0) + { + where = where.And(p => p.platform == platform); + } + //广告位类型 int + var type = Request.Form["type"].FirstOrDefault().ObjectToInt(0); + if (type > 0) + { + where = where.And(p => p.type == type); + } + //获取数据 var list = await _coreCmsAdvertPositionServices.QueryPageAsync(where, orderEx, orderBy, pageCurrent, pageSize); @@ -192,6 +206,15 @@ namespace CoreCms.Net.Web.Admin.Controllers { //返回数据 var jm = new AdminUiCallBack { code = 0 }; + + var advertPlatform = EnumHelper.EnumToList(); + var advertPositionType = EnumHelper.EnumToList(); + jm.data = new + { + advertPlatform, + advertPositionType + }; + return jm; } @@ -210,6 +233,15 @@ namespace CoreCms.Net.Web.Admin.Controllers { //返回数据 var jm = new AdminUiCallBack { code = 0 }; + + var advertPlatform = EnumHelper.EnumToList(); + var advertPositionType = EnumHelper.EnumToList(); + jm.data = new + { + advertPlatform, + advertPositionType + }; + return jm; } @@ -269,7 +301,16 @@ namespace CoreCms.Net.Web.Admin.Controllers } jm.code = 0; - jm.data = model; + + var advertPlatform = EnumHelper.EnumToList(); + var advertPositionType = EnumHelper.EnumToList(); + jm.data = new + { + advertPlatform, + advertPositionType, + model + }; + return jm; } @@ -311,6 +352,8 @@ namespace CoreCms.Net.Web.Admin.Controllers oldModel.updateTime = DateTime.Now; oldModel.isEnable = entity.isEnable; oldModel.sort = entity.sort; + oldModel.platform = entity.platform; + oldModel.type = entity.type; //事物处理过程结束 var bl = await _coreCmsAdvertPositionServices.UpdateAsync(oldModel); diff --git a/CoreCms.Net.Web.Admin/Controllers/Advert/CoreCmsAdvertisementController.cs b/CoreCms.Net.Web.Admin/Controllers/Advert/CoreCmsAdvertisementController.cs index ccf24973..dd915d66 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Advert/CoreCmsAdvertisementController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Advert/CoreCmsAdvertisementController.cs @@ -225,7 +225,7 @@ namespace CoreCms.Net.Web.Admin.Controllers { //返回数据 var jm = new AdminUiCallBack { code = 0 }; - var types = EnumHelper.EnumToList(); + var types = EnumHelper.EnumToList(); jm.data = new { types @@ -250,7 +250,7 @@ namespace CoreCms.Net.Web.Admin.Controllers var jm = new AdminUiCallBack { code = 0 }; var advertPosition = await _coreCmsAdvertPositionServices.QueryAsync(); - var types = EnumHelper.EnumToList(); + var types = EnumHelper.EnumToList(); jm.data = new { advertPosition, @@ -311,7 +311,7 @@ namespace CoreCms.Net.Web.Admin.Controllers jm.code = 0; var advertPosition = await _coreCmsAdvertPositionServices.QueryAsync(); - var types = EnumHelper.EnumToList(); + var types = EnumHelper.EnumToList(); jm.data = new { diff --git a/CoreCms.Net.Web.Admin/Controllers/WeChat/WeChatMessageResponseController.cs b/CoreCms.Net.Web.Admin/Controllers/WeChat/WeChatMessageResponseController.cs index a930b04e..15044200 100644 --- a/CoreCms.Net.Web.Admin/Controllers/WeChat/WeChatMessageResponseController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/WeChat/WeChatMessageResponseController.cs @@ -326,8 +326,6 @@ namespace CoreCms.Net.Admin.Admin.Controllers }; jm.code = 0; return jm; - - return jm; } #endregion diff --git a/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj b/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj index c989ce25..12d41d42 100644 --- a/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj +++ b/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj @@ -622,6 +622,45 @@ + + + true + PreserveNewest + + + true + PreserveNewest + + + true + PreserveNewest + + + true + PreserveNewest + + + true + PreserveNewest + + + true + PreserveNewest + + + true + PreserveNewest + + + true + PreserveNewest + + + true + PreserveNewest + + + PreserveNewest diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/content/advert/advertisement/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/content/advert/advertisement/index.html index 3ec05c18..02f4477e 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/content/advert/advertisement/index.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/content/advert/advertisement/index.html @@ -96,6 +96,7 @@ cols: [ [ { field: 'id', title: '序列', width: 60, sort: false }, + { field: 'positionId', title: '广告位序列', sort: false }, { field: 'name', title: '广告名称', sort: false }, { field: 'imageUrl', title: '广告图片', width: 100, sort: false, diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/content/advert/advertposition/create.html b/CoreCms.Net.Web.Admin/wwwroot/views/content/advert/advertposition/create.html index 621f4242..a288f0a6 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/content/advert/advertposition/create.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/content/advert/advertposition/create.html @@ -1,6 +1,30 @@