From ef7c06054595b7ea667f74d2e14a9eeb3349adc1 Mon Sep 17 00:00:00 2001
From: khalil <khalil@chuhaiwl2023.com>
Date: Tue, 26 Nov 2024 14:37:34 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=81=E7=A4=BC=E8=AE=B0=E5=BD=95-=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B0-=E6=9F=A5=E8=AF=A2-=E4=BF=AE=E6=94=B9=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/users/GiftSendRecordView.vue | 30 +++++++++++---------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/src/views/users/GiftSendRecordView.vue b/src/views/users/GiftSendRecordView.vue
index db52fde..f68e421 100644
--- a/src/views/users/GiftSendRecordView.vue
+++ b/src/views/users/GiftSendRecordView.vue
@@ -14,15 +14,6 @@
                     <div id="toolbar">
                         送礼用户id：<input type="text" name="senderErbanNo" id="senderErbanNo" class="input-sm" />
                         收礼用户id：<input type="text" name="receiverErbanNo" id="receiverErbanNo" class="input-sm" />
-                        礼物类型：
-                        <select name="giftType" id="giftType">
-                            <option value="">全部</option>
-                            <option value="0">背包礼物</option>
-                            <option value="2">普通礼物</option>
-                            <option value="5">福袋奖池礼物</option>
-                            <option value="7">贵族礼物</option>
-                            <option value="8">周星榜礼物</option>
-                        </select>
                         礼物名称：<input type="text" name="giftName" id="giftName" class="input-sm" />
                         送礼时间：<input type="text" name="startTime" id="startTime" class="input-sm">
                         - <input type="text" name="endTime" id="endTime" class="input-sm">
@@ -50,7 +41,7 @@ export default {
     },
     methods: {
         initData() {
-            let tableLoaded = false;
+
             let currParams = {};
 
             $('#table').bootstrapTable('destroy');
@@ -83,9 +74,9 @@ export default {
                 cache: false,
                 striped: true,
                 showRefresh: false,
-                pageSize: 10,
+                pageSize: 30,
                 pagination: true,
-                pageList: [10, 20, 30, 50],
+                pageList: [30, 50, 100, 200],
                 sidePagination: "server", //表示服务端请求
                 //设置为undefined可以获取pageNumber，pageSize，searchText，sortName，sortOrder
                 //设置为limit可以获取limit, offset, search, sort, order
@@ -110,11 +101,9 @@ export default {
                 url: '/admin/giftSendRecord/list',
                 onLoadSuccess: function () {  //加载成功时执行
                     console.log("load success");
-                    tableLoaded = true;
                 },
                 onLoadError: function () {  //加载失败时执行
                     console.log("load fail");
-                    tableLoaded = false;
                 }
             })
             $('#btnSearch').on('click', function () {
@@ -123,7 +112,6 @@ export default {
                 //     $("#tipModal").modal('show');
                 //     return;
                 // }
-                console.debug('ASDFASDF')
                 // if ($('#startTime').val() && $('#endTime').val()) {
                 //     var dateStart = new Date($('#startTime').val().replace(/\-/g, "/"));
                 //     var dateEnd = new Date($('#endTime').val().replace(/\-/g, "/"));
@@ -135,18 +123,24 @@ export default {
                 //         return;
                 //     }
                 // }
-                if (tableLoaded || currParams.pageNumber > 1) {
+                if (currParams.pageNumber > 1) {
                     TableHelper.doRefreshAndToPage1('#table');
                 } else {
                     TableHelper.doRefresh('#table');
                 }
             })
             var picker1 = $("#startTime").datetimepicker({
-                format: 'yyyy-mm-dd hh:ii:00',
+                todayHighlight: true,
+                todayBtn: true,
+                language: "zh-cn",
+                format: 'yyyy-mm-dd hh:ii:ss',
                 autoclose: true
             })
             var picker2 = $('#endTime').datetimepicker({
-                format: 'yyyy-mm-dd hh:ii:00',
+                todayHighlight: true,
+                todayBtn: true,
+                language: "zh-cn",
+                format: 'yyyy-mm-dd hh:ii:ss',
                 autoclose: true
             })
             picker1.on('changeDate', function () {