From bb0c7d3c6cecdfd04f3a191b59a1b9a8853d69e2 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Mon, 15 Jun 2020 16:12:47 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev

---
 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/groupProduct.html |   15 +++------------
 1 files changed, 3 insertions(+), 12 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 09e5bf6..414aa09 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
@@ -8,25 +8,16 @@
     </div>
     <div class="layui-card-body">
         <div class="layui-form toolbar">&emsp;
-            <input type="text" name="date" id="datebegin" lay-verify="date" placeholder="yyyy-MM-dd" autocomplete="off"
+            <input type="text" name="date" id="datebegin" lay-verify="date"  autocomplete="off"
                 class="layui-input search-input">
             至
-            <input type="text" name="date" id="dateend" lay-verify="date" placeholder="yyyy-MM-dd" autocomplete="off"
+            <input type="text" name="date" id="dateend" lay-verify="date"  autocomplete="off"
                 class="layui-input search-input"> &emsp;
             <button id="product-btn-search" class="layui-btn icon-btn"><i class="layui-icon">&#xe615;</i>搜索</button>
         </div>
         <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,

--
Gitblit v1.8.0