feat:物流轨迹功能

jd-logistics-ui-v3/src/views/logistics/order/components/PickupTimeCascader.vue

@@ -77,12 +77,12 @@ const props = defineProps({
   // 开始时间
   startTime: {
     type: Number,
-    default: 9
+    default: 8
   },
   // 结束时间
   endTime: {
     type: Number,
-    default: 21
+    default: 20
   },
   // 当前时间（用于测试）
   currentTime: {

jd-logistics-ui-v3/src/views/logistics/order/index.vue

@@ -462,36 +462,36 @@
             </div>
           </el-tab-pane>
 
-<!--          &lt;!&ndash; 新增物流轨迹标签页 &ndash;&gt;-->
-<!--          <el-tab-pane label="物流轨迹" name="logistics">-->
-<!--            <div class="logistics-trace-container">-->
-<!--              <div v-if="deliverTraceLoading" class="loading-container">-->
-<!--                <el-icon class="loading-icon"><Loading /></el-icon>-->
-<!--                <span>正在查询物流信息...</span>-->
-<!--              </div>-->
-<!--              <div v-else-if="deliverTraceData.length === 0" class="empty-container">-->
-<!--                <el-icon><Box /></el-icon>-->
-<!--                <span>暂无物流信息</span>-->
-<!--              </div>-->
-<!--              <div v-else class="trace-timeline">-->
-<!--                <el-timeline>-->
-<!--                  <el-timeline-item-->
-<!--                      v-for="(item, index) in deliverTraceData"-->
-<!--                      :key="index"-->
-<!--                      :timestamp="item.time"-->
-<!--                      placement="top"-->
-<!--                      :type="getTimelineType(index)"-->
-<!--                      size="large"-->
-<!--                  >-->
-<!--                    <div class="trace-item">-->
-<!--                      <div class="trace-content">{{ item.context }}</div>-->
-<!--                      <div class="trace-time">{{ item.ftime }}</div>-->
-<!--                    </div>-->
-<!--                  </el-timeline-item>-->
-<!--                </el-timeline>-->
-<!--              </div>-->
-<!--            </div>-->
-<!--          </el-tab-pane>-->
+          <!-- 新增物流轨迹标签页 -->
+          <el-tab-pane label="物流轨迹" name="logistics">
+            <div class="logistics-trace-container">
+              <div v-if="deliverTraceLoading" class="loading-container">
+                <el-icon class="loading-icon"><Loading /></el-icon>
+                <span>正在查询物流信息...</span>
+              </div>
+              <div v-else-if="deliverTraceData.length === 0" class="empty-container">
+                <el-icon><Box /></el-icon>
+                <span>暂无物流信息</span>
+              </div>
+              <div v-else class="trace-timeline">
+                <el-timeline>
+                  <el-timeline-item
+                      v-for="(item, index) in deliverTraceData"
+                      :key="index"
+                      :timestamp="item.time"
+                      placement="top"
+                      :type="getTimelineType(index)"
+                      size="large"
+                  >
+                    <div class="trace-item">
+                      <div class="trace-content">{{ item.context }}</div>
+                      <div class="trace-time">{{ item.ftime }}</div>
+                    </div>
+                  </el-timeline-item>
+                </el-timeline>
+              </div>
+            </div>
+          </el-tab-pane>
 
           <!-- 新增费用信息标签页 -->
           <el-tab-pane label="费用信息" name="fee">
@@ -1110,7 +1110,7 @@ const getDeliverTrace = (externalWaybillNo) => {
   deliverTraceLoading.value = true
   const params = {
     number: externalWaybillNo,
-    company: form.value.orderType == '1' ? 'jd' : 'sf'
+    company: ''
   }
 
   deliverTrace(params).then(response => {