Merge branch 'score_shop'

wzy

2022-10-12 4615437af0749766f519c10734e19360b0877ece

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

@@ -130,7 +130,7 @@
                        <th data-field="totalScore" data-align="center">获得总积分</th>
                        <th data-field="currentScore" data-align="center">可兑换积分</th>
                        <th data-field="isSales" data-align="center" data-formatter="buildIsSales">是否为销售员</th>
                        <th data-align="center"  data-width="195px" data-field="userId" data-formatter="buildOperate">操作</th>
                        <th data-align="center"  data-width="195px" data-field="userId" data-formatter="buildOperation">操作</th>
                    </tr>
                    </thead>
                </table>
@@ -145,7 +145,7 @@
        MTools.ininDatetimepicker(".datetimepicker");
        var delUrl="";
        myGrid=MGrid.initGrid({
            url:basePath+"/admin/sysVipInfo/showList",
            url:basePath+"/admin/vipInfo/showVipInfoList",
            delUrl:delUrl,
        });

@@ -189,13 +189,18 @@
    var btns = [];
    btns[0] = "", btns[1] = "";

    function buildOperate(value, row, index){
    function buildOperation(value, row, index) {
        var html = "";
        html += '<div class="btn-group">'
        html += '</div>';
        html += '<a class="text-info" href="javascript:void(0)" onClick="setSalesMan(\''+row.id+'\')">设置推广员</a>&nbsp;&nbsp;'
        return html;
    }

    function setSalesMan(val) {
        MTools.handleItem(basePath + "/fenXiao/fenXiaoUser/setSaleMan?id=" + val, "确定将该用户设置为推广员？",
            function () {
                myGrid.serchData();
            });
    }