From 3f113675dc58160034fa4c63fe48f63585255172 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com>
Date: Wed, 11 Aug 2021 14:18:46 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A3=9F=E5=A0=82=E7=AB=AF=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E5=87=BA=E5=BA=93=E2=80=9C=E5=B7=B2=E7=A1=AE=E8=AE=A4=E2=80=9D?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=94=B9=E6=88=90=E2=80=9C=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E4=B8=AD=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 canteen/pages/delivery/apply.vue  | 2 +-
 canteen/pages/delivery/detail.vue | 2 +-
 canteen/pages/delivery/order.vue  | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/canteen/pages/delivery/apply.vue b/canteen/pages/delivery/apply.vue
index b6aadec..dd3d6b8 100644
--- a/canteen/pages/delivery/apply.vue
+++ b/canteen/pages/delivery/apply.vue
@@ -265,7 +265,7 @@
 						})
 						return;
 					}
-					let state = ['待确认', '已确认'][_t]; // 传入状态
+					let state = ['待确认', '申请中'][_t]; // 传入状态
 					let _api = this.API.API_CANTEEN_WAREHOUSEOUT;
 					let _data = {
 						data: list,
diff --git a/canteen/pages/delivery/detail.vue b/canteen/pages/delivery/detail.vue
index 2d4ea51..c568355 100644
--- a/canteen/pages/delivery/detail.vue
+++ b/canteen/pages/delivery/detail.vue
@@ -33,7 +33,7 @@
 		<view class="fixed-bottom">
 			<view v-if="type == '待确认'" class="lf-row-flex-end" style="justify-content: space-between;width: 100%;">
 				<button class="btn btn1" @click="$url('/pages/delivery/apply?o_sn='+ o_sn+'&enter_type=1')">编辑</button>
-				<button class="btn btn2" @click="orderStateChange('已确认')">立即申请</button>
+				<button class="btn btn2" @click="orderStateChange('申请中')">立即申请</button>
 			</view>
 			<view v-else-if="type == '已出库'" class="lf-row-between" style="justify-content: space-between;width: 100%;">
 				<button class="btn btn1" @click="$url('/pages/delivery/apply?o_sn='+ o_sn+'&enter_type=2')">复用出库单</button>
diff --git a/canteen/pages/delivery/order.vue b/canteen/pages/delivery/order.vue
index 7cc3c25..f6bc725 100644
--- a/canteen/pages/delivery/order.vue
+++ b/canteen/pages/delivery/order.vue
@@ -80,6 +80,7 @@
 					let class_name = {
 						'待确认': 'quoted-price',
 						'已确认': 'wait',
+						'申请中': 'wait',
 						'已完成': 'passed',
 						'已退单': 'refuse'
 					}