From ae0a3507a6c38c87435c6789e7fe6c067c335573 Mon Sep 17 00:00:00 2001
From: dragon <3013557874@qq.com>
Date: Wed, 30 Oct 2024 17:46:48 +0800
Subject: [PATCH] =?UTF-8?q?=E9=92=BB=E7=9F=B3=E6=B5=81=E6=B0=B4=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=97=B6=E5=88=86=E7=A7=92+=E8=BD=AC=E8=B5=A0?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=96=B0=E5=A2=9Eweb-api=E9=87=91=E5=B8=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/guildOperationManagement/diamondFlow.vue | 7 ++++---
 src/views/users/DiamondGiveHistoryView.vue         | 3 +++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/views/guildOperationManagement/diamondFlow.vue b/src/views/guildOperationManagement/diamondFlow.vue
index 6ba2478..9e352e6 100644
--- a/src/views/guildOperationManagement/diamondFlow.vue
+++ b/src/views/guildOperationManagement/diamondFlow.vue
@@ -38,6 +38,7 @@
           v-model="inquire.time[0]"
           type="date"
           placeholder="开始时间"
+          format="YYYY-MM-DD 00:00:00"
         >
         </el-date-picker>
       </div>
@@ -49,6 +50,7 @@
           v-model="inquire.time[1]"
           type="date"
           placeholder="结束时间"
+          format="YYYY-MM-DD 23:59:59"
         >
         </el-date-picker>
       </div>
@@ -144,7 +146,6 @@ export default {
       let time = this.inquire.time;
       let startTime = null;
       let endTime = null;
-      console.log(this.inquire.time, 111111);
       if (time.length > 0) {
         startTime = this.inquire.time[0]
           ? dateFormat(this.inquire.time[0], "yyyy-MM-dd")
@@ -180,8 +181,8 @@ export default {
       let startTime = "";
       let endTime = "";
       if (time && time.length > 0) {
-        startTime = dateFormat(this.inquire.time[0], "yyyy-MM-dd hh:mm:ss");
-        endTime = dateFormat(this.inquire.time[1], "yyyy-MM-dd hh:mm:ss");
+        startTime = dateFormat(this.inquire.time[0], "yyyy-MM-dd");
+        endTime = dateFormat(this.inquire.time[1], "yyyy-MM-dd");
       }
       diamondStatisticsExport({
         guildId: this.inquire.guildId,
diff --git a/src/views/users/DiamondGiveHistoryView.vue b/src/views/users/DiamondGiveHistoryView.vue
index 417167e..ad20853 100644
--- a/src/views/users/DiamondGiveHistoryView.vue
+++ b/src/views/users/DiamondGiveHistoryView.vue
@@ -24,6 +24,7 @@
                                     <option value="">请选择...</option>
                                     <option value="0">金币</option>
                                     <option value="1">背包礼物</option>
+                                    <option value="2">web-api金币</option>
                                 </select>
                             </div>
 
@@ -163,6 +164,8 @@ export default {
                             formatter: function (val, row, index) {
                                 if (row.type == 0) {
                                     return '金币'
+                                }else if(row.type == 2){
+                                    return 'web-api金币';
                                 } else {
                                     return '背包礼物';
                                 }