wgh/coreshoppro
1
0
Fork 0
mirror of http://git.coreshop.cn/jianweie/coreshoppro.git synced 2026-03-23 00:37:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

# 2022-02-11

Browse Source 
### 1.3.5 开源社区版（会员专业版同步修改）：
无
### 0.1.6 会员专业版：
【新增】后台【平台设置-订单管理】增加【佣金计算通道】功能，分为【仅代理】【仅分销】【先代理后分销】【先分销后代理】四种自选模式。
【新增】增加【CoreCmsAgentOrderDetails】表，实现代理佣金订单详情列表功能，精确到具体商品明细。
【新增】增加【CoreCmsDistributionOrderDetails】表，实现三级佣金订单详情列表功能，精确到具体商品明细。
【修复】修复代理商商铺开启按钮错用三级分销商店铺开关功能，增加代理商商铺开启开关。
【修复】修复代理商佣金明细日期选择范围错乱问题。
【优化】uniapp自带progress进度条更换为uview2.x进度条。
【优化】敏感词过滤组件启用废弃的【WordsMatch】方法，启用【StringSearch】方法替代。
This commit is contained in:
JianWeie
2022-02-11 05:28:04 +08:00
parent 05df55d7ec
commit 8f64209d27
45 changed files with 16751 additions and 607 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CoreCms.Net.Web.Admin/wwwroot/views/agent/setting/index.html
View File

@@ -56,6 +56,13 @@
</div>
<div class="layui-form-mid">开启此功能，代理商自己下单也将直接计算利润提成</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">{{d.data.configs['agentStore']['sKey']}}：</label>
<div class="layui-input-inline layui-inline-7">
<input type="radio" lay-filter="agentStore" name="agentStore" value="1" title="开启" {{d.data.configs['agentStore']['sValue']==="1" ? 'checked':''}}>
<input type="radio" lay-filter="agentStore" name="agentStore" value="2" title="不开启" {{d.data.configs['agentStore']['sValue']==="2" ? 'checked':''}}>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">&nbsp;</label>
@@ -127,7 +134,7 @@
<script>
var indexData;
var debug = layui.setter.debug;
layui.data.done = function (d) {

25
CoreCms.Net.Web.Admin/wwwroot/views/shop/setting/index.html
View File

@@ -367,6 +367,27 @@
<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>
<div class="layui-form-item">
<label class="layui-form-label">{{d.data.configs['commissionChannel']['sKey']}}：</label>
<div class="layui-input-inline layui-inline-12">
<input type="radio" lay-filter="commissionChannel" name="commissionChannel" value="1" title="仅代理" {{d.data.configs['commissionChannel']['sValue']==="1" ? 'checked':''}}>
<input type="radio" lay-filter="commissionChannel" name="commissionChannel" value="2" title="仅分销" {{d.data.configs['commissionChannel']['sValue']==="2" ? 'checked':''}}>
<input type="radio" lay-filter="commissionChannel" name="commissionChannel" value="3" title="先代理后分销" {{d.data.configs['commissionChannel']['sValue']==="3" ? 'checked':''}}>
<input type="radio" lay-filter="commissionChannel" name="commissionChannel" value="4" title="先分销后代理" {{d.data.configs['commissionChannel']['sValue']==="4" ? 'checked':''}}>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">说明：</label>
<div class="layui-form-mid layui-word-aux">
仅代理指只计算代理分佣逻辑，如果代理分佣逻辑不满足而不继续执行。<br />
仅分销指只计算三级分销佣金，如果三级分佣模式不满足则不继续执行。<br />
先代理后分销：指先计算代理分佣逻辑是否满足，如果是则只走代理分佣逻辑，如果不是，验证之后则继续执行三级分销分佣逻辑。<br />
先分销后代理：指先计算是否三级分销满足，满足则只计算三级分级分销，如果不满足再继续执行代理分佣逻辑。<br />
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">&nbsp;</label>
<div class="layui-input-block">
@@ -630,6 +651,7 @@
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">&nbsp;</label>
<div class="layui-input-block">
@@ -963,9 +985,6 @@
}
}
//初始化分销设置是否选中商品
if (d.data.configs.distributionGoodsId) {
var obj = d.data.configs.distributionGoodsId;