From 004e1229ed36a98cc3bb9e3c0eb15be2ab8c0642 Mon Sep 17 00:00:00 2001
From: 克 刘 <4345453@qq.com>
Date: Thu, 16 Apr 2020 11:16:49 +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/product.html |   12 ++----------
 1 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/product.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/product.html
index 53c6ebb..7dd3ce8 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/product.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/product.html
@@ -21,12 +21,8 @@
 </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="未处理|已处理"
+    <input type="checkbox" lay-filter="product-tpl-state" value="{{d.id}}" lay-skin="switch" lay-text="禁用|启用"
            {{d.enabled==true?'checked':''}}/>
-</script>
-<!-- 弹窗内容 -->
-<script type="text/html" id="feedback-detail">
-
 </script>
 
 <script>
@@ -40,7 +36,6 @@
 
         // 渲染表格
         var renderTable = function () {
-            layer.load(2);
             table.render({
                 elem: '#product-table',
                 url: config.base_server + 'api-opration/product',
@@ -70,10 +65,7 @@
                     { field: 'enabled', width: 150, templet: '#product-tpl-state', sort: true, title: '状态' },
                     { field: 'createTime', width: 200, sort: true, title: '创建时间' },
                     { align: 'center', width: 100, toolbar: '#product-table-bar', title: '操作' }
-                ]],
-                done: function () {
-                    layer.closeAll('loading');
-                }
+                ]]
             });
         }
         renderTable();

--
Gitblit v1.8.0