Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger

jyy

2021-06-09 ec87cf1ee2b9382bf9d089711f0ff82ae8e7077c

 zq-erp/src/main/resources/templates/views/admin/shop/shopProduct-list.html

@@ -36,12 +36,12 @@
                       type="text" class="form-control">
            </div>
            <div class="form-group">
                <label class="control-label">上架卖场</label>
                <label class="control-label">积分抵扣</label>
                <select style="width:100px;" class="form-control select2" size="1"
                        name="mallType" >
                        name="ableScorePay" >
                    <option value="">请选择</option>
                    <option value="1">微商城</option>
                    <option value="2">积分商城</option>
                    <option value="1">可抵扣</option>
                    <option value="2">不可抵扣</option>
                </select>
            </div>
            <div class="form-group">
@@ -122,7 +122,8 @@
                <tr>
                    <th data-checkbox="true"></th>
                    <th data-formatter="MGrid.indexfn" data-align="center">序号</th>
                    <th data-field="mallType" data-align="center" data-formatter="mallType">上架卖场</th>
                    <th data-field="id" data-align="center" >ID</th>
                    <th data-field="ableScorePay" data-align="center" data-formatter="ableScorePay">积分抵扣</th>
                    <th data-field="title" data-align="center">产品名称</th>
                    <th data-field="imgMobile" data-align="center" data-formatter="MGrid.getImage">产品图片</th>
                    <th data-field="attrValues" data-align="center" data-formatter="formatAttr">产品属性</th>
@@ -298,12 +299,12 @@
            });
    }

    function mallType(value, row, index) {
    function ableScorePay(value, row, index) {
        var html = "";
        if (value ==1) {
          html="微商城"
          html="可抵扣"
        }else{
            html="积分商城"
            html="不可抵扣"
        }
        return html;
    }