mirror of
http://git.coreshop.cn/jianweie/coreshoppro.git
synced 2026-03-26 17:47:21 +08:00
# 2022-02-24
### 1.3.7 开源社区版: 无 ### 0.2.4 会员专业版: 【新增】数据库sku表【CoreCmsProducts】增加"积分可抵扣金额"【pointsDeduction】字段 【新增】商品sku新增最高抵扣金额功能,可通过积分进行价格抵扣,实现单品使用【积分+价格】的购买模式。与订单积分折扣并存。 【新增】积分新增积分模式功能,分为全局计算和单品计算,【全局计算】是指直接对订单按照使用比例进行计算,【单品计算】是指根据单个商品下sku独立设置的最高可抵扣金额进行计算。 【新增】积分新增显示积分组合兑换价功能,勾选显示,将在商品详情,购物车等界面显示积分加价格的效果。 【新增】积分新增显示名称功能,前端可改名积分显示名称为自定义,如:金豆,衡豆等。 【新增】商品列表页面、购物车界面、下单界面、商品详情界面新增积分新增是否显示组合价功能,如果勾选,将显示【1000积分+25元换购】的内容。 【优化】当添加视频后,默认采用商品封面图作为视频底图,防止视频大小差异出现黑边或预加载中黑屏的问题。 【优化】商品列表展示列表去除padding留白效果。 【优化】优化form表单redio和checkBox选项分行显示的问题。 【修复】修复拼团分享页面倒计时识别失败的问题,修复拼团分享页面分享按钮点击失败的问题。#I4QWDH #I4QWFC
This commit is contained in:
@@ -297,6 +297,7 @@
|
||||
<col width="80">
|
||||
<col width="80">
|
||||
<col width="80">
|
||||
<col width="80">
|
||||
</colgroup>
|
||||
<thead>
|
||||
<tr>
|
||||
@@ -305,6 +306,7 @@
|
||||
<th>货号</th>
|
||||
<th>SKU</th>
|
||||
<th>重量(克)</th>
|
||||
<th>低分最大<br />可抵金额</th>
|
||||
<th>库存</th>
|
||||
<th><i class="required-color">*</i>销售价</th>
|
||||
<th>成本价</th>
|
||||
@@ -345,6 +347,9 @@
|
||||
<td>
|
||||
<input type="text" name="product[weight][]" value="{{item.weight}}" placeholder="重量" class="layui-input layui-inline-1">
|
||||
</td>
|
||||
<td>
|
||||
<input type="text" name="product[pointsDeduction][]" value="{{item.pointsDeduction}}" placeholder="金额" class="layui-input layui-inline-1">
|
||||
</td>
|
||||
<td class="have-add-td">
|
||||
<input type="text" name="product[stock][]" value="{{item.stock}}" placeholder="库存" class="layui-input layui-inline-1 goods-stock">
|
||||
</td>
|
||||
@@ -507,6 +512,7 @@
|
||||
sn: layui.coreHelper.getSN('SN'),
|
||||
spesDesc: "",
|
||||
stock: 1000,
|
||||
pointsDeduction: 0,
|
||||
weight: 0,
|
||||
price: 0,
|
||||
costprice: 0,
|
||||
@@ -781,7 +787,7 @@
|
||||
}
|
||||
, done: function (res) {
|
||||
if (res.code > 0) {
|
||||
return layer.msg('上传失败');
|
||||
return layer.msg('上传失败');
|
||||
} else {
|
||||
layer.msg('上传成功');
|
||||
imgs.push(res.data.fileUrl);
|
||||
@@ -801,7 +807,7 @@
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
|
||||
//SKU缩略图上传
|
||||
$('.upSpecImage').click(function () {
|
||||
var _that = this;
|
||||
@@ -1428,6 +1434,7 @@
|
||||
productModel.levelOne = field['product[levelOne][' + i + ']'];
|
||||
productModel.levelTwo = field['product[levelTwo][' + i + ']'];
|
||||
productModel.levelThree = field['product[levelThree][' + i + ']'];
|
||||
productModel.pointsDeduction = field['product[pointsDeduction][' + i + ']'];
|
||||
products.push(productModel);
|
||||
}
|
||||
//会员价格模型
|
||||
|
||||
@@ -289,6 +289,7 @@
|
||||
<col width="80">
|
||||
<col width="80">
|
||||
<col width="80">
|
||||
<col width="80">
|
||||
</colgroup>
|
||||
<thead>
|
||||
<tr>
|
||||
@@ -298,6 +299,7 @@
|
||||
<th>SKU</th>
|
||||
<th>冻结库存</th>
|
||||
<th>重量(克)</th>
|
||||
<th>低分最大<br />可抵金额</th>
|
||||
<th>库存</th>
|
||||
<th><i class="required-color">*</i>销售价</th>
|
||||
<th>成本价</th>
|
||||
@@ -341,7 +343,9 @@
|
||||
<td>
|
||||
<input type="text" name="product[weight][]" value="{{item.weight}}" placeholder="重量" class="layui-input layui-inline-1">
|
||||
</td>
|
||||
|
||||
<td>
|
||||
<input type="text" name="product[pointsDeduction][]" value="{{item.pointsDeduction}}" placeholder="金额" class="layui-input layui-inline-1">
|
||||
</td>
|
||||
<td class="have-add-td">
|
||||
<input type="text" name="product[stock][]" value="{{item.stock}}" placeholder="库存" class="layui-input layui-inline-1 goods-stock">
|
||||
</td>
|
||||
@@ -610,6 +614,7 @@
|
||||
sn: layui.coreHelper.getSN('SN'),
|
||||
spesDesc: "",
|
||||
stock: 1000,
|
||||
pointsDeduction: 0,
|
||||
weight: 0,
|
||||
price: 0,
|
||||
costprice: 0,
|
||||
@@ -1537,6 +1542,7 @@
|
||||
productModel.levelOne = field['product[levelOne][' + i + ']'];
|
||||
productModel.levelTwo = field['product[levelTwo][' + i + ']'];
|
||||
productModel.levelThree = field['product[levelThree][' + i + ']'];
|
||||
productModel.pointsDeduction = field['product[pointsDeduction][' + i + ']'];
|
||||
products.push(productModel);
|
||||
}
|
||||
//会员价格模型
|
||||
|
||||
@@ -445,6 +445,29 @@
|
||||
<input type="radio" lay-filter="pointSwitch" name="pointSwitch" value="2" title="不开启" {{d.data.configs['pointSwitch']['sValue']==="2" ? 'checked':''}}>
|
||||
</div>
|
||||
</div>
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label">{{d.data.configs['pointExchangeModel']['sKey']}}:</label>
|
||||
<div class="layui-input-inline layui-inline-7">
|
||||
<input type="radio" lay-filter="pointExchangeModel" name="pointExchangeModel" value="1" title="全局计算" {{d.data.configs['pointExchangeModel']['sValue']==="1" ? 'checked':''}}>
|
||||
<input type="radio" lay-filter="pointExchangeModel" name="pointExchangeModel" value="2" title="单品计算" {{d.data.configs['pointExchangeModel']['sValue']==="2" ? 'checked':''}}>
|
||||
</div>
|
||||
<div class="layui-form-mid layui-word-aux">【全局计算】是指直接对订单按照使用比例进行计算,【单品计算】是指根据单个商品下sku独立设置的最高可抵扣金额进行计算。</div>
|
||||
</div>
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label">{{d.data.configs['pointShowExchangePrice']['sKey']}}:</label>
|
||||
<div class="layui-input-inline layui-inline-7">
|
||||
<input type="radio" lay-filter="pointShowExchangePrice" name="pointShowExchangePrice" value="1" title="显示" {{d.data.configs['pointShowExchangePrice']['sValue']==="1" ? 'checked':''}}>
|
||||
<input type="radio" lay-filter="pointShowExchangePrice" name="pointShowExchangePrice" value="2" title="不显示" {{d.data.configs['pointShowExchangePrice']['sValue']==="2" ? 'checked':''}}>
|
||||
</div>
|
||||
<div class="layui-form-mid layui-word-aux">勾选显示,将在商品详情,购物车等界面显示积分加价格的效果。</div>
|
||||
</div>
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label">{{d.data.configs['pointShowName']['sKey']}}:</label>
|
||||
<div class="layui-input-inline layui-inline-2">
|
||||
<input type="text" name="pointShowName" value="{{d.data.configs['pointShowName']['sValue']}}" lay-verify="title" autocomplete="off" placeholder="请输入" class="layui-input">
|
||||
</div>
|
||||
<div class="layui-form-mid layui-word-aux">前端积分可以展示别的名称如:衡豆。金豆等等</div>
|
||||
</div>
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label">{{d.data.configs['pointDiscountedProportion']['sKey']}}:</label>
|
||||
<div class="layui-input-inline layui-inline-2">
|
||||
@@ -457,7 +480,7 @@
|
||||
<div class="layui-input-inline layui-inline-2">
|
||||
<input type="number" name="ordersPointProportion" value="{{d.data.configs['ordersPointProportion']['sValue']}}" lay-verify="title|number" autocomplete="off" placeholder="请输入正整数" class="layui-input" max="100" min="0">
|
||||
</div>
|
||||
<div class="layui-form-mid layui-word-aux">(%)单个订单积分折现最大百分比</div>
|
||||
<div class="layui-form-mid layui-word-aux">(%)单个订单积分折现最大百分比【仅全局计算下有小,单品计算模式直接根据单品的设置】</div>
|
||||
</div>
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label">{{d.data.configs['ordersRewardProportion']['sKey']}}:</label>
|
||||
|
||||
Reference in New Issue
Block a user