Merge branch 'feature/reward' of wmtx/platform into release

修改时间

Application/Admin/Controller/StatementMangementController.class.php

@@ -568,7 +568,7 @@ class StatementMangementController extends ThinkController
                 } else {
                     $data = M('reward_record', 'tab_')->where(['id'=>$id])->find();
                     if (!$data) return $this->error("未找到该记录");
-                    $data['confirm_time'] = $data['confirm_time'] ? date('Y-m-d H:i:s', $data['confirm_time']) : '';
+                    $data['confirm_time'] = $data['confirm_time'] ? date('Y-m-d', $data['confirm_time']) : '';
                     $data['accounts'] = json_decode($data['accounts'], true) ?: [];
                     $data['settlement_info'] = json_decode($data['settlement_info'], true) ?: [];
                     //$this->assign('data', $data);
@@ -627,7 +627,7 @@ class StatementMangementController extends ThinkController
                 } else {
                     $data = M('reward_record', 'tab_')->where(['id'=>$id])->find();
                     if (!$data) return $this->error("未找到该记录");
-                    $data['confirm_time'] = $data['confirm_time'] ? date('Y-m-d H:i:s', $data['confirm_time']) : '';
+                    $data['confirm_time'] = $data['confirm_time'] ? date('Y-m-d', $data['confirm_time']) : '';
                     $data['accounts'] = json_decode($data['accounts'], true) ?: [];
                     $data['settlement_info'] = json_decode($data['settlement_info'], true) ?: [];
                     //$this->assign('data', $data);

Application/Admin/View/StatementMangement/rewardManageSave.html

@@ -299,11 +299,11 @@
             </li>
             <li>
                 <label>奖惩时间</label>
-                <input type="text" id="reward_time" readonly name="reward_time" class="" value="{:date('Y-m-d H:i:s',$data['reward_time'])}" placeholder="奖惩时间" />
+                <input type="text" id="reward_time" readonly name="reward_time" class="" value="{:date('Y-m-d',$data['reward_time'])}" placeholder="奖惩时间" />
             </li>
             <li>
                 <label>奖惩结算时间</label>
-                <input type="text" id="settlement_time" readonly name="settlement_time" class="" value="<?=$data['settlement_time'] ? date('Y-m-d H:i:s',$data['settlement_time']) : ''?>" placeholder="奖惩时间" />
+                <input type="text" id="settlement_time" readonly name="settlement_time" class="" value="<?=$data['settlement_time'] ? date('Y-m-d',$data['settlement_time']) : ''?>" placeholder="奖惩时间" />
             </li>
             <li>
                 <label>奖惩确认时间</label>
@@ -366,7 +366,7 @@
         $("#reward_time, #confirm_time, #settlement_time").each(function(){
             laydate.render({
                 elem: this //指定元素
-                ,type: 'datetime'
+                ,type: 'date'
             });
         });
 

Application/Admin/View/StatementMangement/rewardManagerDetail.html

@@ -283,11 +283,11 @@
             </li>
             <li>
                 <label>奖惩时间</label>
-                <input type="text"readonly class="" value="{:date('Y-m-d H:i:s',$data['reward_time'])}" placeholder="奖惩时间" />
+                <input type="text"readonly class="" value="{:date('Y-m-d',$data['reward_time'])}" placeholder="奖惩时间" />
             </li>
             <li>
                 <label>奖惩结算时间</label>
-                <input type="text" readonly  class="" value="<?=$data['settlement_time'] ? date('Y-m-d H:i:s',$data['settlement_time']) : ''?>" placeholder="奖惩时间" />
+                <input type="text" readonly  class="" value="<?=$data['settlement_time'] ? date('Y-m-d',$data['settlement_time']) : ''?>" placeholder="奖惩时间" />
             </li>
             <li>
                 <label>奖惩确认时间</label>