Merge branch 'dev'

zhaoxiaohao

2020-11-17 b7265cdd6f3e1fbb0d428c27e5b5e29e34d56953

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

@@ -457,6 +457,7 @@
                data.isShare = (data.isShare.indexOf("不") == 0) ? 0 : 1;
                if (!strUtil.isEmpty(data.beginTime) && !strUtil.isEmpty(data.endTime)) {
                    if (dateUtil.compareDate(data.endTime, data.beginTime)) {
                        data.id=data.id+'';
                        tempDataList(data);
                        waitRecharge();
                    } else {
@@ -565,8 +566,8 @@
                                        var listDetailData = new Array();
                                        $.each(listData, function (index, item) {
                                            var detailData = {
                                                orderId: orderData.id,
                                                proId: item.id,
                                                orderId: orderData.id+'',
                                                proId: item.id+'',
                                                proType: item.proType,
                                                proName: item.proName,
                                                isShare: item.isShare,
@@ -595,7 +596,7 @@
                                                            "");
                                                        layer.msg(data.msg, {
                                                            icon: 1,
                                                            time: 3000
                                                            time: 2000
                                                        }, function () {
                                                            admin
                                                                .finishPopupCenter();