From 8a266092ac1f485248a01c38074418cdb037c1c0 Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Thu, 29 May 2025 14:21:56 +0800
Subject: [PATCH] =?UTF-8?q?feat(wl):=20=E6=9F=A5=E7=9C=8B=E7=89=A9?=
 =?UTF-8?q?=E6=B5=81=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/mine/order/index.vue |   2 +-
 pages/mine/order/wl.vue    | 360 +++++++++++++++++++++++++------------
 2 files changed, 242 insertions(+), 120 deletions(-)

diff --git a/pages/mine/order/index.vue b/pages/mine/order/index.vue
index e04d035..4fa7ef9 100644
--- a/pages/mine/order/index.vue
+++ b/pages/mine/order/index.vue
@@ -102,7 +102,7 @@
             @click="openWl(item)"
             shape="circle"
             :text="'查看物流'"
-            color="#E03030"
+            color="#005BAC"
           ></u-button>
         </view>
       </view>
diff --git a/pages/mine/order/wl.vue b/pages/mine/order/wl.vue
index 0130d0a..733e05e 100644
--- a/pages/mine/order/wl.vue
+++ b/pages/mine/order/wl.vue
@@ -1,35 +1,64 @@
-
 <template>
   <view class="content">
-    <view v-for="(item, index) in wlData"
-          :key="index">
-      <view class="tab">
-        <view @click="isClick = index"
-              class="tab_i">
-          <view>{{'快递包裹'}}{{index+1 }}</view>
-          <view :class="[isClick===index?'heng':'heng1']">
+    <!-- 选项卡区域 - 移到外层 -->
+    <view class="tab-container" v-if="wlData.length > 0">
+      <view
+        v-for="(item, index) in wlData"
+        :key="index"
+        @click="isClick = index"
+        class="tab-item"
+        :class="{ active: isClick === index }"
+      >
+        <view class="tab-text">快递包裹{{ index === 0 ? '' : index }}</view>
+        <view class="tab-underline" :class="{ show: isClick === index }"></view>
+      </view>
+    </view>
+
+    <!-- 分隔区域 -->
+    <view class="separator"></view>
+
+    <!-- 当前选中的物流信息 -->
+    <view v-if="wlData.length > 0 && wlData[isClick]">
+      <!-- 物流信息头部 -->
+      <view class="logistics-header">
+        <view class="logistics-info">
+          <image src="@/static/images/wl.png" class="logistics-icon" />
+          <view class="logistics-details">
+            <view class="company-name"
+              >物流公司：{{ wlData[isClick].expressName }}</view
+            >
+            <view class="tracking-number"
+              >物流单号：{{ wlData[isClick].expressCode }}</view
+            >
           </view>
         </view>
+        <view class="copy-btn" @click="onCopy(wlData[isClick].expressCode)"
+          >复制</view
+        >
       </view>
-      <view class="hui"></view>
-      <view class="head_t">
-        <view class="disflex">
-          <img src="@/static/images/wl.png"
-               alt="">
-          <view>{{ item.expressName }}{{'快递包裹'}} {{ item.expressCode }}</view>
-        </view>
-        <view @click="onCopy(item.expressCode)">{{'复制'}}</view>
-      </view>
-      <view class="wl_tree"
-            v-for="ctem,cndex in item.detailList"
-            :key="cndex">
-        <view class="zhong">
-          <view :class="cndex==0?'red1':'qiu'"></view>
-          <view class="gun"></view>
-        </view>
-        <view class="tree_r">
-          <view :class="cndex==0?'red2':'tree_t'">{{ ctem.time }}</view>
-          <view :class="cndex==0?'red3':'tree_t'">{{ ctem.context }}</view>
+
+      <!-- 物流轨迹时间线 -->
+      <view class="timeline-container">
+        <view
+          class="timeline-item"
+          v-for="(ctem, cndex) in wlData[isClick].detailList"
+          :key="cndex"
+        >
+          <view class="timeline-left">
+            <view class="timeline-dot" :class="{ active: cndex === 0 }"></view>
+            <view
+              class="timeline-line"
+              v-if="cndex < wlData[isClick].detailList.length - 1"
+            ></view>
+          </view>
+          <view class="timeline-content">
+            <view class="timeline-time" :class="{ active: cndex === 0 }">{{
+              ctem.time
+            }}</view>
+            <view class="timeline-desc" :class="{ active: cndex === 0 }">{{
+              ctem.context
+            }}</view>
+          </view>
         </view>
       </view>
     </view>
@@ -52,7 +81,7 @@ export default {
   onShow() {},
   methods: {
     openWl(id) {
-      api.expressList(id).then((res) => {
+      api.expressList(id).then(res => {
         if (res.code == 200) {
           this.wlData = res.data
         }
@@ -60,7 +89,7 @@ export default {
     },
     onCopy(code) {
       let text = code + ''
-      this.$copyText(text).then((res) => {
+      this.$copyText(text).then(res => {
         uni.showToast({
           title: '复制成功',
           icon: 'none',
@@ -72,109 +101,202 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.tab {
+.content {
+  background-color: #f5f5f5;
+  min-height: 100vh;
+}
+
+/* 选项卡样式 */
+.tab-container {
+  display: flex;
+  background: #ffffff;
+  padding: 20rpx 40rpx 0;
+}
+
+.tab-item {
+  flex: 1;
+  text-align: center;
+  padding-bottom: 20rpx;
+  cursor: pointer;
+}
+
+.tab-text {
+  font-size: 28rpx;
+  color: #999999;
+  font-weight: 400;
+  margin-bottom: 8rpx;
+}
+
+.tab-item.active .tab-text {
+  color: #333333;
+  font-weight: 500;
+}
+
+.tab-underline {
+  height: 4rpx;
+  background: transparent;
+  margin: 0 auto;
+  width: 60rpx;
+  border-radius: 2rpx;
+  transition: all 0.3s ease;
+}
+
+.tab-underline.show {
+  background: #005bac;
+}
+
+/* 分隔区域 */
+.separator {
+  height: 20rpx;
+  background: #f5f5f5;
+}
+
+/* 物流信息头部 */
+.logistics-header {
+  background: #ffffff;
+  padding: 30rpx 40rpx;
   display: flex;
   align-items: center;
   justify-content: space-between;
-  padding: 0 24rpx;
-  margin-top: 20rpx;
-  margin-bottom: 6rpx;
+  border-bottom: 1rpx solid #eeeeee;
 }
-.tab_i {
-  // width: 120rpx;
-  text-align: center;
+
+.logistics-info {
+  display: flex;
+  align-items: center;
+  flex: 1;
+}
+
+.logistics-icon {
+  width: 88rpx;
+  height: 88rpx;
+  margin-right: 20rpx;
+  border-radius: 50%;
+}
+
+.logistics-details {
+  flex: 1;
+}
+
+.company-name {
   font-size: 28rpx;
-  font-family: PingFang SC;
-  font-weight: 400;
   color: #333333;
-  // margin-right: 28rpx;
-  white-space: nowrap;
+  font-weight: 500;
+  margin-bottom: 8rpx;
+}
+
+.tracking-number {
+  font-size: 24rpx;
+  color: #666666;
+  font-weight: 400;
+}
+
+.copy-btn {
+  padding: 12rpx 24rpx;
+  background: #f8f8f8;
+  border: 1rpx solid #e6e6e6;
+  border-radius: 8rpx;
+  font-size: 24rpx;
+  color: #666666;
+  cursor: pointer;
+}
+
+.copy-btn:active {
+  background: #eeeeee;
+}
+
+/* 时间线样式 */
+.timeline-container {
+  background: #ffffff;
+  padding: 0 40rpx 40rpx;
+}
+
+.timeline-item {
+  display: flex;
+  position: relative;
+  padding: 30rpx 0;
+}
+
+.timeline-left {
   display: flex;
   flex-direction: column;
   align-items: center;
+  margin-right: 30rpx;
+  position: relative;
 }
-.heng {
-  width: 24px;
-  height: 2px;
-  background: #ed1d25;
-  border-radius: 1px 1px 1px 1px;
-  margin-top: 4rpx;
-}
-.heng1 {
-  width: 24px;
-  height: 2px;
-  background: #fff;
-  border-radius: 1px 1px 1px 1px;
-  margin-top: 4rpx;
-}
-.hui {
-  height: 24rpx;
-  background: #eee;
-}
-.head_t {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  font-size: 12px;
-  font-family: PingFang SC-Regular, PingFang SC;
-  font-weight: 400;
-  color: #666666;
-  border-bottom: 1px solid #ccc;
-  margin: 0 20rpx;
-  padding: 20rpx;
-  margin-bottom: 40rpx;
-  img {
-    width: 44px;
-    height: 44px;
-    margin-right: 10px;
-  }
-}
-.disflex {
-  display: flex;
-  align-items: center;
-}
-.wl_tree {
-  display: flex;
-  padding-right: 40rpx;
-  .zhong {
-    // flex: 1;
-    margin: 0 20px;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    .qiu {
-      width: 10px;
-      height: 10px;
-      background: #cccccc;
-      border-radius: 50%;
-      // margin: 10px 0;
-      // margin: 3px 0 10px 0;
-    }
-    .gun {
-      background: #ccc;
-      width: 1px;
-      min-height: 110px;
-    }
-  }
-  .tree_r {
-    // width: 60%;
-    font-size: 24rpx;
-    color: #999;
-    .tree_t {
-      color: #999;
-    }
-  }
-}
-.red1 {
-  width: 10px;
-  height: 10px;
-  background: #005BAC;
+
+.timeline-dot {
+  width: 20rpx;
+  height: 20rpx;
   border-radius: 50%;
+  background: #cccccc;
+  position: relative;
+  z-index: 2;
 }
-.red2 {
-  color: #005BAC;
+
+.timeline-dot.active {
+  background: #ff4757;
+  width: 24rpx;
+  height: 24rpx;
 }
+
+.timeline-line {
+  width: 2rpx;
+  background: #eeeeee;
+  position: absolute;
+  top: 24rpx;
+  bottom: -30rpx;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 1;
+}
+
+.timeline-content {
+  flex: 1;
+  padding-top: 2rpx;
+}
+
+.timeline-time {
+  font-size: 24rpx;
+  color: #999999;
+  margin-bottom: 8rpx;
+  font-weight: 400;
+}
+
+.timeline-time.active {
+  color: #ff4757;
+  font-weight: 500;
+}
+
+.timeline-desc {
+  font-size: 28rpx;
+  color: #666666;
+  line-height: 1.5;
+  font-weight: 400;
+}
+
+.timeline-desc.active {
+  color: #333333;
+  font-weight: 500;
+}
+
+/* 移除旧样式 */
+.tab,
+.tab_i,
+.heng,
+.heng1,
+.hui,
+.head_t,
+.disflex,
+.wl_tree,
+.zhong,
+.qiu,
+.gun,
+.tree_r,
+.tree_t,
+.red1,
+.red2,
 .red3 {
-  color: #333;
+  display: none;
 }
 </style>