快递

app/index/controller/User.php

@@ -62,20 +62,34 @@ class User extends Controller
         if (empty($userId)) {
             return view('passport/logIn');
         }
+        $orderId = intval($orderId);
         $model = OrderModel::getUserOrderDetail($orderId);
         $orderAddress = OrderAddress::get(['order_id' => $orderId]);
-        $expModel = new ExpressModel();
-        $tracks = $expModel->dynamicUsps($model['express_no']);
-        $selfTrack = [
-            ['date' => date('Y-m-d H:i:s', $model['create_time'] + 3653), 'text' => 'Orders taken', 'desc' => 'The merchant has received your order and is waiting to be shipped'],
-            ['date' => date('Y-m-d H:i:s', $model['create_time'] + 9864), 'text' => 'Orders taken', 'desc' => 'The order has entered the warehouse']
-        ];
+
+        if (!empty($model['express_no'])) {
+            $expModel = new ExpressModel();
+            $tracks = $expModel->dynamicUsps($model['express_no']);
+            //dd($tracks);
+        } else {
+            $tracks = [];
+        }
+
         if (!$tracks) {
             $f1Track = [];
         } else {
-            $f1Track = $tracks['list']['trackList'] ?? [];
+            $f1Track = $tracks['list'][0]['trackList'] ?? [];
         }
 
+        $createTimeInt = strtotime($model['create_time']);
+
+        $selfTrack[2] = ['time' => date('Y-m-d H:i:s', $createTimeInt + 5), 'text' => 'Order paid', 'desc' => 'Successful'];
+
+        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'];
+        }
         return view('orderDetails', ['order' => $model, 'orderAddress' => $orderAddress, 'selfTrack' => $selfTrack, 'f1Track' => $f1Track]);
     }
 

app/index/view/user/orderDetails.html

@@ -158,7 +158,7 @@
                     <!-- 物流信息 -->
                     <div class="logisticsBox eleBox">
                         <div class="logsTeFlex">
-                            <p class="logsTitle">物流信息</p>
+                            <p class="logsTitle">Logistics tracks</p>
                             <div class="openButton">
                                 <img src="/assets/index/asstes/icon/slt.png" alt="">
                             </div>
@@ -168,7 +168,7 @@
                                 <div class="logsLink"></div>
                                 <!-- 物流天数据 -->
                                 <div class="logItem">
-                                    <p class="logTime">2024.03.11</p>
+<!--                                    <p class="logTime">2024.03.11</p>-->
                                     <!-- 物流当天信息 -->
                                     {foreach $f1Track as $track}
                                     <div class="logSunItem">
@@ -182,7 +182,7 @@
                                     {/foreach}
                                 </div>
                                 <div class="logItem">
-                                    <p class="logTime">2024.03.11</p>
+<!--                                    <p class="logTime">2024.03.11</p>-->
                                     <!-- 物流当天信息 -->
                                     {foreach $selfTrack as $track}
                                     <div class="logSunItem">
@@ -228,7 +228,7 @@
                     <!-- 送货地址 -->
                     <div class="addressBox eleBox">
                         <div class="addTeFlex">
-                            <p class="addTeTitle">送货地址</p>
+                            <p class="addTeTitle">Shipping address</p>
                             <div class="openButton">
                                 <img src="/assets/index/asstes/icon/slt.png" alt="">
                             </div>