From 924259d8bcf0e8d24d8e6a5dc78220eb5e65e6e6 Mon Sep 17 00:00:00 2001
From: Enzo <1284707383@qq.com>
Date: Tue, 3 Aug 2021 16:56:48 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
canteen/pages/purchase/order.vue | 4 ++--
supplier/pages/gonghuo/order.vue | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/canteen/pages/purchase/order.vue b/canteen/pages/purchase/order.vue
index 9e17143..5c56316 100644
--- a/canteen/pages/purchase/order.vue
+++ b/canteen/pages/purchase/order.vue
@@ -30,11 +30,11 @@
{{ item.send_time }}
- 收货时间
+ 预计收货时间
{{ item.deadline }}
- 送达时间
+ 实际送达时间
{{ item.receive_time }}
diff --git a/supplier/pages/gonghuo/order.vue b/supplier/pages/gonghuo/order.vue
index 2d21d1c..902ca09 100644
--- a/supplier/pages/gonghuo/order.vue
+++ b/supplier/pages/gonghuo/order.vue
@@ -26,7 +26,7 @@
{{ item.deadline_text }}
- 送达时间
+ 实际送达时间
{{ item.receive_time }}
From 0b31d116dd39adaf6fa9f4aa9dd40684b81f7595 Mon Sep 17 00:00:00 2001
From: Enzo <1284707383@qq.com>
Date: Tue, 3 Aug 2021 17:03:25 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
canteen/pages/purchase/order.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/canteen/pages/purchase/order.vue b/canteen/pages/purchase/order.vue
index 5c56316..f9036cd 100644
--- a/canteen/pages/purchase/order.vue
+++ b/canteen/pages/purchase/order.vue
@@ -29,9 +29,9 @@
发单时间
{{ item.send_time }}
-
+
预计收货时间
- {{ item.deadline }}
+ {{ item.deadline_text }}
实际送达时间