From 2d7001c58c19bc19cb4338aea384019376761335 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=81=B0=E7=81=B0?= Date: Mon, 26 Sep 2022 23:05:52 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=B0=83=E6=95=B4=E3=80=91=E5=90=8E?= =?UTF-8?q?=E5=8F=B0=E9=99=84=E4=BB=B6=E5=AD=98=E5=82=A8=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=BA=E3=80=90=E6=9C=AC=E5=9C=B0=E5=AD=98?= =?UTF-8?q?=E5=82=A8=E3=80=91=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E5=BC=80?= =?UTF-8?q?=E5=90=AF=E8=87=AA=E5=AE=9A=E4=B9=89=E7=BB=91=E5=AE=9A=E5=9F=9F?= =?UTF-8?q?=E5=90=8D=E3=80=82=E5=8F=AF=E8=AE=BE=E7=BD=AE=E4=B8=BA=E5=90=8E?= =?UTF-8?q?=E5=8F=B0=E5=9F=9F=E5=90=8D=E6=88=96CDN=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E3=80=82=20=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E5=90=8E?= =?UTF-8?q?=E5=8F=B0=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E4=BD=8D=E7=BD=AE=EF=BC=8C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E3=80=90=E9=97=A8=E5=BA=97=E8=AE=BE=E7=BD=AE=E3=80=91=E9=80=89?= =?UTF-8?q?=E9=A1=B9=E5=8D=A1=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SystemSettingDictionary.cs | 2 +- CoreCms.Net.Services/Com/ToolsServices.cs | 7 +- .../views/distribution/setting/index.html | 8 -- .../wwwroot/views/shop/setting/index.html | 92 ++++++++++--------- 4 files changed, 55 insertions(+), 54 deletions(-) diff --git a/CoreCms.Net.Configuration/SystemSettingDictionary.cs b/CoreCms.Net.Configuration/SystemSettingDictionary.cs index 4a9fb0ec..91f434fc 100644 --- a/CoreCms.Net.Configuration/SystemSettingDictionary.cs +++ b/CoreCms.Net.Configuration/SystemSettingDictionary.cs @@ -209,7 +209,7 @@ namespace CoreCms.Net.Configuration di.Add(SystemSettingConstVars.FilesStoragePath, new DictionaryKeyValues() { sKey = "存储路径", sValue = "/upload/" }); di.Add(SystemSettingConstVars.FilesStorageFileSuffix, new DictionaryKeyValues() { sKey = "文件后缀类型", sValue = "gif,jpg,jpeg,png,bmp,xls,xlsx,doc,pdf,mp4,WebM,Ogv" }); di.Add(SystemSettingConstVars.FilesStorageFileMaxSize, new DictionaryKeyValues() { sKey = "文件最大大小", sValue = "10" }); - di.Add(SystemSettingConstVars.FilesStorageBucketBindUrl, new DictionaryKeyValues() { sKey = "云存储绑定域名", sValue = "https://www.corecms.net/" }); + di.Add(SystemSettingConstVars.FilesStorageBucketBindUrl, new DictionaryKeyValues() { sKey = "绑定域名", sValue = "https://www.corecms.net/" }); di.Add(SystemSettingConstVars.FilesStorageAccessKeyId, new DictionaryKeyValues() { sKey = "云存储授权账户", sValue = "" }); di.Add(SystemSettingConstVars.FilesStorageAccessKeySecret, new DictionaryKeyValues() { sKey = "云存储授权密钥", sValue = "" }); di.Add(SystemSettingConstVars.FilesStorageTencentAccountId, new DictionaryKeyValues() { sKey = "腾讯云账户标识", sValue = "" }); diff --git a/CoreCms.Net.Services/Com/ToolsServices.cs b/CoreCms.Net.Services/Com/ToolsServices.cs index e938b937..410386ed 100644 --- a/CoreCms.Net.Services/Com/ToolsServices.cs +++ b/CoreCms.Net.Services/Com/ToolsServices.cs @@ -141,7 +141,8 @@ namespace CoreCms.Net.Services string bucketBindDomain = string.Empty; if (filesStorageLocation == (int)GlobalEnumVars.FilesStorageLocation.Admin) { - bucketBindDomain = AppSettingsConstVars.AppConfigAppUrl; + //bucketBindDomain = AppSettingsConstVars.AppConfigAppUrl; + bucketBindDomain = !string.IsNullOrEmpty(options.BucketBindUrl) ? options.BucketBindUrl : AppSettingsConstVars.AppConfigAppUrl; } else if (filesStorageLocation == (int)GlobalEnumVars.FilesStorageLocation.API) { @@ -317,7 +318,9 @@ namespace CoreCms.Net.Services string bucketBindDomain = string.Empty; if (filesStorageLocation == (int)GlobalEnumVars.FilesStorageLocation.Admin) { - bucketBindDomain = AppSettingsConstVars.AppConfigAppUrl; + //bucketBindDomain = AppSettingsConstVars.AppConfigAppUrl; + bucketBindDomain = !string.IsNullOrEmpty(options.BucketBindUrl) ? options.BucketBindUrl : AppSettingsConstVars.AppConfigAppUrl; + ; } else if (filesStorageLocation == (int)GlobalEnumVars.FilesStorageLocation.API) { diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/distribution/setting/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/distribution/setting/index.html index a0b69d07..4740f766 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/distribution/setting/index.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/distribution/setting/index.html @@ -40,14 +40,6 @@
- -
- -
- - -
-
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 f5e97575..249ab66c 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/shop/setting/index.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/shop/setting/index.html @@ -41,6 +41,7 @@
  • 提现设置
  • 邀请好友设置
  • 附件设置
    • +
  • 门店设置
  • 其他设置
    • @@ -221,13 +222,7 @@
    -
    - -
    - - -
    -
    +
    @@ -428,16 +423,6 @@
    退货的详细地址
    -
    - 发货相关 -
    -
    - -
    - - -
    -
    佣金通道
    @@ -667,6 +652,16 @@
    +
    + 关闭后，个人中心将不显示【邀请好友】按钮及【天天分钱】板块通道。 +
    +
    + +
    + + +
    +
    佣金设置（当不开启三级分销时候，推广好友三级统一返现比例）
    @@ -749,14 +744,15 @@
    M（兆），一般10M即可，超过网络容易缓慢
    -
    -
    - -
    - -
    -
    独立绑定的域名最好，也可以用云存储提供的多级域名
    +
    + +
    +
    +
    独立绑定的域名最好，也可以用云存储提供的多级域名
    +
    + +
    @@ -823,7 +819,33 @@
    - +
    +
    +
    + +
    + + +
    +
    +
    + 发货相关 +
    +
    + +
    + + +
    +
    +
    + +
    + +
    +
    +
    +
    @@ -833,7 +855,7 @@
    -
    客服ID，找客服开通
    +
    客服ID，用于PC端，H5端对接在线客服系统
    腾讯地图
    @@ -859,29 +881,13 @@
    -
    快递100
    -
    - -
    - -
    -
    快递100公司编码，申请地址：https://www.kuaidi100.com
    -
    -
    - -
    - -
    -
    快递100授权key，申请地址：https://www.kuaidi100.com
    -
    -
    统计代码
    -
    只需要粘贴<script></script>内的代码，只统计H5端。微信小程序请使用"小程序数据助手"
    +
    只需要粘贴<script></script>内的代码，只统计PC端，H5端。微信小程序请使用"小程序数据助手"