| xqd
@@ -21,6 +21,7 @@ use Carbon\Carbon;
|
|
|
use Illuminate\Http\Request;
|
|
|
use Illuminate\Support\Facades\Auth;
|
|
|
use Illuminate\Support\Facades\Log;
|
|
|
+use phpDocumentor\Reflection\DocBlock;
|
|
|
|
|
|
class OrderController extends BaseController
|
|
|
{
|
| xqd
@@ -197,7 +198,7 @@ class OrderController extends BaseController
|
|
|
$item['status'] = $item['status'] ? '已确认':'未确认';
|
|
|
$item['confirmation_user_id'] = User::where('id',$item['confirmation_user_id'])->value('name');
|
|
|
$item['project_id'] = Project::where('id',$item['project_id'])->value('name');
|
|
|
- $item['confirmation_time'] = $item['confirmation_time'] ?$item['confirmation_time']: '暂无';
|
|
|
+ $item['confirmation_time'] = $item['confirmation_time'] ? date('Y-m-d',strtotime($item['confirmation_time'])): '暂无';
|
|
|
}
|
|
|
}else
|
|
|
{
|
| xqd
@@ -245,7 +246,7 @@ class OrderController extends BaseController
|
|
|
$order_view->date = date('Y年m月',strtotime($order_view->date));
|
|
|
$order_view->total_price = $order_view->total_price/100;
|
|
|
$order_view->project_id = Project::where('id',$order_view->project_id)->value('name');
|
|
|
- $order_view->confirmation_time = $order_view->confirmation_time ?date('Y-m-d',date('Y-m-d',$order_view->confirmation_time)): '暂无';
|
|
|
+ $order_view->confirmation_time = $order_view->confirmation_time ? date('Y-m-d',strtotime($order_view->confirmation_time)): '暂无';
|
|
|
$order_view->status = $order_view->status ? '已确认':'未确认';
|
|
|
$before_time = strtotime($dates);
|
|
|
//获取订单详情
|