diff --git a/CoreCms.Net.Auth/CoreCms.Net.Auth.csproj b/CoreCms.Net.Auth/CoreCms.Net.Auth.csproj index 649aaace..cb447269 100644 --- a/CoreCms.Net.Auth/CoreCms.Net.Auth.csproj +++ b/CoreCms.Net.Auth/CoreCms.Net.Auth.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/CoreCms.Net.Caching/CoreCms.Net.Caching.csproj b/CoreCms.Net.Caching/CoreCms.Net.Caching.csproj index 91840aac..2ba0e748 100644 --- a/CoreCms.Net.Caching/CoreCms.Net.Caching.csproj +++ b/CoreCms.Net.Caching/CoreCms.Net.Caching.csproj @@ -5,10 +5,10 @@ - - + + - + diff --git a/CoreCms.Net.CodeGenerator/CoreCms.Net.CodeGenerator.csproj b/CoreCms.Net.CodeGenerator/CoreCms.Net.CodeGenerator.csproj index 05309caf..2ffadc5f 100644 --- a/CoreCms.Net.CodeGenerator/CoreCms.Net.CodeGenerator.csproj +++ b/CoreCms.Net.CodeGenerator/CoreCms.Net.CodeGenerator.csproj @@ -48,7 +48,7 @@ - + diff --git a/CoreCms.Net.Configuration/CoreCms.Net.Configuration.csproj b/CoreCms.Net.Configuration/CoreCms.Net.Configuration.csproj index ee007ee8..540f6422 100644 --- a/CoreCms.Net.Configuration/CoreCms.Net.Configuration.csproj +++ b/CoreCms.Net.Configuration/CoreCms.Net.Configuration.csproj @@ -7,7 +7,7 @@ - + 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.Core/CoreCms.Net.Core.csproj b/CoreCms.Net.Core/CoreCms.Net.Core.csproj index 7f1573c8..8801c656 100644 --- a/CoreCms.Net.Core/CoreCms.Net.Core.csproj +++ b/CoreCms.Net.Core/CoreCms.Net.Core.csproj @@ -14,19 +14,19 @@ - - - + + + - - - + + + - - + + diff --git a/CoreCms.Net.Filter/CoreCms.Net.Filter.csproj b/CoreCms.Net.Filter/CoreCms.Net.Filter.csproj index 9fa11baf..89b57695 100644 --- a/CoreCms.Net.Filter/CoreCms.Net.Filter.csproj +++ b/CoreCms.Net.Filter/CoreCms.Net.Filter.csproj @@ -5,7 +5,7 @@ - + diff --git a/CoreCms.Net.IServices/CoreCms.Net.IServices.csproj b/CoreCms.Net.IServices/CoreCms.Net.IServices.csproj index 205e09c9..8b6fa923 100644 --- a/CoreCms.Net.IServices/CoreCms.Net.IServices.csproj +++ b/CoreCms.Net.IServices/CoreCms.Net.IServices.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/CoreCms.Net.Loging/CoreCms.Net.Loging.csproj b/CoreCms.Net.Loging/CoreCms.Net.Loging.csproj index 59e29df6..70ee0287 100644 --- a/CoreCms.Net.Loging/CoreCms.Net.Loging.csproj +++ b/CoreCms.Net.Loging/CoreCms.Net.Loging.csproj @@ -5,7 +5,7 @@ - + diff --git a/CoreCms.Net.Model/CoreCms.Net.Model.csproj b/CoreCms.Net.Model/CoreCms.Net.Model.csproj index 32068bbe..c3e84b3c 100644 --- a/CoreCms.Net.Model/CoreCms.Net.Model.csproj +++ b/CoreCms.Net.Model/CoreCms.Net.Model.csproj @@ -7,9 +7,9 @@ - + - + diff --git a/CoreCms.Net.RedisMQ/CoreCms.Net.RedisMQ.csproj b/CoreCms.Net.RedisMQ/CoreCms.Net.RedisMQ.csproj index afc9ef80..903e4635 100644 --- a/CoreCms.Net.RedisMQ/CoreCms.Net.RedisMQ.csproj +++ b/CoreCms.Net.RedisMQ/CoreCms.Net.RedisMQ.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/CoreCms.Net.Repository/CoreCms.Net.Repository.csproj b/CoreCms.Net.Repository/CoreCms.Net.Repository.csproj index 89ce94b6..17a3e7dd 100644 --- a/CoreCms.Net.Repository/CoreCms.Net.Repository.csproj +++ b/CoreCms.Net.Repository/CoreCms.Net.Repository.csproj @@ -6,7 +6,7 @@ - + diff --git a/CoreCms.Net.Services/CoreCms.Net.Services.csproj b/CoreCms.Net.Services/CoreCms.Net.Services.csproj index 96697089..726663d3 100644 --- a/CoreCms.Net.Services/CoreCms.Net.Services.csproj +++ b/CoreCms.Net.Services/CoreCms.Net.Services.csproj @@ -5,19 +5,19 @@ - - - - - + + + + + - - - - - - - + + + + + + + diff --git a/CoreCms.Net.Swagger/CoreCms.Net.Swagger.csproj b/CoreCms.Net.Swagger/CoreCms.Net.Swagger.csproj index b0509fdd..856f2e1f 100644 --- a/CoreCms.Net.Swagger/CoreCms.Net.Swagger.csproj +++ b/CoreCms.Net.Swagger/CoreCms.Net.Swagger.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/CoreCms.Net.Task/CoreCms.Net.Task.csproj b/CoreCms.Net.Task/CoreCms.Net.Task.csproj index 97168751..00d624d6 100644 --- a/CoreCms.Net.Task/CoreCms.Net.Task.csproj +++ b/CoreCms.Net.Task/CoreCms.Net.Task.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-navbar/coreshop-navbar.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-navbar/coreshop-navbar.vue index 564f83c7..e6da704b 100644 --- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-navbar/coreshop-navbar.vue +++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-navbar/coreshop-navbar.vue @@ -28,7 +28,7 @@ mode : string, title : string, handleCustomRouteJump : () => void | null, - placeholder:boolean; + placeholder : boolean; }>(), { isBack: true, bgColor: '#eef2f6', @@ -36,7 +36,7 @@ mode: 'center', title: '', handleCustomRouteJump: null, - placeholder:true, + placeholder: true, }); const hanlderBack = () => { diff --git a/CoreCms.Net.Uni-App/CoreShop/manifest.json b/CoreCms.Net.Uni-App/CoreShop/manifest.json index c37836f5..2d46a0e3 100644 --- a/CoreCms.Net.Uni-App/CoreShop/manifest.json +++ b/CoreCms.Net.Uni-App/CoreShop/manifest.json @@ -79,6 +79,7 @@ } }, "mp-alipay" : { + "appid" : "2021004107611929", "usingComponents" : true }, "mp-baidu" : { diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify.vue b/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify.vue index 1cee0a37..38fb3232 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/classify/classify.vue @@ -1,5 +1,6 @@