From d9a6c2881b08906445eaf4caa46a13fbf5cc45af Mon Sep 17 00:00:00 2001
From: dragon <3013557874@qq.com>
Date: Tue, 19 Nov 2024 15:23:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B4=A2=E5=8A=A1=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E8=BD=AC=E8=B5=A0=E7=BB=9F=E8=AE=A1=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E7=AD=9B=E9=80=89=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/users/DiamondGiveHistoryView.vue | 34 +++++++++-------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/src/views/users/DiamondGiveHistoryView.vue b/src/views/users/DiamondGiveHistoryView.vue
index ad20853..6839965 100644
--- a/src/views/users/DiamondGiveHistoryView.vue
+++ b/src/views/users/DiamondGiveHistoryView.vue
@@ -29,8 +29,8 @@
                             </div>
 
                             <label class="col-sm-2 control-label">统计时间:</label>
-                            <div class="col-sm-2"><input type="text" class="form-control" name="beginTime" id="beginTime">
-                            </div><span class="col-sm-1">至</span>
+                            <div class="col-sm-2"><input type="text" class="form-control" name="beginTime" id="beginTime"></div>
+                            <span class="col-sm-1">至</span>
                             <div class="col-sm-2"><input type="text" class="form-control" name="endTime" id="endTime"></div>
 
                         </div>
@@ -111,24 +111,7 @@
 <script>
 import TableHelper from '@/utils/bootstrap-table-helper';
 
-var picker1 = $("#beginTime").datetimepicker({
-    format: 'yyyy-mm-dd hh:ii:00',
-    autoclose: true,
-    todayBtn: true,
-});
-var picker2 = $("#endTime").datetimepicker({
-    format: 'yyyy-mm-dd hh:ii:00',
-    autoclose: true,
-    todayBtn: true
-});
-var picker3 = $('#editEndTime').datetimepicker({
-    format: 'yyyy-mm-dd hh:ii:00',
-    autoclose: true
-})
-var picker4 = $('#editStartTime').datetimepicker({
-    format: 'yyyy-mm-dd hh:ii:00',
-    autoclose: true
-})
+
 
 /*picker1.on('changeDate', function () {
     var date = $('#beginDate').datetimepicker('getDate');
@@ -290,7 +273,16 @@ export default {
                         console.log("load fail");
                     }
                 });
-
+                var picker1 = $("#beginTime").datetimepicker({
+                    format: 'yyyy-mm-dd hh:mm:ss',
+                    autoclose: true,
+                    todayBtn: true,
+                });
+                var picker2 = $("#endTime").datetimepicker({
+                    format: 'yyyy-mm-dd hh:mm:ss',
+                    autoclose: true,
+                    todayBtn: true
+                });
                 // 查询刷新
                 $('#btnSearch').on('click', function () {
                     TableHelper.doRefresh('#table');