From 5dd0de8d747ee615c0b034fb606d0eddac79726c Mon Sep 17 00:00:00 2001 From: jianweie code Date: Thu, 17 Oct 2024 23:35:29 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=91=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E4=BD=93=E7=B3=BB=EF=BC=9A=E7=94=A8=E6=88=B7=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E5=BD=95=E5=85=A5=E5=A2=9E=E5=8A=A0=E5=BC=80=E5=85=B3?= =?UTF-8?q?=EF=BC=8C=E5=8F=AF=E4=BB=A5=E6=8E=A7=E5=88=B6=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E5=90=AF=E7=94=A8=E5=9C=B0=E7=90=86=E4=BD=8D=E7=BD=AE=E5=9D=90?= =?UTF-8?q?=E6=A0=87=E5=8A=9F=E8=83=BD=E6=9D=A5=E8=8E=B7=E5=8F=96=E7=BB=8F?= =?UTF-8?q?=E7=BA=AC=E5=BA=A6=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SystemSettingConstVars.cs | 7 ++++++ .../SystemSettingDictionary.cs | 1 + .../CoreCms.Net.Web.Admin.xml | 2 +- .../wwwroot/views/shop/setting/index.html | 10 ++++++++- .../Controllers/CommonController.cs | 4 +++- .../CoreCms.Net.Web.WebApi.xml | 22 ++++++++++++++++++- 6 files changed, 42 insertions(+), 4 deletions(-) diff --git a/CoreCms.Net.Configuration/SystemSettingConstVars.cs b/CoreCms.Net.Configuration/SystemSettingConstVars.cs index 29ed9ee9..6c225c62 100644 --- a/CoreCms.Net.Configuration/SystemSettingConstVars.cs +++ b/CoreCms.Net.Configuration/SystemSettingConstVars.cs @@ -9,6 +9,8 @@ ***********************************************************************/ +using static SKIT.FlurlHttpClient.Wechat.Api.Models.ChannelsECMerchantAddressAddRequest.Types.AddressDetail.Types; + namespace CoreCms.Net.Configuration { /// @@ -591,6 +593,11 @@ namespace CoreCms.Net.Configuration /// public const string ShowCustomForm = "showCustomForm"; + /// + /// 用户地址开启坐标功能 + /// + public const string AllowAddressToUseMap = "allowAddressToUseMap"; + /// /// 显示首页弹窗 diff --git a/CoreCms.Net.Configuration/SystemSettingDictionary.cs b/CoreCms.Net.Configuration/SystemSettingDictionary.cs index 26712f72..d5371c87 100644 --- a/CoreCms.Net.Configuration/SystemSettingDictionary.cs +++ b/CoreCms.Net.Configuration/SystemSettingDictionary.cs @@ -64,6 +64,7 @@ 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.ShowCustomForm, new DictionaryKeyValues() { sKey = "显示自定义表单按钮", sValue = "2" }); + di.Add(SystemSettingConstVars.AllowAddressToUseMap, new DictionaryKeyValues() { sKey = "用户地址开启坐标", sValue = "1" }); di.Add(SystemSettingConstVars.ShowIndexPopupWindow, new DictionaryKeyValues() { sKey = "显示首页弹窗", sValue = "2" }); di.Add(SystemSettingConstVars.IndexPopupWindowImageUrl, new DictionaryKeyValues() { sKey = "图片地址", sValue = "" }); diff --git a/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.xml b/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.xml index 77f7dbf4..5bf798fd 100644 --- a/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.xml +++ b/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.xml @@ -2521,7 +2521,7 @@ 订单表 - + 构造函数 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 d154f437..7fbebd0d 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/shop/setting/index.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/shop/setting/index.html @@ -53,7 +53,8 @@
1、如果开启【显示门店列表】模块，则微信小程序审核如果发现可能会失败，并提示“【小程序涉及多个商家提供商品的在线交易及配送，请补充选择：电商平台-电商平台类目。】”，可先关闭，审核后再开启。
2、如果开启【显示充值】模块，则微信小程序审核如果发现可能会失败，并提示“【小程序页面内容涉及账户充值服务，需补充商家自营-预付卡销售-发行方类目。】”，可先关闭，审核后再开启。
- 2、如果开启【是否允许提现】模块，则微信小程序审核如果发现可能会失败，并提示“【小程序页面内容涉嫌收集用户信息，包括但不限于银行卡，手机号码等。】”，可先关闭，审核后再开启。
+ 3、如果开启【是否允许提现】模块，则微信小程序审核如果发现可能会失败，并提示“【小程序页面内容涉嫌收集用户信息，包括但不限于银行卡，手机号码等。】”，可先关闭，审核后再开启。
+ 4、如果关闭【用户地址开启坐标功能】模块，则用户在录入地址位置将不会走腾讯地图去获取坐标，“将导致【同城配送】订单模式下获取不到正确的公里数”，不要同城配送的可以关闭。
@@ -76,6 +77,13 @@
+
+ +
+ + +
+
控制首页是否弹出弹窗广告
diff --git a/CoreCms.Net.Web.WebApi/Controllers/CommonController.cs b/CoreCms.Net.Web.WebApi/Controllers/CommonController.cs index 8f07f1c7..41c29a17 100644 --- a/CoreCms.Net.Web.WebApi/Controllers/CommonController.cs +++ b/CoreCms.Net.Web.WebApi/Controllers/CommonController.cs @@ -112,6 +112,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers var showSolitaire = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ShowSolitaire).ObjectToInt(2); //显示接龙按钮 var showCalendar = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ShowCalendar).ObjectToInt(2); //显示签到按钮 var showLiveBroadCast = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ShowLiveBroadCast).ObjectToInt(2); //显示小程序直播入口 + var allowAddressToUseMap = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.AllowAddressToUseMap).ObjectToInt(2); //用户地址开启坐标功能 var showIndexPopupWindow = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ShowIndexPopupWindow).ObjectToInt(2); //显示首页弹窗 var indexPopupWindowImageUrl = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.IndexPopupWindowImageUrl); //首页弹窗图片地址 @@ -254,7 +255,8 @@ namespace CoreCms.Net.Web.WebApi.Controllers indexPopupWindowImageUrl, indexPopupWindowHrefUrl, showCustomForm, - showLiveBroadCast + showLiveBroadCast, + allowAddressToUseMap }; jm.data = model; return jm; diff --git a/CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.xml b/CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.xml index f89c4cfe..7e60327b 100644 --- a/CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.xml +++ b/CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.xml @@ -193,6 +193,12 @@ + + + 批量删除购物车信息 + + + 设置购物车商品数量 @@ -597,7 +603,7 @@ 订单调用接口数据 - + 构造函数 @@ -716,6 +722,20 @@ + + + 查询当前订单是否接入微信发货信息管理 + + + + + + + 根据订单编号获取当前订单的支付信息 + + + + 页面接口