From 7ea2a2cfe922c9b2d5c09c737d10a7f1ab5b50d1 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Mon, 01 Mar 2021 14:14:35 +0800
Subject: [PATCH] Merge branch 'dev1.1' into dev

---
 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/productdetail.html |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 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 26bea23..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
@@ -108,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');
                 });
             }
@@ -130,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