From 6fb14149d62199cfcc0448c82eb2f51f9c5181de Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Thu, 31 Dec 2020 16:55:30 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into parter
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/groupProduct.html | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 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 7eb5f0f..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
@@ -18,15 +18,6 @@
<table class="layui-table" id="product-table" lay-filter="product-table"></table>
</div>
</div>
-<!-- 表格操作列 -->
-<script type="text/html" id="product-table-bar">
- <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
-</script>
-<!-- 表格状态列 -->
-<script type="text/html" id="product-tpl-state">
- <input type="checkbox" lay-filter="product-tpl-state" value="{{d.id}}" lay-skin="switch" lay-text="未处理|已处理"
- {{d.enabled==true?'checked':''}}/>
-</script>
<script>
layui.use(['table', 'config','laydate'], function () {
@@ -44,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,
@@ -68,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