mirror of
http://git.coreshop.cn/jianweie/coreshoppro.git
synced 2025-12-06 19:23:25 +08:00
【调整】后台附件存储方式设置为【本地存储】的时候,开启自定义绑定域名。可设置为后台域名或CDN地址。
【优化】后台优化部分设置展示位置,增加【门店设置】选项卡。
This commit is contained in:
@@ -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 = "" });
|
||||
|
||||
@@ -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)
|
||||
{
|
||||
|
||||
@@ -40,14 +40,6 @@
|
||||
|
||||
<div class="layui-tab-item layui-show">
|
||||
<div class="layui-form coreshop-form">
|
||||
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label">{{d.data.configs['showInviterInfo']['sKey']}}:</label>
|
||||
<div class="layui-input-inline layui-inline-7">
|
||||
<input type="radio" lay-filter="showInviterInfo" name="showInviterInfo" value="1" title="开启" {{d.data.configs['showInviterInfo']['sValue']==="1" ? 'checked':''}}>
|
||||
<input type="radio" lay-filter="showInviterInfo" name="showInviterInfo" value="2" title="不开启" {{d.data.configs['showInviterInfo']['sValue']==="2" ? 'checked':''}}>
|
||||
</div>
|
||||
</div>
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label">{{d.data.configs['openDistribution']['sKey']}}:</label>
|
||||
<div class="layui-input-inline layui-inline-7">
|
||||
|
||||
@@ -41,6 +41,7 @@
|
||||
<li lay-id="cash">提现设置</li>
|
||||
<li lay-id="inviteFriends">邀请好友设置</li>
|
||||
<li lay-id="filesStorage">附件设置</li>
|
||||
<li lay-id="store">门店设置</li>
|
||||
<li lay-id="other">其他设置</li>
|
||||
</ul>
|
||||
<div class="layui-tab-content">
|
||||
@@ -221,13 +222,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label">{{d.data.configs['storeSwitch']['sKey']}}:</label>
|
||||
<div class="layui-input-inline layui-inline-7">
|
||||
<input type="radio" lay-filter="storeSwitch" name="storeSwitch" value="1" title="开启" {{d.data.configs['storeSwitch']['sValue']==="1" ? 'checked':''}}>
|
||||
<input type="radio" lay-filter="storeSwitch" name="storeSwitch" value="2" title="不开启" {{d.data.configs['storeSwitch']['sValue']==="2" ? 'checked':''}}>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label">{{d.data.configs['invoiceSwitch']['sKey']}}:</label>
|
||||
<div class="layui-input-inline layui-inline-7">
|
||||
@@ -428,16 +423,6 @@
|
||||
<div class="layui-form-mid layui-word-aux">退货的详细地址</div>
|
||||
</div>
|
||||
|
||||
<blockquote class="layui-elem-quote">
|
||||
发货相关
|
||||
</blockquote>
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label">{{d.data.configs['storeOrderAutomaticDelivery']['sKey']}}:</label>
|
||||
<div class="layui-input-inline layui-inline-7">
|
||||
<input type="radio" lay-filter="storeOrderAutomaticDelivery" name="storeOrderAutomaticDelivery" value="1" title="开启" {{d.data.configs['storeOrderAutomaticDelivery']['sValue']==="1" ? 'checked':''}}>
|
||||
<input type="radio" lay-filter="storeOrderAutomaticDelivery" name="storeOrderAutomaticDelivery" value="2" title="不开启" {{d.data.configs['storeOrderAutomaticDelivery']['sValue']==="2" ? 'checked':''}}>
|
||||
</div>
|
||||
</div>
|
||||
<blockquote class="layui-elem-quote">
|
||||
佣金通道
|
||||
</blockquote>
|
||||
@@ -667,6 +652,16 @@
|
||||
|
||||
<div class="layui-tab-item">
|
||||
<div class="layui-form coreshop-form">
|
||||
<blockquote class="layui-elem-quote">
|
||||
关闭后,个人中心将不显示【邀请好友】按钮及【天天分钱】板块通道。
|
||||
</blockquote>
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label">{{d.data.configs['showInviterInfo']['sKey']}}:</label>
|
||||
<div class="layui-input-inline layui-inline-7">
|
||||
<input type="radio" lay-filter="showInviterInfo" name="showInviterInfo" value="1" title="开启" {{d.data.configs['showInviterInfo']['sValue']==="1" ? 'checked':''}}>
|
||||
<input type="radio" lay-filter="showInviterInfo" name="showInviterInfo" value="2" title="不开启" {{d.data.configs['showInviterInfo']['sValue']==="2" ? 'checked':''}}>
|
||||
</div>
|
||||
</div>
|
||||
<blockquote class="layui-elem-quote">
|
||||
佣金设置(当不开启三级分销时候,推广好友三级统一返现比例)
|
||||
</blockquote>
|
||||
@@ -749,14 +744,15 @@
|
||||
<div class="layui-form-mid layui-word-aux">M(兆),一般10M即可,超过网络容易缓慢</div>
|
||||
</div>
|
||||
|
||||
<div id="cloudConfig">
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label">{{d.data.configs['filesStorageBucketBindUrl']['sKey']}}:</label>
|
||||
<div class="layui-input-inline layui-inline-10">
|
||||
<input type="text" name="filesStorageBucketBindUrl" value="{{d.data.configs['filesStorageBucketBindUrl']['sValue']}}" lay-verify="title" autocomplete="off" placeholder="" class="layui-input">
|
||||
</div>
|
||||
<div class="layui-form-mid layui-word-aux">独立绑定的域名最好,也可以用云存储提供的多级域名</div>
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label">{{d.data.configs['filesStorageBucketBindUrl']['sKey']}}:</label>
|
||||
<div class="layui-input-inline layui-inline-10">
|
||||
<input type="text" name="filesStorageBucketBindUrl" value="{{d.data.configs['filesStorageBucketBindUrl']['sValue']}}" lay-verify="title" autocomplete="off" placeholder="" class="layui-input">
|
||||
</div>
|
||||
<div class="layui-form-mid layui-word-aux">独立绑定的域名最好,也可以用云存储提供的多级域名</div>
|
||||
</div>
|
||||
|
||||
<div id="cloudConfig">
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label">{{d.data.configs['filesStorageAccessKeyId']['sKey']}}:</label>
|
||||
<div class="layui-input-inline layui-inline-10">
|
||||
@@ -823,7 +819,33 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="layui-tab-item">
|
||||
<div class="layui-form coreshop-form">
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label">{{d.data.configs['storeSwitch']['sKey']}}:</label>
|
||||
<div class="layui-input-inline layui-inline-7">
|
||||
<input type="radio" lay-filter="storeSwitch" name="storeSwitch" value="1" title="开启" {{d.data.configs['storeSwitch']['sValue']==="1" ? 'checked':''}}>
|
||||
<input type="radio" lay-filter="storeSwitch" name="storeSwitch" value="2" title="不开启" {{d.data.configs['storeSwitch']['sValue']==="2" ? 'checked':''}}>
|
||||
</div>
|
||||
</div>
|
||||
<blockquote class="layui-elem-quote">
|
||||
发货相关
|
||||
</blockquote>
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label">{{d.data.configs['storeOrderAutomaticDelivery']['sKey']}}:</label>
|
||||
<div class="layui-input-inline layui-inline-7">
|
||||
<input type="radio" lay-filter="storeOrderAutomaticDelivery" name="storeOrderAutomaticDelivery" value="1" title="开启" {{d.data.configs['storeOrderAutomaticDelivery']['sValue']==="1" ? 'checked':''}}>
|
||||
<input type="radio" lay-filter="storeOrderAutomaticDelivery" name="storeOrderAutomaticDelivery" value="2" title="不开启" {{d.data.configs['storeOrderAutomaticDelivery']['sValue']==="2" ? 'checked':''}}>
|
||||
</div>
|
||||
</div>
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label"> </label>
|
||||
<div class="layui-input-block">
|
||||
<button class="layui-btn" lay-submit="" lay-filter="save">保存更改</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="layui-tab-item">
|
||||
<div class="layui-form coreshop-form">
|
||||
@@ -833,7 +855,7 @@
|
||||
<div class="layui-input-inline layui-inline-5">
|
||||
<input type="text" name="entId" value="{{d.data.configs['entId']['sValue']}}" lay-verify="title" autocomplete="off" placeholder="" class="layui-input">
|
||||
</div>
|
||||
<div class="layui-form-mid layui-word-aux">客服ID,找客服开通</div>
|
||||
<div class="layui-form-mid layui-word-aux">客服ID,用于PC端,H5端对接在线客服系统</div>
|
||||
</div>
|
||||
<fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;"> <legend>腾讯地图</legend></fieldset>
|
||||
<div class="layui-form-item">
|
||||
@@ -859,29 +881,13 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;"> <legend>快递100</legend></fieldset>
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label">{{d.data.configs['kuaidi100Customer']['sKey']}}:</label>
|
||||
<div class="layui-input-inline layui-inline-5">
|
||||
<input type="text" name="kuaidi100Customer" value="{{d.data.configs['kuaidi100Customer']['sValue']}}" lay-verify="title" autocomplete="off" placeholder="" class="layui-input">
|
||||
</div>
|
||||
<div class="layui-form-mid layui-word-aux">快递100公司编码,申请地址:https://www.kuaidi100.com</div>
|
||||
</div>
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label">{{d.data.configs['kuaidi100Key']['sKey']}}:</label>
|
||||
<div class="layui-input-inline layui-inline-5">
|
||||
<input type="text" name="kuaidi100Key" value="{{d.data.configs['kuaidi100Key']['sValue']}}" lay-verify="title" autocomplete="off" placeholder="" class="layui-input">
|
||||
</div>
|
||||
<div class="layui-form-mid layui-word-aux">快递100授权key,申请地址:https://www.kuaidi100.com</div>
|
||||
</div>
|
||||
|
||||
<fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;"> <legend>统计代码</legend></fieldset>
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label">{{d.data.configs['statisticsCode']['sKey']}}:</label>
|
||||
<div class="layui-input-inline layui-inline-8">
|
||||
<textarea name="statisticsCode" id="statisticsCode" cols="30" rows="10" class="layui-input" style="height: 100px; padding: 10px">{{d.data.configs['statisticsCode']['sValue']}}</textarea>
|
||||
</div>
|
||||
<div class="layui-form-mid layui-word-aux">只需要粘贴<script></script>内的代码,只统计H5端。微信小程序请使用"小程序数据助手"</div>
|
||||
<div class="layui-form-mid layui-word-aux">只需要粘贴<script></script>内的代码,只统计PC端,H5端。微信小程序请使用"小程序数据助手"</div>
|
||||
</div>
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label"> </label>
|
||||
|
||||
Reference in New Issue
Block a user