# 2022-02-25

### 1.3.7 开源社区版：
无
### 0.2.5 会员专业版：
【新增】数据库sku表【CoreCmsProducts】增加"赠送积分"【points】字段。
【新增】商品sku新增赠送积分功能，订单结算后可根据单品的积分与数量进行计算。与订单积分按照金额比例获取并存。
【新增】前端新增是否显示单品赠送积分功能，勾选显示，将在商品详情，购物车等界面显示购买此物品赠送多少积分的效果。
【优化】前端使用显示“积分”两个字的界面，替换为后台设置的名称。
【修复】修复form表单录入编辑界面属性值重复的问题。#I4V1PE
【修复】修复商品添加和编辑界面存在的错别字。#I4V1OR
【修复】修复广告位设置商品，弹出选择框不显示图片的问题。#I4V1EO

CoreCms.Net.Web.Admin/wwwroot/views/content/advert/advertisement/getGoods.html

@@ -86,10 +86,10 @@
                             { field: 'id', title: '商品ID', width: 80, sort: false },
                             { field: 'name', title: '商品名称', sort: false },
                             {
-                                field: 'images', title: '图集', width: 100, sort: false,
+                                field: 'image', title: '图集', width: 100, sort: false,
                                 templet: function (d) {
-                                    if (d.images) {
-                                        return '<a href="javascript:void(0);" onclick=layui.coreHelper.viewImage("' + d.images + '")><image style="max-width:28px;max-height:28px;" src="' + d.images + '" /></a>';
+                                    if (d.image) {
+                                        return '<a href="javascript:void(0);" onclick=layui.coreHelper.viewImage("' + d.image + '")><image style="max-width:28px;max-height:28px;" src="' + d.image + '" /></a>';
                                     } else {
                                         return '<a href="javascript:void(0);" onclick=layui.coreHelper.viewImage("' + setter.noImagePicUrl + '")><image style="max-width:30px;max-height:30px;" src="' + setter.noImagePicUrl + '" /></a>';
                                     }

CoreCms.Net.Web.Admin/wwwroot/views/content/customform/form/create.html

@@ -99,7 +99,7 @@
         <div class="layui-form-item">
             <label for="description" class="layui-form-label">表单描述</label>
             <div class="layui-input-block">
-                <textarea name="description" id="description" lay-verify="required|verifydescription" placeholder="请输入内容" class="layui-textarea" lay-reqText="请输入表单描述" placeholder="请输入表单描述"></textarea>
+                <textarea name="description" id="description" lay-verify="required|verifydescription" class="layui-textarea" lay-reqText="请输入表单描述" placeholder="请输入表单描述"></textarea>
             </div>
         </div>
 
@@ -525,7 +525,6 @@
                 });
 
                 form.verify({
-
                     verifyname: [/^[\S]{0,100}$/, '表单名称最大只允许输入100位字符，且不能出现空格'],
                     verifydescription: [/^(.|\n){0,500}$/, '表单描述最大只允许输入255位字符，且不能出现空格'],
                     verifyheadTypeValue: [/^[\S]{0,200}$/, '表单头值最大只允许输入200位字符，且不能出现空格'],

CoreCms.Net.Web.Admin/wwwroot/views/content/customform/form/edit.html

@@ -101,7 +101,7 @@
         <div class="layui-form-item">
             <label for="description" class="layui-form-label">表单描述</label>
             <div class="layui-input-block">
-                <textarea name="description" id="description" lay-verify="required|verifydescription" placeholder="请输入内容" class="layui-textarea" lay-reqText="请输入表单描述" placeholder="请输入表单描述">{{d.params.data.model.description || '' }}</textarea>
+                <textarea name="description" id="description" lay-verify="required|verifydescription" class="layui-textarea" lay-reqText="请输入表单描述" placeholder="请输入表单描述">{{d.params.data.model.description || '' }}</textarea>
             </div>
         </div>
 
@@ -543,6 +543,7 @@
 
 
                 form.verify({
+
                     verifyname: [/^[\S]{0,100}$/, '表单名称最大只允许输入100位字符，且不能出现空格'],
                     verifydescription: [/^(.|\n){0,500}$/, '表单描述最大只允许输入255位字符，且不能出现空格'],
                     verifyheadTypeValue: [/^[\S]{0,200}$/, '表单头值最大只允许输入200位字符，且不能出现空格'],

CoreCms.Net.Web.Admin/wwwroot/views/good/goods/create.html

@@ -306,7 +306,8 @@
                 <th>货号</th>
                 <th>SKU</th>
                 <th>重量(克)</th>
-                <th>低分最大<br />可抵金额</th>
+                <th>赠送积分</th>
+                <th>积分最大<br />可抵金额</th>
                 <th>库存</th>
                 <th><i class="required-color">*</i>销售价</th>
                 <th>成本价</th>
@@ -345,13 +346,16 @@
                     {{item.spesDesc}}
                 </td>
                 <td>
-                    <input type="text" name="product[weight][]" value="{{item.weight}}" placeholder="重量" class="layui-input layui-inline-1">
+                    <input type="number" name="product[weight][]" value="{{item.weight}}" placeholder="重量" class="layui-input layui-inline-1">
+                </td>
+                <td>
+                    <input type="number" name="product[points][]" value="{{item.points}}" 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">
+                    <input type="number" name="product[stock][]" value="{{item.stock}}" placeholder="库存" class="layui-input layui-inline-1 goods-stock">
                 </td>
                 <td>
                     <input type="text" name="product[price][]" value="{{item.price}}" placeholder="销售价" class="layui-input layui-inline-1">
@@ -513,6 +517,7 @@
                     spesDesc: "",
                     stock: 1000,
                     pointsDeduction: 0,
+                    points: 0,
                     weight: 0,
                     price: 0,
                     costprice: 0,
@@ -1435,6 +1440,7 @@
                             productModel.levelTwo = field['product[levelTwo][' + i + ']'];
                             productModel.levelThree = field['product[levelThree][' + i + ']'];
                             productModel.pointsDeduction = field['product[pointsDeduction][' + i + ']'];
+                            productModel.points = field['product[points][' + i + ']'];
                             products.push(productModel);
                         }
                         //会员价格模型

CoreCms.Net.Web.Admin/wwwroot/views/good/goods/edit.html

@@ -299,7 +299,8 @@
                 <th>SKU</th>
                 <th>冻结库存</th>
                 <th>重量(克)</th>
-                <th>低分最大<br />可抵金额</th>
+                <th>赠送积分</th>
+                <th>积分最大<br />可抵金额</th>
                 <th>库存</th>
                 <th><i class="required-color">*</i>销售价</th>
                 <th>成本价</th>
@@ -341,13 +342,16 @@
                     {{item.freezeStock}}
                 </td>
                 <td>
-                    <input type="text" name="product[weight][]" value="{{item.weight}}" placeholder="重量" class="layui-input layui-inline-1">
+                    <input type="number" name="product[weight][]" value="{{item.weight}}" placeholder="重量" class="layui-input layui-inline-1">
+                </td>
+                <td>
+                    <input type="number" name="product[points][]" value="{{item.points}}" 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">
+                    <input type="number" name="product[stock][]" value="{{item.stock}}" placeholder="库存" class="layui-input layui-inline-1 goods-stock">
                 </td>
                 <td>
                     <input type="text" name="product[price][]" value="{{item.price}}" placeholder="销售价" class="layui-input layui-inline-1">
@@ -615,6 +619,7 @@
                     spesDesc: "",
                     stock: 1000,
                     pointsDeduction: 0,
+                    points: 0,
                     weight: 0,
                     price: 0,
                     costprice: 0,
@@ -1543,6 +1548,7 @@
                             productModel.levelTwo = field['product[levelTwo][' + i + ']'];
                             productModel.levelThree = field['product[levelThree][' + i + ']'];
                             productModel.pointsDeduction = field['product[pointsDeduction][' + i + ']'];
+                            productModel.points = field['product[points][' + i + ']'];
                             products.push(productModel);
                         }
                         //会员价格模型

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

@@ -448,10 +448,10 @@
                                         <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':''}}>
+                                                <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 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>
@@ -461,6 +461,24 @@
                                             </div>
                                             <div class="layui-form-mid layui-word-aux">勾选显示，将在商品详情，购物车等界面显示积分加价格的效果。</div>
                                         </div>
+
+                                        <div class="layui-form-item">
+                                            <label class="layui-form-label">{{d.data.configs['pointGetModel']['sKey']}}：</label>
+                                            <div class="layui-input-inline layui-inline-7">
+                                                <input type="radio" lay-filter="pointGetModel" name="pointGetModel" value="1" title="订单获取" {{d.data.configs['pointGetModel']['sValue']==="1" ? 'checked':''}}>
+                                                <input type="radio" lay-filter="pointGetModel" name="pointGetModel" value="2" title="单品获取" {{d.data.configs['pointGetModel']['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['pointShowPoint']['sKey']}}：</label>
+                                            <div class="layui-input-inline layui-inline-7">
+                                                <input type="radio" lay-filter="pointShowPoint" name="pointShowPoint" value="1" title="显示" {{d.data.configs['pointShowPoint']['sValue']==="1" ? 'checked':''}}>
+                                                <input type="radio" lay-filter="pointShowPoint" name="pointShowPoint" value="2" title="不显示" {{d.data.configs['pointShowPoint']['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">
@@ -480,14 +498,14 @@
                                             <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>
                                             <div class="layui-input-inline layui-inline-2">
                                                 <input type="number" name="ordersRewardProportion" value="{{d.data.configs['ordersRewardProportion']['sValue']}}" lay-verify="title|number" autocomplete="off" placeholder="请输入正整数" class="layui-input" min="0">
                                             </div>
-                                            <div class="layui-form-mid layui-word-aux">订单多少人民币奖励1个积分</div>
+                                            <div class="layui-form-mid layui-word-aux">订单多少人民币奖励1个积分【积分赠送模式仅订单获取模式下有效，单品获取模式直接根据单品的设置积分计算】</div>
                                         </div>
                                         <div class="layui-form-item">
                                             <label class="layui-form-label">{{d.data.configs['signPointType']['sKey']}}：</label>