From 7c50e4ce6be2929057b61afb9ef1ee7a61beb6f6 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 16 七月 2025 11:49:12 +0800
Subject: [PATCH] 前端

---
 admin/src/components/business/orderProgress.vue |   90 ++++++++++++++++++++++++++++++++++-----------
 1 files changed, 68 insertions(+), 22 deletions(-)

diff --git a/admin/src/components/business/orderProgress.vue b/admin/src/components/business/orderProgress.vue
index 06de68c..30cd834 100644
--- a/admin/src/components/business/orderProgress.vue
+++ b/admin/src/components/business/orderProgress.vue
@@ -6,15 +6,30 @@
         :visible.sync="visible"
         :confirm-working="isWorking"
     >
-        <el-timeline reverse>
-            <el-timeline-item v-for="(item, index) in list" :key="index" :hide-timestamp="true">
-                <div style="display: flex; flex-direction: column;">
-                    <span class="a">{{item.title}}</span>
-                    <span class="b">{{item.creatorName}} {{item.companyName || '骞冲彴鐞嗚禂鍛�'}} {{item.createDate }}</span>
-                    <span class="c" v-if="index >0 && item.content">璇存槑锛歿{item.content}}</span>
-                </div>
-            </el-timeline-item>
+      <div class="time-line">
+        <el-timeline :reverse="true">
+          <el-timeline-item
+              v-for="(activity, index) in list"
+              :key="index"
+              color="#2991FF"
+              size="large"
+              type="primary"
+          >
+            <div class="time">
+              <div>
+            <span class="year">
+              {{ activity.createTime.substring(0, 10) }}
+            </span>
+              </div>
+              <div class="day">{{ activity.createTime.substring(10,20) }}</div>
+            </div>
+            <div class="ml10">
+              <div class="list-title">{{ activity.title }}</div>
+              <div class="list-company">{{activity.logInfo }}</div>
+            </div>
+          </el-timeline-item>
         </el-timeline>
+      </div>
     </GlobalWindow>
 </template>
 
@@ -39,19 +54,50 @@
   }
 }
 </script>
-
 <style lang="scss" scoped>
-    .a {
-        color: rgba(16,16,16,1);
-        font-size: 14px;
-    }
-    .b {
-        color: rgba(154,154,154,1);
-        font-size: 14px;
-        margin: 10px 0;
-    }
-    .c {
-        color: rgba(16,16,16,1);
-        font-size: 14px;
-    }
+.time-line {
+  margin-top: 50px;
+  margin-left: 200px;
+}
+.list-title {
+  font-size: 12px;
+  font-family: PingFangSC-Medium, PingFang SC;
+  font-weight: 500;
+  color: #181b1e;
+}
+.list-company {
+  font-size: 12px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #596878;
+  margin-top: 15px;
+  margin-bottom: 15px;
+}
+.list-desc {
+  font-size: 12px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #596878;
+}
+//宸︿晶鏃堕棿
+.time {
+  color: #409eff;
+  position: absolute;
+  left: -94px;
+  top: 1px;
+  .year {
+    font-size: 14px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 400;
+    color: #20354a;
+  }
+  .day {
+    font-size: 12px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 400;
+    color: black;
+    text-align: right;
+    margin-top: 0px;
+  }
+}
 </style>

--
Gitblit v1.9.3