From 192ad848977d9e0d18fe5bd899e8c8ef728ff62f Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Thu, 28 Nov 2019 17:53:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0-=E3=80=8B=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E5=B8=81=E5=85=85=E5=80=BC=E5=AF=BC=E5=87=BA=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/ExportController.class.php | 7 ++++++-
 Application/Media/Controller/IndexController.class.php  | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php
index e6e6fb766..6e46c418f 100644
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/Application/Admin/Controller/ExportController.class.php
@@ -1004,7 +1004,7 @@ class ExportController extends Controller
                     array('pay_amount', "充值平台币"),
                     array('pay_way', "充值方式", 'get_pay_way', '*'),
                     array('pay_ip', "充值ip"),
-                    array('create_time', "充值时间", 'time_format'),
+                    array('create_time', "充值时间"),
                     array('pay_status', L('Order_status'), 'get_info_status', '*', '9'),
                     array('', "共计充值{$total}"),
                 );
@@ -1012,6 +1012,10 @@ class ExportController extends Controller
                     ->where($map)
                     ->order('id DESC')
                     ->select();
+                foreach ($xlsData as $key => $value) {
+                    $xlsData[$key]['create_time'] = date('Y-m-d H:i:s', $value['create_time']);
+                }
+//                dd($xlsData);
                 break;
             case 9:
                 $xlsName = $xlsName?$xlsName:"平台币发放";
@@ -1542,6 +1546,7 @@ class ExportController extends Controller
             $xlsName = $xlsCell = $xlsData = [];
 
         }
+
         //数据处理
         foreach ($xlsData as $key => $val) {
             foreach ($xlsCell as $k => $v) {
diff --git a/Application/Media/Controller/IndexController.class.php b/Application/Media/Controller/IndexController.class.php
index 6c62afa6f..598b9a936 100644
--- a/Application/Media/Controller/IndexController.class.php
+++ b/Application/Media/Controller/IndexController.class.php
@@ -375,7 +375,7 @@ class IndexController extends BaseController {
                 S('index_reco',$reco);
             }
         }
-        $reco=game_merge($reco,$model['map']);
+        $reco = game_merge($reco,$model['map']);
         $this->assign('recommend',$reco);