From 1e4180161296dc452b76ebd848703e80dc81a994 Mon Sep 17 00:00:00 2001
From: chc <1501738723@qq.com>
Date: Thu, 9 Mar 2023 11:17:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20:bug:=20=E8=87=AA=E6=8F=90=E4=B8=8D?=
 =?UTF-8?q?=E5=9B=9E=E6=98=BE=E9=97=AE=E9=A2=98,=E8=87=AA=E6=8F=90?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=90=8E=E5=88=B8=E7=A0=81=E5=8F=96=E6=B6=88?=
 =?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/fillorder.vue   | 2 +-
 pages/order/myOrder.vue     | 3 +++
 pages/order/orderDetail.vue | 2 +-
 utils/filters.js            | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pages/order/fillorder.vue b/pages/order/fillorder.vue
index 142cdcc..7d56f1d 100644
--- a/pages/order/fillorder.vue
+++ b/pages/order/fillorder.vue
@@ -664,7 +664,7 @@ export default {
         this.$store.state.canUseCoupons = res.data.result.canUseCoupons;
         this.$store.state.cantUseCoupons = res.data.result.cantUseCoupons;
 
-        if (!res.data.result.memberAddress.id) {
+        if (!res.data.result.memberAddress) {
           // 获取会员默认地址
           this.getUserAddress();
         } else {
diff --git a/pages/order/myOrder.vue b/pages/order/myOrder.vue
index 452797b..a22bb10 100644
--- a/pages/order/myOrder.vue
+++ b/pages/order/myOrder.vue
@@ -297,6 +297,9 @@ export default {
         {
           orderStatus: "CANCELLED", //已取消
         },
+        {
+          orderStatus: "STAY_PICKED_UP", //待自提
+        },
       ],
       cancelShow: false, //是否显示取消
       orderSn: "", //ordersn
diff --git a/pages/order/orderDetail.vue b/pages/order/orderDetail.vue
index 055bd0c..d0b6143 100644
--- a/pages/order/orderDetail.vue
+++ b/pages/order/orderDetail.vue
@@ -21,7 +21,7 @@
 
       <view class="logistics-List" v-else>
         <view class="verificationCode" v-if="order.verificationCode">
-          券码： {{ order.verificationCode }}
+          券码： {{ order.orderStatus == 'CANCELLED' ?  '已失效' : order.verificationCode }}
         </view>
         <view v-else class="logistics-List-title">
           {{ '暂无物流信息' }}
diff --git a/utils/filters.js b/utils/filters.js
index bb75189..2650ed1 100644
--- a/utils/filters.js
+++ b/utils/filters.js
@@ -499,6 +499,7 @@ export function orderStatusList (val) {
     COMPLETED: "已完成",
     COMPLETE: "已完成",
     TAKE: "待核验",
+    STAY_PICKED_UP: "待自提",
   };
   return orderStatusList[val];
 }