Merge branch 'master' of http://119.23.72.7/zhujilai/Order into zjl_order_msg_20180402

resources/views/orderlist/content.blade.php

@@ -258,7 +258,7 @@
                                     }
                                     }
                                 ?>
                                 ?>
                             </td>
                             </td>
-                            <td class="show-list">{{$username != 'vpadmin@ichunt.com' ? date('Y-m-d h:i:s', $v['create_time']) : date('Y-m-d', $v['create_time'])}}</td>
+                            <td class="show-list">{{$username != 'vpadmin@ichunt.com' ? date('Y-m-d H:i:s', $v['create_time']) : date('Y-m-d', $v['create_time'])}}</td>
                             <td>
                             <td>
                                 <div class="btn-group btn-group-xs">
                                 <div class="btn-group btn-group-xs">
 	                                    <a class="btn btn-primary" href="{{URL('details', ['order_id'=>$v['order_id']])}}">详情</a>
 	                                    <a class="btn btn-primary" href="{{URL('details', ['order_id'=>$v['order_id']])}}">详情</a>
@@ -296,14 +296,14 @@
                                         <?php 
                                         <?php 
                                             if ($v['order_pay_time'] != 0) {
                                             if ($v['order_pay_time'] != 0) {
                                                 if ($username != 'vpadmin@ichunt.com') {
                                                 if ($username != 'vpadmin@ichunt.com') {
-                                                    echo date('Y-m-d h:i:s', $v['order_pay_time']);
+                                                    echo date('Y-m-d H:i:s', $v['order_pay_time']);
                                                 } else {
                                                 } else {
                                                     echo date('Y-m-d', $v['order_pay_time']);
                                                     echo date('Y-m-d', $v['order_pay_time']);
                                                 }                                              
                                                 }                                              
                                             } else {
                                             } else {
                                                 if ($v['advance_pay_time'] != 0) {
                                                 if ($v['advance_pay_time'] != 0) {
                                                     if ($username != 'vpadmin@ichunt.com') {
                                                     if ($username != 'vpadmin@ichunt.com') {
-                                                        echo date('Y-m-d h:i:s', $v['advance_pay_time']);
+                                                        echo date('Y-m-d H:i:s', $v['advance_pay_time']);
                                                     } else {
                                                     } else {
                                                         echo date('Y-m-d', $v['advance_pay_time']);
                                                         echo date('Y-m-d', $v['advance_pay_time']);
                                                     } 
                                                     }