From 0a8b731d9cf46c78c0c4c66fa9954eeb262e4017 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Mon, 10 Aug 2020 09:20:50 +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/productdetail.html |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/productdetail.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/productdetail.html
index 5cc539d..a393c76 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/productdetail.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/productdetail.html
@@ -10,8 +10,8 @@
         <div class="layui-form toolbar">&emsp;
             <div  class="layui-col-sm10">
                 <div class="layui-col-sm4">
-                    <input type="text" class="layui-input search-input" id="startTime" placeholder="yyyy-MM-dd"> 至 <input type="text"
-                    class="layui-input search-input" id="endTime" placeholder="yyyy-MM-dd"> &emsp;
+                    <input type="text" class="layui-input search-input" id="startTime" placeholder="开始时间"> 至 <input type="text"
+                    class="layui-input search-input" id="endTime" placeholder="结束时间"> &emsp;
                 </div>
                 <div class="layui-col-sm2">
                     <input id="product-search-value" class="layui-input search-input" type="text" placeholder="按产品名" />&emsp;
@@ -95,7 +95,7 @@
                     // { field: 'createTime', width: 160, sort: true, title: '创建时间',templet:function(d){
                     //     return new Date(d.createTime).dateFormat("yyyy/MM/dd hh:mm:ss");
                     // } },
-                    { field: 'createTime', width: 250, sort: true, title: '创建时间', templet: "<div>{{layui.util.toDateString(d.createTime, 'yyyy/MM/dd HH:mm')}}</div>" },
+                    { field: 'createTime', width: 200, sort: true, title: '创建时间', templet: "<div>{{layui.util.toDateString(d.createTime, 'yyyy/MM/dd HH:mm')}}</div>" },
                     { align: 'center', width: 100, toolbar: '#product-table-bar', title: '操作' }
                 ]]
             });
@@ -109,7 +109,7 @@
                     layer.load(2);
                     admin.req('api-opration/productorderrecord/' + 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();
                         });
                         obj.del();

--
Gitblit v1.8.0