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

zhaoxiaohao

2020-04-24 d3386ce4a4439ee740ca79d33ac7040963a18948

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

@@ -21,7 +21,7 @@
</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="未处理|已处理"
    <input type="checkbox" lay-filter="product-tpl-state" value="{{d.id}}" lay-skin="switch" lay-text="禁用|启用"
           {{d.enabled==true?'checked':''}}/>
</script>

@@ -45,6 +45,14 @@
                cols: [[
                    { field: 'proName', width: 300, title: '产品名称' },
                    {
                        field: 'proType',align: 'center', width: 100, templet: function (d) {
                            if (d.proType === 0)
                                return "试用"
                            else
                                return "正式"
                        }, title: '类型'
                    },
                    {
                        field: 'proTime', width: 150, title: '有效时长', templet: function (d) {
                            switch (d.proTimeUnit) {
                                case 0: