From 772a8cebf0fc784052eb93c98535e20eba660113 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=81=B0=E7=81=B0?= Date: Sun, 25 Sep 2022 20:00:48 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=91=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E9=A6=96=E9=A1=B5=E3=80=90=E5=BC=B9=E7=AA=97=E5=B9=BF?= =?UTF-8?q?=E5=91=8A=E3=80=91=E5=BC=80=E5=85=B3=EF=BC=8C=E9=80=9A=E8=BF=87?= =?UTF-8?q?=E5=90=8E=E5=8F=B0=E3=80=90=E5=95=86=E5=9F=8E=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E3=80=91=E3=80=90=E5=B9=B3=E5=8F=B0=E8=AE=BE=E7=BD=AE=E3=80=91?= =?UTF-8?q?=E3=80=90=E7=89=B9=E6=AE=8A=E5=BC=80=E5=85=B3=E3=80=91=E5=BC=80?= =?UTF-8?q?=E5=90=AF=E5=92=8C=E5=85=B3=E9=97=AD=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CoreCms.Net.Configuration/SystemSettingConstVars.cs | 5 +++++ CoreCms.Net.Configuration/SystemSettingDictionary.cs | 2 ++ .../CoreShop/pages/index/default/default.vue | 6 +++++- .../wwwroot/views/shop/setting/index.html | 12 +++++++++++- .../Controllers/CommonController.cs | 4 +++- 5 files changed, 26 insertions(+), 3 deletions(-) diff --git a/CoreCms.Net.Configuration/SystemSettingConstVars.cs b/CoreCms.Net.Configuration/SystemSettingConstVars.cs index 4b3897b2..4156a47c 100644 --- a/CoreCms.Net.Configuration/SystemSettingConstVars.cs +++ b/CoreCms.Net.Configuration/SystemSettingConstVars.cs @@ -584,6 +584,11 @@ namespace CoreCms.Net.Configuration /// public const string ShowCalendar = "showCalendar"; + /// + /// 显示首页弹窗 + /// + public const string ShowIndexPopupWindow = "showIndexPopupWindow"; + //第三方接口============================================================================ /// diff --git a/CoreCms.Net.Configuration/SystemSettingDictionary.cs b/CoreCms.Net.Configuration/SystemSettingDictionary.cs index fb3c1c10..4a9fb0ec 100644 --- a/CoreCms.Net.Configuration/SystemSettingDictionary.cs +++ b/CoreCms.Net.Configuration/SystemSettingDictionary.cs @@ -58,6 +58,8 @@ namespace CoreCms.Net.Configuration di.Add(SystemSettingConstVars.ShowSolitaire, new DictionaryKeyValues() { sKey = "显示接龙按钮", sValue = "2" }); di.Add(SystemSettingConstVars.ShowCalendar, new DictionaryKeyValues() { sKey = "显示签到按钮", sValue = "2" }); + di.Add(SystemSettingConstVars.ShowIndexPopupWindow, new DictionaryKeyValues() { sKey = "显示首页弹窗", sValue = "2" }); + //搜索发现关键字 di.Add(SystemSettingConstVars.RecommendKeys, new DictionaryKeyValues() { sKey = "搜索发现关键词", sValue = "核心,内容,管理,系统" }); diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/index/default/default.vue b/CoreCms.Net.Uni-App/CoreShop/pages/index/default/default.vue index 07b64fd5..3566140e 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/index/default/default.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/index/default/default.vue @@ -47,12 +47,16 @@ shareUrl: this.$globalConstVars.shareUrl, isScorll: false, homeTitle: '', - modalShow: true, + modalShow: false }; }, updated() { this.copy = true; }, + mounted() { + console.log(this.$store.state.config.showIndexPopupWindow); + this.modalShow = this.$store.state.config.showIndexPopupWindow == 1; + }, computed: { ...mapState({ hasLogin: state => state.hasLogin, diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/shop/setting/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/shop/setting/index.html index 84d9c276..f5e97575 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/shop/setting/index.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/shop/setting/index.html @@ -66,10 +66,20 @@ - +
+ 控制首页是否弹出弹窗广告 +
+
+ +
+ + +
+
控制个人中心面板是否显示以下组件按钮
+
diff --git a/CoreCms.Net.Web.WebApi/Controllers/CommonController.cs b/CoreCms.Net.Web.WebApi/Controllers/CommonController.cs index 61c3cd5c..a78cc994 100644 --- a/CoreCms.Net.Web.WebApi/Controllers/CommonController.cs +++ b/CoreCms.Net.Web.WebApi/Controllers/CommonController.cs @@ -109,6 +109,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers var showGroupBuying = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ShowGroupBuying).ObjectToInt(2); //显示团购按钮 var showSolitaire = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ShowSolitaire).ObjectToInt(2); //显示接龙按钮 var showCalendar = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ShowCalendar).ObjectToInt(2); //显示签到按钮 + var showIndexPopupWindow = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ShowIndexPopupWindow).ObjectToInt(2); //显示签到按钮 var imageMax = 5; //前端上传图片最多几张 var storeSwitch = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.StoreSwitch).ObjectToInt(); //开启门店自提状态 @@ -239,7 +240,8 @@ namespace CoreCms.Net.Web.WebApi.Controllers showSeckill, showGroupBuying, showSolitaire, - showCalendar + showCalendar, + showIndexPopupWindow }; jm.data = model; return jm;