From 077a770de78221af0ce0498bc45beb5231b1402a Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Tue, 18 Feb 2020 18:24:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A5=96=E7=BD=9A=E8=AE=B0=E5=BD=95=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E3=80=8B=E5=A5=96=E7=BD=9A=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E5=88=A4=E8=AF=BB=EF=BC=8C=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=88=A4=E8=AF=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/StatementMangementController.class.php     | 2 +-
 Application/Admin/View/StatementMangement/rewardManageList.html | 2 +-
 Application/Admin/View/StatementMangement/rewardManageSave.html | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Application/Admin/Controller/StatementMangementController.class.php b/Application/Admin/Controller/StatementMangementController.class.php
index 4714782a8..6ad7ab8af 100644
--- a/Application/Admin/Controller/StatementMangementController.class.php
+++ b/Application/Admin/Controller/StatementMangementController.class.php
@@ -259,7 +259,7 @@ class StatementMangementController extends ThinkController
                 $item['reward_type_desc'] = $item['reward_type'] == 1 ? "奖励" : "惩罚";
                 $item['company_type_desc'] = $item['company_type'] == 1 ? "上游公司" : "下游公司";
                 $item['relation_game_name'] = $games[$item['relation_game_id']];
-                $item['reward_time'] = date('Y-m-d H:i:s', $item['reward_time']);
+                $item['reward_time'] = $item['reward_time'] ? date('Y-m-d H:i:s', $item['reward_time']) : '-';
                 // if ($item['company_type'] == 1) {
 
                 // } else {
diff --git a/Application/Admin/View/StatementMangement/rewardManageList.html b/Application/Admin/View/StatementMangement/rewardManageList.html
index 8ac38dd30..43eebf417 100644
--- a/Application/Admin/View/StatementMangement/rewardManageList.html
+++ b/Application/Admin/View/StatementMangement/rewardManageList.html
@@ -153,7 +153,7 @@
                                 <td>{$data.content}</td>
                                 <td>{$data.money}</td>
                                 <td>{$data.remark}</td>
-                                <td>{:date('Y-m-d H:i:s',$data['reward_time'])}</td>
+                                <td>{$data['reward_time']}</td>
                                 <td>{:get_admin_nickname($data['creater_id'])}</td>
                                 <td>
                                     <a href="{:U('StatementMangement/rewardManageSave',array('id'=>$data['id']))}">编辑 </a>
diff --git a/Application/Admin/View/StatementMangement/rewardManageSave.html b/Application/Admin/View/StatementMangement/rewardManageSave.html
index 885bb6c85..f36b33eff 100644
--- a/Application/Admin/View/StatementMangement/rewardManageSave.html
+++ b/Application/Admin/View/StatementMangement/rewardManageSave.html
@@ -63,7 +63,7 @@
 
     <form action="{:U('StatementMangement/rewardManageSave')}" enctype="application/x-www-form-urlencoded" method="POST"
           class="form-horizontal form_info_ml" id="form">
-        <div class="formtitle"><span>奖惩编辑</span></div>
+        <div class="formtitle"><span>奖惩<?php if ($_GET['id']):?>编辑 <?php else:?>新增<?php endif;?></span></div>
         <ul class="form_info ">
             <input type="hidden" name="id" value="{$data.id}" />
             <li>