|
@@ -81,15 +81,18 @@ class User extends Controller
|
|
|
}
|
|
|
|
|
|
$createTimeInt = strtotime($model['create_time']);
|
|
|
+ $selfTrack = [];
|
|
|
|
|
|
- $selfTrack[2] = ['time' => date('Y-m-d H:i:s', $createTimeInt + 5), 'text' => 'Order paid', 'desc' => 'Successful'];
|
|
|
+ if (time() > $createTimeInt + 9864) {
|
|
|
+ $selfTrack[] = ['time' => date('Y-m-d H:i:s', $createTimeInt + 9864), 'text' => 'Orders taken', 'desc' => 'The order has entered the warehouse'];
|
|
|
+ }
|
|
|
|
|
|
if (time() > $createTimeInt + 3653) {
|
|
|
- $selfTrack[1] = ['time' => date('Y-m-d H:i:s', $createTimeInt + 3653), 'text' => 'Orders taken', 'desc' => 'The merchant has received your order and is waiting to be shipped'];
|
|
|
- }
|
|
|
- if (time() > $createTimeInt + 9864) {
|
|
|
- $selfTrack[0] = ['time' => date('Y-m-d H:i:s', $createTimeInt + 9864), 'text' => 'Orders taken', 'desc' => 'The order has entered the warehouse'];
|
|
|
+ $selfTrack[] = ['time' => date('Y-m-d H:i:s', $createTimeInt + 3653), 'text' => 'Orders taken', 'desc' => 'The merchant has received your order and is waiting to be shipped'];
|
|
|
}
|
|
|
+
|
|
|
+ $selfTrack[] = ['time' => date('Y-m-d H:i:s', $createTimeInt + 5), 'text' => 'Order paid', 'desc' => 'Successful'];
|
|
|
+
|
|
|
return view('orderDetails', ['order' => $model, 'orderAddress' => $orderAddress, 'selfTrack' => $selfTrack, 'f1Track' => $f1Track]);
|
|
|
}
|
|
|
|