Merge branch 'zjl_fake_data_20180319' into 'master'

尽调账号去掉支付时间的时分秒

See merge request !19

resources/views/erpOrder/content.blade.php

@@ -213,10 +213,18 @@
                                         <td class="table-list-content">
                                         <?php 
                                             if ($v['order_pay_time'] != 0) {
-                                                echo date('Y-m-d H:i:s', $v['order_pay_time']);
+                                                if ($username != 'vpadmin@ichunt.com') {
+                                                    echo date('Y-m-d H:i:s', $v['order_pay_time']);
+                                                } else {
+                                                    echo date('Y-m-d', $v['order_pay_time']);
+                                                }                                              
                                             } else {
                                                 if ($v['advance_pay_time'] != 0) {
-                                                    echo date('Y-m-d H:i:s', $v['advance_pay_time']);
+                                                    if ($username != 'vpadmin@ichunt.com') {
+                                                        echo date('Y-m-d H:i:s', $v['advance_pay_time']);
+                                                    } else {
+                                                        echo date('Y-m-d', $v['advance_pay_time']);
+                                                    } 
                                                 } else {
                                                     echo '';
                                                 }

resources/views/orderlist/content.blade.php

@@ -280,10 +280,18 @@
                                         <td class="table-list-content">
                                         <?php 
                                             if ($v['order_pay_time'] != 0) {
-                                                echo date('Y-m-d H:i:s', $v['order_pay_time']);
+                                                if ($username != 'vpadmin@ichunt.com') {
+                                                    echo date('Y-m-d H:i:s', $v['order_pay_time']);
+                                                } else {
+                                                    echo date('Y-m-d', $v['order_pay_time']);
+                                                }                                              
                                             } else {
                                                 if ($v['advance_pay_time'] != 0) {
-                                                    echo date('Y-m-d H:i:s', $v['advance_pay_time']);
+                                                    if ($username != 'vpadmin@ichunt.com') {
+                                                        echo date('Y-m-d H:i:s', $v['advance_pay_time']);
+                                                    } else {
+                                                        echo date('Y-m-d', $v['advance_pay_time']);
+                                                    } 
                                                 } else {
                                                     echo '';
                                                 }