From cb02e734a2bedbe9503edc506fe4853bcf3ad491 Mon Sep 17 00:00:00 2001
From: mike <esseak@gmail.com>
Date: Sat, 11 Jun 2022 12:10:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=A2=E5=8D=95=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87=20=EF=BC=8C=E5=AE=8C=E5=96=84=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/order.vue         |   5 +++--
 static/icon/order_status5.png | Bin 0 -> 2150 bytes
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 static/icon/order_status5.png

diff --git a/pages/order/order.vue b/pages/order/order.vue
index 8186bfc..db51a05 100644
--- a/pages/order/order.vue
+++ b/pages/order/order.vue
@@ -79,7 +79,7 @@
 						  <view class="justify-between">
 						    <view class="flex-row group_8">
 						      <image :src="showOrderStatusIcon(item.status)" class="image_7" />
-						      <text class="text_7">{{ ['在线送评','确认收货','定价','发货'][item.status-1] }}</text>
+						      <text class="text_7">{{ ['在线送评','确认收货','定价','发货','已确认'][item.status-1] }}</text>
 						    </view>
 						    <text class="text_8" :style="{color: item.status_text_color}">{{ item.status_text }}</text>
 						  </view>
@@ -144,6 +144,7 @@
 	import orderStatus2 from '@/static/icon/order_status2.png';
 	import orderStatus3 from '@/static/icon/order_status3.png';
 	import orderStatus4 from '@/static/icon/order_status4.png';
+	import orderStatus5 from '@/static/icon/order_status5.png';
 	
 	export default {
 		data(){
@@ -247,7 +248,7 @@
 			},
 			showOrderStatusIcon(){
 				return function(status){
-					return [orderStatus1, orderStatus2, orderStatus3, orderStatus4][status-1]
+					return [orderStatus1, orderStatus2, orderStatus3, orderStatus4, orderStatus5][status-1]
 				}
 			}
 		},
diff --git a/static/icon/order_status5.png b/static/icon/order_status5.png
new file mode 100644
index 0000000000000000000000000000000000000000..a28f90ef28bfd0a651f8b59b3de3b92529a5c49a
GIT binary patch
literal 2150
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

literal 0
HcmV?d00001