From e7c3314727fc06444689c0e6ecab5fea337afeb0 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Fri, 26 Feb 2021 15:24:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/productdetail.html | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/productdetail.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/productdetail.html
index a12b18e..98ac489 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/productdetail.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/productdetail.html
@@ -1,9 +1,9 @@
<div class="layui-card">
<div class="layui-card-header">
- <h2 class="header-title">产品消费记录</h2>
+ <h2 class="header-title">产品充值记录</h2>
<span class="layui-breadcrumb pull-right">
<a href="#!console">首页</a>
- <a><cite>产品消费记录</cite></a>
+ <a><cite>产品充值记录</cite></a>
</span>
</div>
<div class="layui-card-body">
@@ -93,9 +93,6 @@
{ field: 'proEndtime', width: 120, title: '结束时间',templet:function(d){
return new Date(d.proEndtime).dateFormat("yyyy/MM/dd");
} },
- // { field: 'createTime', width: 160, sort: true, title: '创建时间',templet:function(d){
- // return new Date(d.createTime).dateFormat("yyyy/MM/dd hh:mm:ss");
- // } },
{ field: 'createTime', width: 200, sort: true, title: '创建时间', templet: "<div>{{layui.util.toDateString(d.createTime, 'yyyy/MM/dd HH:mm')}}</div>" },
{ align: 'center', width: 100, toolbar: '#product-table-bar', title: '操作',
fixed: 'right' }
@@ -111,10 +108,14 @@
layer.load(2);
admin.req('api-opration/productorderrecord/' + obj.data.id, {}, function (data) {
layer.closeAll('loading');
- layer.msg(data.msg, { icon: 1, time: 2000 }, function () {
- renderTable();
- });
- obj.del();
+ if(data.code==200)
+ {
+ layer.msg("指定充值记录删除成功！", { icon: 1, time: 2000 });
+ obj.del();
+ }
+ else{
+ layer.msg(data.msg, { icon: 3, time: 2000 });
+ }
}, 'DELETE');
});
}
@@ -133,7 +134,11 @@
}
var proName = $('#product-search-value').val();
var hospitalId = $('#hospitalId').val();
- table.reload('product-table', { where: { proName: proName,hospitalId: hospitalId,startTime: startTime, endTime: endTime } });
+ table.reload('product-table', {
+ where: { proName: proName,hospitalId: hospitalId,startTime: startTime, endTime: endTime },
+ page: {
+ curr: 1
+ } });
});
//比较日期大小
--
Gitblit v1.8.0