From b7265cdd6f3e1fbb0d428c27e5b5e29e34d56953 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Tue, 17 Nov 2020 17:55:21 +0800
Subject: [PATCH] Merge branch 'dev'
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html | 8 ++++----
1 files changed, 4 insertions(+), 4 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 0156127..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
@@ -278,7 +278,6 @@
admin.req('api-user/sysdepartment/getPayMes?departmentId=' + hospitalData.departmentId, {},
function (data) {
layer.closeAll('loading');
- debugger
if (0 === data.code) {
queryData = data.data;
if (queryData === true) {
@@ -458,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 {
@@ -566,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,
@@ -596,7 +596,7 @@
"");
layer.msg(data.msg, {
icon: 1,
- time: 3000
+ time: 2000
}, function () {
admin
.finishPopupCenter();
--
Gitblit v1.8.0