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/groupProduct.html | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/groupProduct.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/groupProduct.html
index 64b2380..cb35adb 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/groupProduct.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/groupProduct.html
@@ -35,7 +35,7 @@
var renderTable = function () {
table.render({
elem: '#product-table',
- url: config.base_server + 'api-opration/productorderdetail/group',
+ url: config.base_server + 'api-opration/productorderrecord/group',
method: 'GET',
headers: { 'Authorization': 'Bearer ' + config.getToken().access_token },
page: true,
@@ -59,7 +59,11 @@
updateTime = dateUtil.getNowDate();
$('#dateend').val(updateTime);
}
- table.reload('product-table', { where: { createTime: createTime,updateTime: updateTime } });
+ table.reload('product-table', {
+ where: { createTime: createTime,updateTime: updateTime},
+ page: {
+ curr: 1
+ } });
});
});
</script>
\ No newline at end of file
--
Gitblit v1.8.0