Merge branch 'dev1.1' into dev

zhaoxiaohao

2021-03-01 7ea2a2cfe922c9b2d5c09c737d10a7f1ab5b50d1

 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/groupProduct.html

@@ -18,15 +18,6 @@
        <table class="layui-table" id="product-table" lay-filter="product-table"></table>
    </div>
</div>
<!-- 表格操作列 -->
<script type="text/html" id="product-table-bar">
    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
</script>
<!-- 表格状态列 -->
<script type="text/html" id="product-tpl-state">
    <input type="checkbox" lay-filter="product-tpl-state" value="{{d.id}}" lay-skin="switch" lay-text="未处理|已处理"
           {{d.enabled==true?'checked':''}}/>
</script>

<script>
    layui.use(['table', 'config','laydate'], function () {
@@ -44,7 +35,7 @@
        var renderTable = function () {
            table.render({
                elem: '#product-table',
                url: config.base_server + 'api-opration/productorderdetail/group',
                url: config.base_server + 'api-opration/productorderrecord/group',
                method: 'GET',
                headers: { 'Authorization': 'Bearer ' + config.getToken().access_token },
                page: true,
@@ -68,7 +59,11 @@
                updateTime = dateUtil.getNowDate();
                $('#dateend').val(updateTime);
            }
            table.reload('product-table', { where: { createTime: createTime,updateTime: updateTime } });
            table.reload('product-table', { 
                where: { createTime: createTime,updateTime: updateTime},
                page: {
                    curr: 1 
                } });
        });
    });
</script>