From e9cbc4b86621cfdc2b7039e56fad760e80865389 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Tue, 17 Nov 2020 17:53:36 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://192.168.2.240:29418/kidgrow-microservices-platform into dev
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html
index 5c3e1ac..23df499 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html
+++ b/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();
--
Gitblit v1.8.0