From e610500db67195f8593745a7f701e44ca6c11895 Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Mon, 14 Oct 2019 09:30:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4=E6=8F=92?=
 =?UTF-8?q?=E4=BB=B6=E9=BB=98=E8=AE=A4=E5=80=BC=E6=98=BE=E7=A4=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Home/Controller/QueryController.class.php      |  1 -
 .../Home/View/default/Query/achievement.html       |  4 ++++
 Application/Home/View/default/Query/arpu.html      | 14 +++++++-------
 Application/Home/View/default/Query/userRoles.html |  4 ++++
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php
index 2d634d5a9..06812628f 100644
--- a/Application/Home/Controller/QueryController.class.php
+++ b/Application/Home/Controller/QueryController.class.php
@@ -657,7 +657,6 @@ class QueryController extends BaseController
         $sdkVersion = I('sdk_version', 0);
         $gameId = I('game_id', 0);
         $serverId = I('server_id', 0);
-
         $promote = $this->getLoginPromote();
         $map = [
             '_logic' => 'or',
diff --git a/Application/Home/View/default/Query/achievement.html b/Application/Home/View/default/Query/achievement.html
index d0cc15b94..fa5245fdf 100644
--- a/Application/Home/View/default/Query/achievement.html
+++ b/Application/Home/View/default/Query/achievement.html
@@ -147,9 +147,13 @@
 <script type="text/javascript" src="__JS__/20170831/select2.min.js"></script>
 <script type="text/javascript">
 $(function() {
+  var defaultDate = $('.range-date').val()
+  defaultDate = defaultDate == '' ? [] : defaultDate.split(' 至 ')
   $('.range-date').flatpickr({
     mode: 'range',
     locale: 'zh',
+    dateFormat: "Y-m-d",
+    defaultDate: defaultDate,
   })
   $('.select_gallery').select2()
   var gameId = $('#game-select').val();
diff --git a/Application/Home/View/default/Query/arpu.html b/Application/Home/View/default/Query/arpu.html
index d284f6b6b..0c7d62e0a 100644
--- a/Application/Home/View/default/Query/arpu.html
+++ b/Application/Home/View/default/Query/arpu.html
@@ -107,7 +107,7 @@
       </div>
       <div class="trunk-content article">
           <div class="trunk-search clearfix">
-            <form action="{:U('Query/arpu_analysis',array('row'=>I('get.row')))}" method="post" enctype="multipart/form-data">
+            <form action="{:U('Query/arpu',array('row'=>I('get.row')))}" method="post" enctype="multipart/form-data">
               <div class="form-group normal_space">
                 <select id="game-select" name="game_id" class="reselect select_gallery" style="width: 220px;" >
                   <option value="0">请选择游戏</option>
@@ -250,9 +250,13 @@
 </script>
 </eq>
 <script>
+var defaultDate = $('.range-date').val()
+  defaultDate = defaultDate == '' ? [] : defaultDate.split(' 至 ')
 $('.range-date').flatpickr({
-    mode: 'range',
-    locale: 'zh',
+  mode: 'range',
+  locale: 'zh',
+  dateFormat: "Y-m-d",
+  defaultDate: defaultDate,
 })
 var gameId = $('#game-select').val();
   var defaultServerId = $('#server-select').attr('data-server');
@@ -315,10 +319,6 @@ var gameId = $('#game-select').val();
     })
   }
 
-    $('.range-date').flatpickr({
-      mode: 'range',
-      locale: 'zh',
-    })
 		layer.config({
 			  extend: 'skin/myskin/style.css', //同样需要加载新皮肤
 			});
diff --git a/Application/Home/View/default/Query/userRoles.html b/Application/Home/View/default/Query/userRoles.html
index 770b16c27..af863eb29 100644
--- a/Application/Home/View/default/Query/userRoles.html
+++ b/Application/Home/View/default/Query/userRoles.html
@@ -139,9 +139,13 @@
 <script type="text/javascript" src="__JS__/20170831/select2.min.js"></script>
 <script type="text/javascript">
 $(function() {
+  var defaultDate = $('.range-date').val()
+  defaultDate = defaultDate == '' ? [] : defaultDate.split(' 至 ')
   $('.range-date').flatpickr({
     mode: 'range',
     locale: 'zh',
+    dateFormat: "Y-m-d",
+    defaultDate: defaultDate,
   })
   $('.select_gallery').select2()
   var gameId = $('#game-select').val();