From 4780ae5b18000dac4519ca743fa3b32ff8d5f12c Mon Sep 17 00:00:00 2001
From: chc <1501738723@qq.com>
Date: Thu, 2 Feb 2023 17:06:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E9=94=80=E8=87=AA=E6=8F=90=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 seller/src/views/order/order/orderDetail.vue | 9 ++++++++-
 seller/src/views/order/order/orderList.vue   | 5 +++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/seller/src/views/order/order/orderDetail.vue b/seller/src/views/order/order/orderDetail.vue
index 5fd939fb..cef64414 100644
--- a/seller/src/views/order/order/orderDetail.vue
+++ b/seller/src/views/order/order/orderDetail.vue
@@ -117,7 +117,7 @@
           </template>
         </Col>
         <Col span="12">
-          <div class="div-item">
+          <div class="div-item" v-if="orderInfo.order.deliveryMethod != 'SELF_PICK_UP'">
             <div class="div-item-left">收货信息：</div>
             <div class="div-item-right">
               {{ orderInfo.order.consigneeName }}
@@ -126,6 +126,13 @@
               {{ orderInfo.order.consigneeDetail }}
             </div>
           </div>
+          <div class="div-item"  v-if="orderInfo.order.deliveryMethod == 'SELF_PICK_UP'">
+            <div class="div-item-left">自提信息：</div>
+            <div class="div-item-right">
+              {{ orderInfo.order.storeAddressPath }}
+              {{ orderInfo.order.storeAddressMobile }}
+            </div>
+          </div>
           <div class="div-item">
             <div class="div-item-left">支付方式：</div>
             <div class="div-item-right">
diff --git a/seller/src/views/order/order/orderList.vue b/seller/src/views/order/order/orderList.vue
index 5db5354a..8aaf7b54 100644
--- a/seller/src/views/order/order/orderList.vue
+++ b/seller/src/views/order/order/orderList.vue
@@ -39,6 +39,7 @@
             <Option value="DELIVERED">已发货</Option>
             <Option value="COMPLETED">已完成</Option>
             <Option value="CANCELLED">已取消</Option>
+            <Option value="STAY_PICKED_UP">待自提</Option>
           </Select>
         </Form-item>
         <Form-item label="订单类型" prop="orderType">
@@ -225,6 +226,10 @@ export default {
               return h("div", [
                 h("tag", { props: { color: "geekblue" } }, "待发货"),
               ]);
+            }else if (params.row.orderStatus == "STAY_PICKED_UP") {
+              return h("div", [
+                h("tag", { props: { color: "geekblue" } }, "待自提"),
+              ]);
             } else if (params.row.orderStatus == "DELIVERED") {
               return h("div", [
                 h("tag", { props: { color: "cyan" } }, "已发货"),