From 4384ad3db8f10b7add5f287681c069d4efb1e0ee Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 16 七月 2025 11:54:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/components/business/orderProgress.vue | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 103 insertions(+), 0 deletions(-)
diff --git a/admin/src/components/business/orderProgress.vue b/admin/src/components/business/orderProgress.vue
new file mode 100644
index 0000000..30cd834
--- /dev/null
+++ b/admin/src/components/business/orderProgress.vue
@@ -0,0 +1,103 @@
+<template>
+ <GlobalWindow
+ :title="title"
+ width="50%"
+ :withFooter="false"
+ :visible.sync="visible"
+ :confirm-working="isWorking"
+ >
+ <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>
+
+<script>
+import BaseOpera from '@/components/base/BaseOpera'
+import GlobalWindow from '@/components/common/GlobalWindow'
+export default {
+ name: 'orderProgress',
+ extends: BaseOpera,
+ components: { GlobalWindow },
+ data () {
+ return {
+ list: []
+ }
+ },
+ methods: {
+ open (title, target) {
+ this.title = title
+ this.list = target
+ this.visible = true
+ }
+ }
+}
+</script>
+<style lang="scss" scoped>
+.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