From 6e930b85e4ef92a0a6170cbb8f2da930bbcc72e9 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 02 Mar 2023 15:57:51 +0800
Subject: [PATCH] 增加活动公告

---
 src/main/resources/templates/febs/views/modules/order/orderList.html |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/templates/febs/views/modules/order/orderList.html b/src/main/resources/templates/febs/views/modules/order/orderList.html
index 1053b54..95b47e3 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderList.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderList.html
@@ -65,14 +65,14 @@
                                         <label class="layui-form-label layui-form-label-sm">开始时间</label>
                                         <div class="layui-input-inline">
                                             <input type="text" name="startTime" id="febs-form-group-date-start" lay-verify="date"
-                                                   placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">
+                                                   placeholder="yyyy-MM-dd HH:mm:ss" autocomplete="off" class="layui-input">
                                         </div>
                                 </div>
                                 <div class="layui-inline">
                                         <label class="layui-form-label layui-form-label-sm">结束时间</label>
                                         <div class="layui-input-inline">
                                             <input type="text" name="endTime" id="febs-form-group-date-end" lay-verify="date"
-                                                   placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">
+                                                   placeholder="yyyy-MM-dd HH:mm:ss" autocomplete="off" class="layui-input">
                                         </div>
                                 </div>
                             </div>
@@ -153,11 +153,11 @@
         currPageOrder = $view.find(".layui-laypage-em").next().html();
         //日期范围
         laydate.render({
-            elem: '#febs-form-group-date-start'
+            elem: '#febs-form-group-date-start',type: 'datetime'
         });
 
         laydate.render({
-            elem: '#febs-form-group-date-end'
+            elem: '#febs-form-group-date-end',type: 'datetime'
         });
 
 
@@ -395,6 +395,7 @@
                         {field: 'memberName', title: '购买人', minWidth: 100,align:'left'},
                         {field: 'memberPhone', title: '联系方式', minWidth: 120,align:'left'},
                         {field: 'goodsName', title: '商品', minWidth: 160,align:'left'},
+                        {field: 'remark', title: '备注', minWidth: 160,align:'left'},
                         {field: 'goodsAmount', title: '价格', minWidth: 80,align:'left'},
                         {field: 'carriage', title: '邮费', minWidth: 80,align:'left'},
                         {field: 'amount', title: '总金额', minWidth: 100,align:'left'},
@@ -529,6 +530,7 @@
                     // "<div>地址:" + data.address + "</div><br><br>" +
                     // "<div>编号:" + data.orderNo + "</div><br><br>" +
                     "<div>商品:" + data.goodsName + "</div><br><br>" +
+                    "<div>备注:" + data.remark + "</div><br><br>" +
                     "</div>"
 
                 contentHtml += template;

--
Gitblit v1.9.1