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

修改时间问题

Application/Admin/Controller/PresidentDepositController.class.php

@@ -219,9 +219,9 @@ class PresidentDepositController extends ThinkController
                     $record['pay_way_text'] = $payWays[$presidentDeposit['pay_way']] ?? '--';
                     $record['create_time'] = $presidentDeposit['create_time'] == 0 ? '--' : date('Y-m-d H:i:s', $presidentDeposit['create_time']);
                     $record['verify_time'] = $promoteBelong && $promoteBelong['verify_time'] != 0 ? date('Y-m-d H:i:s', $promoteBelong['verify_time']) : '--';
-                    $record['pay_confirm_time'] = $presidentDeposit['pay_confirm_time'] == 0 ? '--' : date('Y-m-d H:i:s', $presidentDeposit['pay_confirm_time']);
-                    $record['refund_time'] = $presidentDeposit['refund_time'] == 0 ? '--' : date('Y-m-d H:i:s', $presidentDeposit['refund_time']);
-                    $record['pay_accept_time'] = $presidentDeposit['pay_accept_time'] == 0 ? '--' : date('Y-m-d H:i:s', $presidentDeposit['pay_accept_time']);
+                    $record['pay_confirm_time'] = $presidentDeposit['pay_confirm_time'] == 0 ? '--' : date('Y-m-d', $presidentDeposit['pay_confirm_time']);
+                    $record['refund_time'] = $presidentDeposit['refund_time'] == 0 ? '--' : date('Y-m-d', $presidentDeposit['refund_time']);
+                    $record['pay_accept_time'] = $presidentDeposit['pay_accept_time'] == 0 ? '--' : date('Y-m-d', $presidentDeposit['pay_accept_time']);
                     $record['status_text'] = $statusList[$presidentDeposit['status']];
                     $record['has_record'] = true;
                     $record['status'] = $presidentDeposit['status'];

Application/Admin/View/PresidentDeposit/form.html

@@ -136,13 +136,13 @@
             <tr>
               <td class="l">押金收到时间：</td>
               <td class="r">
-                <input type="text" class="txt time-stamp" name="pay_accept_time" id="pay_accept_time" value="<?= $record['pay_accept_time']?date('Y-m-d H:i:s', $record['pay_accept_time']):''?>" readonly>
+                <input type="text" class="txt time-stamp" name="pay_accept_time" id="pay_accept_time" value="<?= $record['pay_accept_time']?date('Y-m-d', $record['pay_accept_time']):''?>" readonly>
               </td>
             </tr>
             <tr>
               <td class="l">押金退款时间：</td>
               <td class="r">
-                <input type="text" class="txt time-stamp" name="refund_time" id="refund_time" value="<?=$record['refund_time']?date('Y-m-d H:i:s', $record['refund_time']):''?>" readonly>
+                <input type="text" class="txt time-stamp" name="refund_time" id="refund_time" value="<?=$record['refund_time']?date('Y-m-d', $record['refund_time']):''?>" readonly>
               </td>
             </tr>
             </tbody>
@@ -199,7 +199,7 @@ $(function(){
     $('.time-stamp').each(function(){
       laydate.render({
       elem: this,
-      type: 'datetime'
+      type: 'date'
     });
     })
     

Application/Admin/View/PresidentDeposit/records.html

@@ -384,7 +384,7 @@
                         success : function() {
                             laydate.render({
                                 elem: '#deposit_recept_time',
-                                type: 'datetime',
+                                type: 'date',
                                 value: new Date() 
                             });
                         },

Application/Admin/View/PresidentDeposit/show.html

@@ -111,14 +111,14 @@
             <tr>
               <td class="l">押金退款时间：</td>
               <td class="r table_radio">
-                <span class="form_radio table_btn"><?=$record['refund_time']?date('Y-m-d H:i:s', $record['refund_time']) : ''?></span>
+                <span class="form_radio table_btn"><?=$record['refund_time']?date('Y-m-d', $record['refund_time']) : ''?></span>
                 <span class="notice-text"></span>
               </td>
             </tr>
             <tr>
               <td class="l">押金收到时间：</td>
               <td class="r table_radio">
-                <span class="form_radio table_btn"><?=$record['pay_accept_time']?date('Y-m-d H:i:s', $record['pay_accept_time']) : ''?></span>
+                <span class="form_radio table_btn"><?=$record['pay_accept_time']?date('Y-m-d', $record['pay_accept_time']) : ''?></span>
                 <span class="notice-text"></span>
               </td>
             </tr>