From 6c203bfe05665157f043ca37023fe34b1c994668 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Mon, 10 Aug 2020 09:14:35 +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 |   10 +++++-----
 1 files changed, 5 insertions(+), 5 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 74bf61a..ab5536d 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
@@ -8,7 +8,7 @@
     </div>
     <div class="layui-card-body">
         <div class="layui-form toolbar">&emsp;
-            <input id="product-search-value" class="layui-input search-input" type="text" placeholder="输入产品名" />&emsp;
+            <input id="product-search-value" class="layui-input search-input" type="text" placeholder="按产品名" />&emsp;
             <button id="product-btn-search" class="layui-btn icon-btn"><i class="layui-icon permissions"
                     permissions="product-list">&#xe615;</i>搜索</button>
             <button id="product-btn-add" class="layui-btn icon-btn permissions" permissions="product-edit"><i
@@ -75,7 +75,7 @@
                     { field: 'enabled', width: 150, templet: '#product-tpl-state', sort: true, title: '状态' },
                     {
                         field: 'createTime', width: 200, sort: true, title: '创建时间', templet: function (d) {
-                            return new Date(d.createTime).dateFormat("yyyy-MM-dd HH:mm");
+                            return new Date(d.createTime).dateFormat("yyyy-MM-dd hh:mm");
                         }
                     },
                     { align: 'center', width: 100, toolbar: '#product-table-bar', title: '操作' }
@@ -96,9 +96,9 @@
             }, function (data) {
                 layer.closeAll('loading');
                 if (data.code == 0) {
-                    layer.msg(data.msg, { icon: 1, time: 500 });
+                    layer.msg(data.msg, { icon: 1, time: 2000 });
                 } else {
-                    layer.msg(data.msg, { icon: 2, time: 500 });
+                    layer.msg(data.msg, { icon: 2, time: 2000 });
                     $(obj.elem).prop('checked', !obj.elem.checked);
                     form.render('checkbox');
                 }
@@ -113,7 +113,7 @@
                     layer.load(2);
                     admin.req('api-opration/product/' + obj.data.id, {}, function (data) {
                         layer.closeAll('loading');
-                        layer.msg(data.msg, { icon: 1, time: 500 }, function () {
+                        layer.msg(data.msg, { icon: 1, time: 2000 }, function () {
 
                             renderTable();
                         });

--
Gitblit v1.8.0