Merge branch 'developer'

Helius

2022-03-04 5483cb84845014996576909dbd3bc5ab6be5803b

Merge branch 'developer'

 zq-erp/src/main/resources/templates/views/admin/hive/vip/vipInfo-list.html

@@ -176,9 +176,9 @@
        var html = "";
        var desc;
        if (row.validFlag == 1) {
            desc = "失效";
            desc = "关闭小程序查询权益";
        } else {
            desc = "生效";
            desc = "开启小程序查询权益";
        }
        html += '<a class="text-info" href="javascript:void(0)" onClick="openVipDetail(\''+row.phone+'\')">查看详情</a>&nbsp;&nbsp;'
        + btns[0].replace("VALUE", row.id).replace("FLAG", row.validFlag).replace("DESC", desc);
@@ -417,9 +417,9 @@
    function vipInfoValid(id, validFlag) {
        var desc;
        if (validFlag == 1) {
            desc = "确认要设置用户为失效吗？";
            desc = "确认要关闭小程序查询权益？";
        } else {
            desc = "确认要设置用户为生效吗？";
            desc = "确认要开启小程序查询权益？";
        }
        MTools.handleItem(
            basePath + '/admin/vipInfo/validFlagChange?id=' + id, desc, function () {
@@ -428,7 +428,7 @@
    }

</script>
<script matrix:btn="vipInfo-youxiao">
<script matrix:btn="vipInfo-miniQuery">
    btns[0]='<a class="text-info" href="javascript:void(0)" onClick="vipInfoValid(\'VALUE\', \'FLAG\')" >DESC</a>&nbsp;&nbsp;'
</script>
</body>